erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: sendMessage's options parameter has been renamed to extra to be consistent with newMessage

Browse source
This commit is contained in:
Goffi 2013-11-13 13:58:10 +01:00
commit 9d42c269db
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/plugin_misc_text_commands.py
View file

@ -210,17 +210,17 @@ class TextCommands(object):
def cmd_whois(self, mess_data, profile):
"""show informations on entity"""
debug("Catched whois command")
entity = mess_data["unparsed"].strip()
if mess_data['type'] == "groupchat":
room = mess_data["to"]
if self.host.plugins["XEP-0045"].isNickInRoom(room, entity, profile):
entity = u"%s/%s" % (room, entity)
if not entity:
target_jid = mess_data["to"]
else:
else:
try:
target_jid = jid.JID(entity)
if not target_jid.user or not target_jid.host:
@ -231,7 +231,7 @@ class TextCommands(object):
whois_msg = [_(u"whois for %(jid)s") % {'jid': target_jid}]
#TODO: add informations here (client version, vcard, etc)
self._feedBack(u"\n".join(whois_msg), mess_data, profile)
return False

6
src/plugins/plugin_xep_0085.py
View file

@ -185,8 +185,8 @@ class XEP_0085(object):
# launch the chat state machine (init the timer)
self.__chatStateActive(to_jid, mess_data["type"], profile)
except StopIteration:
if "chat_state" in mess_data["options"]:
state = mess_data["options"]["chat_state"]
if "chat_state" in mess_data["extra"]:
state = mess_data["extra"].pop("chat_state")
assert(state in CHAT_STATES)
message.addElement(state, NS_CHAT_STATES)
return mess_data
@ -303,7 +303,7 @@ class ChatStateMachine:
'',
'',
self.mess_type,
options={"chat_state": state},
extra={"chat_state": state},
profile_key=self.profile)
self.state = state
if not self.timer is None: