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

Rename var chatmanager -> channelManager

Browse Source 
Apply requested changes
This commit is contained in:
miterosan
2018-04-12 23:19:13 +02:00
parent b997f0f3fa
commit e39f5a1adf
7 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,8 @@ namespace osu.Game.Online.Chat
private APIAccess api;
private readonly Scheduler scheduler;
private ScheduledDelegate fetchMessagesScheduleder;
private GetChannelMessagesRequest fetchChannelMsgReq;
private GetUserMessagesRequest fetchUserMsgReq;
private GetMessagesRequest fetchMsgReq;
private GetPrivateMessagesRequest fetchPrivateMsgReq;
private long? lastChannelMsgId;
private long? lastUserMsgId;
@ -151,26 +151,26 @@ namespace osu.Game.Online.Chat
private void fetchNewMessages()
{
if (fetchChannelMsgReq == null)
if (fetchMsgReq == null)
fetchNewChannelMessages();
if (fetchUserMsgReq == null)
if (fetchPrivateMsgReq == null)
fetchNewUserMessages();
}
private void fetchNewUserMessages()
{
fetchUserMsgReq = new GetUserMessagesRequest(lastUserMsgId);
fetchPrivateMsgReq = new GetPrivateMessagesRequest(lastUserMsgId);
fetchUserMsgReq.Success += messages =>
fetchPrivateMsgReq.Success += messages =>
{
handleUserMessages(messages);
lastUserMsgId = messages.LastOrDefault()?.Id ?? lastUserMsgId;
fetchUserMsgReq = null;
fetchPrivateMsgReq = null;
};
fetchUserMsgReq.Failure += exception => Logger.Error(exception, "Fetching user messages failed.");
fetchPrivateMsgReq.Failure += exception => Logger.Error(exception, "Fetching user messages failed.");
api.Queue(fetchUserMsgReq);
api.Queue(fetchPrivateMsgReq);
}
private void handleUserMessages(IEnumerable<Message> messages)
@ -220,19 +220,19 @@ namespace osu.Game.Online.Chat
private void fetchNewChannelMessages()
{
fetchChannelMsgReq = new GetChannelMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId);
fetchMsgReq = new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId);
fetchChannelMsgReq.Success += messages =>
fetchMsgReq.Success += messages =>
{
if (messages == null)
return;
handleChannelMessages(messages);
lastChannelMsgId = messages.LastOrDefault()?.Id ?? lastChannelMsgId;
fetchChannelMsgReq = null;
fetchMsgReq = null;
};
fetchChannelMsgReq.Failure += exception => Logger.Error(exception, "Fetching channel messages failed.");
fetchMsgReq.Failure += exception => Logger.Error(exception, "Fetching channel messages failed.");
api.Queue(fetchChannelMsgReq);
api.Queue(fetchMsgReq);
}
private void handleChannelMessages(IEnumerable<Message> messages)
@ -258,7 +258,7 @@ namespace osu.Game.Online.Chat
{
JoinedChannels.Add(channel);
var fetchInitialMsgReq = new GetChannelMessagesRequest(new[] { channel }, null);
var fetchInitialMsgReq = new GetMessagesRequest(new[] { channel }, null);
fetchInitialMsgReq.Success += handleChannelMessages;
fetchInitialMsgReq.Failure += exception => Logger.Error(exception, "Failed to fetch inital messages.");
api.Queue(fetchInitialMsgReq);
@ -281,8 +281,8 @@ namespace osu.Game.Online.Chat
fetchMessagesScheduleder = scheduler.AddDelayed(fetchNewMessages, 1000, true);
break;
default:
fetchChannelMsgReq?.Cancel();
fetchChannelMsgReq = null;
fetchMsgReq?.Cancel();
fetchMsgReq = null;
fetchMessagesScheduleder?.Cancel();
break;
}