carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

exclude !biofoids and !jannies from 3bcf4e3d22

master
Aevann 2023-08-09 16:44:19 +03:00
parent 1952c852dc
commit b1c7336a92
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/helpers/alerts.py
View File

@ -146,6 +146,7 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, log_cost=None):
if FEATURES['PING_GROUPS']: if FEATURES['PING_GROUPS']:
cost = 0 cost = 0
coin_receivers = set()
for i in group_mention_regex.finditer(text): for i in group_mention_regex.finditer(text):
if oldtext and i.group(1) in oldtext: if oldtext and i.group(1) in oldtext:
@ -163,6 +164,7 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, log_cost=None):
elif i.group(1) == 'jannies': elif i.group(1) == 'jannies':
group = None group = None
member_ids = set([x[0] for x in g.db.query(User.id).filter(User.admin_level > 0, User.id != AEVANN_ID).all()]) member_ids = set([x[0] for x in g.db.query(User.id).filter(User.admin_level > 0, User.id != AEVANN_ID).all()])
coins_receivers.update(member_ids)
else: else:
group = g.db.get(Group, i.group(1)) group = g.db.get(Group, i.group(1))
if not group: continue if not group: continue
@ -182,9 +184,15 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, log_cost=None):
if log_cost: if log_cost:
log_cost.ping_cost = cost log_cost.ping_cost = cost
if group.name == 'biofoids':
coins_receivers.update(member_ids)
if cost: if cost:
v.charge_account('combined', cost) v.charge_account('combined', cost)
if coins_receivers:
g.db.query(User).options(load_only(User.id)).filter(User.id.in_(coins_receivers)).update({ User.coins: User.coins + 10 })
return notify_users - BOT_IDs - {v.id, 0} - v.all_twoway_blocks return notify_users - BOT_IDs - {v.id, 0} - v.all_twoway_blocks