ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed outdated mclogin command, removed unused fields from default config

Browse source
This commit is contained in:
Luke Rogers 2013-07-09 08:09:58 +12:00
parent 6564338b94
commit 5d30398bc1
2 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/config.py
View file

@ -30,19 +30,15 @@ if not os.path.exists('config'):
"acls": {}, "acls": {},
"api_keys": "api_keys":
{ {
"geoip": "INSERT API KEY FROM ipinfodb.com HERE", "tvdb": "",
"tvdb": "INSERT API KEY FROM thetvdb.com HERE", "wolframalpha": "",
"bitly_user": "INSERT USERNAME FROM bitly.com HERE", "lastfm": "",
"bitly_api": "INSERT API KEY FROM bitly.com HERE", "rottentomatoes": "",
"wolframalpha": "INSERT API KEY FROM wolframalpha.com HERE",
"lastfm": "INSERT API KEY FROM lastfm HERE",
"rottentomatoes": "INSERT API KEY FROM rottentomatoes HERE",
"mc_user": "INSERT minecraft USERNAME HERE",
"mc_pass": "INSERT minecraft PASSWORD HERE",
"twitter_consumer_key": "", "twitter_consumer_key": "",
"twitter_consumer_secret": "", "twitter_consumer_secret": "",
"twitter_access_token": "", "twitter_access_token": "",
"twitter_access_secret": "" "twitter_access_secret": "",
"wunderground": ""
}, },
"plugins": "plugins":
{ {

16
plugins/mctools.py
View file

@ -61,22 +61,6 @@ def srvData(domain):
data = [getsrv['data'][2],getsrv['data'][3]] data = [getsrv['data'][2],getsrv['data'][3]]
return data return data
@hook.command(autohelp=False)
def mclogin(inp, bot=None):
"mclogin -- Checks the status of Minecraft's login servers."
username = bot.config.get("api_keys", {}).get("mc_user", None)
password = bot.config.get("api_keys", {}).get("mc_pass", None)
if password is None:
return "error: no login set"
login = http.get("https://login.minecraft.net/", user=username,
password=password, version=13)
if username.lower() in login.lower():
return "Minecraft login servers appear to be online!"
else:
return "Minecraft login servers appear to be offline!"
@hook.command(autohelp=False) @hook.command(autohelp=False)
def mcstatus(inp, say=None): def mcstatus(inp, say=None):