mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-21 12:14:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't do profile repl if no repl targets

Browse source
This commit is contained in:
David Baker 2018-04-17 12:26:45 +01:00
parent 22e416b726
commit dde01efbcb
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
synapse/handlers/profile.py
View file

@ -50,9 +50,10 @@ class ProfileHandler(BaseHandler):
self._update_remote_profile_cache, self.PROFILE_UPDATE_MS, self._update_remote_profile_cache, self.PROFILE_UPDATE_MS,
) )
reactor.callWhenRunning(self._assign_profile_replication_batches) if len(self.hs.config.replicate_user_profiles_to) > 0:
reactor.callWhenRunning(self._replicate_profiles) reactor.callWhenRunning(self._assign_profile_replication_batches)
self.clock.looping_call(self._replicate_profiles, self.PROFILE_REPLICATE_INTERVAL) reactor.callWhenRunning(self._replicate_profiles)
self.clock.looping_call(self._replicate_profiles, self.PROFILE_REPLICATE_INTERVAL)
@defer.inlineCallbacks @defer.inlineCallbacks
def _assign_profile_replication_batches(self): def _assign_profile_replication_batches(self):
@ -210,8 +211,11 @@ class ProfileHandler(BaseHandler):
if new_displayname == '': if new_displayname == '':
new_displayname = None new_displayname = None
cur_batchnum = yield self.store.get_latest_profile_replication_batch_number() if len(self.hs.config.replicate_user_profiles_to) > 0:
new_batchnum = 0 if cur_batchnum is None else cur_batchnum + 1 cur_batchnum = yield self.store.get_latest_profile_replication_batch_number()
new_batchnum = 0 if cur_batchnum is None else cur_batchnum + 1
else:
new_batchnum = None
yield self.store.set_profile_displayname( yield self.store.set_profile_displayname(
target_user.localpart, new_displayname, new_batchnum target_user.localpart, new_displayname, new_batchnum
@ -266,8 +270,11 @@ class ProfileHandler(BaseHandler):
if not by_admin and target_user != requester.user: if not by_admin and target_user != requester.user:
raise AuthError(400, "Cannot set another user's avatar_url") raise AuthError(400, "Cannot set another user's avatar_url")
cur_batchnum = yield self.store.get_latest_profile_replication_batch_number() if len(self.hs.config.replicate_user_profiles_to) > 0:
new_batchnum = 0 if cur_batchnum is None else cur_batchnum + 1 cur_batchnum = yield self.store.get_latest_profile_replication_batch_number()
new_batchnum = 0 if cur_batchnum is None else cur_batchnum + 1
else:
new_batchnum = None
yield self.store.set_profile_avatar_url( yield self.store.set_profile_avatar_url(
target_user.localpart, new_avatar_url, new_batchnum, target_user.localpart, new_avatar_url, new_batchnum,