sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Resolve CA errors

Browse Source
This commit is contained in:
Craftplacer
2020-01-18 15:57:51 +01:00
parent 8ddd36596e
commit 64fe9692ed
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,13 @@ namespace osu.Game.Online.Chat
localUser = api.LocalUser; localUser = api.LocalUser;
// Listen for new messages // Listen for new messages
channelManager.JoinedChannels.ItemsAdded += (joinedChannels) => channelManager.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) => channelManager.JoinedChannels.ItemsRemoved += leftChannels =>
{ {
foreach (var channel in leftChannels) foreach (var channel in leftChannels)
channel.NewMessagesArrived -= channel_NewMessagesArrived; channel.NewMessagesArrived -= channel_NewMessagesArrived;
@ -92,7 +92,7 @@ namespace osu.Game.Online.Chat
public void HandleMessages(Channel channel, IEnumerable<Message> messages) public void HandleMessages(Channel channel, IEnumerable<Message> messages)
{ {
// don't show if the ChatOverlay and the channel is visible. // don't show if the ChatOverlay and the target channel is visible.
if (IsActive && channelManager.CurrentChannel.Value == channel) if (IsActive && channelManager.CurrentChannel.Value == channel)
return; return;
@ -118,8 +118,7 @@ namespace osu.Game.Online.Chat
if (notifyOnChat.Value && channel.Type == ChannelType.PM) if (notifyOnChat.Value && channel.Type == ChannelType.PM)
{ {
var existingNotification = privateMessageNotifications.OfType<PrivateMessageNotification>() var existingNotification = privateMessageNotifications.FirstOrDefault(n => n.Username == message.Sender.Username);
.FirstOrDefault(n => n.Username == message.Sender.Username);
if (existingNotification == null) if (existingNotification == null)
{ {
@ -200,24 +199,13 @@ namespace osu.Game.Online.Chat
this.onClick = onClick; this.onClick = onClick;
} }
private int messageCount = 0; private int messageCount;
public int MessageCount public int MessageCount
{ {
get => messageCount; get => messageCount;
set set => Text = (messageCount = value) > 1 ? $"You received {messageCount} private messages from '{Username}'. Click to read it!"
{ : $"You received a private message from '{Username}'. Click to read it!";
messageCount = value;
if (messageCount > 1)
{
Text = $"You received {messageCount} private messages from '{Username}'. Click to read it!";
}
else
{
Text = $"You received a private message from '{Username}'. Click to read it!";
}
}
} }
public string Username { get; set; } public string Username { get; set; }

4
osu.Game/OsuGame.cs
View File

@ -59,8 +59,6 @@ namespace osu.Game
private ChannelManager channelManager; private ChannelManager channelManager;
private MessageNotifier messageNotifier;
private NotificationOverlay notifications; private NotificationOverlay notifications;
private NowPlayingOverlay nowPlaying; private NowPlayingOverlay nowPlaying;
@ -615,7 +613,7 @@ namespace osu.Game
loadComponentSingleFile(direct = new DirectOverlay(), overlayContent.Add, true); loadComponentSingleFile(direct = new DirectOverlay(), overlayContent.Add, true);
loadComponentSingleFile(social = new SocialOverlay(), overlayContent.Add, true); loadComponentSingleFile(social = new SocialOverlay(), overlayContent.Add, true);
loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true); loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
loadComponentSingleFile(messageNotifier = new MessageNotifier(), AddInternal, true); loadComponentSingleFile(new MessageNotifier(), AddInternal, true);
loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true); loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true);
loadComponentSingleFile(Settings = new SettingsOverlay { GetToolbarHeight = () => ToolbarOffset }, leftFloatingOverlayContent.Add, true); loadComponentSingleFile(Settings = new SettingsOverlay { GetToolbarHeight = () => ToolbarOffset }, leftFloatingOverlayContent.Add, true);
var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true); var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true);