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

Remove unnecessary changes after rework

Browse Source
This commit is contained in:
Craftplacer 2020-01-18 14:17:26 +01:00
parent 5d244f48f7
commit f55cf03bd0
1 changed files with 13 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
osu.Game/Online/Chat/MessageNotifier.cs
View File

@ -118,24 +118,20 @@ namespace osu.Game.Online.Chat
if (notifyOnChat.Value && channel.Type == ChannelType.PM) if (notifyOnChat.Value && channel.Type == ChannelType.PM)
{ {
// Scheduling because of possible "race-condition" (NotificationOverlay didn't add the notification yet). var existingNotification = privateMessageNotifications.OfType<PrivateMessageNotification>()
Schedule(() => .FirstOrDefault(n => n.Username == message.Sender.Username);
{
var existingNotification = privateMessageNotifications.OfType<PrivateMessageNotification>() if (existingNotification == null)
.FirstOrDefault(n => n.Username == message.Sender.Username); {
var notification = new PrivateMessageNotification(message.Sender.Username, onClick);
notificationOverlay?.Post(notification);
privateMessageNotifications.Add(notification);
}
else
{
existingNotification.MessageCount++;
}
if (existingNotification == null)
{
var notification = new PrivateMessageNotification(message.Sender.Username, onClick);
notificationOverlay?.Post(notification);
privateMessageNotifications.Add(notification);
}
else
{
existingNotification.MessageCount++;
}
});
continue; continue;
} }
@ -158,40 +154,6 @@ namespace osu.Game.Online.Chat
} }
} }
} }
//making sure if the notification drawer bugs out, we merge it afterwards again.
Schedule(() => mergeNotifications());
}
/// <summary>
/// Checks current notifications if they aren't merged, and merges them together again.
/// </summary>
private void mergeNotifications()
{
if (notificationOverlay == null)
{
return;
}
var pmn = notificationOverlay.Notifications.OfType<PrivateMessageNotification>();
foreach (var notification in pmn)
{
var duplicates = pmn.Where(n => n.Username == notification.Username);
if (duplicates.Count() < 2)
continue;
var first = duplicates.First();
foreach (var notification2 in duplicates)
{
if (notification2 == first)
continue;
first.MessageCount += notification2.MessageCount;
notification2.Close();
}
}
} }
private static string[] getWords(string input) => input.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); private static string[] getWords(string input) => input.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);