restructure code, use shared workspace packages

Author: hackermondev

Diff for: .editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{rs}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[*.yaml,*.yml]
+indent_style = space
+indent_size = 2

Diff for: .replit

@@ -1,4 +1,4 @@
-run = "bash run_replit.sh"
+run = "bash scripts/run_replit.sh"
 hidden = ["target", "dump.rdb", ".git"]
 entrypoint = "README.md"
 

Diff for: Cargo.lock

@@ -1,7 +1,13 @@
 [workspace]
-
 members = [
-    "src/sexurity-api",
-    "src/sexurity-poller",
-    "src/sexurity-discord"
-]
+    "src/security_api",
+    "src/security_poller",
+    "src/security_discord"
+]
+
+[workspace.dependencies]
+tokio = { version = "1.38.0", features = ["full"] }
+serde = { version = "1.0.163", features = ["derive"] }
+serde_json = "1.0.96"
+log = "0.4.17"
+pretty_env_logger = "0.5.0"

Diff for: Cargo.toml

@@ -1,15 +1,15 @@
 FROM rust:1.75 as builder
-WORKDIR /usr/src/sexurity
+WORKDIR /usr/src/security
 
 COPY . .
-RUN cargo install --path src/sexurity-discord
-RUN cargo install --path src/sexurity-poller
+RUN cargo install --path src/security_discord
+RUN cargo install --path src/security_poller
 
 FROM ubuntu
 RUN apt-get update && apt-get install -y wget jq curl && rm -rf /var/lib/apt/lists/*
 RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && chmod +x /usr/local/bin/yq
 
-COPY --from=builder /usr/local/cargo/bin/sexurity-discord /usr/local/bin/sexurity-discord
-COPY --from=builder /usr/local/cargo/bin/sexurity-poller /usr/local/bin/sexurity-poller
-COPY ./yaml_to_cli.sh /usr/local/bin/yaml_to_cli.sh
+COPY --from=builder /usr/local/cargo/bin/security_discord /usr/local/bin/discord
+COPY --from=builder /usr/local/cargo/bin/security_poller /usr/local/bin/poller
+COPY ./scripts/yaml_to_cli.sh /usr/local/bin/yaml_to_cli.sh
 ENV RUST_LOG info

Diff for: Dockerfile

@@ -8,10 +8,10 @@ services:
     expose:
       - "6379"
 
-  sexurity-poller:
+  poller:
     depends_on:
       - db
-    image: sexurity
+    image: hackerone-tracker
     links:
       - db
     build:
@@ -20,17 +20,18 @@ services:
     volumes:
       - type: bind
         source: config.yaml
-        target: /etc/sexurity/config.yaml
+        target: /etc/security/config.yaml
     environment:
-      - APP_NAME=sexurity-poller
+      - APP_NAME=poller
       - CONFIG_NAME=poller
     restart: always
-    command: [ "bash", "/usr/local/bin/yaml_to_cli.sh", "/etc/sexurity/config.yaml" ]
+    command:
+      ["bash", "/usr/local/bin/yaml_to_cli.sh", "/etc/security/config.yaml"]
 
-  sexurity-discord:
+  security_discord:
     depends_on:
       - db
-    image: sexurity
+    image: hackerone-tracker
     links:
       - db
     build:
@@ -39,15 +40,15 @@ services:
     volumes:
       - type: bind
         source: config.yaml
-        target: /etc/sexurity/config.yaml
+        target: /etc/security/config.yaml
 
     environment:
-      - APP_NAME=sexurity-discord
+      - APP_NAME=discord
       - CONFIG_NAME=discord
 
     restart: always
-    command: [ "bash", "/usr/local/bin/yaml_to_cli.sh", "/etc/sexurity/config.yaml" ]
+    command:
+      ["bash", "/usr/local/bin/yaml_to_cli.sh", "/etc/security/config.yaml"]
 
 volumes:
   db_data:
-

Diff for: docker-compose.yml

@@ -22,5 +22,5 @@ fi
 
 sed -i -e 's/redis:6379/localhost:6379/g' config.yaml # Replace redis://redis:6379 to redis://localhost:6379 in config file
 echo "Starting sexurity..."
-RUST_LOG=info APP_NAME=./target/release/sexurity-poller CONFIG_NAME=poller bash yaml_to_cli.sh config.yaml &
-RUST_LOG=info APP_NAME=./target/release/sexurity-discord CONFIG_NAME=discord bash yaml_to_cli.sh config.yaml
+RUST_LOG=info APP_NAME=./target/release/sexurity-poller CONFIG_NAME=poller bash scripts/yaml_to_cli.sh config.yaml &
+RUST_LOG=info APP_NAME=./target/release/sexurity-discord CONFIG_NAME=discord bash scripts/yaml_to_cli.sh config.yaml

Diff for: image.png

@@ -1,5 +1,5 @@
 [package]
-name = "sexurity-api"
+name = "security_api"
 version = "0.1.0"
 edition = "2021"
 

Diff for: run_replit.sh renamed to scripts/run_replit.sh

@@ -69,6 +69,7 @@ impl ReportsDataQueueItem {
 pub mod embed_colors {
     pub const NEGATIVE: u32 = 16711680;
     pub const POSTIVE: u32 = 5222492;
+    pub const MAJOR: u32 = 16567356;
     pub const TRANSPARENT: u32 = 2829617;
 }
 

Diff for: yaml_to_cli.sh renamed to scripts/yaml_to_cli.sh

@@ -1,5 +1,5 @@
 [package]
-name = "sexurity-discord"
+name = "security_discord"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,10 +8,10 @@ edition = "2021"
 [dependencies]
 clap = { version = "4.0", features = ["derive", "env"] }
 reqwest = { version = "0.11.18", features = ["blocking", "json"] }
-sexurity-api = { path = "../sexurity-api" }
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
+security_api = { path = "../security_api" }
+serde.workspace = true
+serde_json.workspace = true
 twilight-util = { version = "0.15.2", features = ["builder"] }
 twilight-model = "0.15.2"
-log = "0.4.17"
-pretty_env_logger = "0.5.0"
+log.workspace = true
+pretty_env_logger.workspace = true

Diff for: src/sexurity-api/Cargo.toml renamed to src/security_api/Cargo.toml

@@ -7,7 +7,7 @@ mod subscriptions;
 use clap::Parser;
 use reqwest::blocking as reqwest;
 use serde::Serialize;
-use sexurity_api::redis;
+use security_api::redis;
 use twilight_model::channel::message::embed::Embed;
 
 #[derive(Default, Debug, Parser)]

Diff for: src/sexurity-api/src/hackerone.rs renamed to src/security_api/src/hackerone.rs

@@ -1,5 +1,5 @@
-use sexurity_api::models;
-use sexurity_api::redis::redis::Connection;
+use security_api::models;
+use security_api::redis::redis::Connection;
 use std::thread::{self, JoinHandle};
 use twilight_model::channel::message::embed::Embed;
 use twilight_util::builder::embed::EmbedBuilder;

Diff for: src/sexurity-api/src/lib.rs renamed to src/security_api/src/lib.rs

@@ -1,6 +1,6 @@
-use sexurity_api::models;
-use sexurity_api::redis::redis::cmd;
-use sexurity_api::redis::redis::Connection;
+use security_api::models;
+use security_api::redis::redis::cmd;
+use security_api::redis::redis::Connection;
 use std::thread;
 use std::thread::JoinHandle;
 use twilight_model::channel::message::embed::Embed;
@@ -131,11 +131,15 @@ fn build_embed_data(
             text = format!("[**``{}``**]({}) was added to [**``{}``**]({}) with **{} reputation** (rank: >100)", new.user_name, format!("https://hackerone.com/{}", new.user_name), handle, format!("https://hackerone.com/{}", handle), new.reputation);
         }
 
-        let embed = EmbedBuilder::new()
+        let mut embed = EmbedBuilder::new()
             .description(text)
-            .color(models::embed_colors::POSTIVE)
-            .build();
-        return Some(embed);
+            .color(models::embed_colors::POSTIVE);
+        
+        if new.rank >= 50 {
+            embed = embed.color(models::embed_colors::MAJOR);
+        }
+
+        return Some(embed.build());
     } else if new.reputation == -1 {
         // user removed from leaderboard
         let text = format!(
@@ -175,6 +179,10 @@ fn build_embed_data(
             .description(text)
             .color(models::embed_colors::POSTIVE);
 
+        if change >= 50 {
+            embed_builder = embed_builder.color(models::embed_colors::MAJOR);
+        }
+
         {
             let mut footer = String::from("");
             if new.rank < old.rank {

Diff for: src/sexurity-api/src/models.rs renamed to src/security_api/src/models.rs

@@ -1,18 +1,17 @@
 [package]
-name = "sexurity-poller"
+name = "security_poller"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 graphql_client = "0.12.0"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
-sexurity-api = { path = "../sexurity-api" }
+serde.workspace = true
+serde_json.workspace = true
+security_api = { path = "../security_api" }
 clap = { version = "4.0", features = ["derive", "env"] }
 chrono = "0.4.24"
 cronjob = "0.4.17"
-log = "0.4.17"
-pretty_env_logger = "0.5.0"
-
+log.workspace = true
+pretty_env_logger.workspace = true

Diff for: src/sexurity-api/src/redis.rs renamed to src/security_api/src/redis.rs

@@ -12,8 +12,8 @@ use clap::Parser;
 
 // use std::{env, ffi::OsString, str::FromStr};
 use graphql_client::GraphQLQuery;
-use sexurity_api::hackerone::{self as hackerone, HackerOneClient};
-use sexurity_api::redis;
+use security_api::hackerone::{self as hackerone, HackerOneClient};
+use security_api::redis;
 
 use crate::polls::PollConfiguration;
 

Diff for: src/sexurity-discord/Cargo.toml renamed to src/security_discord/Cargo.toml

@@ -1,5 +1,5 @@
-use sexurity_api::hackerone::HackerOneClient;
-use sexurity_api::redis::redis::Client;
+use security_api::hackerone::HackerOneClient;
+use security_api::redis::redis::Client;
 pub mod programs;
 pub mod reports;
 pub mod reputation;

Diff for: src/sexurity-discord/src/breakdown.rs renamed to src/security_discord/src/breakdown.rs

@@ -1,6 +1,6 @@
 use cronjob::CronJob;
 use graphql_client::GraphQLQuery;
-use sexurity_api::{
+use security_api::{
     hackerone::{
         self,
         discovery_query::{DiscoveryQueryOpportunitiesSearchNodes, OpportunitiesQuery, SortInput},

Diff for: src/sexurity-discord/src/main.rs renamed to src/security_discord/src/main.rs

@@ -3,10 +3,10 @@ extern crate cronjob;
 use chrono;
 use cronjob::CronJob;
 use graphql_client::GraphQLQuery;
-use sexurity_api::hackerone::{self as hackerone, HackerOneClient};
-use sexurity_api::models::{self as models, ReportData};
-use sexurity_api::redis::redis::Commands;
-use sexurity_api::redis::{load_set_to_vec, redis, redis::cmd, save_vec_to_set};
+use security_api::hackerone::{self as hackerone, HackerOneClient};
+use security_api::models::{self as models, ReportData};
+use security_api::redis::redis::Commands;
+use security_api::redis::{load_set_to_vec, redis, redis::cmd, save_vec_to_set};
 
 pub fn start_poll_event_loop(config: &PollConfiguration) {
     let poll_config = config.clone();