refactor(chat): remove duplicated redis operation

GameProgressive · Oct 19, 2023 · 10ba463 · 10ba463
1 parent e15c1a3
commit 10ba463
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 34 deletions.
diff --git a/src/Servers/Chat/src/Aggregate/ChannelProperty/ChannelManage.cs b/src/Servers/Chat/src/Aggregate/ChannelProperty/ChannelManage.cs
@@ -76,7 +76,8 @@ public static ChannelMessageBroker AddMessageBrocker(Channel channel)
         }
         public static void RemoveMessageBrocker(Channel channel)
         {
-            MessageBrokers.TryRemove(channel.Name, out var _);
+            MessageBrokers.TryRemove(channel.Name, out var broker);
+            broker.Dispose();
         }
     }
 }
diff --git a/src/Servers/Chat/src/Aggregate/Redis/ClientInfoCache.cs b/src/Servers/Chat/src/Aggregate/Redis/ClientInfoCache.cs
@@ -10,7 +10,7 @@ public record ClientInfoCache : Core.Abstraction.BaseClass.RedisKeyValueObject
         [RedisKey]
         public string NickName { get; set; }
         public ClientInfo Info { get; set; }
-        public ClientInfoCache() : base(RedisDbNumber.ChatChannel, TimeSpan.FromHours(1)) { }
+        public ClientInfoCache() : base(RedisDbNumber.ChatChannel, TimeSpan.FromMinutes(2)) { }
         public class RedisClient : Core.Abstraction.BaseClass.RedisClient<ClientInfoCache>
         {
             public RedisClient() { }

diff --git a/src/Servers/Chat/src/Application/Client.cs b/src/Servers/Chat/src/Application/Client.cs
@@ -33,6 +33,7 @@ public Client(IConnection connection, IServer server, ClientInfo info) : this(co
         protected override void EventBinding()
         {
             base.EventBinding();
+            // bind a event that can update the client info to redis
             _timer = new EasyTimer(TimeSpan.FromMinutes(1));
             _timer.Elapsed += (s, e) => Application.StorageOperation.Persistance.UpdateClient(this);
             _timer.Start();

diff --git a/src/Servers/Chat/src/Handler/CmdHandler/Channel/JoinHandler.cs b/src/Servers/Chat/src/Handler/CmdHandler/Channel/JoinHandler.cs
@@ -92,7 +92,7 @@ protected override void DataOperation()
                     {
                         _user = _channel.AddUser(_client, _request.Password ?? null);
                     }
-                    Aggregate.Channel.UpdateChannelCache(_user, _channel);
+                    base.UpdateChannelCache(); // <= we update the channel cache here
                 }
                 else
                 {
@@ -106,6 +106,10 @@ protected override void DataOperation()
             _result.JoinerPrefix = _client.Info.IRCPrefix;
         }
 
+        protected override void UpdateChannelCache()
+        {
+            // we do not update channel cache again in base class because we update it when channel is created
+        }
         protected override void ResponseConstruct()
         {
             _response = new JoinResponse(_request, _result);

diff --git a/src/Servers/Chat/src/Handler/CmdHandler/Channel/PartHandler.cs b/src/Servers/Chat/src/Handler/CmdHandler/Channel/PartHandler.cs
@@ -16,9 +16,6 @@ public sealed class PartHandler : ChannelHandlerBase
         private new PartResponse _response { get => (PartResponse)base._response; set => base._response = value; }
         private new PartResult _result { get => (PartResult)base._result; set => base._result = value; }
         public PartHandler(IShareClient client, PartRequest request) : base(client, request) { }
-        static PartHandler()
-        {
-        }
         protected override void RequestCheck()
         {
             if (_request.RawRequest is null)
@@ -48,40 +45,46 @@ protected override void DataOperation()
             {
                 case PeerRoomType.Normal:
                 case PeerRoomType.Staging:
-                    if (_user.IsChannelCreator)
-                    {
-                        switch (_channel.RoomType)
-                        {
-                            case PeerRoomType.Normal:
-                            case PeerRoomType.Staging:
-                                Aggregate.Channel.RemoveLocalChannel(_channel);
-                                break;
-                        }
-                        foreach (var user in _channel.Users.Values)
-                        {
-                            // we do not need to send part message to leaver
-                            if (user.Client.Info.NickName == _user.Client.Info.NickName)
-                            {
-                                continue;
-                            }
-                            // We create a new KICKHandler to handle KICK operation for us
-                            var kickRequest = new KickRequest
-                            {
-                                KickeeNickName = user.Client.Info.NickName,
-                                ChannelName = _channel.Name,
-                                Reason = _request.Reason,
-                            };
-                            new KickHandler(_client, kickRequest).Handle();
-                        }
-                    }
+                    KickAllUser();
                     goto default;
                 default:
                     // we need always remove the connection in leaver and channel
                     _channel.RemoveUser(_user);
                     break;
             }
         }
-        protected override void PublishMessage()
+        private void KickAllUser()
+        {
+            if (_user.IsChannelCreator)
+            {
+                // we first send all user message to let them known the creator is leaving
+                foreach (var user in _channel.Users.Values)
+                {
+                    // we do not need to send part message to leaver
+                    if (user.Client.Info.NickName == _user.Client.Info.NickName)
+                    {
+                        continue;
+                    }
+                    // We create a new KICKHandler to handle KICK operation for us
+                    var kickRequest = new KickRequest
+                    {
+                        KickeeNickName = user.Client.Info.NickName,
+                        ChannelName = _channel.Name,
+                        Reason = _request.Reason,
+                    };
+                    new KickHandler(_client, kickRequest).Handle();
+                }
+                // we remove the local channel and unbind events
+                switch (_channel.RoomType)
+                {
+                    case PeerRoomType.Normal:
+                    case PeerRoomType.Staging:
+                        Aggregate.Channel.RemoveLocalChannel(_channel);
+                        break;
+                }
+            }
+        }
+        protected override void UpdateChannelCache()
         {
             switch (_channel.RoomType)
             {
@@ -90,7 +93,7 @@ protected override void PublishMessage()
                     Aggregate.Channel.RemoveChannelCache(_user, _channel);
                     break;
                 default:
-                    base.PublishMessage();
+                    base.UpdateChannelCache();
                     break;
             }
         }