Merge branch 'main' into Sichongzou/main

tests/platforms/static/bilibili_arknights_profile.json

@@ -0,0 +1 @@
+{"code":0,"message":"0","ttl":1,"data":{"mid":161775300,"name":"明日方舟","sex":"保密","face":"http://i0.hdslb.com/bfs/face/89154378c06a5ed332c40c2ca56f50cd641c0c90.jpg","face_nft":0,"sign":"重铸未来 方舟启航","rank":10000,"level":6,"jointime":0,"moral":0,"silence":0,"coins":0,"fans_badge":true,"fans_medal":{"show":false,"wear":false,"medal":null},"official":{"role":3,"title":"明日方舟官方账号","desc":"","type":1},"vip":{"type":2,"status":1,"due_date":1648828800000,"vip_pay_type":0,"theme_type":0,"label":{"path":"","text":"年度大会员","label_theme":"annual_vip","text_color":"#FFFFFF","bg_style":1,"bg_color":"#FB7299","border_color":""},"avatar_subscript":1,"nickname_color":"#FB7299","role":3,"avatar_subscript_url":"http://i0.hdslb.com/bfs/vip/icon_Certification_big_member_22_3x.png"},"pendant":{"pid":5305,"name":"明日方舟音律系列","image":"http://i0.hdslb.com/bfs/garb/item/615a1653281141ddf64cbb98c792ddaee78f7f40.png","expire":0,"image_enhance":"http://i0.hdslb.com/bfs/garb/item/516ecdf2d495a62f1bac31497c831b711823140c.webp","image_enhance_frame":"http://i0.hdslb.com/bfs/garb/item/c0751afbf950373c260254d02768eabf30ff3906.png"},"nameplate":{"nid":0,"name":"","image":"","image_small":"","level":"","condition":""},"user_honour_info":{"mid":0,"colour":null,"tags":[]},"is_followed":true,"top_photo":"http://i1.hdslb.com/bfs/space/6c6084808ec5bdff1985acc05ce0e126c49ad76e.png","theme":{},"sys_notice":{},"live_room":{"roomStatus":1,"liveStatus":0,"url":"https://live.bilibili.com/5555734?broadcast_type=0\u0026is_room_feed=1","title":"《明日方舟》2022新春前瞻特辑","cover":"http://i0.hdslb.com/bfs/live/new_room_cover/79af83a27f6001c1acfb47d1c0b879290f7c3308.jpg","roomid":5555734,"roundStatus":1,"broadcast_type":0,"watched_show":{"switch":true,"num":13033,"text_small":"1.3万","text_large":"1.3万人看过","icon":"https://i0.hdslb.com/bfs/live/a725a9e61242ef44d764ac911691a7ce07f36c1d.png","icon_location":"","icon_web":"https://i0.hdslb.com/bfs/live/8d9d0f33ef8bf6f308742752d13dd0df731df19c.png"}},"birthday":"","school":null,"profession":{"name":"","department":"","title":"","is_show":0},"tags":null,"series":{"user_upgrade_status":3,"show_upgrade_window":false},"is_senior_member":0}}

tests/platforms/static/terra-hist-0.json

@@ -0,0 +1 @@
+{"code":0,"msg":"","data":[{"coverUrl":"https://web.hycdn.cn/comic/pic/20220507/c4da4fb95587101f1867a30fe85cb557.png","comicCid":"6253","title":"123罗德岛！？","subtitle":"你可能不知道的罗德岛小剧场！","episodeCid":"5771","episodeType":1,"episodeShortTitle":"「流明」篇","updateTime":1652025600},{"coverUrl":"https://web.hycdn.cn/comic/pic/20220505/5c296539f5dc808603f20dda86879c9c.png","comicCid":"0696","title":"A1行动预备组","subtitle":"","episodeCid":"2897","episodeType":1,"episodeShortTitle":"01","updateTime":1651852800},{"coverUrl":"https://web.hycdn.cn/comic/pic/20220428/f4dc1e91420d18eccb80d60bba322d42.png","comicCid":"6253","title":"123罗德岛！？","subtitle":"你可能不知道的罗德岛小剧场！","episodeCid":"6346","episodeType":1,"episodeShortTitle":"「艾丽妮」篇","updateTime":1651507200}]}

tests/platforms/static/terra-hist-1.json

