From 31e26364a6c5dda84e294ff60e88820ef7c9d69f Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Fri, 22 Sep 2017 01:47:24 +0200
Subject: [PATCH] Initial implementation of chat commands

---
 .../Online/API/Requests/PostMessageRequest.cs |  3 +-
 osu.Game/Online/Chat/Message.cs               |  3 ++
 osu.Game/Overlays/Chat/ChatLine.cs            |  7 ++--
 osu.Game/Overlays/ChatOverlay.cs              | 33 ++++++++++++++++---
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/API/Requests/PostMessageRequest.cs b/osu.Game/Online/API/Requests/PostMessageRequest.cs
index 52269d9fe8..f0c7cb9a9b 100644
--- a/osu.Game/Online/API/Requests/PostMessageRequest.cs
+++ b/osu.Game/Online/API/Requests/PostMessageRequest.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Online.API.Requests
             req.Method = HttpMethod.POST;
             req.AddParameter(@"target_type", message.TargetType.GetDescription());
             req.AddParameter(@"target_id", message.TargetId.ToString());
+            req.AddParameter(@"is_action", message.IsAction.ToString().ToLower());
             req.AddParameter(@"message", message.Content);
 
             return req;
@@ -30,4 +31,4 @@ namespace osu.Game.Online.API.Requests
 
         protected override string Target => @"chat/messages";
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Chat/Message.cs b/osu.Game/Online/Chat/Message.cs
index 509861868a..79b5c4fc1a 100644
--- a/osu.Game/Online/Chat/Message.cs
+++ b/osu.Game/Online/Chat/Message.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"target_id")]
         public int TargetId;
 
+        [JsonProperty(@"is_action")]
+        public bool IsAction;
+
         [JsonProperty(@"timestamp")]
         public DateTimeOffset Timestamp;
 
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index cac0ce01ae..fc18049491 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Overlays.Chat
         public const float LEFT_PADDING = message_padding + padding * 2;
 
         private const float padding = 15;
+        private const float padding_action = 5;
         private const float message_padding = 200;
         private const float text_size = 20;
 
@@ -183,7 +184,7 @@ namespace osu.Game.Overlays.Chat
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding { Left = message_padding + padding },
+                    Padding = new MarginPadding { Left = message_padding + (message.IsAction ? padding_action : padding) },
                     Children = new Drawable[]
                     {
                         contentFlow = new OsuTextFlowContainer(t => { t.TextSize = text_size; })
@@ -194,6 +195,8 @@ namespace osu.Game.Overlays.Chat
                     }
                 }
             };
+            if (message.IsAction)
+                contentFlow.Colour = senderHasBackground ? OsuColour.FromHex(message.Sender.Colour) : username_colours[message.Sender.Id % username_colours.Length];
 
             updateMessageContent();
             FinishTransforms(true);
@@ -205,7 +208,7 @@ namespace osu.Game.Overlays.Chat
             timestamp.FadeTo(message is LocalEchoMessage ? 0 : 1, 500, Easing.OutQuint);
 
             timestamp.Text = $@"{message.Timestamp.LocalDateTime:HH:mm:ss}";
-            username.Text = $@"{message.Sender.Username}" + (senderHasBackground ? "" : ":");
+            username.Text = (message.IsAction ? "*" : "") + $@"{message.Sender.Username}" + (senderHasBackground || message.IsAction ? "" : ":");
             contentFlow.Text = message.Content;
         }
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 7c28bdea4d..ef755b6239 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -465,7 +465,7 @@ namespace osu.Game.Overlays
 
             textbox.Text = string.Empty;
 
-            if (string.IsNullOrEmpty(postText))
+            if (string.IsNullOrWhiteSpace(postText))
                 return;
 
             var target = currentChannel;
@@ -478,11 +478,35 @@ namespace osu.Game.Overlays
                 return;
             }
 
+            bool isAction = false;
+
             if (postText[0] == '/')
             {
-                // TODO: handle commands
-                target.AddNewMessages(new ErrorMessage("Chat commands are not supported yet!"));
-                return;
+                postText = postText.Substring(1);
+                string commandKeyword = postText.Split(' ')[0];
+
+                switch (commandKeyword)
+                {
+                    case "me":
+
+                        if (!postText.StartsWith("me ") || string.IsNullOrWhiteSpace(postText.Substring(3)))
+                        {
+                            currentChannel.AddNewMessages(new ErrorMessage("Usage: /me [action]"));
+                            return;
+                        }
+
+                        isAction = true;
+                        postText = postText.Substring(3);
+                        break;
+
+                    case "help":
+                        currentChannel.AddNewMessages(new ErrorMessage("Supported commands: /help, /me [action]"));
+                        return;
+
+                    default:
+                        currentChannel.AddNewMessages(new ErrorMessage($@"""/{commandKeyword}"" is not supported! For a list of supported commands see /help"));
+                        return;
+                }
             }
 
             var message = new LocalEchoMessage
@@ -491,6 +515,7 @@ namespace osu.Game.Overlays
                 Timestamp = DateTimeOffset.Now,
                 TargetType = TargetType.Channel, //TODO: read this from channel
                 TargetId = target.Id,
+                IsAction = isAction,
                 Content = postText
             };