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

Use temporary prefixes as per the MSC

pull/7673/head
Brendan Abolivier 2020-06-10 20:32:01 +01:00
parent aad40e38e1
commit df3323a7cf
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/sync.py
View File

@ -1895,7 +1895,9 @@ class SyncHandler(object):
if notifs is not None: if notifs is not None:
unread_notifications["notification_count"] = notifs["notify_count"] unread_notifications["notification_count"] = notifs["notify_count"]
unread_notifications["highlight_count"] = notifs["highlight_count"] unread_notifications["highlight_count"] = notifs["highlight_count"]
unread_notifications["unread_count"] = notifs["unread_count"] unread_notifications["org.matrix.msc2625.unread_count"] = (
notifs["unread_count"]
)
sync_result_builder.joined.append(room_sync) sync_result_builder.joined.append(room_sync)

2
synapse/rest/client/v1/push_rule.py
View File

@ -267,7 +267,7 @@ def _check_actions(actions):
raise InvalidRuleException("No actions found") raise InvalidRuleException("No actions found")
for a in actions: for a in actions:
if a in ["notify", "dont_notify", "coalesce", "mark_unread"]: if a in ["notify", "dont_notify", "coalesce", "org.matrix.msc2625.mark_unread"]:
pass pass
elif isinstance(a, dict) and "set_tweak" in a: elif isinstance(a, dict) and "set_tweak" in a:
pass pass

2
synapse/storage/data_stores/main/event_push_actions.py
View File

@ -454,7 +454,7 @@ class EventPushActionsWorkerStore(SQLBaseStore):
# can be used to insert into the `event_push_actions_staging` table. # can be used to insert into the `event_push_actions_staging` table.
def _gen_entry(user_id, actions): def _gen_entry(user_id, actions):
is_highlight = 1 if _action_has_highlight(actions) else 0 is_highlight = 1 if _action_has_highlight(actions) else 0
notif = 0 if "mark_unread" in actions else 1 notif = 0 if "org.matrix.msc2625.mark_unread" in actions else 1
return ( return (
event_id, # event_id column event_id, # event_id column
user_id, # user_id column user_id, # user_id column