diff --git a/apiclient.py b/apiclient.py index cd772423..e239b3e0 100644 --- a/apiclient.py +++ b/apiclient.py @@ -1,3 +1,5 @@ +import os + import requests @@ -16,4 +18,4 @@ class ApiClient: return None -client = ApiClient('http://127.0.0.1:5000/openqq') +client = ApiClient(os.environ.get('QQ_API_URL')) diff --git a/app.py b/app.py index e55290cd..3e4bd312 100644 --- a/app.py +++ b/app.py @@ -107,4 +107,4 @@ def _load_commands(): if __name__ == '__main__': _load_commands() - app.run(host='127.0.0.1', port=8888) + app.run(host=os.environ.get('HOST'), port=os.environ.get('PORT')) diff --git a/commands/todayinhistory.py b/commands/todayinhistory.py new file mode 100644 index 00000000..68af4af2 --- /dev/null +++ b/commands/todayinhistory.py @@ -0,0 +1,29 @@ +import requests +from lxml import etree + +from command import CommandRegistry +from commands import core + +__registry__ = cr = CommandRegistry() + + +@cr.register('today_in_history', '历史上的今天') +def today_in_history(_, ctx_msg): + core.echo('正在查询,请稍等……', ctx_msg) + resp = requests.get('http://tool.lu/todayonhistory/') + ok = False + if resp.status_code == 200: + html = etree.HTML(resp.text) + li_elems = html.xpath('//ul[@id="tohlis"]/li') + # reply = reduce(lambda x, y: x.text + '\n' + y.text, li_elems) + step = 10 + for start in range(0, len(li_elems), step): + reply = '' + for item in li_elems[start:start + step]: + reply += item.text + '\n' + reply = reply.rstrip() + core.echo(reply, ctx_msg) + core.echo('以上~', ctx_msg) + ok = True + if not ok: + core.echo('很抱歉,网络出错了……建议等会儿再试吧~', ctx_msg) diff --git a/commands/zhihu.py b/commands/zhihu.py index 1e58a9cc..1d718b50 100644 --- a/commands/zhihu.py +++ b/commands/zhihu.py @@ -147,7 +147,7 @@ def _subscribe_interactively(args_text, ctx_msg, source): if s.data['need_confirm']: if a.strip() != '1': # Cancel - core.echo('已放弃更改~') + core.echo('已放弃更改~', c) return True core.echo('请发送想要获取推送的时间(格式如 20:05):', c) s.state += 1