@@ -0,0 +1 @@
+{"code":0,"msg":"","data":[{"coverUrl":"https://web.hycdn.cn/comic/pic/20220507/ab8a2ff408ec7d587775aed70b178ec0.png","comicCid":"6253","title":"123罗德岛！？","subtitle":"你可能不知道的罗德岛小剧场！","episodeCid":"4938","episodeType":1,"episodeShortTitle":"「掠风」篇","updateTime":1652112000},{"coverUrl":"https://web.hycdn.cn/comic/pic/20220507/c4da4fb95587101f1867a30fe85cb557.png","comicCid":"6253","title":"123罗德岛！？","subtitle":"你可能不知道的罗德岛小剧场！","episodeCid":"5771","episodeType":1,"episodeShortTitle":"「流明」篇","updateTime":1652025600},{"coverUrl":"https://web.hycdn.cn/comic/pic/20220505/5c296539f5dc808603f20dda86879c9c.png","comicCid":"0696","title":"A1行动预备组","subtitle":"","episodeCid":"2897","episodeType":1,"episodeShortTitle":"01","updateTime":1651852800},{"coverUrl":"https://web.hycdn.cn/comic/pic/20220428/f4dc1e91420d18eccb80d60bba322d42.png","comicCid":"6253","title":"123罗德岛！？","subtitle":"你可能不知道的罗德岛小剧场！","episodeCid":"6346","episodeType":1,"episodeShortTitle":"「艾丽妮」篇","updateTime":1651507200}]}

tests/platforms/test_arknights.py

@@ -61,6 +61,7 @@ async def test_fetch_new(
         "https://ak-conf.hypergryph.com/config/prod/announce_meta/IOS/preannouncement.meta.json"
     )
     monster_siren_router = respx.get("https://monster-siren.hypergryph.com/api/news")
