mirror of https://github.com/watcha-fr/synapse
Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do:
* Make badges work again * Remove old, unused codepull/4/merge
David Baker
9 years ago
parent
b29f98377d
commit
7e2c89a37f
@ -0,0 +1,66 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Copyright 2015, 2016 OpenMarket Ltd |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
|
||||
from twisted.internet import defer |
||||
|
||||
|
||||
@defer.inlineCallbacks |
||||
def get_badge_count(hs, user_id): |
||||
invites, joins = yield defer.gatherResults([ |
||||
hs.get_datastore().get_invited_rooms_for_user(user_id), |
||||
hs.get_datastore().get_rooms_for_user(user_id), |
||||
], consumeErrors=True) |
||||
|
||||
my_receipts_by_room = yield hs.get_datastore().get_receipts_for_user( |
||||
user_id, "m.read", |
||||
) |
||||
|
||||
badge = len(invites) |
||||
|
||||
for r in joins: |
||||
if r.room_id in my_receipts_by_room: |
||||
last_unread_event_id = my_receipts_by_room[r.room_id] |
||||
|
||||
notifs = yield ( |
||||
hs.get_datastore().get_unread_event_push_actions_by_room_for_user( |
||||
r.room_id, user_id, last_unread_event_id |
||||
) |
||||
) |
||||
badge += notifs["notify_count"] |
||||
defer.returnValue(badge) |
||||
|
||||
|
||||
@defer.inlineCallbacks |
||||
def get_context_for_event(hs, ev): |
||||
name_aliases = yield hs.get_datastore().get_room_name_and_aliases( |
||||
ev.room_id |
||||
) |
||||
|
||||
ctx = {'aliases': name_aliases[1]} |
||||
if name_aliases[0] is not None: |
||||
ctx['name'] = name_aliases[0] |
||||
|
||||
their_member_events_for_room = yield hs.get_datastore().get_current_state( |
||||
room_id=ev.room_id, |
||||
event_type='m.room.member', |
||||
state_key=ev.user_id |
||||
) |
||||
for mev in their_member_events_for_room: |
||||
if mev.content['membership'] == 'join' and 'displayname' in mev.content: |
||||
dn = mev.content['displayname'] |
||||
if dn is not None: |
||||
ctx['sender_display_name'] = dn |
||||
|
||||
defer.returnValue(ctx) |
||||
@ -0,0 +1,10 @@ |
||||
from httppusher import HttpPusher |
||||
|
||||
PUSHER_TYPES = { |
||||
'http': HttpPusher |
||||
} |
||||
|
||||
|
||||
def create_pusher(hs, pusherdict): |
||||
if pusherdict['kind'] in PUSHER_TYPES: |
||||
return PUSHER_TYPES[pusherdict['kind']](hs, pusherdict) |
||||
@ -0,0 +1,75 @@ |
||||
# Copyright 2016 OpenMarket Ltd |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
|
||||
|
||||
# Change the last_token to last_stream_ordering now that pushers no longer |
||||
# listen on an event stream but instead select out of the event_push_actions |
||||
# table. |
||||
|
||||
|
||||
import logging |
||||
|
||||
logger = logging.getLogger(__name__) |
||||
|
||||
|
||||
def token_to_stream_ordering(token): |
||||
return int(token[1:].split('_')[0]) |
||||
|
||||
|
||||
def run_upgrade(cur, database_engine, *args, **kwargs): |
||||
logger.info("Porting pushers table, delta 31...") |
||||
cur.execute(""" |
||||
CREATE TABLE IF NOT EXISTS pushers2 ( |
||||
id BIGINT PRIMARY KEY, |
||||
user_name TEXT NOT NULL, |
||||
access_token BIGINT DEFAULT NULL, |
||||
profile_tag VARCHAR(32) NOT NULL, |
||||
kind VARCHAR(8) NOT NULL, |
||||
app_id VARCHAR(64) NOT NULL, |
||||
app_display_name VARCHAR(64) NOT NULL, |
||||
device_display_name VARCHAR(128) NOT NULL, |
||||
pushkey TEXT NOT NULL, |
||||
ts BIGINT NOT NULL, |
||||
lang VARCHAR(8), |
||||
data TEXT, |
||||
last_stream_ordering INTEGER, |
||||
last_success BIGINT, |
||||
failing_since BIGINT, |
||||
UNIQUE (app_id, pushkey, user_name) |
||||
) |
||||
""") |
||||
cur.execute("""SELECT |
||||
id, user_name, access_token, profile_tag, kind, |
||||
app_id, app_display_name, device_display_name, |
||||
pushkey, ts, lang, data, last_token, last_success, |
||||
failing_since |
||||
FROM pushers |
||||
""") |
||||
count = 0 |
||||
for row in cur.fetchall(): |
||||
row = list(row) |
||||
row[12] = token_to_stream_ordering(row[12]) |
||||
cur.execute(database_engine.convert_param_style(""" |
||||
INSERT into pushers2 ( |
||||
id, user_name, access_token, profile_tag, kind, |
||||
app_id, app_display_name, device_display_name, |
||||
pushkey, ts, lang, data, last_stream_ordering, last_success, |
||||
failing_since |
||||
) values (%s)""" % (','.join(['?' for _ in range(len(row))]))), |
||||
row |
||||
) |
||||
count += 1 |
||||
cur.execute("DROP TABLE pushers") |
||||
cur.execute("ALTER TABLE pushers2 RENAME TO pushers") |
||||
logger.info("Moved %d pushers to new table", count) |
||||
Loading…
Reference in new issue