h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 14:22:55 +08:00
Code Issues Releases Wiki Activity

Update API responses for chat.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-19 17:39:57 +09:00
parent 3eca32a380
commit 325af333b9
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Online/Chat/Message.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using System.ComponentModel;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Game.Users; using osu.Game.Users;
@ -16,8 +17,11 @@ namespace osu.Game.Online.Chat
[JsonProperty(@"user_id")] [JsonProperty(@"user_id")]
public int UserId; public int UserId;
[JsonProperty(@"channel_id")] [JsonProperty(@"target_type")]
public int ChannelId; public TargetType TargetType;
[JsonProperty(@"target_id")]
public int TargetId;
[JsonProperty(@"timestamp")] [JsonProperty(@"timestamp")]
public DateTimeOffset Timestamp; public DateTimeOffset Timestamp;
@ -33,4 +37,12 @@ namespace osu.Game.Online.Chat
{ {
} }
} }
public enum TargetType
{
[Description(@"channel")]
Channel,
[Description(@"user")]
User
}
} }

6
osu.Game/Overlays/ChatOverlay.cs
View File

@ -136,11 +136,11 @@ namespace osu.Game.Overlays
fetchReq = new GetMessagesRequest(careChannels, lastMessageId); fetchReq = new GetMessagesRequest(careChannels, lastMessageId);
fetchReq.Success += delegate (List<Message> messages) fetchReq.Success += delegate (List<Message> messages)
{ {
var ids = messages.Select(m => m.ChannelId).Distinct(); var ids = messages.Where(m => m.TargetType == TargetType.Channel).Select(m => m.TargetId).Distinct();
//batch messages per channel. //batch messages per channel.
foreach (var id in ids) foreach (var id in ids)
careChannels.Find(c => c.Id == id)?.AddNewMessages(messages.Where(m => m.ChannelId == id)); careChannels.Find(c => c.Id == id)?.AddNewMessages(messages.Where(m => m.TargetId == id));
lastMessageId = messages.LastOrDefault()?.Id ?? lastMessageId; lastMessageId = messages.LastOrDefault()?.Id ?? lastMessageId;