ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-07-28 16:51:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up and fix

Browse Source
This commit is contained in:
Richard Chien
2017-02-16 09:10:56 +08:00
parent 0f7f9250c1
commit 82a0681e9f
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
commands/networktools.py
View File

@ -28,13 +28,12 @@ def ip(args_text, ctx_msg):
resp = requests.get(chinaz_url % query)
if resp.status_code == 200:
html = etree.HTML(resp.text)
p_elems = html.xpath('//*[@id="leftinfo"]/div[3]/div[2]/p')
if len(p_elems) > 1:
p_elems = p_elems[1:]
reply = 'ChinaZ:'
p_elems = html.xpath('//p[@class="WhwtdWrap bor-b1s col-gray03"]')
if len(p_elems) > 0:
reply = 'ChinaZ.com:'
for p_elem in p_elems:
span_elems = p_elem.getchildren()
reply += '\n' + span_elems[1].text.replace('.', '_') + ', ' + span_elems[3].text
reply += '\n' + span_elems[1].text + ', ' + span_elems[3].text
core.echo(reply, ctx_msg)
found = True
@ -44,7 +43,7 @@ def ip(args_text, ctx_msg):
# Example: 'IP：123.125.114.144 来自：北京市 联通'
items = resp.text.strip().split('：')
if len(items) == 3:
reply = 'IP_CN:\n' + items[1].split(' ')[0].replace('.', '_') + ', ' + items[2]
reply = 'IP.cn:\n' + items[1].split(' ')[0] + ', ' + items[2]
core.echo(reply, ctx_msg)
found = True
@ -53,7 +52,7 @@ def ip(args_text, ctx_msg):
if resp.status_code == 200 and resp.text.strip():
# Example: '["中国","江苏","常州","","教育网"]'
parts = json.loads(resp.text)
reply = 'IPIP_NET\n' + query.replace('.', '_') + ' ' + ''.join(parts)
reply = 'IPIP.net\n' + query + ' ' + ''.join(parts)
core.echo(reply, ctx_msg)
found = True