catdog2/urlbot-native-trex
1
0
Fork 0
mirror of http://aero2k.de/t/repos/urlbot-native.git synced 2017-09-06 15:25:38 +02:00
Code Issues Releases Activity

rewrite of get_nick_from_object()

Browse Source
This commit is contained in:
braph
2016-04-07 17:50:58 +02:00
committed by Thorsten Sperber
parent 550fa44f42
commit 43950a70fb
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common.py
View File

@@ -5,6 +5,7 @@ import logging
import re import re
import requests import requests
from urllib.error import URLError from urllib.error import URLError
import sleekxmpp
BUFSIZ = 8192 BUFSIZ = 8192
USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64; rv:31.0) ' \ USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64; rv:31.0) ' \
@@ -96,11 +97,24 @@ def giphy(subject, api_key):
def get_nick_from_object(message_obj): def get_nick_from_object(message_obj):
"""
not quite correct yet, also the private property access isn't nice. if isinstance(message_obj, sleekxmpp.Message):
""" msg_type = message_obj.getType()
nick = message_obj['mucnick'] or message_obj['from']._jid[2]
return nick if msg_type == "groupchat":
return message_obj.getMucnick()
elif msg_type == "chat":
jid = message_obj.getFrom()
return jid.resource
else:
raise Exception("Message, but not groupchat/chat")
elif isinstance(message_obj, sleekxmpp.Presence):
jid = message_obj.getFrom()
return jid.resource
else:
raise Exception("Message type is: " + str(type(message_obj)))
def else_command(args): def else_command(args):