catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix interface

Browse Source
This commit is contained in:
Thorsten
2015-11-28 15:54:49 +01:00
parent 7a059387b4
commit bef3130256
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins.py
View File

@@ -1022,14 +1022,14 @@ def set_status(argv, **args):
return { return {
'presence': { 'presence': {
'status': 'xa', 'status': 'xa',
'message': 'I\'m muted now. You can unmute me with "%s: set_status unmute"' % conf("bot_user") 'msg': 'I\'m muted now. You can unmute me with "%s: set_status unmute"' % conf("bot_user")
} }
} }
elif argv[1] == 'unmute' and args['reply_user'] == conf('bot_owner'): elif argv[1] == 'unmute' and args['reply_user'] == conf('bot_owner'):
return { return {
'presence': { 'presence': {
'status': None, 'status': None,
'message': '' 'msg': ''
} }
} }

10
urlbot.py
View File

@@ -118,6 +118,10 @@ class UrlBot(IdleBot):
""" """
Send a reply to a message Send a reply to a message
""" """
if self.status is not None:
self.logger.warn("I'm muted!")
return
set_conf('request_counter', conf('request_counter') + 1) set_conf('request_counter', conf('request_counter') + 1)
if str is not type(message): if str is not type(message):
@@ -352,10 +356,10 @@ class UrlBot(IdleBot):
presence = action['presence'] presence = action['presence']
conf_set('presence', presence) conf_set('presence', presence)
self.status = presence['msg'] self.status = presence.get('msg')
self.show = presence['status'] self.show = presence.get('status')
self.send_presence(pstatus=presence['msg'], pshow=presence['status']) self.send_presence(pstatus=self.status, pshow=self.show)
# self.reconnect(wait=True) # self.reconnect(wait=True)
if '__main__' == __name__: if '__main__' == __name__: