nobot fix

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.4.5
+- Ignore #nobot in bio if the user is also a member
+
 ## v0.4.4
 - Fix some failing tests
 - Lowercase the domain when normalizing an account

Cargo.toml

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

src/error.rs

@@ -8,6 +8,8 @@ pub enum GroupError {
     UserIsBanned,
     #[error("User opted out from the group")]
     UserOptedOut,
+    #[error("User opted out from the group using #nobot")]
+    UserOptedOutNobot,
     #[error("Server could not be banned because there are admin users on it")]
     AdminsOnServer,
     #[error("Config error: {0}")]

src/group_handler/handle_mention.rs

@@ -773,11 +773,11 @@ impl<'a> ProcessMention<'a> {
         // Try to unfollow
         let account = self.client.get_account(id).await?;
         let bio = utils::strip_html(&account.note);
-        if RE_NOBOT_TAG.is_match(&bio) {
-            // #nobot
-            Err(GroupError::UserOptedOut)
+        let normalized = normalize_acct(&account.acct, &self.group_acct)?;
+        if RE_NOBOT_TAG.is_match(&bio) && !self.config.is_member(&normalized) {
+            // #nobot in a non-member account
+            Err(GroupError::UserOptedOutNobot)
         } else {
-            let normalized = normalize_acct(&account.acct, &self.group_acct)?;
             if self.config.is_banned(&normalized) {
                 Err(GroupError::UserIsBanned)
             } else if self.config.is_optout(&normalized) {