Skip to content

Commit f100ab0

Browse files
showelltimabbott
authored andcommitted
jabber mirror: Remove code for occupy/vacate events.
The server no longer sends occupy/vacate events for streams. The mirror should continue to work fine by processing subsription-related events.
1 parent befbb95 commit f100ab0

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

zulip/integrations/jabber/jabber_mirror_backend.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ def process_event(self, event: Dict[str, Any]) -> None:
219219
logging.exception("Exception forwarding Zulip => Jabber")
220220
elif event['type'] == 'subscription':
221221
self.process_subscription(event)
222-
elif event['type'] == 'stream':
223-
self.process_stream(event)
224222

225223
def stream_message(self, msg: Dict[str, str]) -> None:
226224
assert(self.jabber is not None)
@@ -266,19 +264,6 @@ def process_subscription(self, event: Dict[str, Any]) -> None:
266264
for stream in streams:
267265
self.jabber.leave_muc(stream_to_room(stream))
268266

269-
def process_stream(self, event: Dict[str, Any]) -> None:
270-
assert(self.jabber is not None)
271-
if event['op'] == 'occupy':
272-
streams = [s['name'].lower() for s in event['streams']]
273-
streams = [s for s in streams if s.endswith("/xmpp")]
274-
for stream in streams:
275-
self.jabber.join_muc(stream_to_room(stream))
276-
if event['op'] == 'vacate':
277-
streams = [s['name'].lower() for s in event['streams']]
278-
streams = [s for s in streams if s.endswith("/xmpp")]
279-
for stream in streams:
280-
self.jabber.leave_muc(stream_to_room(stream))
281-
282267
def get_rooms(zulipToJabber: ZulipToJabberBot) -> List[str]:
283268
def get_stream_infos(key: str, method: Callable[[], Dict[str, Any]]) -> Any:
284269
ret = method()

0 commit comments

Comments
 (0)