h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 12:02:54 +08:00
Code Issues Releases Wiki Activity

Use binded list

Browse Source
This commit is contained in:
Craftplacer 2020-01-25 16:43:51 +01:00
parent 16c500d0b0
commit e0ef672549
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ namespace osu.Game.Online.Chat
private Bindable<bool> notifyOnMention; private Bindable<bool> notifyOnMention;
private Bindable<bool> notifyOnChat; private Bindable<bool> notifyOnChat;
private Bindable<User> localUser; private Bindable<User> localUser;
private BindableList<Channel> joinedChannels = new BindableList<Channel>();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, IAPIProvider api) private void load(OsuConfigManager config, IAPIProvider api)
@ -43,14 +44,16 @@ namespace osu.Game.Online.Chat
notifyOnChat = config.GetBindable<bool>(OsuSetting.ChatMessageNotification); notifyOnChat = config.GetBindable<bool>(OsuSetting.ChatMessageNotification);
localUser = api.LocalUser; localUser = api.LocalUser;
channelManager.JoinedChannels.BindTo(joinedChannels);
// Listen for new messages // Listen for new messages
channelManager.JoinedChannels.ItemsAdded += joinedChannels => joinedChannels.ItemsAdded += joinedChannels =>
{ {
foreach (var channel in joinedChannels) foreach (var channel in joinedChannels)
channel.NewMessagesArrived += channel_NewMessagesArrived; channel.NewMessagesArrived += channel_NewMessagesArrived;
}; };
channelManager.JoinedChannels.ItemsRemoved += leftChannels => joinedChannels.ItemsRemoved += leftChannels =>
{ {
foreach (var channel in leftChannels) foreach (var channel in leftChannels)
channel.NewMessagesArrived -= channel_NewMessagesArrived; channel.NewMessagesArrived -= channel_NewMessagesArrived;
@ -116,7 +119,7 @@ namespace osu.Game.Online.Chat
private void checkForMentions(Channel channel, Message message, string username) private void checkForMentions(Channel channel, Message message, string username)
{ {
if (!notifyOnMention.Value || !isMentioning(message.Content, username)) if (!notifyOnMention.Value || !IsMentioning(message.Content, username))
return; return;
var notification = new MentionNotification(message.Sender.Username, channel); var notification = new MentionNotification(message.Sender.Username, channel);