From 5fdf1f5715a24198c1b5404d34705176b297fe72 Mon Sep 17 00:00:00 2001 From: yzhh Date: Fri, 7 Aug 2020 21:44:35 +0800 Subject: [PATCH] done --- user/ruserlib.py | 12 ++++++------ user/userlib.py | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/user/ruserlib.py b/user/ruserlib.py index ddc7d7d4..f2671ef9 100644 --- a/user/ruserlib.py +++ b/user/ruserlib.py @@ -10,13 +10,13 @@ import urllib from bs4 import BeautifulSoup as bs def rUser1(url, str3): q = str3 - url1 = url+'/api.php?action=query&list=users&ususers=' + q + '&usprop=groups%7Cblockinfo%7Cregistration%7Ceditcount%7Cgender&format=json' - url2 = url+'/api.php?action=query&meta=allmessages&ammessages=mainpage&format=json' + url1 = url+'api.php?action=query&list=users&ususers=' + q + '&usprop=groups%7Cblockinfo%7Cregistration%7Ceditcount%7Cgender&format=json' + url2 = url+'api.php?action=query&meta=allmessages&ammessages=mainpage&format=json' s = requests.get(url1, timeout=10) file = json.loads(s.text) c = requests.get(url2, timeout=10) file2 = json.loads(c.text) - url3 = url + '/UserProfile:' + q + url3 = url + 'UserProfile:' + q res = requests.get(url3, timeout=10) try: Wikiname = file2['query']['allmessages'][0]['*'] @@ -40,9 +40,9 @@ def rUser1(url, str3): a = re.sub('', '', a) g = re.sub('User:', '', str3) if not Blockreason: - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + a +' | WikiPoints：'+ point + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry) + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + a +' | WikiPoints：'+ point + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry) else: - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + a + ' | WikiPoints：'+ point + '\n' + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry + '，理由：“' + Blockreason + '”') + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + a + ' | WikiPoints：'+ point + '\n' + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry + '，理由：“' + Blockreason + '”') except Exception: try: User = '用户：' + file['query']['users'][0]['name'] @@ -57,6 +57,6 @@ def rUser1(url, str3): a = re.sub('
', '', a) a = re.sub('
', '', a) g = re.sub('User:', '', str3) - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User +a + ' | WikiPoints：'+ point + '\n' + Group + '\n' + Gender + '\n' + Registration) + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User +a + ' | WikiPoints：'+ point + '\n' + Group + '\n' + Gender + '\n' + Registration) except Exception: return('没有找到此用户。'+str3) \ No newline at end of file diff --git a/user/userlib.py b/user/userlib.py index 4c4acea2..ec36f92e 100644 --- a/user/userlib.py +++ b/user/userlib.py @@ -9,8 +9,8 @@ import re import urllib def User1(url, str3): q = str3 - url1 = url+'/api.php?action=query&list=users&ususers=' + q + '&usprop=groups%7Cblockinfo%7Cregistration%7Ceditcount%7Cgender&format=json' - url2 = url+'/api.php?action=query&meta=allmessages&ammessages=mainpage&format=json' + url1 = url+'api.php?action=query&list=users&ususers=' + q + '&usprop=groups%7Cblockinfo%7Cregistration%7Ceditcount%7Cgender&format=json' + url2 = url+'api.php?action=query&meta=allmessages&ammessages=mainpage&format=json' s = requests.get(url1, timeout=10) file = json.loads(s.text) c = requests.get(url2, timeout=10) @@ -32,15 +32,15 @@ def User1(url, str3): try: g = re.sub('User:', '', str3) if not Blockreason: - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry) + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry) else: - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + '\n' + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry + '，理由：“' + Blockreason + '”') + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + '\n' + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry + '，理由：“' + Blockreason + '”') except Exception: g = re.sub('User:', '', str3) if not Blockreason: - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry) + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry) else: - return(url+'/UserProfile:' + urllib.parse.quote(str3.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry + '，理由：“' + Blockreason + '”') + return(url+'UserProfile:' + urllib.parse.quote(str3.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration + '\n' +file['query']['users'][0]['name'] + '正在被封禁！\n被' + Blockedby + '封禁，时间从' + Blockedtimestamp + '到' + Blockexpiry + '，理由：“' + Blockreason + '”') except Exception: try: User = '用户：' + file['query']['users'][0]['name'] @@ -49,6 +49,6 @@ def User1(url, str3): Gender = '性别：' + gender(file['query']['users'][0]['gender']) Registration = '注册时间：' + UTC8(file['query']['users'][0]['registration']) g = re.sub('User:', '', str3) - return(url+'/UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration) + return(url+'UserProfile:' + urllib.parse.quote(g.encode('UTF-8')) + '\n'+Wikiname+'\n' + User + Editcount + '\n' + Group + '\n' + Gender + '\n' + Registration) except Exception: return('没有找到此用户。') \ No newline at end of file