From 0b11d7dfb408f4e5fe6248ae8377ddc7aa1aa5ee Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 23 Feb 2021 03:48:35 +0100
Subject: Add truncate_message util

---
 bot/utils/messages.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bot/utils/messages.py b/bot/utils/messages.py
index 077dd9569..c01fa5d0e 100644
--- a/bot/utils/messages.py
+++ b/bot/utils/messages.py
@@ -154,3 +154,12 @@ async def send_denial(ctx: Context, reason: str) -> None:
 def format_user(user: discord.abc.User) -> str:
     """Return a string for `user` which has their mention and ID."""
     return f"{user.mention} (`{user.id}`)"
+
+
+def truncate_message(message: discord.Message, limit: int) -> str:
+    """Returns a truncated version of the message content, up to the specified limit."""
+    text = message.content
+    if len(text) > limit:
+        return text[:limit-3] + "..."
+    else:
+        return text
-- 
cgit v1.2.3


From e1d269d82eed8a01d3d3b0ff33d05e3c79324007 Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 23 Feb 2021 04:00:01 +0100
Subject: Add function to DM users when opening help channel

---
 bot/exts/help_channels/_message.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/bot/exts/help_channels/_message.py b/bot/exts/help_channels/_message.py
index 2bbd4bdd6..12ac4035d 100644
--- a/bot/exts/help_channels/_message.py
+++ b/bot/exts/help_channels/_message.py
@@ -8,6 +8,7 @@ import bot
 from bot import constants
 from bot.exts.help_channels import _caches
 from bot.utils.channel import is_in_category
+from bot.utils.messages import truncate_message
 
 log = logging.getLogger(__name__)
 
@@ -92,6 +93,38 @@ async def is_empty(channel: discord.TextChannel) -> bool:
     return False
 
 
