nikdoof/kosbot
1
0
Fork 0
mirror of https://github.com/nikdoof/kosbot.git synced 2025-12-11 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some minor issues.

Browse Source
This commit is contained in:
Andrew Williams
2014-08-04 20:30:13 +01:00
parent fd50d4db4e
commit d2ab09fdd7
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -52,3 +52,6 @@ coverage.xml
# Sphinx documentation # Sphinx documentation
docs/_build/ docs/_build/
# IDEA
.idea

28
kosbot.py
View File

@@ -1,7 +1,11 @@
import os import os
import logging
import sleekxmpp import sleekxmpp
import requests import requests
from urlparse import urljoin try:
from urlparse import urljoin
except ImportError:
from urllib.parse import urljoin
class KOSCheckBot(sleekxmpp.ClientXMPP): class KOSCheckBot(sleekxmpp.ClientXMPP):
@@ -27,13 +31,17 @@ class KOSCheckBot(sleekxmpp.ClientXMPP):
args = msg['body'].split(' ')[1:] args = msg['body'].split(' ')[1:]
if cmd == 'kos': if cmd == 'kos':
return self.cmd_kos(msg, cmd, args) result = self.cmd_kos(msg, cmd, args)
msg.reply(result).send()
def cmd_kos(self, msg, cmd, args) def cmd_kos(self, msg, cmd, args):
arg = ' '.join(args) arg = ' '.join(args)
resp = requests.get(urljoin(KOS_API_URL, params={ resp = requests.get(self.KOS_API_URL, params={
'c': 'json', 'c': 'json',
'q': arg 'q': arg,
'type': 'unit',
'details': None
}) })
if resp.status_code != requests.codes.ok: if resp.status_code != requests.codes.ok:
return "Something went wrong (Error %s)" % resp.status_code return "Something went wrong (Error %s)" % resp.status_code
@@ -47,8 +55,8 @@ class KOSCheckBot(sleekxmpp.ClientXMPP):
return "KOS returned no results (Not on KOS)" return "KOS returned no results (Not on KOS)"
results = [] results = []
for result in data['results'] for result in data['results']:
text = '%s (%s) - %s'.format( text = '{} ({}) - {}'.format(
result['label'], result['label'],
result['type'], result['type'],
'KOS' if result['kos'] else 'Not KOS' 'KOS' if result['kos'] else 'Not KOS'
@@ -58,10 +66,12 @@ class KOSCheckBot(sleekxmpp.ClientXMPP):
if __name__ == '__main__': if __name__ == '__main__':
logging.basicConfig(level=logging.DEBUG)
jid = os.environ.get('KOSBOT_JID') jid = os.environ.get('KOSBOT_JID')
password = os.environ.get('KOSBOT_PASSWORD') password = os.environ.get('KOSBOT_PASSWORD')
nickname = os.environ.get('KOSBOT_NICKNAME', 'KOSBot') nickname = os.environ.get('KOSBOT_NICKNAME', 'KOSBot')
rooms = os.environ.get('KOSBOT_CHANNELS') rooms = os.environ.get('KOSBOT_ROOMS')
rooms = [x.strip() for x in rooms.split(',')] rooms = [x.strip() for x in rooms.split(',')]
@@ -69,6 +79,6 @@ if __name__ == '__main__':
bot.register_plugin('xep_0030') # Service Discovery bot.register_plugin('xep_0030') # Service Discovery
bot.register_plugin('xep_0045') # Multi-User Chat bot.register_plugin('xep_0045') # Multi-User Chat
bot.register_plugin('xep_0199') # XMPP Ping bot.register_plugin('xep_0199') # XMPP Ping
if bot.connect(): if bot.connect():
bot.process(block=True) bot.process(block=True)