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

Simplify user channel message population code

Browse Source
This commit is contained in:
Dean Herbert 2018-07-23 21:15:52 +02:00
parent 0aacde836a
commit 1ab75529a1
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,29 +203,42 @@ namespace osu.Game.Online.Chat
{ {
var joinedUserChannels = JoinedChannels.Where(c => c.Target == TargetType.User).ToList(); var joinedUserChannels = JoinedChannels.Where(c => c.Target == TargetType.User).ToList();
var outgoingMessages = messages.Where(m => m.Sender.Id == api.LocalUser.Value.Id); Channel getChannelForUser(User user)
var outgoingMessagesGroups = outgoingMessages.GroupBy(m => m.TargetId);
var incomingMessagesGroups = messages.Except(outgoingMessages).GroupBy(m => m.UserId);
foreach (var messageGroup in incomingMessagesGroups)
{ {
var targetUser = messageGroup.First().Sender; var channel = joinedUserChannels.FirstOrDefault(c => c.Id == user.Id);
var channel = joinedUserChannels.FirstOrDefault(c => c.Id == targetUser.Id);
if (channel == null) if (channel == null)
{ {
channel = new PrivateChannel { User = targetUser }; channel = new PrivateChannel { User = user };
JoinedChannels.Add(channel); JoinedChannels.Add(channel);
joinedUserChannels.Add(channel); joinedUserChannels.Add(channel);
} }
channel.AddNewMessages(messageGroup.ToArray()); return channel;
var outgoingTargetMessages = outgoingMessagesGroups.FirstOrDefault(g => g.Key == targetUser.Id); }
long localUserId = api.LocalUser.Value.Id;
var outgoingGroups = messages.Where(m => m.Sender.Id == localUserId).GroupBy(m => m.TargetId);
var incomingGroups = messages.Where(m => m.Sender.Id != localUserId).GroupBy(m => m.UserId);
foreach (var group in incomingGroups)
{
var targetUser = group.First().Sender;
var channel = getChannelForUser(targetUser);
channel.AddNewMessages(group.ToArray());
var outgoingTargetMessages = outgoingGroups.FirstOrDefault(g => g.Key == targetUser.Id);
if (outgoingTargetMessages != null) if (outgoingTargetMessages != null)
channel.AddNewMessages(outgoingTargetMessages.ToArray()); channel.AddNewMessages(outgoingTargetMessages.ToArray());
} }
var withoutReplyGroups = outgoingMessagesGroups.Where(g => joinedUserChannels.All(m => m.Id != g.Key)); // Because of the way the API provides data right now, outgoing messages do not contain required
// user (or in the future, target channel) metadata. As such we need to do a second request
// to find out the specifics of the user.
var withoutReplyGroups = outgoingGroups.Where(g => joinedUserChannels.All(m => m.Id != g.Key));
foreach (var withoutReplyGroup in withoutReplyGroups) foreach (var withoutReplyGroup in withoutReplyGroups)
{ {
@ -234,10 +247,8 @@ namespace osu.Game.Online.Chat
userReq.Failure += exception => Logger.Error(exception, "Failed to get user informations."); userReq.Failure += exception => Logger.Error(exception, "Failed to get user informations.");
userReq.Success += user => userReq.Success += user =>
{ {
var channel = new PrivateChannel { User = user }; var channel = getChannelForUser(user);
channel.AddNewMessages(withoutReplyGroup.ToArray()); channel.AddNewMessages(withoutReplyGroup.ToArray());
JoinedChannels.Add(channel);
}; };
api.Queue(userReq); api.Queue(userReq);