summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-16 11:35:01 +0000
committerErik Johnston <erik@matrix.org>2018-02-16 11:35:01 +0000
commit012e8e142a4ca7d87e1ffd66cce44b23bf943e9c (patch)
tree7742bcb7216e50b8378e10efc7075f0572175b4d /synapse
parentFix unit test (diff)
downloadsynapse-012e8e142a4ca7d87e1ffd66cce44b23bf943e9c.tar.xz
Comments
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py3
-rw-r--r--synapse/storage/event_push_actions.py3
-rw-r--r--synapse/storage/schema/delta/47/push_actions_staging.sql4
3 files changed, 9 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index 1140788aa7..bf4f1c5836 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -189,6 +189,9 @@ class BulkPushRuleEvaluator(object):
                 if matches:
                     actions = [x for x in rule['actions'] if x != 'dont_notify']
                     if actions and 'notify' in actions:
+                        # Push rules say we should notify the user of this event,
+                        # so we mark it in the DB in the staging area. (This
+                        # will then get handled when we persist the event)
                         yield self.store.add_push_actions_to_staging(
                             event.event_id, uid, actions,
                         )
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py
index 28226455bf..ea56d4d065 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -762,7 +762,8 @@ class EventPushActionsStore(SQLBaseStore):
         Args:
             event_id (str)
             user_id (str)
-            actions (list)
+            actions (list[dict|str]): An action can either be a string or
+                dict.
 
         Returns:
             Deferred
diff --git a/synapse/storage/schema/delta/47/push_actions_staging.sql b/synapse/storage/schema/delta/47/push_actions_staging.sql
index ec4b1d7d42..edccf4a96f 100644
--- a/synapse/storage/schema/delta/47/push_actions_staging.sql
+++ b/synapse/storage/schema/delta/47/push_actions_staging.sql
@@ -13,6 +13,10 @@
  * limitations under the License.
  */
 
+-- Temporary staging area for push actions that have been calculated for an
+-- event, but the event hasn't yet been persisted.
+-- When the event is persisted the rows are moved over to the
+-- event_push_actions table.
 CREATE TABLE event_push_actions_staging (
     event_id TEXT NOT NULL,
     user_id TEXT NOT NULL,