improve account lookup

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.2.4
+- make account lookup try harder
+
+## v0.2.3
+- `/add user` will now try to follow even if already a member
+
 ## v0.2.2
 - All hashtags, server names and handles are now lowercased = case-insensitive
 - Prevent the `-a` flag overwriting existing group in the config

Cargo.lock

@@ -328,7 +328,7 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
 [[package]]
 name = "fedigroups"
-version = "0.2.2"
+version = "0.2.4"
 dependencies = [
  "anyhow",
  "clap",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fedigroups"
-version = "0.2.2"
+version = "0.2.4"
 authors = ["Ondřej Hruška <ondra@ondrovo.com>"]
 edition = "2018"
 publish = false

src/group_handler/handle_mention.rs

@@ -46,24 +46,21 @@ impl<'a> ProcessMention<'a> {
                 Err(e.into())
             }
             Ok(Ok(res)) => {
-                debug!("Result: {:#?}", res);
+                for item in res.accounts {
-
-                if let Some(item) = res.accounts.into_iter().next() {
                     let acct_normalized = normalize_acct(&item.acct, &self.group_acct)?;
                     if acct_normalized == acct {
                         debug!("Search done, account found: {}", item.acct);
-                        Ok(Some(item.id))
+                        return Ok(Some(item.id))
                     } else {
-                        warn!("Search done but found wrong account: {}", item.acct);
+                        warn!("Found wrong account: {}", item.acct);
-                        Ok(None)
                     }
-                } else {
+                }
+
                 debug!("Search done, nothing found");
                 Ok(None)
             }
         }
     }
-    }
 
     fn append_admin_list_to_reply(&mut self) {
         let mut admins = self.config.get_admins().collect::<Vec<_>>();
@@ -379,7 +376,6 @@ impl<'a> ProcessMention<'a> {
     async fn cmd_add_member(&mut self, user: &str) -> Result<(), GroupError> {
         let u = normalize_acct(user, &self.group_acct)?;
         if self.is_admin {
-            if !self.config.is_member(&u) {
             match self.config.set_member(&u, true) {
                 Ok(_) => {
                     self.add_reply(format!("User {} added to the group!", u));
@@ -390,9 +386,6 @@ impl<'a> ProcessMention<'a> {
                     self.add_reply(format!("Failed to add user {} to group: {}", u, e));
                 }
             }
-            } else {
-                debug!("User was already a member");
-            }
         } else {
             self.add_reply("Only admins can manage members");
         }
@@ -402,7 +395,6 @@ impl<'a> ProcessMention<'a> {
     async fn cmd_remove_member(&mut self, user: &str) -> Result<(), GroupError> {
         let u = normalize_acct(user, &self.group_acct)?;
         if self.is_admin {
-            if self.config.is_member(&u) {
             match self.config.set_member(&u, false) {
                 Ok(_) => {
                     self.add_reply(format!("User {} removed from the group.", u));
@@ -413,7 +405,6 @@ impl<'a> ProcessMention<'a> {
                     unreachable!()
                 }
             }
-            }
         } else {
             self.add_reply("Only admins can manage members");
         }
@@ -586,10 +577,11 @@ impl<'a> ProcessMention<'a> {
             // admin can leave but that's a bad idea
             let _ = self.config.set_member(&self.status_acct, false);
             self.add_reply("You're no longer a group member. Unfollow the group user to stop receiving group messages.");
+        }
+
         self.unfollow_user_by_id(&self.status_user_id).await
             .log_error("Failed to unfollow");
     }
-    }
 
     async fn cmd_join(&mut self) {
         if self.config.is_member_or_admin(&self.status_acct) {