sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Create an abstraction for APIMessagesRequest

Browse Source
This commit is contained in:
miterosan
2018-04-14 13:23:16 +02:00
parent a9f3885d28
commit 1b51da70af
4 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
osu.Game/Online/Chat/ChannelManager.cs
View File

@ -152,25 +152,46 @@ namespace osu.Game.Online.Chat
private void fetchNewMessages()
{
if (fetchMsgReq == null)
fetchNewChannelMessages();
fetchMessages(
() => new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId),
messages =>
{
if (messages == null)
return;
handleChannelMessages(messages);
lastChannelMsgId = messages.LastOrDefault()?.Id ?? lastChannelMsgId;
fetchMsgReq = null;
}
);
if (fetchPrivateMsgReq == null)
fetchNewUserMessages();
fetchMessages(
() => new GetPrivateMessagesRequest(lastChannelMsgId),
messages =>
{
if (messages == null)
return;
handleUserMessages(messages);
lastUserMsgId = messages.LastOrDefault()?.Id ?? lastUserMsgId;
fetchPrivateMsgReq = null;
}
);
}
private void fetchNewUserMessages()
private void fetchMessages(Func<APIMessagesRequest> messagesRequest, Action<List<Message>> handler)
{
fetchPrivateMsgReq = new GetPrivateMessagesRequest(lastUserMsgId);
if (messagesRequest == null)
throw new ArgumentNullException(nameof(messagesRequest));
if (handler == null)
throw new ArgumentNullException(nameof(handler));
fetchPrivateMsgReq.Success += messages =>
{
handleUserMessages(messages);
lastUserMsgId = messages.LastOrDefault()?.Id ?? lastUserMsgId;
fetchPrivateMsgReq = null;
};
fetchPrivateMsgReq.Failure += exception => Logger.Error(exception, "Fetching user messages failed.");
var messagesReq = messagesRequest.Invoke();
api.Queue(fetchPrivateMsgReq);
messagesReq.Success += handler.Invoke;
messagesReq.Failure += exception => Logger.Error(exception, "Fetching messages failed.");
api.Queue(messagesReq);
}
private void handleUserMessages(IEnumerable<Message> messages)
@ -218,23 +239,6 @@ namespace osu.Game.Online.Chat
}
}
private void fetchNewChannelMessages()
{
fetchMsgReq = new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId);
fetchMsgReq.Success += messages =>
{
if (messages == null)
return;
handleChannelMessages(messages);
lastChannelMsgId = messages.LastOrDefault()?.Id ?? lastChannelMsgId;
fetchMsgReq = null;
};
fetchMsgReq.Failure += exception => Logger.Error(exception, "Fetching channel messages failed.");
api.Queue(fetchMsgReq);
}
private void handleChannelMessages(IEnumerable<Message> messages)
{
var channels = JoinedChannels.ToList();