auto code cleanup
This commit is contained in:
yzhh
parent
501a39bb34
commit
f85a11577d
5 changed files with 26 additions and 15 deletions
|
|
@ -121,4 +121,5 @@ async def _(msg: MessageSession):
|
|||
get_section = await get_pic(q[qq].realurl, qq, headers, section=s)
|
||||
if get_section:
|
||||
await msg.sendMessage(Image(get_section))
|
||||
|
||||
asyncio.create_task(bgtask())
|
||||
|
|
|
|||
|
|
@ -153,7 +153,8 @@ async def _(msg: MessageSession):
|
|||
await msg.finish(f'成功重置请求时所使用的前缀。')
|
||||
|
||||
|
||||
@wiki.handle('fandom enable {禁用Fandom全局Interwiki查询}', 'fandom disable {禁用Fandom全局Interwiki查询}', required_admin=True)
|
||||
@wiki.handle('fandom enable {禁用Fandom全局Interwiki查询}', 'fandom disable {禁用Fandom全局Interwiki查询}',
|
||||
required_admin=True)
|
||||
async def _(msg: MessageSession):
|
||||
if msg.parsed_msg.get('enable', False):
|
||||
msg.data.edit_option('wiki_fandom_addon', True)
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@ async def ab(wiki_url):
|
|||
pageurl = wiki.wiki_info.articlepath.replace('$1', 'Special:AbuseLog')
|
||||
d = []
|
||||
for x in query['query']['abuselog'][:5]:
|
||||
d.append('•' + x['title'] + ' - ' + x['user'] + '于' + UTC8(x['timestamp'], 'onlytimenoutc') + '\n过滤器名：' + x[
|
||||
'filter'] + '\n处理结果：' + x['result'])
|
||||
d.append(
|
||||
'•' + x['title'] + ' - ' + x['user'] + '于' + UTC8(x['timestamp'], 'onlytimenoutc') + '\n过滤器名：' + x[
|
||||
'filter'] + '\n处理结果：' + x['result'])
|
||||
y = await check(*d)
|
||||
y = '\n'.join(z['content'] for z in y)
|
||||
if y.find('<吃掉了>') != -1 or y.find('<全部吃掉了>') != -1:
|
||||
|
|
|
|||
|
|
@ -198,7 +198,8 @@ class WikiLib:
|
|||
try:
|
||||
get_page = await get_url(self.url, fmt='text', headers=self.headers)
|
||||
if get_page.find('<title>Attention Required! | Cloudflare</title>') != -1:
|
||||
return WikiStatus(available=False, value=False, message='CloudFlare拦截了机器人的请求，请联系站点管理员解决此问题。')
|
||||
return WikiStatus(available=False, value=False,
|
||||
message='CloudFlare拦截了机器人的请求，请联系站点管理员解决此问题。')
|
||||
m = re.findall(
|
||||
r'(?im)<\s*link\s*rel="EditURI"\s*type="application/rsd\+xml"\s*href="([^>]+?)\?action=rsd"\s*/\s*>',
|
||||
get_page)
|
||||
|
|
@ -532,6 +533,7 @@ class WikiLib:
|
|||
except Exception:
|
||||
Logger.debug(traceback.format_exc())
|
||||
return None, False
|
||||
|
||||
searches = []
|
||||
for srwhat in srwhats:
|
||||
searches.append(search_something(srwhat))
|
||||
|
|
@ -576,7 +578,8 @@ class WikiLib:
|
|||
repo_url = query_client_info['query']['wikibase']['repo']['url']['base']
|
||||
siteid = query_client_info['query']['wikibase']['siteid']
|
||||
query_target_site = WikiLib(self.wiki_info.interwiki[lang], headers=self.headers)
|
||||
target_siteid = (await query_target_site.get_json(**qc_string))['query']['wikibase']['siteid']
|
||||
target_siteid = (await query_target_site.get_json(**qc_string))['query']['wikibase'][
|
||||
'siteid']
|
||||
qr_wiki_info = WikiLib(repo_url)
|
||||
qr_string = {'action': 'wbgetentities', 'sites': siteid, 'titles': title,
|
||||
'props': 'sitelinks/urls', 'redirects': 'yes'}
|
||||
|
|
@ -680,7 +683,8 @@ class WikiLib:
|
|||
page_info.title = page_info.interwiki_prefix + t
|
||||
if page_info.possible_research_title is not None:
|
||||
page_info.possible_research_title = [page_info.interwiki_prefix + possible_title
|
||||
for possible_title in page_info.possible_research_title]
|
||||
for possible_title in
|
||||
page_info.possible_research_title]
|
||||
|
||||
if before_page_info.section is not None:
|
||||
page_info.section = before_page_info.section
|
||||
|
|
|
|||
|
|
@ -45,9 +45,6 @@ async def _(msg: MessageSession):
|
|||
await query_pages(msg, pageid=page_id, iw=iw)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[str, list, tuple] = None,
|
||||
pageid: str = None, iw: str = None, lang: str = None,
|
||||
template=False, mediawiki=False, use_prefix=True, inline_mode=False, preset_message=None):
|
||||
|
|
@ -201,7 +198,8 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
{r.link: {'url': r.info.realurl, 'in_allowlist': r.info.in_allowlist}})
|
||||
elif r.link is not None and r.section is not None and r.info.in_allowlist:
|
||||
render_section_list.append(
|
||||
{r.link: {'url': r.info.realurl, 'section': r.section, 'in_allowlist': r.info.in_allowlist}})
|
||||
{r.link: {'url': r.info.realurl, 'section': r.section,
|
||||
'in_allowlist': r.info.in_allowlist}})
|
||||
if plain_slice:
|
||||
msg_list.append(Plain('\n'.join(plain_slice)))
|
||||
else:
|
||||
|
|
@ -217,12 +215,16 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
pi += 1
|
||||
wait_plain_slice.append(
|
||||
f'{pi}. {p}')
|
||||
wait_plain_slice.append(f'请回复指定序号获取对应内容，若回复“是”，'
|
||||
f'则默认选择{str(r.possible_research_title.index(display_title) + 1)}号内容。')
|
||||
wait_possible_list.append({display_before_title: {display_title: r.possible_research_title}})
|
||||
wait_plain_slice.append(f'请直接发送指定序号获取对应内容，若回复“是”，'
|
||||
f'则默认选择'
|
||||
f'{str(r.possible_research_title.index(display_title) + 1)}'
|
||||
f'号内容，发送其他内容则代表取消获取。')
|
||||
wait_possible_list.append({display_before_title: {display_title:
|
||||
r.possible_research_title}})
|
||||
else:
|
||||
wait_plain_slice.append(
|
||||
f'提示：[{display_before_title}]不存在，您是否想要找的是[{display_title}]？')
|
||||
f'提示：[{display_before_title}]不存在，您是否想要找的是[{display_title}]？\n'
|
||||
f'（请直接发送“是”字来确认，发送其他内容则代表取消获取。）')
|
||||
else:
|
||||
wait_plain_slice.append(
|
||||
f'提示：[{display_before_title}]不存在，您可能要找的是：[{display_title}]。')
|
||||
|
|
@ -255,7 +257,8 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
msg_list.append(Plain(f'发生错误：' + str(e)))
|
||||
if isinstance(session, MessageSession):
|
||||
if msg_list:
|
||||
if all([not render_infobox_list, not render_section_list, not dl_list, not wait_list, not wait_possible_list]):
|
||||
if all(
|
||||
[not render_infobox_list, not render_section_list, not dl_list, not wait_list, not wait_possible_list]):
|
||||
await session.finish(msg_list)
|
||||
else:
|
||||
await session.sendMessage(msg_list)
|
||||
|
|
@ -330,6 +333,7 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
if wait_list_:
|
||||
await query_pages(session, wait_list_, use_prefix=False, preset_message='\n'.join(preset_message),
|
||||
lang=lang)
|
||||
|
||||
asyncio.create_task(infobox())
|
||||
asyncio.create_task(section())
|
||||
asyncio.create_task(image_and_voice())
|
||||
|
|
|
|||
Reference in a new issue