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: