Turn subscription requests back on

Fix removing registration if user is not online (e.g. w/ wrong
subscription)

3 files changed, 18 insertions, 14 deletions

diff --git a/gateway.py b/gateway.py
index a646a73..f1b5d2b 100644
--- a/gateway.py
+++ b/gateway.py
@@ -334,7 +334,7 @@ class VK(object):
 	@utils.threaded
 	def disconnect(self):
 		"""
-		Stops all user handlers and removes their from Poll
+		Stops all user handlers and removes them from Poll
 		"""
 		self.online = False
 		logger.debug("VK: user %s has left", self.source)
@@ -451,18 +451,18 @@ class User(object):
 		self.sync = threading._allocate_lock()
 		logger.debug("User initialized (jid: %s)", self.source)
 
-	findUserInDB = lambda self: runDatabaseQuery("select * from users where jid=?", (self.source,), many=False)
+	@classmethod
+	findUserInDB = lambda cls, source: runDatabaseQuery("select * from users where jid=?", (source,), many=False)
 
 	def connect(self, username=None, password=None, token=None):
 		"""
 		Calls VK.auth() and calls captchaChallenge on captcha
 		Updates db if auth() is done
-		Raises exception if raise_exc == True
 		"""
 		logger.debug("User connecting (jid: %s)", self.source)
 		exists = False
 		# check if user registered
-		user = self.findUserInDB()
+		user = self.findUserInDB(self.source)
 		if user:
 			exists = True
 			_, _, token, self.lastMsgID, self.rosterSet = user
@@ -536,7 +536,7 @@ class User(object):
 
 	def sendInitPresence(self):
 		"""
-		Sends init presence (available) to the user from all their online friends
+		Sends init presence (available) to the user from all them online friends
 		"""
 		if not self.settings.i_am_ghost and not self.vk.engine.captcha:
 			if not self.friends:
@@ -718,7 +718,6 @@ class User(object):
 				for uid in self.friends:
 					if uid not in friends:
 						sendPresence(self.source, vk2xmpp(uid), "unsubscribe")
-						sendPresence(self.source, vk2xmpp(uid), "unsubscribed")
 				self.friends = friends
 
 	def reauth(self):
@@ -773,7 +772,7 @@ def sendMessage(cl, destination, source, body=None, timestamp=0, typ="active"):
 		cl: xmpp.Client object
 		destination: to whom send the message
 		source: from who send the message
-		body: obviously message body
+		body: message body
 		timestamp: message timestamp (XEP-0091)
 		typ: xmpp chatstates type (XEP-0085)
 	"""
@@ -838,8 +837,8 @@ def removeUser(user, roster=False, notify=True):
 	elif user:
 		source = user.source
 	else:
-		raise ValueError("No user or token was given")
-	user = Transport.get(source)  # here's probability it's not the User object
+		raise ValueError("No user or source was given")
+	user = Transport.get(source)
 	if notify:
 		# Would russians understand the joke?
 		sendMessage(Component, source, TransportID,
@@ -880,8 +879,9 @@ def getPid():
 					os.kill(old, 15)
 					time.sleep(3)
 					os.kill(old, 9)
-				except OSError:
-					Print("%d not killed.\n" % old, False)
+				except OSError as e:
+					if e.errno != 3:
+						Print("%d %s.\n" % (old, e.message), False)
 				else:
 					Print("%d killed.\n" % old, False)
 	wFile(pidFile, str(pid))
@@ -935,7 +935,7 @@ def initializeUsers():
 
 def runMainActions():
 	"""
-	Running main actions to make transport work
+	Running the main actions to make the transport work
 	"""
 	if allowBePublic:
 		makeMeKnown()
diff --git a/library/rostermanager.py b/library/rostermanager.py
index cc1a3aa..218a6b6 100644
--- a/library/rostermanager.py
+++ b/library/rostermanager.py
@@ -44,7 +44,7 @@ class Roster:
 		logger.debug("RosterManager: sending %s fellas to user (jid: %s)", len(items), user)
 		with RosterSemaphore:
 			sender(Component, iq, cb=answer)
-#			user.sendSubPresence(user.friends)
+			user.sendSubPresence(user.friends)
 
 	@classmethod
 	def checkRosterx(cls, user, resource):
diff --git a/modules/mod_iq_register.py b/modules/mod_iq_register.py
index d3acc85..9f32dba 100644
--- a/modules/mod_iq_register.py
+++ b/modules/mod_iq_register.py
@@ -79,10 +79,14 @@ def register_handler(cl, iq):
 			logger.debug("user %s want to remove me..." % source)
 			if source in Transport:
 				user = Transport[source]
-				removeUser(user, True, False)
 				result = iq.buildReply("result")
 				result.setPayload([], add=False)
 				executeHandlers("evt09", (source,))
+
+			elif User.findUserInDB(source):
+				removeUser(source, True, False)
+				sendPresence(TransportID, destination, "unsubscribe")
+				executeHandlers("evt09", (source,))
 	if result:
 		sender(cl, result)