merge from master

Author: Taaku18

CHANGELOG.md

@@ -4,13 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-# v2.17.1
+# v2.17.2
+
+### Changed
+
+- Logs search command will search through log keys as well now. 
+- For example, `?logs search e7499e82f8ff`.
 
+# v2.17.1
 ### What's new?
 
 Stricter fallback genesis embed search.
 
-### What's changed?
+### Changed
 How modmail checks if a channel is a thread: 
 
 1. First the bot checks if the channel topic is in the format `User ID: xxxx`, this means it is a thread.
@@ -38,7 +44,7 @@ An issue where a scheduled close would not execute over a long period of time if
 
 # v2.16.0
 
-### What's changed?
+### Changed
 
 All support for Modmail API (api.modmail.tk) has terminated. 
 If you're still using api.modmail.tk, you will need to migrate to the self-hosted database

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.17.1'
+__version__ = '2.17.2'
 
 import asyncio
 import logging
@@ -344,12 +344,12 @@ async def on_connect(self):
     async def setup_indexes(self):
         """Setup text indexes so we can use the $search operator"""
         coll = self.db.logs
-        index_name = 'messages.content_text_messages.author.name_text'
+        index_name = 'messages.content_text_messages.author.name_text_key_text'
 
         index_info = await coll.index_information()
 
         # Backwards compatibility
-        old_index = 'messages.content_text'
+        old_index = 'messages.content_text_messages.author.name_text'
         if old_index in index_info:
             logger.info(info(f'Dropping old index: {old_index}'))
             await coll.drop_index(old_index)
@@ -359,7 +359,8 @@ async def setup_indexes(self):
             logger.info(info('Name: ' + index_name))
             await coll.create_index([
                 ('messages.content', 'text'),
-                ('messages.author.name', 'text')
+                ('messages.author.name', 'text'),
+                ('key', 'text')
             ])
 
     async def on_ready(self):

cogs/modmail.py

@@ -620,7 +620,7 @@ async def contact(self, ctx,
 
     @commands.command()
     @trigger_typing
-    @checks.has_permissions(manage_channels=True)
+    @checks.has_permissions(kick_members=True)
     async def blocked(self, ctx):
         """Returns a list of blocked users"""
         embed = discord.Embed(title='Blocked Users',
@@ -653,7 +653,7 @@ async def blocked(self, ctx):
 
     @commands.command()
     @trigger_typing
-    @checks.has_permissions(manage_channels=True)
+    @checks.has_permissions(kick_members=True)
     async def block(self, ctx, user: Optional[User] = None, *,
                     after: UserFriendlyTime = None):
         """
@@ -719,7 +719,7 @@ async def block(self, ctx, user: Optional[User] = None, *,
 
     @commands.command()
     @trigger_typing
-    @checks.has_permissions(manage_channels=True)
+    @checks.has_permissions(kick_members=True)
     async def unblock(self, ctx, *, user: User = None):
         """
         Unblocks a user from using Modmail.