h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Code Issues Releases Wiki Activity

Handle channel parts

Browse Source
This commit is contained in:
Dan Balasescu 2022-11-07 11:36:55 +09:00
parent d426977f03
commit e3adf5a985
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,8 @@ namespace osu.Game.Online.Chat
joinChannel(localChannel); joinChannel(localChannel);
}); });
connector.ChannelParted += ch => Schedule(() => LeaveChannel(getChannel(ch)));
connector.NewMessages += msgs => Schedule(() => addMessages(msgs)); connector.NewMessages += msgs => Schedule(() => addMessages(msgs));
connector.PresenceReceived += () => Schedule(() => connector.PresenceReceived += () => Schedule(() =>

3
osu.Game/Online/Notifications/NotificationsClient.cs
View File

@ -18,6 +18,7 @@ namespace osu.Game.Online.Notifications
public abstract class NotificationsClient : PersistentEndpointClient public abstract class NotificationsClient : PersistentEndpointClient
{ {
public Action<Channel>? ChannelJoined; public Action<Channel>? ChannelJoined;
public Action<Channel>? ChannelParted;
public Action<List<Message>>? NewMessages; public Action<List<Message>>? NewMessages;
public Action? PresenceReceived; public Action? PresenceReceived;
@ -65,6 +66,8 @@ namespace osu.Game.Online.Notifications
ChannelJoined?.Invoke(channel); ChannelJoined?.Invoke(channel);
} }
protected void HandleChannelParted(Channel channel) => ChannelParted?.Invoke(channel);
protected void HandleMessages(List<Message> messages) protected void HandleMessages(List<Message> messages)
{ {
NewMessages?.Invoke(messages); NewMessages?.Invoke(messages);

2
osu.Game/Online/Notifications/NotificationsClientConnector.cs
View File

@ -16,6 +16,7 @@ namespace osu.Game.Online.Notifications
public abstract class NotificationsClientConnector : PersistentEndpointClientConnector public abstract class NotificationsClientConnector : PersistentEndpointClientConnector
{ {
public event Action<Channel>? ChannelJoined; public event Action<Channel>? ChannelJoined;
public event Action<Channel>? ChannelParted;
public event Action<List<Message>>? NewMessages; public event Action<List<Message>>? NewMessages;
public event Action? PresenceReceived; public event Action? PresenceReceived;
@ -29,6 +30,7 @@ namespace osu.Game.Online.Notifications
var client = await BuildNotificationClientAsync(cancellationToken); var client = await BuildNotificationClientAsync(cancellationToken);
client.ChannelJoined = c => ChannelJoined?.Invoke(c); client.ChannelJoined = c => ChannelJoined?.Invoke(c);
client.ChannelParted = c => ChannelParted?.Invoke(c);
client.NewMessages = m => NewMessages?.Invoke(m); client.NewMessages = m => NewMessages?.Invoke(m);
client.PresenceReceived = () => PresenceReceived?.Invoke(); client.PresenceReceived = () => PresenceReceived?.Invoke();

9
osu.Game/Online/Notifications/WebSocket/WebSocketNotificationsClient.cs
View File

@ -122,6 +122,15 @@ namespace osu.Game.Online.Notifications.WebSocket
HandleJoinedChannel(joinedChannel); HandleJoinedChannel(joinedChannel);
break; break;
case @"chat.channel.part":
Debug.Assert(message.Data != null);
Channel? partedChannel = JsonConvert.DeserializeObject<Channel>(message.Data.ToString());
Debug.Assert(partedChannel != null);
HandleChannelParted(partedChannel);
break;
case @"chat.message.new": case @"chat.message.new":
Debug.Assert(message.Data != null); Debug.Assert(message.Data != null);