From 1f5ff52644de342e502e32b2a1bbd2505b0bb846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98KimigaiiWuyi=E2=80=99?= <444835641@qq.com> Date: Mon, 13 Nov 2023 20:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D`=E5=8E=9F?= =?UTF-8?q?=E7=A5=9E=E5=85=AC=E5=91=8A`=20(#604)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GenshinUID/genshinuid_ann/__init__.py | 2 +- GenshinUID/genshinuid_ann/ann_card.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/GenshinUID/genshinuid_ann/__init__.py b/GenshinUID/genshinuid_ann/__init__.py index a4c834a5..71019548 100644 --- a/GenshinUID/genshinuid_ann/__init__.py +++ b/GenshinUID/genshinuid_ann/__init__.py @@ -29,11 +29,11 @@ async def ann_(bot: Bot, ev: Event): img = await convert_img(img) return await bot.send(img) + ann_id = ann_id.replace('#', '') if not ann_id.isdigit(): raise Exception('公告ID不正确') img = await ann_detail_card(int(ann_id)) - img = await convert_img(img) await bot.send(img) diff --git a/GenshinUID/genshinuid_ann/ann_card.py b/GenshinUID/genshinuid_ann/ann_card.py index 0a3e48f1..a68a10c5 100644 --- a/GenshinUID/genshinuid_ann/ann_card.py +++ b/GenshinUID/genshinuid_ann/ann_card.py @@ -93,15 +93,18 @@ async def ann_detail_card(ann_id): for a in soup.find_all('a'): a.string = '' - for img in soup.find_all('img'): - img.string = img.get('src') - msg_list = [ann_img] - msg_list += [ - BeautifulSoup(x.get_text('').replace('<<', ''), 'lxml').get_text() - + '\n' - for x in soup.find_all('p') - ] + for img in soup.find_all('img'): + msg_list.append(img.get('src')) + # img.string = img.get('src') + + msg_list.extend( + [ + BeautifulSoup(x.get_text('').replace('<<', ''), 'lxml').get_text() + + '\n' + for x in soup.find_all('p') + ] + ) drow_height = 0 for msg in msg_list: