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
Package registry
Container registry
Model registry
Operate
Terraform modules
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
Timo Ley
synapse
Commits
eff3ae3b
Commit
eff3ae3b
authored
6 years ago
by
Neil Johnson
Browse files
Options
Downloads
Patches
Plain Diff
add room tagging
parent
bfb6c586
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synapse/server_notices/resource_limits_server_notices.py
+5
-9
5 additions, 9 deletions
synapse/server_notices/resource_limits_server_notices.py
with
5 additions
and
9 deletions
synapse/server_notices/resource_limits_server_notices.py
+
5
−
9
View file @
eff3ae3b
...
@@ -66,8 +66,12 @@ class ResourceLimitsServerNotices(object):
...
@@ -66,8 +66,12 @@ class ResourceLimitsServerNotices(object):
room_id
=
yield
self
.
_server_notices_manager
.
get_notice_room_for_user
(
user_id
)
room_id
=
yield
self
.
_server_notices_manager
.
get_notice_room_for_user
(
user_id
)
# Need to set tag here because room may have been created prior to
# tagging being set on creation. Ideally would set something to read
# room tags first, and cache that aggressively/
yield
self
.
_store
.
add_tag_to_room
(
user_id
,
room_id
,
'
m.server_notice
'
,
None
)
currently_blocked
=
False
currently_blocked
=
False
logger
.
info
(
"
GET CURRENT STATE
"
)
pinned_state_event
=
None
pinned_state_event
=
None
try
:
try
:
pinned_state_event
=
yield
self
.
_state
.
get_current_state
(
pinned_state_event
=
yield
self
.
_state
.
get_current_state
(
...
@@ -82,15 +86,9 @@ class ResourceLimitsServerNotices(object):
...
@@ -82,15 +86,9 @@ class ResourceLimitsServerNotices(object):
referenced_events
=
pinned_state_event
.
content
.
get
(
'
pinned
'
)
referenced_events
=
pinned_state_event
.
content
.
get
(
'
pinned
'
)
events
=
yield
self
.
_store
.
get_events
(
referenced_events
)
events
=
yield
self
.
_store
.
get_events
(
referenced_events
)
logger
.
info
(
events
)
for
event_id
,
event
in
events
.
items
():
for
event_id
,
event
in
events
.
items
():
logger
.
info
(
"
event_id, event event.type %s %s %s
"
%
(
event_id
,
event
,
event
.
type
)
)
if
event
.
type
==
EventTypes
.
ServerNoticeLimitReached
:
if
event
.
type
==
EventTypes
.
ServerNoticeLimitReached
:
currently_blocked
=
True
currently_blocked
=
True
logger
.
info
(
"
currently_blocked is %r
"
%
currently_blocked
)
try
:
try
:
# Normally should always pass in user_id if you have it, but in
# Normally should always pass in user_id if you have it, but in
# this case are checking what would happen to other users if they
# this case are checking what would happen to other users if they
...
@@ -109,7 +107,6 @@ class ResourceLimitsServerNotices(object):
...
@@ -109,7 +107,6 @@ class ResourceLimitsServerNotices(object):
yield
self
.
_server_notices_manager
.
send_notice
(
yield
self
.
_server_notices_manager
.
send_notice
(
user_id
,
content
,
EventTypes
.
Pinned
,
''
,
user_id
,
content
,
EventTypes
.
Pinned
,
''
,
)
)
logger
.
info
(
'
deactivate block
'
)
except
AuthError
as
e
:
except
AuthError
as
e
:
# Need to start notifying of blocking
# Need to start notifying of blocking
...
@@ -131,7 +128,6 @@ class ResourceLimitsServerNotices(object):
...
@@ -131,7 +128,6 @@ class ResourceLimitsServerNotices(object):
event
.
event_id
,
event
.
event_id
,
]
]
}
}
logger
.
info
(
"
active block
"
)
yield
self
.
_server_notices_manager
.
send_notice
(
yield
self
.
_server_notices_manager
.
send_notice
(
user_id
,
content
,
EventTypes
.
Pinned
,
''
,
user_id
,
content
,
EventTypes
.
Pinned
,
''
,
)
)
...
...
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