Refactoring: rename Transport to Users, create error reporter, fix #135

9 files changed, 21 insertions, 20 deletions

diff --git a/extensions/avatar_hash.py b/extensions/avatar_hash.py
index 4f4e20d..3e62946 100644
--- a/extensions/avatar_hash.py
+++ b/extensions/avatar_hash.py
@@ -85,8 +85,8 @@ class AvatarHash(object):
 
 
 def addPresenceHash(prs, destination, source):
-	if destination in Transport and not prs.getType():
-		user = Transport[destination]
+	if destination in Users and not prs.getType():
+		user = Users[destination]
 		if user.settings.avatar_hash:
 			x = prs.setTag("x", namespace=xmpp.NS_VCARD_UPDATE)
 			uid = vk2xmpp(source)
diff --git a/extensions/groupchats.py b/extensions/groupchats.py
index abcfaff..2c72a77 100644
--- a/extensions/groupchats.py
+++ b/extensions/groupchats.py
@@ -419,13 +419,13 @@ class Chat(object):
 			jid = runDatabaseQuery("select user from groupchats where jid=?", (source,), many=False)
 			if jid:
 				jid = jid[0]
-		if jid and jid in Transport:
-			user = Transport[jid]
+		if jid and jid in Users:
+			user = Users[jid]
 		return user
 
 	@staticmethod
 	def getJIDByID(id):
-		for key, value in Transport.iteritems():
+		for key, value in Users.iteritems():
 			if key == id:
 				return value
 		return None
diff --git a/extensions/interpreter.py b/extensions/interpreter.py
index e8e899a..1c20fd9 100644
--- a/extensions/interpreter.py
+++ b/extensions/interpreter.py
@@ -13,8 +13,8 @@ def interpreter_msg02(msg):
 			if len(raw) > 1:
 				text, args = raw
 				args = args.strip()
-				if source in Transport:
-					user = Transport[source]
+				if source in Users:
+					user = Users[source]
 				if text == "!eval" and args and source in ADMIN_JIDS:
 					try:
 						result = unicode(eval(args))
diff --git a/extensions/status-from-vk.py b/extensions/status-from-vk.py
index 54ad4c7..6ad2f0f 100644
--- a/extensions/status-from-vk.py
+++ b/extensions/status-from-vk.py
@@ -15,8 +15,8 @@ def statusfromvk_evt07(user):
 
 
 def statusfromvk_prs02(prs, destination, source):
-	if source != TransportID and destination in Transport:
-		user = Transport[destination]
+	if source != TransportID and destination in Users:
+		user = Users[destination]
 		if user.settings.status_from_vk and not prs.getType():
 			id = vk2xmpp(source)
 			if id in user.friends and user.friends[id].get("status"):
diff --git a/extensions/status-to-vk.py b/extensions/status-to-vk.py
index d9743f4..a66b594 100644
--- a/extensions/status-to-vk.py
+++ b/extensions/status-to-vk.py
@@ -11,9 +11,9 @@ VK_ACCESS += 1024
 GLOBAL_USER_SETTINGS["status_to_vk"] = {"label": "Publish my status in VK", "value": 0}
 
 def statustovk_prs01(source, prs, retry=3):
-	if source in Transport and prs.getType() in ("available", None):
+	if source in Users and prs.getType() in ("available", None):
 		if prs.getTo() == TransportID:
-			user = Transport[source]
+			user = Users[source]
 			if user.settings.status_to_vk:
 				mask = user.vk.method("account.getAppPermissions") or 0
 				if mask:
diff --git a/extensions/sticker.py b/extensions/sticker.py
index 442874e..c4f58b4 100644
--- a/extensions/sticker.py
+++ b/extensions/sticker.py
@@ -40,7 +40,7 @@ def sendSticker(msg, destination, source):
 		if msg.getType() == "groupchat":
 			user = Chat.getUserObject(destination)
 		else:
-			user = Transport.get(destination)
+			user = Users.get(destination)
 		if user and user.settings.send_stickers:
 			url = sticker_url.search(body)
 			if url:
diff --git a/extensions/typing_reader.py b/extensions/typing_reader.py
index 626cf7f..7dafff0 100644
--- a/extensions/typing_reader.py
+++ b/extensions/typing_reader.py
@@ -7,8 +7,8 @@ GLOBAL_USER_SETTINGS["typingreader"] = {"label": "Mark my messages as read when
 def typingreader_watch(msg):
 	jidFrom = msg.getFrom()
 	source = jidFrom.getStripped()
-	if msg.getType() == "chat" and source in Transport:
-		user = Transport[source]
+	if msg.getType() == "chat" and source in Users:
+		user = Users[source]
 		if user.settings.typingreader:
 			if (user.lastMsgID > user.lastMarkedMessage) and msg.getTag("composing"):
 				user.vk.method("messages.markAsRead", {"message_ids": str(user.lastMsgID)})
diff --git a/extensions/user_activity.py b/extensions/user_activity.py
index 12c372d..22823b6 100644
--- a/extensions/user_activity.py
+++ b/extensions/user_activity.py
@@ -39,7 +39,7 @@ def user_activity_remove():
 	LA = utils.TimeMachine(USER_LIFETIME_LIMIT)
 	for (jid, date) in users:
 		if (time.time() - date) >= LA:
-			if jid not in Transport:
+			if jid not in Users:
 				runDatabaseQuery("delete from users where jid=?", (jid,), set=True)
 				runDatabaseQuery("delete from last_activity where jid=?", (jid,))
 				settings = "%s/%s" % (settingsDir, jid)
@@ -54,12 +54,13 @@ def user_activity_remove():
 						" Relogin or you'll be exterminated.") % LA, LA)
 	utils.runThread(user_activity_remove, delay=(60*60*24))
 
+
 # A dirty hack to add seen users in stats
 def calcStats():
 	"""
 	Returns count(*) from users database
 	"""
-	countOnline = len(Transport)
+	countOnline = len(Users)
 	countTotal = runDatabaseQuery("select count(*) from users", many=False)[0]
 	countSeen = runDatabaseQuery("select count(*) from last_activity where date >=?", (startTime,), many=False)[0]
 	return [countTotal, countSeen, countOnline]
diff --git a/extensions/user_nickname.py b/extensions/user_nickname.py
index 5b18cfb..e13a43b 100644
--- a/extensions/user_nickname.py
+++ b/extensions/user_nickname.py
@@ -23,8 +23,8 @@ def add_username(stanza, user, uid):
 
 
 def add_nickname_msg03(msg, destination, source):
-	if destination in Transport and source != TransportID:  # That would be strange if user wasn't in Transport
-		user = Transport[destination]
+	if destination in Users and source != TransportID:  # That would be strange if user wasn't in Transport
+		user = Users[destination]
 		if user.settings.add_nicknames_msg:
 			uid = vk2xmpp(source)
 			strangers = getattr(user, "strangers", set([]))
@@ -35,8 +35,8 @@ def add_nickname_msg03(msg, destination, source):
 
 
 def add_nickname_prs02(prs, destination, source):
-	if destination in Transport and not prs.getType():
-		user = Transport[destination]
+	if destination in Users and not prs.getType():
+		user = Users[destination]
 		uid = vk2xmpp(source)
 		if uid in user.friends and user.settings.add_nicknames_prs:
 			add_username(prs, user, uid)