diff --git a/CelesteNet.Server.ChatModule/CMDs/CmdLocate.cs b/CelesteNet.Server.ChatModule/CMDs/CmdLocate.cs index c70ef580..c897ba51 100644 --- a/CelesteNet.Server.ChatModule/CMDs/CmdLocate.cs +++ b/CelesteNet.Server.ChatModule/CMDs/CmdLocate.cs @@ -52,7 +52,7 @@ public override void Run(CmdEnv env, List? args) { // the DataChat above was constructed with self so that the spam check in PrepareAndLog doesn't break, // and we do need to PrepareAndLog because we need a valid msg ID... - chat = Chat.PrepareAndLog(null, chat); + chat = Chat.PrepareAndLog(null, chat, false); if (chat != null) { chat.Player = OtherPlayer; diff --git a/CelesteNet.Server.FrontendModule/Frontend.cs b/CelesteNet.Server.FrontendModule/Frontend.cs index f016a131..5c5c41c8 100644 --- a/CelesteNet.Server.FrontendModule/Frontend.cs +++ b/CelesteNet.Server.FrontendModule/Frontend.cs @@ -141,7 +141,6 @@ private void OnSessionStart(CelesteNetPlayerSession session) { "sess_join", PlayerSessionToFrontend(session, frontendWS.IsAuthorized, true) )); TryBroadcastUpdate(Settings.APIPrefix + "/status"); - //TryBroadcastUpdate(Settings.APIPrefix + "/players"); session.OnEnd += OnSessionEnd; } @@ -150,7 +149,6 @@ private void OnSessionEnd(CelesteNetPlayerSession session, DataPlayerInfo? lastP "sess_leave", PlayerSessionToFrontend(session, frontendWS.IsAuthorized, true) )); TryBroadcastUpdate(Settings.APIPrefix + "/status"); - //TryBroadcastUpdate(Settings.APIPrefix + "/players"); } private void OnDisconnect(CelesteNetServer server, CelesteNetConnection con, CelesteNetPlayerSession? session) { @@ -163,7 +161,9 @@ private void OnBroadcastChannels(Channels obj) { } private void OnChannelMove(CelesteNetPlayerSession session, Channel? from, Channel? to) { - BroadcastCMD(false, "chan_move", + BroadcastCMD( + from?.IsPrivate == true || to?.IsPrivate == true, + "chan_move", new { session.SessionID, fromID = from?.ID, @@ -185,7 +185,11 @@ private void OnCreateChannel(Channel channel, int total) { } private void OnRemoveChannel(string name, uint id, int total) { - BroadcastCMD(false, "chan_remove", + // it would've been better to also pass the `Channel` instance into this tbh + // but I'm not gonna change the event/delegate signature at this point... + BroadcastCMD( + name.StartsWith(Channels.PrefixPrivate), + "chan_remove", new { Name = name, ID = id,