mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
Only run pushers for users on this hs!
This commit is contained in:
parent
091c545c4f
commit
f73f154ec2
@ -267,7 +267,7 @@ class BaseHandler(object):
|
|||||||
event, context=context
|
event, context=context
|
||||||
)
|
)
|
||||||
|
|
||||||
action_generator = ActionGenerator(self.store)
|
action_generator = ActionGenerator(self.hs, self.store)
|
||||||
yield action_generator.handle_event(serialize_event(
|
yield action_generator.handle_event(serialize_event(
|
||||||
event, self.clock.time_msec()
|
event, self.clock.time_msec()
|
||||||
))
|
))
|
||||||
|
@ -245,7 +245,7 @@ class FederationHandler(BaseHandler):
|
|||||||
yield user_joined_room(self.distributor, user, event.room_id)
|
yield user_joined_room(self.distributor, user, event.room_id)
|
||||||
|
|
||||||
if not backfilled and not event.internal_metadata.is_outlier():
|
if not backfilled and not event.internal_metadata.is_outlier():
|
||||||
action_generator = ActionGenerator(self.store)
|
action_generator = ActionGenerator(self.hs, self.store)
|
||||||
yield action_generator.handle_event(serialize_event(
|
yield action_generator.handle_event(serialize_event(
|
||||||
event, self.clock.time_msec())
|
event, self.clock.time_msec())
|
||||||
)
|
)
|
||||||
|
@ -15,6 +15,8 @@
|
|||||||
|
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
|
||||||
|
from synapse.types import UserID
|
||||||
|
|
||||||
import push_rule_evaluator
|
import push_rule_evaluator
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
@ -23,7 +25,8 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
|
|
||||||
class ActionGenerator:
|
class ActionGenerator:
|
||||||
def __init__(self, store):
|
def __init__(self, hs, store):
|
||||||
|
self.hs = hs
|
||||||
self.store = store
|
self.store = store
|
||||||
# really we want to get all user ids and all profile tags too,
|
# really we want to get all user ids and all profile tags too,
|
||||||
# since we want the actions for each profile tag for every user and
|
# since we want the actions for each profile tag for every user and
|
||||||
@ -37,6 +40,9 @@ class ActionGenerator:
|
|||||||
users = yield self.store.get_users_in_room(event['room_id'])
|
users = yield self.store.get_users_in_room(event['room_id'])
|
||||||
|
|
||||||
for uid in users:
|
for uid in users:
|
||||||
|
if not self.hs.is_mine(UserID.from_string(uid)):
|
||||||
|
continue
|
||||||
|
|
||||||
evaluator = yield push_rule_evaluator.\
|
evaluator = yield push_rule_evaluator.\
|
||||||
evaluator_for_user_name_and_profile_tag(
|
evaluator_for_user_name_and_profile_tag(
|
||||||
uid, None, event['room_id'], self.store
|
uid, None, event['room_id'], self.store
|
||||||
|
Loading…
Reference in New Issue
Block a user