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

Split HandleMessages method

Browse Source
This commit is contained in:
Craftplacer 2020-01-19 17:55:17 +01:00
parent 86ecaf223d
commit 4feae82434
1 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,48 +103,52 @@ namespace osu.Game.Online.Chat
if (message.Id < channel.LastReadId) if (message.Id < channel.LastReadId)
return; return;
// ignore messages from yourself
var localUsername = localUser.Value.Username; var localUsername = localUser.Value.Username;
if (message.Sender.Username == localUsername) if (message.Sender.Username == localUsername)
continue; continue;
var words = getWords(message.Content); if (checkForPMs(channel, message))
void onClick()
{
notificationOverlay.Hide();
chatOverlay.Show();
channelManager.CurrentChannel.Value = channel;
}
if (notifyOnChat.Value && channel.Type == ChannelType.PM)
{
var existingNotification = privateMessageNotifications.FirstOrDefault(n => n.Username == message.Sender.Username);
if (existingNotification == null)
{
var notification = new PrivateMessageNotification(message.Sender.Username, onClick);
notificationOverlay?.Post(notification);
privateMessageNotifications.Add(notification);
}
else
{
existingNotification.MessageCount++;
}
continue; continue;
}
if (notifyOnMention.Value && anyCaseInsensitive(words, localUsername)) // change output to bool again if another "message processor" is added.
{ checkForMentions(channel, message, localUsername);
var notification = new MentionNotification(message.Sender.Username, onClick);
notificationOverlay?.Post(notification);
continue;
}
} }
} }
private bool checkForPMs(Channel channel, Message message)
{
if (!notifyOnChat.Value || channel.Type != ChannelType.PM)
return false;
var existingNotification = privateMessageNotifications.FirstOrDefault(n => n.Username == message.Sender.Username);
if (existingNotification == null)
{
var notification = new PrivateMessageNotification(message.Sender.Username, channel);
notificationOverlay?.Post(notification);
privateMessageNotifications.Add(notification);
}
else
{
existingNotification.MessageCount++;
}
return true;
}
private void checkForMentions(Channel channel, Message message, string username)
{
var words = getWords(message.Content);
if (!notifyOnMention.Value || !anyCaseInsensitive(words, username))
return;
var notification = new MentionNotification(message.Sender.Username, channel);
notificationOverlay?.Post(notification);
}
private static IEnumerable<string> getWords(string input) => Regex.Matches(input, @"\w+").Select(c => c.Value); private static IEnumerable<string> getWords(string input) => Regex.Matches(input, @"\w+").Select(c => c.Value);
/// <summary> /// <summary>
@ -158,12 +162,12 @@ namespace osu.Game.Online.Chat
public class PrivateMessageNotification : SimpleNotification public class PrivateMessageNotification : SimpleNotification
{ {
public PrivateMessageNotification(string username, Action onClick) public PrivateMessageNotification(string username, Channel channel)
{ {
Icon = FontAwesome.Solid.Envelope; Icon = FontAwesome.Solid.Envelope;
Username = username; Username = username;
MessageCount = 1; MessageCount = 1;
this.onClick = onClick; Channel = channel;
} }
private int messageCount; private int messageCount;
@ -176,17 +180,19 @@ namespace osu.Game.Online.Chat
public string Username { get; set; } public string Username { get; set; }
private readonly Action onClick; public Channel Channel { get; set; }
public override bool IsImportant => false; public override bool IsImportant => false;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, MessageNotifier notifier) private void load(OsuColour colours, ChatOverlay chatOverlay, NotificationOverlay notificationOverlay, ChannelManager channelManager, MessageNotifier notifier)
{ {
IconBackgound.Colour = colours.PurpleDark; IconBackgound.Colour = colours.PurpleDark;
Activated = delegate Activated = delegate
{ {
onClick?.Invoke(); notificationOverlay.Hide();
chatOverlay.Show();
channelManager.CurrentChannel.Value = Channel;
if (notifier.privateMessageNotifications.Contains(this)) if (notifier.privateMessageNotifications.Contains(this))
notifier.privateMessageNotifications.Remove(this); notifier.privateMessageNotifications.Remove(this);
@ -198,24 +204,27 @@ namespace osu.Game.Online.Chat
public class MentionNotification : SimpleNotification public class MentionNotification : SimpleNotification
{ {
public MentionNotification(string username, Action onClick) public MentionNotification(string username, Channel channel)
{ {
Icon = FontAwesome.Solid.At; Icon = FontAwesome.Solid.At;
Text = $"Your name was mentioned in chat by '{username}'. Click to find out why!"; Text = $"Your name was mentioned in chat by '{username}'. Click to find out why!";
this.onClick = onClick; Channel = channel;
} }
private readonly Action onClick; public Channel Channel { get; set; }
public override bool IsImportant => false; public override bool IsImportant => false;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours, ChatOverlay chatOverlay, NotificationOverlay notificationOverlay, ChannelManager channelManager)
{ {
IconBackgound.Colour = colours.PurpleDark; IconBackgound.Colour = colours.PurpleDark;
Activated = delegate Activated = delegate
{ {
onClick?.Invoke(); notificationOverlay.Hide();
chatOverlay.Show();
channelManager.CurrentChannel.Value = Channel;
return true; return true;
}; };
} }