sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/update-chat-api' into update-framework

Browse Source
This commit is contained in:
Dean Herbert
2018-09-28 18:23:09 +09:00
parent a4bf21268b d5d8a28b53
commit e1c187b641
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Chat/Channel.cs
View File

@ -60,6 +60,8 @@ namespace osu.Game.Online.Chat
{ {
messages = messages.Except(Messages).ToArray(); messages = messages.Except(Messages).ToArray();
if (messages.Length == 0) return;
Messages.AddRange(messages); Messages.AddRange(messages);
MessagesLoaded = true; MessagesLoaded = true;

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

@ -304,6 +304,8 @@ namespace osu.Game.Overlays
Scheduler.Add(delegate Scheduler.Add(delegate
{ {
//todo: decide how to handle default channels for a user now that they are saved server-side.
// we likely don't want to re-join every startup like this.
//addChannel(channels.Find(c => c.Name == @"#lazer")); //addChannel(channels.Find(c => c.Name == @"#lazer"));
//addChannel(channels.Find(c => c.Name == @"#osu")); //addChannel(channels.Find(c => c.Name == @"#osu"));
//addChannel(channels.Find(c => c.Name == @"#lobby")); //addChannel(channels.Find(c => c.Name == @"#lobby"));
@ -449,14 +451,16 @@ namespace osu.Game.Overlays
fetchReq.Success += updates => fetchReq.Success += updates =>
{ {
// fuck the what.
if (updates?.Presence != null) if (updates?.Presence != null)
{ {
foreach (var channel in updates.Presence) foreach (var channel in updates.Presence)
{
if (careChannels.Find(c => c.Id == channel.Id) == null)
{ {
channel.Joined.Value = true; channel.Joined.Value = true;
addChannel(channel); addChannel(channel);
} }
}
foreach (var group in updates.Messages.Where(m => m.TargetType == TargetType.Channel).GroupBy(m => m.TargetId)) foreach (var group in updates.Messages.Where(m => m.TargetType == TargetType.Channel).GroupBy(m => m.TargetId))
careChannels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray()); careChannels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
@ -464,13 +468,11 @@ namespace osu.Game.Overlays
lastMessageId = updates.Messages.LastOrDefault()?.Id ?? lastMessageId; lastMessageId = updates.Messages.LastOrDefault()?.Id ?? lastMessageId;
} }
Debug.Write("success!");
fetchReq = null; fetchReq = null;
}; };
fetchReq.Failure += delegate fetchReq.Failure += delegate
{ {
Debug.Write("failure!");
fetchReq = null; fetchReq = null;
}; };