Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:06:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename event-actions to event_push_actions as per PR request

Browse source
This commit is contained in:
David Baker 2016-01-04 14:05:37 +00:00
parent 928c575c6f
commit c914d67cda
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/storage/__init__.py
View file

@ -33,7 +33,7 @@ from .pusher import PusherStore
from .push_rule import PushRuleStore
from .media_repository import MediaRepositoryStore
from .rejections import RejectionsStore
from .event_actions import EventActionsStore
from .event_push_actions import EventPushActionsStore
from .state import StateStore
from .signatures import SignatureStore
@ -76,7 +76,7 @@ class DataStore(RoomMemberStore, RoomStore,
SearchStore,
TagsStore,
AccountDataStore,
EventActionsStore
EventPushActionsStore
):
def __init__(self, hs):

20
synapse/storage/event_actions.py → synapse/storage/event_push_actions.py
View file

@ -22,9 +22,9 @@ import simplejson as json
logger = logging.getLogger(__name__)
class EventActionsStore(SQLBaseStore):
class EventPushActionsStore(SQLBaseStore):
@defer.inlineCallbacks
def set_actions_for_event_and_users(self, event, tuples):
def set_push_actions_for_event_and_users(self, event, tuples):
"""
:param event: the event set actions for
:param tuples: list of tuples of (user_id, profile_tag, actions)
@ -42,15 +42,15 @@ class EventActionsStore(SQLBaseStore):
yield self.runInteraction(
"set_actions_for_event_and_users",
self._simple_insert_many_txn,
EventActionsTable.table_name,
EventPushActionsTable.table_name,
values
)
@defer.inlineCallbacks
def get_unread_event_actions_by_room_for_user(
def get_unread_event_push_actions_by_room_for_user(
self, room_id, user_id, last_read_event_id
):
def _get_unread_event_actions_by_room(txn):
def _get_unread_event_push_actions_by_room(txn):
sql = (
"SELECT stream_ordering, topological_ordering"
" FROM events"
@ -68,7 +68,7 @@ class EventActionsStore(SQLBaseStore):
sql = (
"SELECT ea.event_id, ea.actions"
" FROM event_actions ea, events e"
" FROM event_push_actions ea, events e"
" WHERE ea.room_id = e.room_id"
" AND ea.event_id = e.event_id"
" AND ea.user_id = ?"
@ -88,11 +88,11 @@ class EventActionsStore(SQLBaseStore):
]
ret = yield self.runInteraction(
"get_unread_event_actions_by_room",
_get_unread_event_actions_by_room
"get_unread_event_push_actions_by_room",
_get_unread_event_push_actions_by_room
)
defer.returnValue(ret)
class EventActionsTable(object):
table_name = "event_actions"
class EventPushActionsTable(object):
table_name = "event_push_actions"

4
synapse/storage/schema/delta/27/event_actions.sql → synapse/storage/schema/delta/27/event_push_actions.sql
View file

@ -13,7 +13,7 @@
* limitations under the License.
*/
CREATE TABLE IF NOT EXISTS event_actions(
CREATE TABLE IF NOT EXISTS event_push_actions(
room_id TEXT NOT NULL,
event_id TEXT NOT NULL,
user_id TEXT NOT NULL,
@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS event_actions(
);
CREATE INDEX event_actions_room_id_event_id_user_id_profile_tag on event_actions(room_id, event_id, user_id, profile_tag);
CREATE INDEX event_push_actions_room_id_event_id_user_id_profile_tag on event_push_actions(room_id, event_id, user_id, profile_tag);