+    terra_list = respx.get("https://terra-historicus.hypergryph.com/api/recentUpdate")
     ak_list_router.mock(return_value=Response(200, json=arknights_list__1))
     detail_router.mock(
         return_value=Response(200, text=get_file("arknights-detail-807"))
@@ -72,6 +73,7 @@ async def test_fetch_new(
         return_value=Response(200, json=get_json("arknights-pre-0.json"))
     )
     monster_siren_router.mock(return_value=Response(200, json=monster_siren_list_0))
+    terra_list.mock(return_value=Response(200, json=get_json("terra-hist-0.json")))
     target = ""
     res = await arknights.fetch_new_post(target, [dummy_user_subinfo])
     assert ak_list_router.called
@@ -90,7 +92,17 @@ async def test_fetch_new(
     assert len(post.pics) == 1
     # assert(post.pics == ['https://ak-fs.hypergryph.com/announce/images/20210623/e6f49aeb9547a2278678368a43b95b07.jpg'])
     print(res3[0][1])
-    r = await post.generate_messages()
+    await post.generate_messages()
+    terra_list.mock(return_value=Response(200, json=get_json("terra-hist-1.json")))
+    res = await arknights.fetch_new_post(target, [dummy_user_subinfo])
+    assert len(res) == 1
+    post = res[0][1][0]
+    assert post.target_type == "terra-historicus"
+    assert post.text == "123罗德岛！？ - 「掠风」篇"
+    assert post.url == "https://terra-historicus.hypergryph.com/comic/6253/episode/4938"
+    assert post.pics == [
+        "https://web.hycdn.cn/comic/pic/20220507/ab8a2ff408ec7d587775aed70b178ec0.png"
+    ]
 
 
 @pytest.mark.render
@@ -116,6 +128,7 @@ async def test_send_with_render(
         "https://ak-conf.hypergryph.com/config/prod/announce_meta/IOS/preannouncement.meta.json"
     )
     monster_siren_router = respx.get("https://monster-siren.hypergryph.com/api/news")
+    terra_list = respx.get("https://terra-historicus.hypergryph.com/api/recentUpdate")
     ak_list_router.mock(return_value=Response(200, json=arknights_list_0))
     detail_router.mock(
         return_value=Response(200, text=get_file("arknights-detail-805"))
@@ -127,6 +140,7 @@ async def test_send_with_render(
         return_value=Response(200, json=get_json("arknights-pre-0.json"))
     )
     monster_siren_router.mock(return_value=Response(200, json=monster_siren_list_0))
+    terra_list.mock(return_value=Response(200, json=get_json("terra-hist-0.json")))
     target = ""
     res = await arknights.fetch_new_post(target, [dummy_user_subinfo])
     assert ak_list_router.called

tests/platforms/test_bilibili.py

@@ -1,3 +1,5 @@
+import typing
+
 import pytest
 from httpx import Response
 from nonebug.app import App
@@ -10,6 +12,10 @@ def bing_dy_list():
     return get_json("bilibili_bing_list.json")["data"]["cards"]
 
 
+if typing.TYPE_CHECKING:
+    from nonebot_bison.platform.bilibili import Bilibili
+
+
 @pytest.fixture
 def bilibili(app: App):
     from nonebot_bison.platform import platform_manager
@@ -46,3 +52,20 @@ async def test_dynamic_forward(bilibili, bing_dy_list):
         + "\n--------------\n"
         + "#明日方舟#\n【新增服饰】\n//殿堂上的游禽 - 星极\n塞壬唱片偶像企划《闪耀阶梯》特供服饰/殿堂上的游禽。星极自费参加了这项企划，尝试着用大众能接受的方式演绎天空之上的故事。\n\n_____________\n谦逊留给观众，骄傲发自歌喉，此夜，唯我璀璨。 "
     )
+
+
+async def test_parse_target(bilibili: "Bilibili"):
+    from nonebot_bison.platform.platform import Platform
+
+    res = await bilibili.parse_target(
+        "https://space.bilibili.com/161775300?from=search&seid=130517740606234234234&spm_id_from=333.337.0.0"
+    )
+    assert res == "161775300"
+    res2 = await bilibili.parse_target(
+        "space.bilibili.com/161775300?from=search&seid=130517740606234234234&spm_id_from=333.337.0.0"
+    )
+    assert res2 == "161775300"
+    with pytest.raises(Platform.ParseTargetException):
+        await bilibili.parse_target(
+            "https://www.bilibili.com/video/BV1qP4y1g738?spm_id_from=333.999.0.0"
+        )

tests/platforms/test_ncm_artist.py

@@ -1,4 +1,5 @@
 import time
+import typing
 
 import pytest
 import respx
@@ -7,6 +8,9 @@ from nonebug.app import App
 
 from .utils import get_json
 
+if typing.TYPE_CHECKING:
+    from nonebot_bison.platform.ncm_artist import NcmArtist
+
 
 @pytest.fixture
 def ncm_artist(app: App):
@@ -48,3 +52,16 @@ async def test_fetch_new(ncm_artist, ncm_artist_0, ncm_artist_1, dummy_user_subi
     assert post.target_type == "ncm-artist"
     assert post.text == "新专辑发布：Y1K"
     assert post.url == "https://music.163.com/#/album?id=131074504"
+
+
+async def test_parse_target(ncm_artist: "NcmArtist"):
+    from nonebot_bison.platform.platform import Platform
+
+    res = await ncm_artist.parse_target("32540734")
+    assert res == "32540734"
+    res = await ncm_artist.parse_target("https://music.163.com/#/artist?id=32540734")
+    assert res == "32540734"
+    res = await ncm_artist.parse_target("music.163.com/#/artist?id=32540734")
+    assert res == "32540734"
+    with pytest.raises(Platform.ParseTargetException):
+        await ncm_artist.parse_target("music.163.com/#/rad?id=32540734")

tests/platforms/test_ncm_radio.py

@@ -1,4 +1,5 @@
 import time
+import typing
 
 import pytest
 import respx
@@ -7,6 +8,9 @@ from nonebug.app import App
 
 from .utils import get_json
 
+if typing.TYPE_CHECKING:
+    from nonebot_bison.platform.ncm_radio import NcmRadio
+
 
 @pytest.fixture
 def ncm_radio(app: App):
@@ -53,3 +57,14 @@ async def test_fetch_new(ncm_radio, ncm_radio_0, ncm_radio_1, dummy_user_subinfo
         "http://p1.music.126.net/H5em5xUNIYXcjJhOmeaSqQ==/109951166647436789.jpg"
     ]
     assert post.target_name == "《明日方舟》游戏原声OST"
+
+
+async def test_parse_target(ncm_radio: "NcmRadio"):
+    res = await ncm_radio.parse_target("https://music.163.com/#/djradio?id=793745436")
+    assert res == "793745436"
+    res = await ncm_radio.parse_target("music.163.com/#/djradio?id=793745436")
+    assert res == "793745436"
+    res = await ncm_radio.parse_target("793745436")
+    assert res == "793745436"
+    with pytest.raises(ncm_radio.ParseTargetException):
+        await ncm_radio.parse_target("music.163.com/#/alm?id=793745436")

tests/platforms/test_weibo.py

@@ -1,3 +1,4 @@
+import typing
 from datetime import datetime
 
 import feedparser
@@ -9,6 +10,9 @@ from pytz import timezone
 
 from .utils import get_file, get_json
 
+if typing.TYPE_CHECKING:
+    from nonebot_bison.platform.weibo import Weibo
+
 
 @pytest.fixture
 def weibo(app: App):
@@ -23,7 +27,14 @@ def weibo_ak_list_1():
 
 
 @pytest.mark.asyncio
+@respx.mock
 async def test_get_name(weibo):
+    profile_router = respx.get(
+        "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
+    )
+    profile_router.mock(
+        return_value=Response(200, json=get_json("weibo_ak_profile.json"))
+    )
     name = await weibo.get_target_name("6279793937")
     assert name == "明日方舟Arknights"
 
@@ -125,3 +136,16 @@ def test_chaohua_tag(weibo):
     tags = weibo.get_tags(test_post)
     assert "刚出生的小羊驼长啥样" in tags
     assert "小羊驼三三超话" in tags
+
+
+async def test_parse_target(weibo: "Weibo"):
+    from nonebot_bison.platform.platform import Platform
+
+    res = await weibo.parse_target("https://weibo.com/u/6441489862")
+    assert res == "6441489862"
+    res = await weibo.parse_target("weibo.com/u/6441489862")
+    assert res == "6441489862"
+    res = await weibo.parse_target("6441489862")
+    assert res == "6441489862"
+    with pytest.raises(Platform.ParseTargetException):
+        await weibo.parse_target("https://weibo.com/arknights")