fixup mp room

player now have 2 ways of fixing mp room:
  - by creating another match
  - by rejoining its existing match

player who created more than 2 rooms at same time is untested, but due
to this fix it shouldn't be possible anymore.

Author: arily

app/api/domains/cho.py

@@ -1395,18 +1395,7 @@ async def handle(self, player: Player) -> None:
 
         if player.match:
             player.enqueue(app.packets.match_join_fail())
-            player.send_bot("You're already in a match. We will try removing you from it.")
-
-            async def next_tick():
-                player.leave_match()
-                player.enqueue(
-                    app.packets.notification(
-                        "You can try again. Please report to staff if you keep getting this error."
-                    )
-                )
-
-            asyncio.create_task(next_tick(), name="remove-duplicated-user")
-            return
+            player.leave_match()
 
         # create the channel and add it
         # to the global channel list as

app/objects/player.py

@@ -572,9 +572,29 @@ async def unsilence(self, admin: Player, reason: str) -> None:
 
         log(f"Unsilenced {self}.", Ansi.LCYAN)
 
+    def _special_case_disconnected_rejoin(self, match: Match, passwd: str) -> bool:
+        """This method will allow user to rejoin a match they were disconnected from. If everything's working properly, this method should never be called."""
+        
+        reverse_slot_search = match.get_slot(self)
+        lobby = app.state.sessions.channels.get_by_name("#lobby")
+        if reverse_slot_search is None:
+            # recoverable, reset user state before perform normal join.
+            self.match = None
+            self.leave_channel(match.chat)
+            self.join_channel(lobby) if lobby else None
+            return self.join_match(match, passwd)
+
+        # user is in the match, but was disconnected.
+        self.join_channel(match.chat)
+        self.leave_channel(lobby) if lobby else None
+        self.enqueue(app.packets.match_join_success(match))
+        return True
+
     def join_match(self, match: Match, passwd: str) -> bool:
         """Attempt to add `self` to `match`."""
         if self.match:
+            if (self.match.id == match.id):
+                return self._special_case_disconnected_rejoin(match, passwd)
             log(f"{self} tried to join multiple matches?")
             self.enqueue(app.packets.match_join_fail())
             return False