mirror of
https://github.com/solero/houdini.git
synced 2024-11-08 20:28:20 +00:00
Room class send_xt
and get_string
methods now have a "filter" flag
This commit is contained in:
parent
576f79c8b7
commit
c977e7f66d
@ -1,6 +1,12 @@
|
||||
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:
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
@ -40,16 +46,15 @@ class RoomMixin:
|
||||
p.toy = None
|
||||
|
||||
async def refresh(self, p):
|
||||
if p.is_vanilla_client and p.data.stealth_moderator:
|
||||
return await p.send_xt('grs', self.id, await self.get_string(is_stealth=True))
|
||||
if p.is_vanilla_client and p.stealth_moderator:
|
||||
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())
|
||||
|
||||
async def get_string(self, is_stealth=False):
|
||||
return '%'.join([await p.string for p in self.penguins_by_id.values()
|
||||
if is_stealth or not p.data.stealth_moderator])
|
||||
async def get_string(self, f=None):
|
||||
return '%'.join([await p.string for p in filter(f, self.penguins_by_id.values())])
|
||||
|
||||
async def send_xt(self, *data):
|
||||
for penguin in self.penguins_by_id.values():
|
||||
async def send_xt(self, *data, f=None):
|
||||
for penguin in filter(f, self.penguins_by_id.values()):
|
||||
await penguin.send_xt(*data)
|
||||
|
||||
|
||||
@ -105,8 +110,8 @@ class Room(db.Model, RoomMixin):
|
||||
|
||||
if self.game:
|
||||
await p.send_xt('jg', self.id)
|
||||
elif p.is_vanilla_client and p.data.stealth_moderator:
|
||||
await p.send_xt('jr', self.id, await self.get_string(is_stealth=True))
|
||||
elif p.is_vanilla_client and p.stealth_moderator:
|
||||
await p.send_xt('jr', self.id, await self.get_string(f=stealth_mod_filter(p.id)))
|
||||
else:
|
||||
await p.send_xt('jr', self.id, await self.get_string())
|
||||
await self.send_xt('ap', await p.string)
|
||||
@ -145,8 +150,8 @@ class PenguinIglooRoom(db.Model, RoomMixin):
|
||||
async def add_penguin(self, p):
|
||||
await RoomMixin.add_penguin(self, p)
|
||||
|
||||
if p.is_vanilla_client and p.data.stealth_moderator:
|
||||
await p.send_xt('jr', self.external_id, await self.get_string(is_stealth=True))
|
||||
if p.is_vanilla_client and p.stealth_moderator:
|
||||
await p.send_xt('jr', self.external_id, await self.get_string(f=stealth_mod_filter(p.id)))
|
||||
else:
|
||||
await p.send_xt('jr', self.external_id, await self.get_string())
|
||||
await self.send_xt('ap', await p.string)
|
||||
|
Loading…
Reference in New Issue
Block a user