Update changelog and merge issues

Author: fourjr

CHANGELOG.md

@@ -11,12 +11,14 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 ## Added
 
 - Ability to have group conversations. ([GH #143](https://github.com/kyb3r/modmail/issues/143))
+- Snippets are invoked case insensitively. ([GH #3077](https://github.com/kyb3r/modmail/issues/3077), [PR #3080](https://github.com/kyb3r/modmail/pull/3080))
 
 ## Fixed
 
 - Certain situations where the internal thread cache breaks and spams new channels. ([GH #3022](https://github.com/kyb3r/modmail/issues/3022), [PR #3028](https://github.com/kyb3r/modmail/pull/3028))
 - Blocked users are now no longer allowed to use `?contact` and react to contact. ([COMMENT #819004157](https://github.com/kyb3r/modmail/issues/2969#issuecomment-819004157), [PR #3027](https://github.com/kyb3r/modmail/pull/3027))
 - UnicodeEncodeError will no longer be raised on Windows. ([PR #3043](https://github.com/kyb3r/modmail/pull/3043))
+- Notifications are no longer duplicated when using both `?notify` and `subscribe`. ([PR #3015](https://github.com/kyb3r/modmail/pull/3015))
 
 ## Internal
 

README.md

@@ -6,11 +6,7 @@
   <br>
 
   <a href="#">
-<<<<<<< HEAD
     <img src="https://img.shields.io/badge/Latest%20Version-v3.10.0-dev4-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
-=======
-    <img src="https://img.shields.io/badge/Latest%20Version-v3.9.5-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
->>>>>>> master
   </a>
 
   <br>

bot.py

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 __version__ = "v3.10.0-dev4"
-=======
-__version__ = "3.9.5"
->>>>>>> master
 
 
 import asyncio
@@ -1268,13 +1264,9 @@ async def handle_reaction_events(self, payload):
             if not thread:
                 return
             try:
-<<<<<<< HEAD
                 _, *linked_message = await thread.find_linked_messages(
                     message.id, either_direction=True
                 )
-=======
-                _, linked_message = await thread.find_linked_messages(message.id, either_direction=True)
->>>>>>> master
             except ValueError as e:
                 logger.warning("Failed to find linked message for reactions: %s", e)
                 return
@@ -1305,7 +1297,6 @@ async def handle_react_to_contact(self, payload):
         else:
             emoji_fmt = f"<:{payload.emoji.name}:{payload.emoji.id}>"
 
-<<<<<<< HEAD
         if emoji_fmt != react_message_emoji:
             return
         channel = self.get_channel(payload.channel_id)
@@ -1338,11 +1329,6 @@ async def on_raw_reaction_add(self, payload):
         await asyncio.gather(
             self.handle_reaction_events(payload), self.handle_react_to_contact(payload),
         )
-=======
-                        ctx = await self.get_context(message)
-                        ctx.author = member
-                        await ctx.invoke(self.get_command("contact"), user=member, manual_trigger=False)
->>>>>>> master
 
     async def on_raw_reaction_remove(self, payload):
         if self.config["transfer_reactions"]:

cogs/modmail.py

@@ -1046,18 +1046,11 @@ async def contact(
 
         exists = await self.bot.threads.find(recipient=user)
         if exists:
-<<<<<<< HEAD
             desc = "A thread for this user already exists"
             if exists.channel:
                 desc += f" in {exists.channel.mention}"
             desc += "."
             embed = discord.Embed(color=self.bot.error_color, description=desc)
-=======
-            embed = discord.Embed(
-                color=self.bot.error_color,
-                description="A thread for this user already " f"exists in {exists.channel.mention}.",
-            )
->>>>>>> master
             await ctx.channel.send(embed=embed, delete_after=3)
 
         else:
@@ -1550,13 +1543,9 @@ async def repair(self, ctx):
                     other_recipients[n] = self.bot.get_user(uid) or await self.bot.fetch_user(uid)
 
                 if recipient is None:
-<<<<<<< HEAD
                     self.bot.threads.cache[user.id] = thread = Thread(
                         self.bot.threads, user_id, ctx.channel, other_recipients
                     )
-=======
-                    self.bot.threads.cache[user.id] = thread = Thread(self.bot.threads, user_id, ctx.channel)
->>>>>>> master
                 else:
                     self.bot.threads.cache[user.id] = thread = Thread(
                         self.bot.threads, recipient, ctx.channel, other_recipients

core/models.py

@@ -127,13 +127,9 @@ def format(self, record):
 
 def configure_logging(name, level=None):
     global ch_debug, log_level
-<<<<<<< HEAD
     ch_debug = RotatingFileHandler(
         name, mode="a+", maxBytes=48000, backupCount=1, encoding="utf-8"
     )
-=======
-    ch_debug = RotatingFileHandler(name, mode="a+", maxBytes=78000, backupCount=10)
->>>>>>> master
 
     formatter_debug = FileFormatter(
         "%(asctime)s %(name)s[%(lineno)d] - %(levelname)s: %(message)s",

core/thread.py

@@ -1136,21 +1136,13 @@ async def find(
                 logger.warning("Thread for %s cancelled.", recipient)
                 return thread
             else:
-<<<<<<< HEAD
                 if not thread.cancelled and (
                     not thread.channel or not self.bot.get_channel(thread.channel.id)
                 ):
                     logger.warning(
                         "Found existing thread for %s but the channel is invalid.", recipient_id
                     )
                     await thread.close(closer=self.bot.user, silent=True, delete_channel=False)
-=======
-                if not thread.channel or not self.bot.get_channel(thread.channel.id):
-                    logger.warning("Found existing thread for %s but the channel is invalid.", recipient_id)
-                    self.bot.loop.create_task(
-                        thread.close(closer=self.bot.user, silent=True, delete_channel=False)
-                    )
->>>>>>> master
                     thread = None
         else:
             channel = discord.utils.find(
@@ -1224,17 +1216,10 @@ async def create(
                 if thread.channel and self.bot.get_channel(thread.channel.id):
                     logger.warning("Found an existing thread for %s, abort creating.", recipient)
                     return thread
-<<<<<<< HEAD
-                logger.warning(
-                    "Found an existing thread for %s, closing previous thread.", recipient
-                )
-                await thread.close(closer=self.bot.user, silent=True, delete_channel=False)
-=======
                 logger.warning("Found an existing thread for %s, closing previous thread.", recipient)
                 self.bot.loop.create_task(
                     thread.close(closer=self.bot.user, silent=True, delete_channel=False)
                 )
->>>>>>> master
 
         thread = Thread(self, recipient)
 
@@ -1304,18 +1289,11 @@ async def remove_reactions():
                 for emoji in emojis:
                     await confirm.remove_reaction(emoji, self.bot.user)
                     await asyncio.sleep(0.2)
-<<<<<<< HEAD
 
             self.bot.loop.create_task(remove_reactions())
             if thread.cancelled:
                 del self.cache[recipient.id]
                 return thread
-=======
-                    await confirm.remove_reaction(deny_emoji, self.bot.user)
-                    await destination.send(embed=discord.Embed(title="Cancelled", color=self.bot.error_color))
-                    del self.cache[recipient.id]
-                    return thread
->>>>>>> master
 
         self.bot.loop.create_task(thread.setup(creator=creator, category=category, initial_message=message))
         return thread

pyproject.toml

@@ -19,7 +19,6 @@ extend-exclude = '''
 )
 '''
 
-<<<<<<< HEAD
 [tool.poetry]
 name = 'Modmail'
 version = '3.10.0-dev4'
@@ -34,10 +33,6 @@ readme = 'README.md'
 repository = 'https://github.com/kyb3r/modmail'
 homepage = 'https://github.com/kyb3r/modmail'
 keywords = ['discord', 'modmail']
-=======
-[tool.pylint.messages_control]
-disable = "C0330, C0326"
->>>>>>> master
 
 [tool.pylint.format]
 max-line-length = "110"