Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-22 05:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move max_users check to room super classes

Browse Source 
Fixes bug where users would see a ghost room once the room fills up
This commit is contained in:
Ben 2020-08-04 19:11:54 +01:00
parent b4769d2383
commit 0099ae9da8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
houdini/data/room.py
View File

@ -26,9 +26,6 @@ class RoomMixin:
self.waddles = {} self.waddles = {}
async def add_penguin(self, p): async def add_penguin(self, p):
if len(self.penguins_by_id) >= self.max_users and not p.moderator:
return await p.send_error(210)
if p.room: if p.room:
await p.room.remove_penguin(p) await p.room.remove_penguin(p)
self.penguins_by_id[p.id] = p self.penguins_by_id[p.id] = p
@ -129,6 +126,9 @@ class Room(db.Model, RoomMixin):
self.blackhole_penguins = {} self.blackhole_penguins = {}
async def add_penguin(self, p): async def add_penguin(self, p):
if len(self.penguins_by_id) >= self.max_users and not p.moderator:
return await p.send_error(210)
if self.blackhole and p.is_vanilla_client: if self.blackhole and p.is_vanilla_client:
self.blackhole_penguins[p.id] = p.room self.blackhole_penguins[p.id] = p.room
p.room = self p.room = self
@ -183,6 +183,9 @@ class PenguinIglooRoom(db.Model, RoomMixin):
return self.penguin_id + PenguinIglooRoom.internal_id return self.penguin_id + PenguinIglooRoom.internal_id
async def add_penguin(self, p): async def add_penguin(self, p):
if len(self.penguins_by_id) >= self.max_users and not p.moderator:
return await p.send_error(210)
await RoomMixin.add_penguin(self, p) await RoomMixin.add_penguin(self, p)
await p.send_xt('jr', self.external_id, await self.get_string(f=stealth_mod_filter(p.id))) await p.send_xt('jr', self.external_id, await self.get_string(f=stealth_mod_filter(p.id)))