Depublish a room from the public rooms list when it is upgraded

synapse/federation/federation_client.py

@@ -553,7 +553,7 @@ def make_membership_event(
         Note that this does not append any events to any graphs.
 
         Args:
-            destinations (Iterable[unicode]): Candidate homeservers which are probably
+            destinations (Iterable[str]): Candidate homeservers which are probably
                 participating in the room.
             room_id (str): The room in which the event will happen.
             user_id (str): The user whose membership is being evented.

synapse/handlers/federation.py

@@ -1112,7 +1112,7 @@ def do_invite_join(self, target_hosts, room_id, joinee, content):
         have finished processing the join.
 
         Args:
-            target_hosts (Iterable[unicode]): List of servers to attempt to join the room with.
+            target_hosts (Iterable[str]): List of servers to attempt to join the room with.
 
             room_id (str): The ID of the room to join.
 

synapse/handlers/room_member.py

@@ -547,6 +547,13 @@ def copy_user_state_on_room_upgrade(self, old_room_id, new_room_id, user_ids):
                     old_room_id, new_room_id, user_id
                 )
             except Exception:
+                logger.warning(
+                    "Error copying tags and/or push rules from rooms %s to %s for user %s. "
+                    "Skipping...",
+                    old_room_id,
+                    new_room_id,
+                    user_id,
+                )
                 continue
 
     @defer.inlineCallbacks