gb/bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: do not return bilibili links only added with a "/"

Browse source
This commit is contained in:
草师傅 2025-08-06 10:50:12 +08:00
parent 3440ab6a96
commit 24deaf811d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/link.py
View file

@ -15,7 +15,7 @@ whitelist_param_links = ['www.iesdouyin.com','item.taobao.com', 'detail.tmall.co
'www.bilibili.com', 'm.bilibili.com', 'bilibili.com', 'mall.bilibili.com', 'www.bilibili.com', 'm.bilibili.com', 'bilibili.com', 'mall.bilibili.com',
'space.bilibili.com', 'live.bilibili.com','item.m.jd.com','item.jd.com','www.xiaohongshu.com'] 'space.bilibili.com', 'live.bilibili.com','item.m.jd.com','item.jd.com','www.xiaohongshu.com']
has_self_redirection_links = ['www.cnbeta.com.tw','m.cnbeta.com.tw','www.landiannews.com'] has_self_redirection_links = ['www.cnbeta.com.tw','m.cnbeta.com.tw','www.landiannews.com', 'www.bilibili.com']
def matches_adb_selector(url, selector): def matches_adb_selector(url, selector):
"""Check if URL matches the given selector""" """Check if URL matches the given selector"""
@ -187,7 +187,7 @@ def transform_into_fixed_url(url):
async def process_url(url): async def process_url(url):
logging.debug('发现链接，正在尝试清理') logging.debug('发现链接，正在尝试清理')
if urlparse(url).hostname in has_self_redirection_links and not urlparse(url).params: if urlparse(url).hostname in has_self_redirection_links and not urlparse(url).params:
# 对于有自我纠正的重定向而且不携带任何跟踪参数的链接，直接返回 # 对于有自我纠正的重定向而且不携带任何参数的链接，直接返回
return None return None
# 对于适配的网站，直接保留白名单参数并返回 # 对于适配的网站，直接保留白名单参数并返回
if urlparse(url).hostname in whitelist_param_links: if urlparse(url).hostname in whitelist_param_links:
@ -202,12 +202,14 @@ async def process_url(url):
extended_url = await extend_short_urls(cleaned_url) extended_url = await extend_short_urls(cleaned_url)
if urlparse(extended_url).hostname in ['chatglm.cn']: if urlparse(extended_url).hostname in ['chatglm.cn']:
final_url = reserve_whitelisted_params(extended_url) final_url = reserve_whitelisted_params(extended_url)
if url != final_url:
return final_url return final_url
# 对于扩展短链接之后的适配的网站，直接保留白名单参数并返回 # 对于扩展短链接之后的适配的网站，直接保留白名单参数并返回
if urlparse(extended_url).hostname in whitelist_param_links: if urlparse(extended_url).hostname in whitelist_param_links:
final_url = reserve_whitelisted_params(extended_url) final_url = reserve_whitelisted_params(extended_url)
if urlparse(final_url).hostname in ['www.iesdouyin.com','bilibili.com', 'm.bilibili.com']: if urlparse(final_url).hostname in ['www.iesdouyin.com','bilibili.com', 'm.bilibili.com']:
final_url = transform_into_fixed_url(final_url) final_url = transform_into_fixed_url(final_url)
if url != final_url:
return final_url return final_url
if urlparse(extended_url).hostname in ['x.com', 'twitter.com']: if urlparse(extended_url).hostname in ['x.com', 'twitter.com']:
# 对于 Twitter 链接，转换为 fixupx.com # 对于 Twitter 链接，转换为 fixupx.com
@ -232,10 +234,8 @@ async def handle_links(message: Message):
if not urls: if not urls:
return return
final_urls = await asyncio.gather(*[process_url(url) for url in urls]) final_urls = await asyncio.gather(*[process_url(url) for url in urls])
# Filter out None values # Filter out None values
final_urls = [url for url in final_urls if url is not None] final_urls = [url for url in final_urls if url is not None]
# 回复处理后的链接 # 回复处理后的链接
if final_urls: if final_urls:
await message.reply(f"{"\n".join(final_urls)}\n消息里有包含跟踪参数的链接，已经帮你转换了哦~\n\n注意：" await message.reply(f"{"\n".join(final_urls)}\n消息里有包含跟踪参数的链接，已经帮你转换了哦~\n\n注意："