From 3cacc11af139184b27d5bbee0abd90b630ac1eb9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Sep 2018 19:33:19 +0900
Subject: [PATCH] Fix outdated API variable

---
 osu.Game/Online/API/Requests/PostMessageRequest.cs | 2 +-
 osu.Game/Online/Chat/Message.cs                    | 7 ++-----
 osu.Game/Overlays/ChatOverlay.cs                   | 5 ++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/API/Requests/PostMessageRequest.cs b/osu.Game/Online/API/Requests/PostMessageRequest.cs
index 188d6ada34..8d9ba5dd5d 100644
--- a/osu.Game/Online/API/Requests/PostMessageRequest.cs
+++ b/osu.Game/Online/API/Requests/PostMessageRequest.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $@"chat/channels/{message.TargetId}/messages";
+        protected override string Target => $@"chat/channels/{message.ChannelId}/messages";
     }
 }
diff --git a/osu.Game/Online/Chat/Message.cs b/osu.Game/Online/Chat/Message.cs
index 535035e4fc..65e0415cd3 100644
--- a/osu.Game/Online/Chat/Message.cs
+++ b/osu.Game/Online/Chat/Message.cs
@@ -18,11 +18,8 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"sender_id")]
         public int UserId;
 
-        [JsonProperty(@"target_type")]
-        public TargetType TargetType;
-
-        [JsonProperty(@"target_id")]
-        public int TargetId;
+        [JsonProperty(@"channel_id")]
+        public int ChannelId;
 
         [JsonProperty(@"is_action")]
         public bool IsAction;
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index d9bb4eb12b..74eac166e2 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -462,7 +462,7 @@ namespace osu.Game.Overlays
                         }
                     }
 
-                    foreach (var group in updates.Messages.Where(m => m.TargetType == TargetType.Channel).GroupBy(m => m.TargetId))
+                    foreach (var group in updates.Messages.GroupBy(m => m.ChannelId))
                         careChannels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
 
                     lastMessageId = updates.Messages.LastOrDefault()?.Id ?? lastMessageId;
@@ -534,8 +534,7 @@ namespace osu.Game.Overlays
             {
                 Sender = api.LocalUser.Value,
                 Timestamp = DateTimeOffset.Now,
-                TargetType = TargetType.Channel, //TODO: read this from channel
-                TargetId = target.Id,
+                ChannelId = target.Id,
                 IsAction = isAction,
                 Content = postText
             };