+async def dm_on_open(message: discord.Message) -> None:
+    """
+    DM claimant with a link to the claimed channel's first message, with a 100 letter preview of the message.
+
+    Does nothing if the user has DMs disabled.
+    """
+    embed = discord.Embed(
+        title="Help channel opened",
+        description=f"You claimed {message.channel.mention}.",
+        colour=bot.constants.Colours.bright_green,
+        timestamp=message.created_at,
+    )
+
+    embed.set_thumbnail(url=constants.Icons.green_questionmark)
+    embed.add_field(
+        name="Your message", value=truncate_message(message, limit=100), inline=False
+    )
+    embed.add_field(
+        name="Want to go there?",
+        value=f"[Jump to message!]({message.jump_url})",
+        inline=False,
+    )
+
+    try:
+        await message.author.send(embed=embed)
+        log.trace(f"Sent DM to {message.author.id} after claiming help channel.")
+    except discord.errors.Forbidden:
+        log.trace(
+            f"Ignoring to send DM to {message.author.id} after claiming help channel: DMs disabled."
+        )
+
+
 async def notify(channel: discord.TextChannel, last_notification: t.Optional[datetime]) -> t.Optional[datetime]:
     """
     Send a message in `channel` notifying about a lack of available help channels.
-- 
cgit v1.2.3


From e6483d633ac6ecc2a88051442108d9c88e5f7745 Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 23 Feb 2021 04:00:58 +0100
Subject: Add green question mark to default config

Add green question mark to default config

Add green question mark to config
---
 bot/constants.py   | 1 +
 config-default.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bot/constants.py b/bot/constants.py
index 8a93ff9cf..69bc82b89 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -326,6 +326,7 @@ class Icons(metaclass=YAMLGetter):
     filtering: str
 
     green_checkmark: str
+    green_questionmark: str
     guild_update: str
 
     hash_blurple: str
diff --git a/config-default.yml b/config-default.yml
index 8e9a29a51..7d9afaa0e 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -90,6 +90,7 @@ style:
         filtering: "https://cdn.discordapp.com/emojis/472472638594482195.png"
 
         green_checkmark: "https://raw.githubusercontent.com/python-discord/branding/master/icons/checkmark/green-checkmark-dist.png"
+        green_questionmark: "https://raw.githubusercontent.com/python-discord/branding/master/icons/checkmark/green-question-mark-dist.png"
         guild_update: "https://cdn.discordapp.com/emojis/469954765141442561.png"
 
         hash_blurple: "https://cdn.discordapp.com/emojis/469950142942806017.png"
-- 
cgit v1.2.3


From e34ea2f1c108d1900e251d17b38563536345d2de Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 23 Feb 2021 04:07:05 +0100
Subject: Send DM when user claims help channel

---
 bot/exts/help_channels/_cog.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/exts/help_channels/_cog.py b/bot/exts/help_channels/_cog.py
index 0995c8a79..a18ddc900 100644
--- a/bot/exts/help_channels/_cog.py
+++ b/bot/exts/help_channels/_cog.py
@@ -102,6 +102,7 @@ class HelpChannels(commands.Cog):
         await _cooldown.revoke_send_permissions(message.author, self.scheduler)
 
         await _message.pin(message)
+        await _message.dm_on_open(message)
 
         # Add user with channel for dormant check.
         await _caches.claimants.set(message.channel.id, message.author.id)
-- 
cgit v1.2.3


From bb9e56c3cb874ef76ab82db02ce8242117e0da92 Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 23 Feb 2021 11:08:41 +0100
Subject: Update embed field title to be more formal

---
 bot/exts/help_channels/_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/help_channels/_message.py b/bot/exts/help_channels/_message.py
index 12ac4035d..95aca067a 100644
--- a/bot/exts/help_channels/_message.py
+++ b/bot/exts/help_channels/_message.py
@@ -111,7 +111,7 @@ async def dm_on_open(message: discord.Message) -> None:
         name="Your message", value=truncate_message(message, limit=100), inline=False
     )
     embed.add_field(
-        name="Want to go there?",
+        name="Conversation",
         value=f"[Jump to message!]({message.jump_url})",
         inline=False,
     )
-- 
cgit v1.2.3


From cae0d84757e026976f1a9e87d52c581669b7b8e8 Mon Sep 17 00:00:00 2001
From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com>
Date: Tue, 23 Feb 2021 11:14:31 +0100
Subject: Use textwrap.shorten instead of custom function

This applies to the help channel DM embed, where the user is sent a
truncated version of their message.
---
 bot/exts/help_channels/_message.py | 6 ++++--
 bot/utils/messages.py              | 9 ---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/bot/exts/help_channels/_message.py b/bot/exts/help_channels/_message.py
index 95aca067a..4113e51c5 100644
--- a/bot/exts/help_channels/_message.py
+++ b/bot/exts/help_channels/_message.py
@@ -1,4 +1,5 @@
 import logging
+import textwrap
 import typing as t
 from datetime import datetime
 
@@ -8,7 +9,6 @@ import bot
 from bot import constants
 from bot.exts.help_channels import _caches
 from bot.utils.channel import is_in_category
-from bot.utils.messages import truncate_message
 
 log = logging.getLogger(__name__)
 
@@ -108,7 +108,9 @@ async def dm_on_open(message: discord.Message) -> None:
 
     embed.set_thumbnail(url=constants.Icons.green_questionmark)
     embed.add_field(
-        name="Your message", value=truncate_message(message, limit=100), inline=False
+        name="Your message",
+        value=textwrap.shorten(message.content, width=100, placeholder="..."),
+        inline=False,
     )
     embed.add_field(
         name="Conversation",
diff --git a/bot/utils/messages.py b/bot/utils/messages.py
index c01fa5d0e..077dd9569 100644
--- a/bot/utils/messages.py
+++ b/bot/utils/messages.py
@@ -154,12 +154,3 @@ async def send_denial(ctx: Context, reason: str) -> None:
 def format_user(user: discord.abc.User) -> str:
     """Return a string for `user` which has their mention and ID."""
     return f"{user.mention} (`{user.id}`)"
-
-
-def truncate_message(message: discord.Message, limit: int) -> str:
-    """Returns a truncated version of the message content, up to the specified limit."""
-    text = message.content
-    if len(text) > limit:
-        return text[:limit-3] + "..."
-    else:
-        return text
-- 
cgit v1.2.3