Merge pull request #260 from kyb3r/show-mutual-guilds

Mutual guilds field and pinned notes

Author: kyb3r

CHANGELOG.md

@@ -4,6 +4,18 @@ 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.23.0
+
+### Added 
+
+Added a "Mutual servers" field to the genesis embed if:
+a) The user is not in the main guild.
+b) The user shares more than 1 server with the bot.
+
+### Changed
+
+Notes taken using the `?note` command are now automatically pinned within the thread channel.
+
 # v2.22.0
 
 ### Added

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = "2.22.0"
+__version__ = "2.23.0"
 
 import asyncio
 import logging

cogs/modmail.py

@@ -655,7 +655,8 @@ async def note(self, ctx, *, msg: str = ""):
         """
         ctx.message.content = msg
         async with ctx.typing():
-            await ctx.thread.note(ctx.message)
+            msg = await ctx.thread.note(ctx.message)
+            await msg.pin()
 
     async def find_linked_message(self, ctx, message_id):
         linked_message_id = None

core/thread.py

@@ -120,22 +120,21 @@ async def setup(self, *, creator=None, category=None):
             log_url = log_count = None
             # ensure core functionality still works
 
-        info_embed = self.manager.format_info_embed(
-            recipient, log_url, log_count, discord.Color.green()
-        )
-
         topic = f"User ID: {recipient.id}"
         if creator:
             mention = None
         else:
             mention = self.bot.config.get("mention", "@here")
 
         async def send_genesis_message():
+            info_embed = self.manager.format_info_embed(
+                recipient, log_url, log_count, discord.Color.green()
+            )
             try:
                 msg = await channel.send(mention, embed=info_embed)
                 self.bot.loop.create_task(msg.pin())
                 self.genesis_message = msg
-            except:
+            except Exception as e:
                 pass
             finally:
                 self.ready = True
@@ -365,11 +364,13 @@ async def note(self, message: discord.Message) -> None:
         if not message.content and not message.attachments:
             raise MissingRequiredArgument(param(name="msg"))
 
-        await asyncio.gather(
+        _, msg = await asyncio.gather(
             self.bot.api.append_log(message, self.channel.id, type_="system"),
             self.send(message, self.channel, note=True),
         )
 
+        return msg
+
     async def reply(self, message: discord.Message, anonymous: bool = False) -> None:
         if not message.content and not message.attachments:
             raise MissingRequiredArgument(param(name="msg"))
@@ -580,7 +581,8 @@ async def send(
         else:
             mentions = None
 
-        await destination.send(mentions, embed=embed)
+        _msg = await destination.send(mentions, embed=embed)
+
         if additional_images:
             self.ready = False
             await asyncio.gather(*additional_images)
@@ -589,6 +591,8 @@ async def send(
         if delete_message:
             self.bot.loop.create_task(ignore(message.delete()))
 
+        return _msg
+
     def get_notifications(self) -> str:
         config = self.bot.config
         key = str(self.id)
@@ -792,9 +796,7 @@ def format_info_embed(self, user, log_url, log_count, color):
             if role_names:
                 embed.add_field(name="Roles", value=role_names, inline=True)
         else:
-            embed.set_footer(
-                text=f"{footer} | Note: this member " "is not part of this server."
-            )
+            embed.set_footer(text=f"{footer} • (not in main server)")
 
         if log_count:
             # embed.add_field(name='Past logs', value=f'{log_count}')
@@ -803,4 +805,10 @@ def format_info_embed(self, user, log_url, log_count, color):
         else:
             embed.description += "."
 
+        mutual_guilds = [g for g in self.bot.guilds if user in g.members]
+        if user not in self.bot.guild.members or len(mutual_guilds) > 1:
+            embed.add_field(
+                name="Mutual Servers", value=", ".join(g.name for g in mutual_guilds)
+            )
+
         return embed