Cargo.lock

@@ -933,23 +933,25 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "poise"
 version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1819d5a45e3590ef33754abce46432570c54a120798bdbf893112b4211fa09a6"
 dependencies = [
  "async-trait",
  "derivative",
  "futures-util",
- "indexmap",
  "parking_lot",
  "poise_macros",
  "regex",
  "serenity",
  "tokio",
  "tracing",
- "trim-in-place",
 ]
 
 [[package]]
 name = "poise_macros"
 version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fa2c123c961e78315cd3deac7663177f12be4460f5440dbf62a7ed37b1effea"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -1326,7 +1328,8 @@ dependencies = [
 [[package]]
 name = "serenity"
 version = "0.12.2"
-source = "git+https://github.com/serenity-rs/serenity.git?rev=e34f4491ee3a0b20ea8dc30cbc77b257f402f692#e34f4491ee3a0b20ea8dc30cbc77b257f402f692"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "880a04106592d0a8f5bdacb1d935889bfbccb4a14f7074984d9cd857235d34ac"
 dependencies = [
  "arrayvec",
  "async-trait",
@@ -1722,12 +1725,6 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "trim-in-place"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
-
 [[package]]
 name = "triomphe"
 version = "0.1.13"

Cargo.toml

@@ -11,7 +11,7 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
 # songbird = { version = "0.3.2", features = ["yt-dlp"] }
-poise = { version = "0.6", features = ["cache"], path="../poise" }
+poise = { version = "0.6", features = ["cache"] }
 dotenv = "0.15.0"
 anyhow = "1.0.75"
 once_cell = "1.19.0"

README.md

@@ -2,26 +2,6 @@
 
 egress a discord server
 
-### NOTE:
-Using custom version of poise (the discord library) because I need to use a specific version of serenity (the discord library for poise). Here's how to set it up:
-
-1) Clone Poise next to this repo:
-
-```shell
-git clone https://github.com/serenity-rs/poise.git
-```
-
-2) Change the version of serenity that poise uses:
-
-```diff
-[dependencies.serenity]
-- version = "x.xx.x"
-+ git = "https://github.com/serenity-rs/serenity.git"
-+ rev = "e34f4491ee3a0b20ea8dc30cbc77b257f402f692"
-```
-
-> Just make sure that the rev is a sha1 commit hash sometime after 7/25/24
-
 ## Getting started
 * goto: [Discord applicatoins](https://discord.com/developers/applications) and
 create an application.

src/command.rs

@@ -3,7 +3,6 @@ use std::{collections::HashMap, fmt::Display, sync::Arc};
 use crate::Context;
 use anyhow::Error;
 use poise::{serenity_prelude::{Cache, CacheHttp, ChannelId, ChannelType, GetMessages, GuildChannel, Http, Message}, CreateReply};
-use tokio::time::Instant;
 use tracing::{debug, error, trace};
 
 struct Server {
@@ -87,10 +86,11 @@ impl Server {
             if child.this.id == *find {
                 return Some(child);
             }
-            if let Some(x) = Self::search_by_id(&mut child.children, find) {
-                return Some(x);
+            match Self::search_by_id(&mut child.children, find) {
+                Some(x) => return Some(x),
+                None => {},
             }
-       }
+        }
         None
    }
 
@@ -99,7 +99,7 @@ impl Server {
         if let Some(parent_id) = &insert.parent_id {
             // find the parent (needs to go thru all nodes)
 
-            match Self::search_by_id(&mut self.channels, parent_id) {
+            match Self::search_by_id(&mut self.channels, &parent_id) {
                 Some(parent_node) => {
                     parent_node.children.push(Channel::new(insert));
                 },
@@ -141,10 +141,7 @@ impl Server {
 
         /// Recursive walk thru the channels
         async fn walk_channels(all: &mut Vec<Channel>, cache: impl CacheHttp + Clone) {
-            // Qty of messages to take at a time, max=100
-            let batch_size = 100;
-
-            let settings = GetMessages::default().limit(batch_size);
+            let settings = GetMessages::default().limit(5);
             for channel in all {
                 // Clone *should* be cheap - it's Arc under the hood
                 // get the messages
@@ -172,11 +169,7 @@ impl Server {
                                 }
                             }                        
                         },
-                        Err(e) => {
-                            error!("While reading messages in \"{}\" before `{}` - {e}", channel.this.name, last);
-                            // Stop reading this channel on an error.
-                            last_id = None;
-                        },
+                        Err(e) => error!("Error while trying to get messages - {e}"),
                     }
                 }
                 // Then recurse into children channels
@@ -207,14 +200,8 @@ pub async fn scrape_all(ctx: Context<'_>) -> Result<(), Error> {
         let mut server = index(map).await;
         match ctx.reply("Starting scrape...").await {
             Ok(ok) => {
-                let start = Instant::now();
                 server.scrape_all().await;
-                let end = start.elapsed().as_millis();
-                let msg_count = server.message_count();
-                let _ = ok.edit(ctx, CreateReply::default().content(
-                    &format!("Done. Stats: \n```toml\nMessages: {msg_count}\nElapsed time: {end}ms\n```")
-                )).await;
-                debug!("Scraped server in {}ms", end);
+                let _ = ok.edit(ctx, CreateReply::default().content(&format!("Scraped {} messages", server.message_count()))).await;
             },
             Err(e) => error!("{e} - While trying to reply to scrape command"),
         }

src/main.rs

@@ -26,6 +26,7 @@ async fn main() {
         .with_env_filter(filter)
         .with_thread_ids(false)
         .with_file(false)
+        .without_time()
         .init();
 
     // Generate sick text like this: