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

Room class send_xt and get_string methods now have a "filter" flag

Browse Source
This commit is contained in:
Ben 2019-12-02 23:36:03 +00:00
parent 576f79c8b7
commit c977e7f66d
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
houdini/data/room.py
View File

@ -1,6 +1,12 @@
from houdini.data import db, AbstractDataCollection from houdini.data import db, AbstractDataCollection
def stealth_mod_filter(stealth_mod_id):
def f(p):
return not p.stealth_moderator or p.id == stealth_mod_id
return f
class RoomMixin: class RoomMixin:
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -40,16 +46,15 @@ class RoomMixin:
p.toy = None p.toy = None
async def refresh(self, p): async def refresh(self, p):
if p.is_vanilla_client and p.data.stealth_moderator: if p.is_vanilla_client and p.stealth_moderator:
return await p.send_xt('grs', self.id, await self.get_string(is_stealth=True)) return await p.send_xt('grs', self.id, await self.get_string(f=stealth_mod_filter(p.id)))
await p.send_xt('grs', self.id, await self.get_string()) await p.send_xt('grs', self.id, await self.get_string())
async def get_string(self, is_stealth=False): async def get_string(self, f=None):
return '%'.join([await p.string for p in self.penguins_by_id.values() return '%'.join([await p.string for p in filter(f, self.penguins_by_id.values())])
if is_stealth or not p.data.stealth_moderator])
async def send_xt(self, *data): async def send_xt(self, *data, f=None):
for penguin in self.penguins_by_id.values(): for penguin in filter(f, self.penguins_by_id.values()):
await penguin.send_xt(*data) await penguin.send_xt(*data)
@ -105,8 +110,8 @@ class Room(db.Model, RoomMixin):
if self.game: if self.game:
await p.send_xt('jg', self.id) await p.send_xt('jg', self.id)
elif p.is_vanilla_client and p.data.stealth_moderator: elif p.is_vanilla_client and p.stealth_moderator:
await p.send_xt('jr', self.id, await self.get_string(is_stealth=True)) await p.send_xt('jr', self.id, await self.get_string(f=stealth_mod_filter(p.id)))
else: else:
await p.send_xt('jr', self.id, await self.get_string()) await p.send_xt('jr', self.id, await self.get_string())
await self.send_xt('ap', await p.string) await self.send_xt('ap', await p.string)
@ -145,8 +150,8 @@ class PenguinIglooRoom(db.Model, RoomMixin):
async def add_penguin(self, p): async def add_penguin(self, p):
await RoomMixin.add_penguin(self, p) await RoomMixin.add_penguin(self, p)
if p.is_vanilla_client and p.data.stealth_moderator: if p.is_vanilla_client and p.stealth_moderator:
await p.send_xt('jr', self.external_id, await self.get_string(is_stealth=True)) await p.send_xt('jr', self.external_id, await self.get_string(f=stealth_mod_filter(p.id)))
else: else:
await p.send_xt('jr', self.external_id, await self.get_string()) await p.send_xt('jr', self.external_id, await self.get_string())
await self.send_xt('ap', await p.string) await self.send_xt('ap', await p.string)