Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
7bf2d6c2
Unverified
Commit
7bf2d6c2
authored
3 years ago
by
Andrew Morgan
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Partially revert #11675; prevent attempting to create pushers on workers (#11770)
parent
56834ab7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/11770.feature
+1
-0
1 addition, 0 deletions
changelog.d/11770.feature
synapse/handlers/register.py
+5
-7
5 additions, 7 deletions
synapse/handlers/register.py
with
6 additions
and
7 deletions
changelog.d/11770.feature
0 → 100644
+
1
−
0
View file @
7bf2d6c2
Add
a
flag to the `synapse_review_recent_signups` script to ignore and filter appservice users.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
synapse/handlers/register.py
+
5
−
7
View file @
7bf2d6c2
...
@@ -979,18 +979,16 @@ class RegistrationHandler:
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment