Merge pull request #20 from amfoss/develop

release v1.1.0

Author: ivinjabraham

.github/workflows/clippy-and-format.yml

@@ -0,0 +1,20 @@
+on:
+  pull_request:
+    branches: [ "main", "develop" ]
+
+name: Cargo Clippy and Format
+jobs:
+  run_clippy_and_format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - run: rustup component add clippy
+
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features
+
+      - name: Check formatting with rustfmt
+        run: cargo fmt -- --check

.github/workflows/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/release-binary.yml

@@ -0,0 +1,31 @@
+name: Release on Tag Push
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  release:
+    name: Build & Release ${{ matrix.target }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [aarch64-apple-darwin, x86_64-pc-windows-gnu, x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Add targets
+        run: rustup target add "${{ matrix.target }}"
+
+      - name: Compile binary
+        run: cargo build --release --target ${{ matrix.target }}
+
+      - name: Upload GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: target/${{ matrix.target }}/release/*
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust.yml renamed to .github/workflows/rust-build.yml

@@ -3,8 +3,6 @@ name: Rust
 on:
   pull_request:
     branches: [ "main", "develop" ]
-  push: 
-    branches: [ "main", "develop" ]
 
 env:
   CARGO_TERM_COLOR: always

Cargo.lock

@@ -8,14 +8,11 @@ anyhow = "1.0.95"
 async-trait = "0.1.83"
 chrono = "0.4.38"
 chrono-tz = "0.10.0"
-poise = "0.6.1"
 reqwest = { version = "0.12.5", features = ["json"] }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
-serenity = { git = "https://github.com/serenity-rs/serenity", branch = "current" }
 tokio = { version = "1.26.0", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1.37"
 dotenv = "0.15.0"
-
-[patch.crates-io]
-serenity = { git = "https://github.com/serenity-rs/serenity", branch = "current" }
+serenity = { version = "0.12.4", features = ["chrono"] }
+poise = "0.6.1"

Cargo.toml

@@ -1,4 +1,4 @@
-1334963922205147176
-1334963925585891419
-1334963927678849145
-1334963929922670682
+1336777074354028574
+1336746702178095144
+1336752144560160823
+1336036250590904332

config.txt

@@ -23,9 +23,7 @@ async fn amdctl(ctx: Context<'_>) -> Result<(), Error> {
     Ok(())
 }
 
-/// Every function that is defined *should* be added to the
-/// returned vector in get_commands to ensure it is registered (available for the user)
-/// when the bot goes online.
+/// Returns a vector containg [Poise Commands][`poise::Command`]
 pub fn get_commands() -> Vec<poise::Command<Data, Error>> {
     vec![amdctl()]
 }

src/commands.rs

@@ -25,15 +25,14 @@ pub struct Streak {
     pub max_streak: i32,
 }
 
+/// Represents a record of the Member relation in [Root][https://www.github.com/amfoss/root].
 #[derive(Clone, Debug, Deserialize)]
 pub struct Member {
     #[serde(rename = "memberId")]
     pub member_id: i32,
     pub name: String,
     #[serde(rename = "discordId")]
     pub discord_id: String,
-    #[serde(rename = "groupId")]
-    pub group_id: u32,
     #[serde(default)]
-    pub streak: Vec<Streak>,
+    pub streak: Vec<Streak>, // Note that Root will NOT have multiple Streak elements but it may be an empty list which is why we use a vector here
 }

src/graphql/models.rs

@@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 use crate::graphql::models::{Member, Streak};
-use anyhow::Context;
+use anyhow::{anyhow, Context};
 
-pub async fn fetch_members() -> Result<Vec<Member>, anyhow::Error> {
-    let request_url = std::env::var("ROOT_URL").expect("ROOT_URL not found");
+pub async fn fetch_members() -> anyhow::Result<Vec<Member>> {
+    let request_url = std::env::var("ROOT_URL").context("ROOT_URL not found in ENV")?;
 
     let client = reqwest::Client::new();
     let query = r#"
@@ -28,7 +28,6 @@ pub async fn fetch_members() -> Result<Vec<Member>, anyhow::Error> {
             memberId
             name
             discordId
-            groupId
             streak {
               currentStreak
               maxStreak
@@ -43,6 +42,13 @@ pub async fn fetch_members() -> Result<Vec<Member>, anyhow::Error> {
         .await
         .context("Failed to successfully post request")?;
 
+    if !response.status().is_success() {
+        return Err(anyhow!(
+            "Server responded with an error: {:?}",
+            response.status()
+        ));
+    }
+
     let response_json: serde_json::Value = response
         .json()
         .await
@@ -52,7 +58,12 @@ pub async fn fetch_members() -> Result<Vec<Member>, anyhow::Error> {
         .get("data")
         .and_then(|data| data.get("members"))
         .and_then(|members| members.as_array())
-        .ok_or_else(|| anyhow::anyhow!("Malformed response: 'members' field missing or invalid"))?;
+        .ok_or_else(|| {
+            anyhow::anyhow!(
+                "Malformed response: Could not access Members from {}",
+                response_json
+            )
+        })?;
 
     let members: Vec<Member> = serde_json::from_value(serde_json::Value::Array(members.clone()))
         .context("Failed to parse 'members' into Vec<Member>")?;
@@ -61,7 +72,7 @@ pub async fn fetch_members() -> Result<Vec<Member>, anyhow::Error> {
 }
 
 pub async fn increment_streak(member: &mut Member) -> anyhow::Result<()> {
-    let request_url = std::env::var("ROOT_URL").context("ROOT_URL was not found")?;
+    let request_url = std::env::var("ROOT_URL").context("ROOT_URL was not found in ENV")?;
 
     let client = reqwest::Client::new();
     let mutation = format!(
@@ -73,12 +84,20 @@ pub async fn increment_streak(member: &mut Member) -> anyhow::Result<()> {
         }}"#,
         member.member_id
     );
+
     let response = client
         .post(request_url)
         .json(&serde_json::json!({"query": mutation}))
         .send()
         .await
-        .context("Root Request failed")?;
+        .context("Failed to succesfully post query to Root")?;
+
+    if !response.status().is_success() {
+        return Err(anyhow!(
+            "Server responded with an error: {:?}",
+            response.status()
+        ));
+    }
 
     // Handle the streak vector
     if member.streak.is_empty() {
@@ -101,7 +120,7 @@ pub async fn increment_streak(member: &mut Member) -> anyhow::Result<()> {
 }
 
 pub async fn reset_streak(member: &mut Member) -> anyhow::Result<()> {
-    let request_url = std::env::var("ROOT_URL").context("ROOT_URL was not found")?;
+    let request_url = std::env::var("ROOT_URL").context("ROOT_URL was not found in the ENV")?;
 
     let client = reqwest::Client::new();
     let mutation = format!(
@@ -120,34 +139,50 @@ pub async fn reset_streak(member: &mut Member) -> anyhow::Result<()> {
         .json(&serde_json::json!({ "query": mutation }))
         .send()
         .await
-        .context("Root Request failed")?;
+        .context("Failed to succesfully post query to Root")?;
+
+    if !response.status().is_success() {
+        return Err(anyhow!(
+            "Server responded with an error: {:?}",
+            response.status()
+        ));
+    }
 
     let response_json: serde_json::Value = response
         .json()
         .await
         .context("Failed to parse response JSON")?;
+
     if let Some(data) = response_json
         .get("data")
         .and_then(|data| data.get("resetStreak"))
     {
-        let current_streak = data.get("currentStreak").and_then(|v| v.as_i64()).unwrap();
-
-        let max_streak = data.get("maxStreak").and_then(|v| v.as_i64()).unwrap();
+        let current_streak =
+            data.get("currentStreak")
+                .and_then(|v| v.as_i64())
+                .ok_or_else(|| anyhow!("current_streak was parsed as None"))? as i32;
+        let max_streak =
+            data.get("maxStreak")
+                .and_then(|v| v.as_i64())
+                .ok_or_else(|| anyhow!("max_streak was parsed as None"))? as i32;
 
         // Update the member's streak vector
         if member.streak.is_empty() {
             // If the streak vector is empty, initialize it with the returned values
             member.streak.push(Streak {
-                current_streak: current_streak as i32,
-                max_streak: max_streak as i32,
+                current_streak,
+                max_streak,
             });
         } else {
             // Otherwise, update the first streak entry
             for streak in &mut member.streak {
-                streak.current_streak = current_streak as i32;
-                streak.max_streak = max_streak as i32;
+                streak.current_streak = current_streak;
+                streak.max_streak = max_streak;
             }
         }
+    } else {
+        return Err(anyhow!("Failed to access data from {}", response_json));
     }
+
     Ok(())
 }