From 02db7eb209af879a0168a371b4cb1c2ad0fcab49 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 10 Dec 2014 14:02:48 +0000
Subject: Fix bug when uploading state with empty state_key

---
 synapse/handlers/_base.py   | 66 ++++-----------------------------------------
 synapse/handlers/message.py | 15 -----------
 2 files changed, 5 insertions(+), 76 deletions(-)

(limited to 'synapse/handlers')

diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 6b5f6e7cd8..fdd3151877 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -97,6 +97,11 @@ class BaseHandler(object):
 
         event = builder.build()
 
+        logger.debug(
+            "Created event %s with auth_events: %s, current state: %s",
+            event.event_id, context.auth_events, context.current_state,
+        )
+
         defer.returnValue(
             (event, context,)
         )
@@ -147,64 +152,3 @@ class BaseHandler(object):
             None,
             destinations=destinations,
         )
-
-    # @defer.inlineCallbacks
-    # def _on_new_room_event(self, event, snapshot, extra_destinations=[],
-    #                        extra_users=[], suppress_auth=False,
-    #                        do_invite_host=None):
-    #     yield run_on_reactor()
-    #
-    #     snapshot.fill_out_prev_events(event)
-    #
-    #     yield self.state_handler.annotate_event_with_state(event)
-    #
-    #     yield self.auth.add_auth_events(event)
-    #
-    #     logger.debug("Signing event...")
-    #
-    #     add_hashes_and_signatures(
-    #         event, self.server_name, self.signing_key
-    #     )
-    #
-    #     logger.debug("Signed event.")
-    #
-    #     if not suppress_auth:
-    #         logger.debug("Authing...")
-    #         self.auth.check(event, auth_events=event.old_state_events)
-    #         logger.debug("Authed")
-    #     else:
-    #         logger.debug("Suppressed auth.")
-    #
-    #     if do_invite_host:
-    #         federation_handler = self.hs.get_handlers().federation_handler
-    #         invite_event = yield federation_handler.send_invite(
-    #             do_invite_host,
-    #             event
-    #         )
-    #
-    #         # FIXME: We need to check if the remote changed anything else
-    #         event.signatures = invite_event.signatures
-    #
-    #     yield self.store.persist_event(event)
-    #
-    #     destinations = set(extra_destinations)
-    #     # Send a PDU to all hosts who have joined the room.
-    #
-    #     for k, s in event.state_events.items():
-    #         try:
-    #             if k[0] == RoomMemberEvent.TYPE:
-    #                 if s.content["membership"] == Membership.JOIN:
-    #                     destinations.add(
-    #                         self.hs.parse_userid(s.state_key).domain
-    #                     )
-    #         except:
-    #             logger.warn(
-    #                 "Failed to get destination from event %s", s.event_id
-    #             )
-    #
-    #     event.destinations = list(destinations)
-    #
-    #     yield self.notifier.on_new_room_event(event, extra_users=extra_users)
-    #
-    #     federation_handler = self.hs.get_handlers().federation_handler
-    #     yield federation_handler.handle_new_event(event, snapshot)
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 13fa0be7b4..9043b945e4 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -165,21 +165,6 @@ class MessageHandler(BaseHandler):
 
         defer.returnValue(event)
 
-    @defer.inlineCallbacks
-    def store_room_data(self, event=None):
-        """ Stores data for a room.
-
-        Args:
-            event : The room path event
-            stamp_event (bool) : True to stamp event content with server keys.
-        Raises:
-            SynapseError if something went wrong.
-        """
-
-        snapshot = yield self.store.snapshot_room(event)
-
-        yield self._on_new_room_event(event, snapshot)
-
     @defer.inlineCallbacks
     def get_room_data(self, user_id=None, room_id=None,
                       event_type=None, state_key=""):
-- 
cgit 1.4.1