Merge branch 'develop' of https://github.com/ClouDev/CloudBot into develop
This commit is contained in:
commit
072e73f3a1
|
@ -123,11 +123,11 @@ def weather(inp, nick="", reply=None, db=None, notice=None):
|
|||
|
||||
reply("\x02{place}\x02 - \x02Current:\x02 {conditions}, {temp_f}F/{temp_c}C, Humidity: {humidity}%, " \
|
||||
"Wind: {wind_kph}KPH/{wind_mph}MPH {wind_text}, \x02Today:\x02 {forecast}, " \
|
||||
"High: {high_f}F/{high_c}C, Low: {low_f}F/{low_c}C." \
|
||||
"High: {high_f}F/{high_c}C, Low: {low_f}F/{low_c}C. " \
|
||||
"\x02Tomorrow:\x02 {_forecast}, High: {_high_f}F" \
|
||||
"/{_high_c}C, Low: {_low_f}F/{_low_c}C.".format(**weather_data))
|
||||
|
||||
if location and not dontsave:
|
||||
db.execute("insert or replace into weather(nick, loc) values (?,?)",
|
||||
(nick.lower(), location))
|
||||
db.commit()
|
||||
db.commit()
|
||||
|
|
Reference in a new issue