Merge branch 'develop' into refresh
This commit is contained in:
commit
b157b4b7af
2 changed files with 14 additions and 4 deletions
|
@ -14,3 +14,11 @@ def bitcoin(inp, message=None):
|
|||
}
|
||||
message("Current: \x0307{!s}\x0f - High: \x0307{!s}\x0f"
|
||||
" - Low: \x0307{!s}\x0f - Volume: {!s}".format(ticker['buy'], ticker['high'], ticker['low'], ticker['vol']))
|
||||
|
||||
@hook.command(autohelp=False)
|
||||
def litecoin(inp, message=None):
|
||||
"""litecoin -- gets current exchange rate for litecoins from BTC-E"""
|
||||
data = http.get_json("https://btc-e.com/api/2/ltc_usd/ticker")
|
||||
ticker = data['ticker']
|
||||
message("Current: \x0307${!s}\x0f - High: \x0307${!s}\x0f"
|
||||
" - Low: \x0307${!s}\x0f - Volume: {!s}LTC".format(ticker['buy'],ticker['high'],ticker['low'],ticker['vol_cur']))
|
||||
|
|
|
@ -9,15 +9,17 @@ from util import hook, http
|
|||
@hook.command('mc')
|
||||
@hook.command
|
||||
def metacritic(inp):
|
||||
"""mc [all|movie|tv|album|x360|ps3|wii|pc|ds|3ds|vita] <title>
|
||||
"""mc [all|movie|tv|album|x360|ps3|pc|gba|ds|3ds|wii|vita|wiiu|xone|ps4] <title>
|
||||
Gets rating for <title> from metacritic on the specified medium."""
|
||||
|
||||
|
||||
# if the results suck, it's metacritic's fault
|
||||
|
||||
args = inp.strip()
|
||||
|
||||
game_platforms = ('x360', 'ps3', 'pc', 'ds', 'wii', '3ds', 'gba',
|
||||
'psp', 'vita')
|
||||
|
||||
game_platforms = ('x360', 'ps3', 'pc', 'gba', 'ds', '3ds', 'wii',
|
||||
'vita', 'wiiu', 'xone', 'ps4')
|
||||
|
||||
all_platforms = game_platforms + ('all', 'movie', 'tv', 'album')
|
||||
|
||||
|
@ -128,7 +130,7 @@ def metacritic(inp):
|
|||
release = None
|
||||
|
||||
try:
|
||||
score = result.find_class('metascore')[0].text_content()
|
||||
score = result.find_class('metascore_w')[0].text_content()
|
||||
except IndexError:
|
||||
score = None
|
||||
|
||||
|
|
Reference in a new issue