summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-06-22 16:35:10 +0100
committerRichard van der Hoff <richard@matrix.org>2018-06-22 16:35:10 +0100
commit1d009013b3c3e814177afc59f066e02a202b21cd (patch)
tree798478eec865dc44d7a203bd0423026ebf1710be /synapse/handlers/federation.py
parentMerge pull request #3435 from matrix-org/rav/fix_event_push_actions_tablescan (diff)
downloadsynapse-1d009013b3c3e814177afc59f066e02a202b21cd.tar.xz
Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"
This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing
changes made to b4a5d767a94f1680d07edfd583aae54ce422573e.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 1ca56c2c97..2571758284 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -495,20 +495,7 @@ class FederationHandler(BaseHandler):
             for e_id, key_to_eid in event_to_state_ids.iteritems()
         }
 
-        erased_senders = yield self.store.are_users_erased(
-            e.sender for e in events,
-        )
-
         def redact_disallowed(event, state):
-            # if the sender has been gdpr17ed, always return a redacted
-            # copy of the event.
-            if erased_senders[event.sender]:
-                logger.info(
-                    "Sender of %s has been erased, redacting",
-                    event.event_id,
-                )
-                return prune_event(event)
-
             if not state:
                 return event