From 7ff39317cdf6bcb161297d4cd54483e601a9c16a Mon Sep 17 00:00:00 2001
From: moyamo <moyamodehacker@gmail.com>
Date: Wed, 6 Jan 2016 16:33:28 +0200
Subject: [PATCH] Clean up \leave room code

---
 group.py   |  6 ++++++
 session.py | 15 +--------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/group.py b/group.py
index 993bae4..224b183 100644
--- a/group.py
+++ b/group.py
@@ -78,6 +78,12 @@ class Group():
 			self._updateParticipant(number, flags, protocol_pb2.STATUS_NONE)
 			del self.participants[number]
 
+	def leaveRoom(self):
+		for number in self.participants:
+			nick = self.participants[number]
+			flags = protocol_pb2.PARTICIPANT_FLAG_ROOM_NOT_FOUND
+			self._updateParticipant(number, flags, protocol_pb2.STATUS_NONE)
+
 	def changeNick(self, number, new_nick):
 		if self.participants[number] == new_nick:
 			return
diff --git a/session.py b/session.py
index ee7fe9c..88b5b91 100644
--- a/session.py
+++ b/session.py
@@ -591,20 +591,7 @@ class Session(YowsupApp):
 			self.leaveGroup(room)
 			# Delete Room on spectrum side
 			group = self.groups[room]
-			for jid in group.participants:
-				buddy = jid.split("@")[0]
-				try:
-					nick = self.buddies[buddy].nick
-				except KeyError:
-					nick = buddy
-				if nick == "":
-					nick = buddy
-				if buddy == self.legacyName:
-					nick = group.nick
-				flags = protocol_pb2.PARTICIPANT_FLAG_ROOM_NOT_FOUND
-				self.backend.handleParticipantChanged(
-						self.user, nick, self._shortenGroupId(room), flags,
-						protocol_pb2.STATUS_NONE, buddy)
+			group.leaveRoom()
 			del self.groups[room]
 
 	def _requestLastSeen(self, buddy):