Merge pull request #388 from papiersnipper/anon_reply_without_command

Add ?logs response command and anon_reply_without_command config var

Author: Taaku18

bot.py

@@ -652,7 +652,7 @@ async def _process_blocked(self, message: discord.Message) -> bool:
                 self.blocked_users.pop(str(message.author.id))
             else:
                 reaction = blocked_emoji
-                end_time = re.search(r"%(.+?)%$", reason)
+                end_time = re.search(r"%(.+?)%", reason)
                 if end_time is not None:
                     logger.debug("No longer blocked, user %s.", message.author.name)
                     after = (
@@ -829,7 +829,9 @@ async def process_commands(self, message):
 
             thread = await self.threads.find(channel=ctx.channel)
             if thread is not None:
-                if self.config.get("reply_without_command"):
+                if self.config.get("anon_reply_without_command"):
+                    await thread.reply(message, anonymous=True)
+                elif self.config.get("reply_without_command"):
                     await thread.reply(message)
                 else:
                     await self.api.append_log(message, type_="internal")

cogs/modmail.py

@@ -16,7 +16,13 @@
 from core.models import PermissionLevel
 from core.paginator import EmbedPaginatorSession
 from core.time import UserFriendlyTime, human_timedelta
-from core.utils import format_preview, User, create_not_found_embed, format_description, trigger_typing
+from core.utils import (
+    format_preview,
+    User,
+    create_not_found_embed,
+    format_description,
+    trigger_typing,
+)
 
 logger = logging.getLogger("Modmail")
 
@@ -704,6 +710,31 @@ async def logs_closed_by(self, ctx, *, user: User = None):
         session = EmbedPaginatorSession(ctx, *embeds)
         await session.run()
 
+    @logs.command(name="responded")
+    @checks.has_permissions(PermissionLevel.SUPPORTER)
+    async def logs_responded(self, ctx, *, user: User = None):
+        """
+        Get all logs where the specified user has responded at least once.
+
+        If no `user` is provided, the user will be the person who sent this command.
+        `user` may be a user ID, mention, or name.
+        """
+        user = user if user is not None else ctx.author
+
+        entries = await self.bot.api.get_responded_logs(user.id)
+
+        embeds = self.format_log_embeds(entries, avatar_url=self.bot.guild.icon_url)
+
+        if not embeds:
+            embed = discord.Embed(
+                color=self.bot.error_color,
+                description=f"{getattr(user, 'mention', user.id)} has not responded to any threads.",
+            )
+            return await ctx.send(embed=embed)
+
+        session = EmbedPaginatorSession(ctx, *embeds)
+        await session.run()
+
     @logs.command(name="search", aliases=["find"])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     async def logs_search(self, ctx, limit: Optional[int] = None, *, query):

cogs/plugins.py

@@ -399,7 +399,9 @@ async def plugins_remove(self, ctx, *, plugin_name: str):
         await self.bot.config.update()
         shutil.rmtree(
             plugin.abs_path,
-            onerror=lambda *args: logger.warning('Failed to remove plugin files %s: %s', plugin, str(args[2]))
+            onerror=lambda *args: logger.warning(
+                "Failed to remove plugin files %s: %s", plugin, str(args[2])
+            ),
         )
         try:
             plugin.abs_path.parent.rmdir()

core/clients.py

@@ -92,6 +92,23 @@ async def get_user_logs(self, user_id: Union[str, int]) -> list:
 
         return await self.logs.find(query, projection).to_list(None)
 
+    async def get_responded_logs(self, user_id: Union[str, int]) -> list:
+        entries = []
+        async for l in self.bot.db.logs.find(
+            {
+                "open": False,
+                "messages": {
+                    "$elemMatch": {
+                        "author.id": str(user_id),
+                        "author.mod": True,
+                        "type": {"$in": ["anonymous", "thread_message"]},
+                    }
+                },
+            }
+        ):
+            entries.append(l)
+        return entries
+
     async def get_log(self, channel_id: Union[str, int]) -> dict:
         logger.debug("Retrieving channel %s logs.", channel_id)
         return await self.logs.find_one({"channel_id": str(channel_id)})

core/config.py

@@ -37,6 +37,7 @@ class ConfigManager:
         "account_age": None,
         "guild_age": None,
         "reply_without_command": False,
+        "anon_reply_without_command": False,
         # logging
         "log_channel_id": None,
         # threads
@@ -112,6 +113,7 @@ class ConfigManager:
         "user_typing",
         "mod_typing",
         "reply_without_command",
+        "anon_reply_without_command",
         "recipient_thread_close",
         "thread_auto_close_silently",
         "thread_move_notify",

core/config_help.json

@@ -126,7 +126,18 @@
       "`{prefix}config set reply_without_command no`"
     ],
     "notes": [
-      "Unfortunately, anonymous `reply_without_command` is currently not possible."
+      "See also: `anon_reply_without_command`."
+    ]
+  },
+  "anon_reply_without_command": {
+    "default": "Disabled",
+    "description": "Setting this configuration will make all non-command messages sent in the thread channel to be anonymously forwarded to the recipient without the need of `{prefix}reply`.",
+    "examples": [
+      "`{prefix}config set anon_reply_without_command yes`",
+      "`{prefix}config set anon_reply_without_command no`"
+    ],
+    "notes": [
+      "See also: `reply_without_command`."
     ]
   },
   "log_channel_id": {

core/decorators.py

@@ -4,7 +4,9 @@
 
 
 def trigger_typing(func):
-    warnings.warn("trigger_typing has been moved to core.utils.trigger_typing, this will be removed.",
-                  DeprecationWarning,
-                  stacklevel=2)
+    warnings.warn(
+        "trigger_typing has been moved to core.utils.trigger_typing, this will be removed.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
     return _trigger_typing(func)