Merge branch 'master' into feat/1365/add-bot-badges-to-user

6 files changed, 12 insertions, 12 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ad813d893..7217cb443 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,11 +7,15 @@ bot/exts/utils/extensions.py            @MarkKoz
 bot/exts/utils/snekbox.py               @MarkKoz @Akarys42
 bot/exts/help_channels/**               @MarkKoz @Akarys42
 bot/exts/moderation/**                  @Akarys42 @mbaruh @Den4200 @ks129
-bot/exts/info/**                        @Akarys42 @mbaruh @Den4200
+bot/exts/info/**                        @Akarys42 @Den4200
+bot/exts/info/information.py            @mbaruh
 bot/exts/filters/**                     @mbaruh
 bot/exts/fun/**                         @ks129
 bot/exts/utils/**                       @ks129
 
+# Rules
+bot/rules/**                            @mbaruh
+
 # Utils
 bot/utils/extensions.py                 @MarkKoz
 bot/utils/function.py                   @MarkKoz
diff --git a/bot/exts/filters/token_remover.py b/bot/exts/filters/token_remover.py
index bd6a1f97a..93f1f3c33 100644
--- a/bot/exts/filters/token_remover.py
+++ b/bot/exts/filters/token_remover.py
@@ -135,7 +135,7 @@ class TokenRemover(Cog):
                 user_id=user_id,
                 user_name=str(user),
                 kind="BOT" if user.bot else "USER",
-            ), not user.bot
+            ), True
         else:
             return UNKNOWN_USER_LOG_MESSAGE.format(user_id=user_id), False
 
@@ -147,7 +147,7 @@ class TokenRemover(Cog):
             channel=msg.channel.mention,
             user_id=token.user_id,
             timestamp=token.timestamp,
-            hmac='x' * len(token.hmac),
+            hmac='x' * (len(token.hmac) - 3) + token.hmac[-3:],
         )
 
     @classmethod
diff --git a/bot/resources/tags/free.md b/bot/resources/tags/free.md
deleted file mode 100644
index 1493076c7..000000000
--- a/bot/resources/tags/free.md
+++ /dev/null
@@ -1,5 +0,0 @@
-**We have a new help channel system!**
-
-Please see <#704250143020417084> for further information.
-
-A more detailed guide can be found on [our website](https://pythondiscord.com/pages/resources/guides/help-channels/).
diff --git a/bot/rules/duplicates.py b/bot/rules/duplicates.py
index 455764b53..8e4fbc12d 100644
--- a/bot/rules/duplicates.py
+++ b/bot/rules/duplicates.py
@@ -13,6 +13,7 @@ async def apply(
         if (
             msg.author == last_message.author
             and msg.content == last_message.content
+            and msg.content
         )
     )
 
diff --git a/config-default.yml b/config-default.yml
index 822b37daf..89f5718fd 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -373,7 +373,7 @@ anti_spam:
     rules:
         attachments:
             interval: 10
-            max: 9
+            max: 6
 
         burst:
             interval: 10
@@ -472,7 +472,7 @@ help_channels:
     deleted_idle_minutes: 5
 
     # Maximum number of channels to put in the available category
-    max_available: 2
+    max_available: 3
 
     # Maximum number of channels across all 3 categories
     # Note Discord has a hard limit of 50 channels per category, so this shouldn't be > 50
diff --git a/tests/bot/exts/filters/test_token_remover.py b/tests/bot/exts/filters/test_token_remover.py
index f99cc3370..51feae9cb 100644
--- a/tests/bot/exts/filters/test_token_remover.py
+++ b/tests/bot/exts/filters/test_token_remover.py
@@ -291,7 +291,7 @@ class TokenRemoverTests(unittest.IsolatedAsyncioTestCase):
             channel=self.msg.channel.mention,
             user_id=token.user_id,
             timestamp=token.timestamp,
-            hmac="x" * len(token.hmac),
+            hmac="xxxxxxxxxxxxxxxxxxxxxxxxjf4",
         )
 
     @autospec("bot.exts.filters.token_remover", "UNKNOWN_USER_LOG_MESSAGE")
@@ -318,7 +318,7 @@ class TokenRemoverTests(unittest.IsolatedAsyncioTestCase):
 
         return_value = TokenRemover.format_userid_log_message(msg, token)
 
-        self.assertEqual(return_value, (known_user_log_message.format.return_value, False))
+        self.assertEqual(return_value, (known_user_log_message.format.return_value, True))
 
         known_user_log_message.format.assert_called_once_with(
             user_id=472265943062413332,