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

Merge pull request #760 from peppy/message-fetch-fix

Browse Source 
Fix initial requests of channel mesages not being performed
This commit is contained in:
Dan Balasescu 2017-05-16 16:07:40 +09:00 committed by GitHub
commit 6cbaf1ba05
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ namespace osu.Game.Overlays
addChannel(channels.Find(c => c.Name == @"#lobby")); addChannel(channels.Find(c => c.Name == @"#lobby"));
}); });
messageRequest = Scheduler.AddDelayed(() => fetchNewMessages(), 1000, true); messageRequest = Scheduler.AddDelayed(fetchNewMessages, 1000, true);
}; };
api.Queue(req); api.Queue(req);
@ -289,17 +289,34 @@ namespace osu.Game.Overlays
channelTabs.AddItem(channel); channelTabs.AddItem(channel);
// we need to get a good number of messages initially for each channel we care about. // we need to get a good number of messages initially for each channel we care about.
fetchNewMessages(channel); fetchInitialMessages(channel);
if (CurrentChannel == null) if (CurrentChannel == null)
CurrentChannel = channel; CurrentChannel = channel;
} }
private void fetchNewMessages(Channel specificChannel = null) private void fetchInitialMessages(Channel channel)
{
var req = new GetMessagesRequest(new List<Channel> { channel }, null);
req.Success += delegate (List<Message> messages)
{
channel.AddNewMessages(messages.ToArray());
Debug.Write("success!");
};
req.Failure += delegate
{
Debug.Write("failure!");
};
api.Queue(req);
}
private void fetchNewMessages()
{ {
if (fetchReq != null) return; if (fetchReq != null) return;
fetchReq = new GetMessagesRequest(specificChannel != null ? new List<Channel> { specificChannel } : careChannels, lastMessageId); fetchReq = new GetMessagesRequest(careChannels, lastMessageId);
fetchReq.Success += delegate (List<Message> messages) fetchReq.Success += delegate (List<Message> messages)
{ {
var ids = messages.Where(m => m.TargetType == TargetType.Channel).Select(m => m.TargetId).Distinct(); var ids = messages.Where(m => m.TargetType == TargetType.Channel).Select(m => m.TargetId).Distinct();