alternative performance fix?

ZeroK-RTS · May 17, 2020 · 9d8bf94 · 9d8bf94
1 parent 95affe3
commit 9d8bf94
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Zero-K.info/Controllers/LobbyController.cs b/Zero-K.info/Controllers/LobbyController.cs
@@ -183,7 +183,6 @@ public async Task<ActionResult> ChatMessages(ChatModel model)
             model = model ?? new ChatModel();
 
             var db = new ZkDataContext();
-            var ret = db.LobbyChatHistories.AsQueryable();
             bool isMuted = Punishment.GetActivePunishment(Global.AccountID, Request.UserHostAddress, 0, null, x => x.BanMute) != null;
             if (!string.IsNullOrEmpty(model.Channel))
             {
@@ -203,9 +202,9 @@ await Global.Server.GhostSay(new Say()
                         User = Global.Account.Name,
                     });
                 }
-                ret = ret
-                    .Where(x => x.Target == model.Channel && x.SayPlace == SayPlace.Channel)
-                    .OrderByDescending(x => x.LobbyChatHistoryID).Take(200);
+                model.Data = db.LobbyChatHistories
+                    .Where(x => x.Target == model.Channel)
+                    .OrderByDescending(x => x.LobbyChatHistoryID).Take(200).ToList().Where(x => x.SayPlace == SayPlace.Channel).AsQueryable();
             }
             else if (!string.IsNullOrEmpty(model.User))
             {
@@ -224,7 +223,7 @@ await Global.Server.GhostSay(new Say()
                     });
                 }
                 //Users can abuse rename to gain access to other users PMs, it's a feature
-                ret = ret
+                model.Data = db.LobbyChatHistories
                     .Where(x => (x.User == model.User && x.Target == Global.Account.Name || x.User == Global.Account.Name && x.Target == model.User) && x.SayPlace == SayPlace.User)
                     .OrderByDescending(x => x.LobbyChatHistoryID);
             }
@@ -233,7 +232,6 @@ await Global.Server.GhostSay(new Say()
                 return PartialView("LobbyChatMessages", model);
             }
 
-            model.Data = ret;
             model.Message = "";
 
             return PartialView("LobbyChatMessages", model);