From 616f281d80ed9c19d715416a43cb003615ac6172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sun, 29 Nov 2020 22:46:50 +0100
Subject: [PATCH 1/2] add untimeout

---
 src/pubsub/moderation.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pubsub/moderation.rs b/src/pubsub/moderation.rs
index 17f2bfa688..2aa15fd096 100644
--- a/src/pubsub/moderation.rs
+++ b/src/pubsub/moderation.rs
@@ -102,6 +102,10 @@ pub enum ModerationActionCommand {
     ///
     /// Given when a user is timed-out with `/timeout <user> <time> <reason>`
     Timeout,
+    /// Untimeout
+    ///
+    /// Given when a user is unbanned while under a timeout `/untimeout <user>` or `/unban <user>`
+    Untimeout,
     /// Mod
     ///
     /// Given when a user is added as a moderator. `/mod <user>`.

From 24157214d37f57bb8f95959fee7329d6c72a2feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sun, 29 Nov 2020 22:46:54 +0100
Subject: [PATCH 2/2] fix typo

---
 src/pubsub/hype_train.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/hype_train.rs b/src/pubsub/hype_train.rs
index ee5bb07847..528481e54c 100644
--- a/src/pubsub/hype_train.rs
+++ b/src/pubsub/hype_train.rs
@@ -189,7 +189,7 @@ pub struct Config {
     /// Primary color of hex
     pub primary_hex_color: Option<String>,
     // FIXME: 2020-11-22 I suspect this will always be returned
-    /// Uses perzonalized settings
+    /// Uses personalized settings
     pub use_personalized_settings: Option<bool>,
     /// Use theme color or not
     pub use_theme_color: Option<bool>,