hotfixes & QOL

src/events.rs

@@ -1,10 +1,10 @@
-use crate::data::{get_mutex_data, update_re_data};
+use crate::data::{get_mutex_data, get_toml_mutex, update_re_data};
 use crate::messages::{make_post_embed, make_removed_embed, EmbedOptions};
 use crate::re_cmds::generic_fns::{is_bk_mod, is_bk_mod_serenity, serenity_edit_msg_embed, serenity_send_msg};
 use crate::websocket::send_cmd_json;
 use crate::{lang, rs_println, Data, Error, CFG_DATA_RE};
 
-use poise::serenity_prelude::{self as serenity, ActivityData, ComponentInteraction, Interaction, Member, Ready};
+use poise::serenity_prelude::{self as serenity, ActivityData, ChannelId, ComponentInteraction, Interaction, Member, MessageId, Ready};
 use serde_json::{json, Value};
 
 use std::future::Future;
@@ -18,7 +18,7 @@ pub fn event_handler<'a>(
 ) -> Pin<Box<dyn Future<Output = Result<(), Error>> + Send + 'a>> {
   Box::pin(async move {
     match event {
-      serenity::FullEvent::Ready { data_about_bot } => on_ready(ctx, data_about_bot),
+      serenity::FullEvent::Ready { data_about_bot } => on_ready(ctx, data_about_bot, data).await,
       serenity::FullEvent::InteractionCreate { interaction } => { let _ = handle_buttons(ctx, data, interaction).await; },
       _ => {}
     }
@@ -27,15 +27,15 @@ pub fn event_handler<'a>(
 }
 
 
-fn on_ready(ctx: &serenity::Context, data_about_bot: &Ready) {
+async fn on_ready(ctx: &serenity::Context, data_about_bot: &Ready, data: &Data) {
   rs_println!(
     "Bot started as user \"{}\" with id {}",
     data_about_bot.user.name,
     data_about_bot.user.id
   );
 
-  let file_text = std::fs::read_to_string("./cfg/status.txt").unwrap();
-  let custom_activity = ActivityData::custom(file_text);
+  let m_data = get_toml_mutex(&data.cfg).await.unwrap();
+  let custom_activity = ActivityData::custom(m_data["general"]["status"].as_str().unwrap());
   
   ctx.online();
   ctx.set_activity(Some(custom_activity));
@@ -65,6 +65,16 @@ async fn handle_buttons(ctx: &serenity::Context, data: &Data, interaction: &Inte
 }
 
 
+async fn update_embed(ctx: &serenity::Context, url: &str, new_data: &Value, c_id: &ChannelId, m_id: &MessageId) {
+  let e: EmbedOptions;
+  let remove = new_data["removed"]["removed"].as_bool().unwrap();
+  if remove { e = make_removed_embed(new_data, url, true); }
+  else      { e = make_post_embed   (new_data, url, true); }
+
+  serenity_edit_msg_embed(ctx, &c_id, &m_id, e).await;
+}
+
+
 async fn approve_btn(ctx: &serenity::Context, data: &Data, c_member: &Member, component: &ComponentInteraction, url: String, approve: bool) -> Result<(), Error> {
   if !is_bk_mod_serenity(ctx, data, c_member, component).await { return Ok(()); }
 
@@ -73,13 +83,11 @@ async fn approve_btn(ctx: &serenity::Context, data: &Data, c_member: &Member, co
   let c_id = component.channel_id;
   let m_id = component.message.id;
 
+  update_re_data(data).await;
+  let new_data = &get_mutex_data(&data.reddit_data).await.unwrap()[CFG_DATA_RE][&url];
+  update_embed(ctx, &url, new_data, &c_id, &m_id).await;
+
   if r["value"].as_bool().unwrap() {
-    update_re_data(data).await;
-    let new_data = &get_mutex_data(&data.reddit_data).await.unwrap()[CFG_DATA_RE][&url];
-    let e = make_post_embed(new_data, &url, true);
-
-    serenity_edit_msg_embed(ctx, &c_id, &m_id, e).await;
-
     if approve {
       serenity_send_msg(ctx, component, lang!("dc_msg_re_post_approve_success"), true).await;
     }
@@ -87,6 +95,9 @@ async fn approve_btn(ctx: &serenity::Context, data: &Data, c_member: &Member, co
       serenity_send_msg(ctx, component, lang!("dc_msg_re_post_disapprove_success"), true).await;
     }
   }
+  else {
+    serenity_send_msg(ctx, component, lang!("dc_msg_re_post_approve_remove"), true).await;
+  }
 
   return Ok(());
 }
@@ -106,16 +117,12 @@ async fn remove_btn(ctx: &serenity::Context, data: &Data, c_member: &Member, com
 
   let c_id = component.channel_id;
   let m_id = component.message.id;
+  
+  update_re_data(data).await;
+  let new_data = &get_mutex_data(&data.reddit_data).await.unwrap()[CFG_DATA_RE][&url];
+  update_embed(ctx, &url, new_data, &c_id, &m_id).await;
 
   if r["value"].as_bool().unwrap() {
-    update_re_data(data).await;
-    let new_data = &get_mutex_data(&data.reddit_data).await.unwrap()[CFG_DATA_RE][&url];
-    let e: EmbedOptions;
-    if remove { e = make_removed_embed(new_data, &url, true); }
-    else      { e = make_post_embed   (new_data, &url, true); }
-
-    serenity_edit_msg_embed(ctx, &c_id, &m_id, e).await;
-
     if remove {
       serenity_send_msg(ctx, component, lang!("dc_msg_re_post_remove_success", &url), true).await;
     }
@@ -137,13 +144,11 @@ async fn vote_btn(ctx: &serenity::Context, data: &Data, c_member: &Member, compo
   let c_id = component.channel_id;
   let m_id = component.message.id;
 
+  update_re_data(data).await;
+  let new_data = &get_mutex_data(&data.reddit_data).await.unwrap()[CFG_DATA_RE][&url];
+  update_embed(ctx, &url, new_data, &c_id, &m_id).await;
+
   if r["value"].as_bool().unwrap() {
-    update_re_data(data).await;
-    let new_data = &get_mutex_data(&data.reddit_data).await.unwrap()[CFG_DATA_RE][&url];
-    let e = make_post_embed(new_data, &url, true);
-
-    serenity_edit_msg_embed(ctx, &c_id, &m_id, e).await;
-
     if vote {
       if is_mod { serenity_send_msg(ctx, component, lang!("dc_msg_re_vote_mod_success"), true).await; }
       else      { serenity_send_msg(ctx, component, lang!("dc_msg_re_vote_success"),     true).await; }
@@ -153,7 +158,10 @@ async fn vote_btn(ctx: &serenity::Context, data: &Data, c_member: &Member, compo
     }
   }
   else {
-    if !vote { serenity_send_msg(ctx, component, lang!("dc_msg_re_vote_remove_havent"), true).await; }
+    if new_data["removed"]["removed"].as_bool().unwrap() {
+      serenity_send_msg(ctx, component, lang!("dc_msg_re_post_vote_removed_post"), true).await;
+    }
+    else if !vote { serenity_send_msg(ctx, component, lang!("dc_msg_re_vote_remove_havent"), true).await; }
   }
 
   return Ok(());

src/main.rs

@@ -164,8 +164,10 @@ async fn main() {
   });
 
   if !args.nosched {
+    let dur = if args.test { Duration::from_secs(60) } else { Duration::from_secs(60 * 10) };
+
     let schedules: Vec<Schedule> = vec![
-      (Duration::from_secs(2 * 60), || Box::pin(read_reddit_inbox()))
+      (dur, || Box::pin(read_reddit_inbox()))
     ];
 
     run_schedules(schedules).await;

src/python.rs

@@ -23,19 +23,30 @@ pub async fn start(args: Args) -> PyResult<()> {
   let py_args = args_str.replace(":true", ":True").replace(":false", ":False");
   let app_path = CString::new(format!("args = {}\n{}", py_args, code)).unwrap();
   
+  let mut traceback: String = String::new();
+  let mut is_error = false;
+
   pyo3::prepare_freethreaded_python();
 
-  let from_python = Python::with_gil(|py| -> PyResult<Py<PyAny>> {
+  let _ = Python::with_gil(|py| -> Result<(), PyErr> {
     let syspath = py.import("sys")?.getattr("path")?.downcast_into::<PyList>()?;
     syspath.insert(0, path)?;
     let empty = CString::new("").unwrap();
 
-    let app: Py<PyAny> = PyModule::from_code(py, &app_path, &empty, &empty)?.into();
+    let py_result = PyModule::from_code(py, &app_path, &empty, &empty);
 
-    return Ok(app);
+    if let Err(ref e) = py_result {
+      traceback = py.import("traceback")?
+        .call_method1("format_exception", (e.get_type(py), e.value(py), e.traceback(py)))?
+        .extract::<Vec<String>>()?
+        .join("");
+      is_error = true;
+    }
+
+    return Ok(());
   });
 
-  if from_python.is_err() {
+  if is_error {
     let own_env = std::env::var("ASSISTANT_OWNERS").unwrap_or("0".to_string());
     let own_vec_str: Vec<String> = own_env.split(",").map(String::from).collect();
     let own_vec_u64: Vec<u64> = own_vec_str
@@ -43,9 +54,15 @@ pub async fn start(args: Args) -> PyResult<()> {
       .map(|s| s.parse::<u64>().expect("Failed to parse ASSISTANT_OWNERS. Invalid syntax."))
       .collect();
 
-    send_dm(lang!("dc_msg_dm_python_err", format!("{:?}", from_python)), args, own_vec_u64).await;
-    errln!("pyO3: {:?}", from_python);
+    send_dm(
+      lang!("dc_msg_dm_python_err", format!("{}", traceback)),
+      args, 
+      own_vec_u64
+    ).await;
+
+    errln!("pyO3: {}", traceback);
   }
+
   return Ok(());
 }
 

src/python/bot.py

@@ -37,12 +37,13 @@ class Bot:
       password =      self.password,
       user_agent =    self.useragent
     )
+    self.sr_list: list[str] = ["bytedicetesting"]
     self.sr = None
     self.data_f: TextIOWrapper = None
     self.data: dict = {}
 
   async def initialize(self):
-    self.sr = await self.r.subreddit("bytedicetesting")
+    self.sr = await self.r.subreddit("+".join(self.sr_list))
 
   async def set_args(self, args: dict):
     self.args = args
@@ -57,11 +58,13 @@ class Bot:
   
   async def update_cfg_str(self, new_cfg: str) -> bool:
     json_cfg = toml.loads(new_cfg)
-    self.sr = await self.r.subreddit(json_cfg[CFG_DATA_RE]["subreddits"])
+    self.sr_list = json_cfg[CFG_DATA_RE]["subreddits"].split("+")
+    self.sr = await self.r.subreddit("+".join(self.sr_list))
     self.fetch_limit = json_cfg[CFG_DATA_RE]["fetch_limit"]
     return True
   
   async def update_cfg(self, new_cfg: dict) -> bool:
-    self.sr = await self.r.subreddit(new_cfg[CFG_DATA_RE]["subreddits"])
+    self.sr_list = new_cfg[CFG_DATA_RE]["subreddits"].split("+")
+    self.sr = await self.r.subreddit("+".join(self.sr_list))
     self.fetch_limit = new_cfg[CFG_DATA_RE]["fetch_limit"]
     return True

src/python/cmds.py

@@ -19,7 +19,7 @@ async def is_cmd(cmd: str, text: str, bot: botPy.Bot) -> bool:
 
 
 async def respond_to_mention(bot: botPy.Bot) -> bool:
-  async for mention in bot.r.inbox.mentions(limit=25):
+  async for mention in bot.r.inbox.mentions(limit=100):
     if not mention.new:
       continue
 
@@ -33,13 +33,15 @@ async def respond_to_mention(bot: botPy.Bot) -> bool:
       await bk_week_add(mention, bot)
 
     else:
+      py_print("Mention was not a command.")
       await mention.mark_read()
 
   return True
 
 
 async def bk_week_add(mention: models.Comment, bot: botPy.Bot):
-  if not mention.subreddit.display_name not in bot.sr:
+  if bot.args["dev"]: py_print("Mention was a command: add_post")
+  if not mention.subreddit.display_name not in bot.sr_list:
     await mention.mark_read()
     return
 
@@ -58,23 +60,18 @@ async def bk_week_add(mention: models.Comment, bot: botPy.Bot):
 
   r = ""
   bd = bot.data[botPy.RE_DATA_POSTS]
+
   if short_url not in bd:
-    posts.add_post_url(bot, short_url)
-    r = "Successfully added this post to the data!"
+    if not is_mod: r = "Successfully added your post to the weekly art submissions!"
+    if is_mod: r = "[MOD ACTION] Successfully added this post to the weekly art submissions!"
+  else:
+    if bd[short_url]["removed"]["removed"] and is_mod:
+      r = "[MOD ACTION] Successfully un-removed this post from the weekly art submissions!"
+    elif not bd[short_url]["removed"]["removed"]:
+      r = "Couldn't add this post to the submissions! Luckily, it's already there!"
 
-  if short_url in bd and is_mod:
-    if "removed" in bd[short_url]:
-      r = "[MOD ACTION] Successfully un-removed this post from the data!"
-    else:
-      r = "[MOD ACTION] Successfully added this post to the data!"
+  await posts.add_post_url(bot, short_url)
 
-    post = await posts.from_url(bot, short_url)
-    post_data = posts.get_post_details(post[1])
-    data.add_post_to_data(bot, post_data, True)
-  
-  elif short_url in bd:
-    r = "Could not add this post to the data. Luckily, it's already there, so there's nothing to worry about!"
-
-
-  await mention.reply(r + " Thank you for participating!" + "\n\n" + BOT_ACTION_POSTFIX)
+  if r != "":
+    await mention.reply(r + " Thank you for participating!" + "\n\n" + BOT_ACTION_POSTFIX)
   await mention.mark_read()

src/python/data.py

@@ -9,7 +9,7 @@ from macros import *
 
 DATA_PATH    = os.path.join(os.path.join(os.getcwd(), "data"))
 DB_PATH      = os.path.join(DATA_PATH, "db")
-DEFAULT_PATH = os.path.join(DATA_PATH, "default")
+DEFAULT_PATH = os.path.join(DATA_PATH, "defaults")
 CFG_PATH     = os.path.join(os.path.join(os.getcwd(), "cfg"))
 
 
@@ -91,7 +91,7 @@ def read_data(bot: botPy.Bot) -> bool:
       return False
 
     py_print("re_data.json not found, creating new from preset...")
-    with open(os.path.join(DATA_PATH, "re_data_preset.json", "r")) as f:
+    with open(os.path.join(DEFAULT_PATH, "re_data_preset.json"), "r") as f:
       data_preset_json = json.load(f)
 
     data_preset_json[botPy.RE_DATA_POSTS].pop("EXAMPLE VALUE", None)
@@ -150,7 +150,7 @@ def add_post_to_data(bot: botPy.Bot, new_data: PostData, bypass_conditions: bool
     if bot.args["dev"]: py_print(f"Added post \"{new_data.url}\" (Conditions bypassed)")
     return True
 
-  if new_data.url not in bot.data[botPy.RE_DATA_POSTS]:
+  elif new_data.url not in bot.data[botPy.RE_DATA_POSTS]:
     bot.data[botPy.RE_DATA_POSTS][new_data.url] = new_data.to_json()
     if bot.args["dev"]: py_print(f"Added post \"{new_data.url}\"")
     return True
@@ -159,6 +159,9 @@ def add_post_to_data(bot: botPy.Bot, new_data: PostData, bypass_conditions: bool
   
 
 def set_approve_post(bot: botPy.Bot, approved: bool, url: str) -> bool:
+  if url not in bot.data[botPy.RE_DATA_POSTS]:
+    return False
+
   if not bot.data[botPy.RE_DATA_POSTS][url]["removed"]["removed"]:
     bot.data[botPy.RE_DATA_POSTS][url]["approved"]["by_human"] = approved
     return True
@@ -205,6 +208,9 @@ def set_vote_post(
 ) -> bool:
   if url not in bot.data[botPy.RE_DATA_POSTS]:
     return False
+  
+  if bot.data[botPy.RE_DATA_POSTS][url]["removed"]["removed"]:
+    return False
 
   votes = bot.data[botPy.RE_DATA_POSTS][url]["votes"]
   re_voters: set[str]  = set(votes["voters_re"])