|
|
@ -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, |
|
|
|