Save event actions to the db

pull/456/head
David Baker 2015-12-10 17:51:15 +00:00
parent a84a693327
commit aa667ee396
4 changed files with 72 additions and 2 deletions

View File

@ -19,7 +19,6 @@ import push_rule_evaluator
import logging
logger = logging.getLogger(__name__)
@ -42,6 +41,9 @@ class ActionGenerator:
evaluator = yield push_rule_evaluator.\
evaluator_for_user_name_and_profile_tag(
uid, None, event['room_id'], self.store
)
)
actions = yield evaluator.actions_for_event(event)
logger.info("actions for user %s: %s", uid, actions)
self.store.set_actions_for_event(
event['event_id'], uid, None, actions
)

View File

@ -33,6 +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 .state import StateStore
from .signatures import SignatureStore
@ -75,6 +76,7 @@ class DataStore(RoomMemberStore, RoomStore,
SearchStore,
TagsStore,
AccountDataStore,
EventActionsStore
):
def __init__(self, hs):

View File

@ -0,0 +1,41 @@
# -*- coding: utf-8 -*-
# Copyright 2014 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 ._base import SQLBaseStore
from twisted.internet import defer
import logging
import simplejson as json
logger = logging.getLogger(__name__)
class EventActionsStore(SQLBaseStore):
@defer.inlineCallbacks
def set_actions_for_event(self, event_id, user_id, profile_tag, actions):
actionsJson = json.dumps(actions)
ret = yield self.runInteraction(
"_set_actions_for_event",
self._simple_upsert_txn,
EventActionsTable.table_name,
{'event_id': event_id, 'user_id': user_id, 'profile_tag': profile_tag},
{'actions': actionsJson}
)
defer.returnValue(ret)
class EventActionsTable(object):
table_name = "event_actions"

View File

@ -0,0 +1,25 @@
/* Copyright 2015 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.
*/
CREATE TABLE IF NOT EXISTS event_actions(
event_id TEXT NOT NULL,
user_id TEXT NOT NULL,
profile_tag VARCHAR(32),
actions TEXT NOT NULL,
CONSTRAINT event_id_user_id_profile_tag_uniqueness UNIQUE (event_id, user_id, profile_tag)
);
CREATE INDEX event_actions_event_id_user_id_profile_tag on event_actions(event_id, user_id, profile_tag);