From d1f939cbc8ff1e6acabbfa93a7de3601a8c2166c Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Mon, 25 May 2020 23:56:48 +0300
Subject: [PATCH] ModMail -> Modmail

---
 docs/commands.md         | 42 ++++++++++++++++++++--------------------
 docs/snippets.md         |  4 ++--
 src/modules/webserver.js |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/commands.md b/docs/commands.md
index 8e8f863..ae2037e 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -1,12 +1,12 @@
 # 🤖 Commands
 
 ## Table of contents
-* [Inside a ModMail thread](#inside-a-modmail-thread)
+* [Inside a Modmail thread](#inside-a-modmail-thread)
 * [Anywhere on the inbox server](#anywhere-on-the-inbox-server)
 * [Snippets (canned messages)](#snippets-canned-messages)
 
-## Inside a ModMail thread
-These commands can only be used inside a ModMail thread's channel on the inbox server.
+## Inside a Modmail thread
+These commands can only be used inside a Modmail thread's channel on the inbox server.
 
 ### `!reply <text>` / `!r <text>`
 Send a reply to the user.
@@ -18,13 +18,13 @@ To reply automatically without using `!reply`, [enable `alwaysReply` in bot sett
 ### `!anonreply <text>` / `!ar <text>`
 Send an anonymous reply to the user. Anonymous replies only show the moderator's role in the reply.
 
-**Example:** `!ar Please only use ModMail for serious messages`
+**Example:** `!ar Please only use Modmail for serious messages`
 
 ### `!close`
-Close the ModMail thread.
+Close the Modmail thread.
 
 ### `!close <time>`
-Close the ModMail thread after a timer. Sending a message to the user or receiving a message from the user will cancel scheduled closing.
+Close the Modmail thread after a timer. Sending a message to the user or receiving a message from the user will cancel scheduled closing.
 
 **Example:** `!close 15m`
 
@@ -32,21 +32,21 @@ Close the ModMail thread after a timer. Sending a message to the user or receivi
 Cancel a timed close.
 
 ### `!logs`
-List previous ModMail logs with the user.
+List previous Modmail logs with the user.
 
 ### `!block`
-Block the user from using ModMail.
+Block the user from using Modmail.
 
 ### `!block <time>`
-Block the user from using ModMail for a specified time.
+Block the user from using Modmail for a specified time.
 
 **Example:** `!block 7d`
 
 ### `!unblock`
-Unblock the user, allowing them to use ModMail again.
+Unblock the user, allowing them to use Modmail again.
 
 ### `!move <category>`
-Move the ModMail thread to a different category.
+Move the Modmail thread to a different category.
 Requires `allowMove` to be enabled in the bot's settings.
 
 ### `!suspend`
@@ -63,43 +63,43 @@ Pings you when the thread gets a new reply.
 Cancel the ping set by `!alert`.
 
 ### `!loglink`
-Get a link to the open ModMail thread's log.
+Get a link to the open Modmail thread's log.
 
 ### `!loglink -s`
-Get a link to the open ModMail thread's log, only showing messages to/from the user (ignores mod chatter within the thread).
+Get a link to the open Modmail thread's log, only showing messages to/from the user (ignores mod chatter within the thread).
 
 ### `!loglink -v`
-Get a link to the open ModMail thread's log, showing extra details about channel and message IDs between the bot and the user.
+Get a link to the open Modmail thread's log, showing extra details about channel and message IDs between the bot and the user.
 This is mainly useful when reporting messages to Discord's Trust & Safety team.
 
 ### `!id`
 Prints the user's ID.
 
 ## Anywhere on the inbox server
-These commands can be used anywhere on the inbox server, even outside ModMail threads.
+These commands can be used anywhere on the inbox server, even outside Modmail threads.
 
 ### `!newthread <userID>`
-Open a ModMail thread with a user.
+Open a Modmail thread with a user.
 
 **Example:** `!newthread 106391128718245888`
 
 ### `!logs <userID>`
-List previous ModMail logs with the specified user.
+List previous Modmail logs with the specified user.
 
 **Example:** `!logs 106391128718245888`
 
 ### `!block <userID>`
-Block the specified user from ModMail.
+Block the specified user from Modmail.
 
 **Example:** `!block 106391128718245888`
 
 ### `!block <userID> <time>`
-Block the specified user from ModMail for a specified time.
+Block the specified user from Modmail for a specified time.
 
 **Example:** `!block 106391128718245888 7d`
 
 ### `!unblock <userID>`
-Unblock the specified user, allowing them to use ModMail again.
+Unblock the specified user, allowing them to use Modmail again.
 
 **Example:** `!unblock 106391128718245888`
 
@@ -109,7 +109,7 @@ Check if the specified user is blocked.
 **Example:** `!is_blocked 106391128718245888`
 
 ### `!version`
-Show the ModMail bot's version.
+Show the Modmail bot's version.
 
 ## Snippets (canned messages)
 See the [📋 Snippets](snippets.md) page for more information!
diff --git a/docs/snippets.md b/docs/snippets.md
index 3ba821a..011e704 100644
--- a/docs/snippets.md
+++ b/docs/snippets.md
@@ -1,5 +1,5 @@
 # 📋 Snippets
-Snippets, sometimes also called "canned messages" or "tags", are commonly used messages you can send in ModMail threads with just 1 command.
+Snippets, sometimes also called "canned messages" or "tags", are commonly used messages you can send in Modmail threads with just 1 command.
 
 ![Snippets example](snippets.gif)
 
@@ -21,7 +21,7 @@ To create a snippet called "hi" with the text "Hello, how can we help you?", use
 
 ## Using snippets
 ### `!!shortcut` / `!!!shortcut`
-Inside a ModMail thread, use `!!shortcut` to send a snippet to the user, replacing `shortcut` with the snippet's name.
+Inside a Modmail thread, use `!!shortcut` to send a snippet to the user, replacing `shortcut` with the snippet's name.
 
 To send a snippet anonymously, use `!!!shortcut`.
 
diff --git a/src/modules/webserver.js b/src/modules/webserver.js
index a1ad9ab..6c8a536 100644
--- a/src/modules/webserver.js
+++ b/src/modules/webserver.js
@@ -73,7 +73,7 @@ async function serveLogs(req, res, pathParts, query) {
   });
 
   const openedAt = moment(thread.created_at).format('YYYY-MM-DD HH:mm:ss');
-  const header = `# ModMail thread with ${thread.user_name} (${thread.user_id}) started at ${openedAt}. All times are in UTC+0.`;
+  const header = `# Modmail thread with ${thread.user_name} (${thread.user_id}) started at ${openedAt}. All times are in UTC+0.`;
 
   const fullResponse = header + '\n\n' + lines.join('\n');