OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Partially revert #11675; prevent attempting to create pushers on workers (#11770)

pull/11783/head
Andrew Morgan 2022-01-20 14:37:34 +00:00 committed by GitHub
parent 56834ab779
commit 7bf2d6c268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/11770.feature Normal file
View File

@ -0,0 +1 @@
Add a flag to the `synapse_review_recent_signups` script to ignore and filter appservice users.

12
synapse/handlers/register.py
View File

@ -979,18 +979,16 @@ class RegistrationHandler:
if ( if (
self.hs.config.email.email_enable_notifs self.hs.config.email.email_enable_notifs
and self.hs.config.email.email_notif_for_new_users and self.hs.config.email.email_notif_for_new_users
and token
): ):
# Pull the ID of the access token back out of the db # Pull the ID of the access token back out of the db
# It would really make more sense for this to be passed # It would really make more sense for this to be passed
# up when the access token is saved, but that's quite an # up when the access token is saved, but that's quite an
# invasive change I'd rather do separately. # invasive change I'd rather do separately.
if token: user_tuple = await self.store.get_user_by_access_token(token)
user_tuple = await self.store.get_user_by_access_token(token) # The token better still exist.
# The token better still exist. assert user_tuple
assert user_tuple token_id = user_tuple.token_id
token_id = user_tuple.token_id
else:
token_id = None
await self.pusher_pool.add_pusher( await self.pusher_pool.add_pusher(
user_id=user_id, user_id=user_id,