diff --git a/src/plugins/nonebot_hk_reporter/platform/ncm_artist.py b/src/plugins/nonebot_hk_reporter/platform/ncm_artist.py index 0f460c7..5592acf 100644 --- a/src/plugins/nonebot_hk_reporter/platform/ncm_artist.py +++ b/src/plugins/nonebot_hk_reporter/platform/ncm_artist.py @@ -45,9 +45,9 @@ class NcmArtist(TargetMixin, NewMessage): def get_date(self, post: RawPost) -> int: return post['publishTime'] // 1000 - def parse(self, raw_post: RawPost) -> Post: - text = '新专辑发布：{}'.format(raw_post.name) - target_name = raw_post.artist.name + async def parse(self, raw_post: RawPost) -> Post: + text = '新专辑发布：{}'.format(raw_post['name']) + target_name = raw_post['artist']['name'] pics = [raw_post['picUrl']] url = "https://music.163.com/#/album?id={}".format(raw_post['id']) return Post('ncm-artist', text=text, url=url, pics=pics, target_name=target_name) diff --git a/src/plugins/nonebot_hk_reporter/platform/platform.py b/src/plugins/nonebot_hk_reporter/platform/platform.py index ede70b5..3362056 100644 --- a/src/plugins/nonebot_hk_reporter/platform/platform.py +++ b/src/plugins/nonebot_hk_reporter/platform/platform.py @@ -114,9 +114,9 @@ class MessageProcessMixin(PlatformNameMixin, CategoryMixin, ParsePostMixin, abst self.parse_cache[post_id] = await self.parse(raw_post) break except Exception as err: + retry_times -= 1 if not retry_times: raise err - retry_times -= 1 return self.parse_cache[post_id] @abstractmethod diff --git a/src/plugins/nonebot_hk_reporter/post.py b/src/plugins/nonebot_hk_reporter/post.py index 31a11c2..cf000ba 100644 --- a/src/plugins/nonebot_hk_reporter/post.py +++ b/src/plugins/nonebot_hk_reporter/post.py @@ -21,7 +21,7 @@ class Post: compress: bool = False override_use_pic: Optional[bool] = None pics: list[Union[str,bytes]] = field(default_factory=list) - extra_msg = list[Message] + extra_msg: list[Message] = field(default_factory=list) _message: Optional[list] = None @@ -125,8 +125,8 @@ class Post: # msgs.append(Message("[CQ:image,file={url}]".format(url=pic))) msgs.append(MessageSegment.image(pic)) if self.compress: - msgs = Message([msgs]) - msgs += self.extra_msg + msgs = [Message([msgs])] + msgs.extend(self.extra_msg) self._message = msgs return self._message diff --git a/tests/platforms/ncm_siren.json b/tests/platforms/ncm_siren.json new file mode 100644 index 0000000..9754c94 --- /dev/null +++ b/tests/platforms/ncm_siren.json @@ -0,0 +1 @@ +{"artist":{"img1v1Id":109951164481886292,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p1.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p1.music.126.net/J8mrQPu9oKSva8ziYrGmJQ==/109951164481886292.jpg","briefDesc":"","musicSize":100,"albumSize":51,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"109951164481886292"},"hotAlbums":[{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p1.music.126.net/RUCLCpxDdPB4H4R9R10UPA==/109951166229373550.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951166229373550,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p1.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p1.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p1.music.126.net/RUCLCpxDdPB4H4R9R10UPA==/109951166229373550.jpg","commentThreadId":"R_AL_3_131074504","publishTime":1628006400000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951166229373550,"subType":"录音室版","name":"Y1K","id":131074504,"type":"Single","size":1,"picId_str":"109951166229373550"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p1.music.126.net/8YLlRz1IF8iyTNVa4i5L6g==/109951166229322486.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951166229322486,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p1.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p1.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p1.music.126.net/8YLlRz1IF8iyTNVa4i5L6g==/109951166229322486.jpg","commentThreadId":"R_AL_3_131075038","publishTime":1627920000000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951166229322486,"subType":"录音室版","name":"Across the wind","id":131075038,"type":"Single","size":1,"picId_str":"109951166229322486"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p1.music.126.net/Sij0cWo4wQSBdCwFn5ClwQ==/109951166109371785.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951166109371785,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p1.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p1.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p1.music.126.net/Sij0cWo4wQSBdCwFn5ClwQ==/109951166109371785.jpg","commentThreadId":"R_AL_3_129325036","publishTime":1625155200000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951166109371785,"subType":"录音室版","name":"Keep the torch","id":129325036,"type":"EP","size":1,"picId_str":"109951166109371785"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p1.music.126.net/FgHY9VuheEun3E9fMInSFg==/109951166068316252.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951166068316252,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p1.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p1.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p1.music.126.net/FgHY9VuheEun3E9fMInSFg==/109951166068316252.jpg","commentThreadId":"R_AL_3_128566237","publishTime":1623427200000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951166068316252,"subType":"录音室版","name":"音律联觉原声EP","id":128566237,"type":"Single","size":4,"picId_str":"109951166068316252"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p1.music.126.net/318nI_pECcHz_oOuwOL9Lw==/109951166032452358.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951166032452358,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p1.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p1.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p1.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/318nI_pECcHz_oOuwOL9Lw==/109951166032452358.jpg","commentThreadId":"R_AL_3_127968151","publishTime":1622476800000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951166032452358,"subType":"录音室版","name":"Real Me","id":127968151,"type":"Single","size":1,"picId_str":"109951166032452358"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/BViNMQzoZX8gbefMs_2eJg==/109951165931247832.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165931247832,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/BViNMQzoZX8gbefMs_2eJg==/109951165931247832.jpg","commentThreadId":"R_AL_3_126685790","publishTime":1619884800000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165931247832,"subType":"录音室版","name":"Immutable","id":126685790,"type":"EP","size":2,"picId_str":"109951165931247832"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/89E3RNrninazynQhqptWEQ==/109951165931247129.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165931247129,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/89E3RNrninazynQhqptWEQ==/109951165931247129.jpg","commentThreadId":"R_AL_3_126686280","publishTime":1619798400000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165931247129,"subType":"录音室版","name":"Voices","id":126686280,"type":"EP","size":1,"picId_str":"109951165931247129"},{"songs":[],"paid":false,"onSale":false,"mark":8192,"blurPicUrl":"https://p2.music.126.net/sXkaRR8w63mf4ZqXUZEoUA==/109951166150017723.jpg","companyId":0,"description":"","status":1,"copyrightId":7003,"picId":109951166150017723,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951165741016462,"alias":[],"picUrl":"https://p2.music.126.net/hVPK_JWhxDbEd_psWcOT3w==/109951165741016462.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":110,"albumSize":25,"trans":"","name":"STARSET","id":887066,"picId_str":"109951165741016462","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"STARSET","id":887066,"img1v1Id_str":"18686200114669622"},{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":["游戏《明日方舟》概念PV3宣传曲"],"tags":"","picUrl":"https://p2.music.126.net/sXkaRR8w63mf4ZqXUZEoUA==/109951166150017723.jpg","commentThreadId":"R_AL_3_126550370","publishTime":1619366400000,"company":"Fearless Records","briefDesc":"","pic":109951166150017723,"subType":"录音室版","name":"INFECTED","id":126550370,"type":"Single","size":1,"picId_str":"109951166150017723"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/iUq8RDifPlq0iLrdUyL7Pw==/109951165911968533.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165911968533,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/iUq8RDifPlq0iLrdUyL7Pw==/109951165911968533.jpg","commentThreadId":"R_AL_3_126353418","publishTime":1619366400000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165911968533,"subType":"录音室版","name":"Feels","id":126353418,"type":"EP","size":1,"picId_str":"109951165911968533"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/ThJ2K5ANl9KAcyqPnNOjRw==/109951165911933976.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165911933976,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/ThJ2K5ANl9KAcyqPnNOjRw==/109951165911933976.jpg","commentThreadId":"R_AL_3_126352100","publishTime":1619280000000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165911933976,"subType":"录音室版","name":"Hold Onto The Light","id":126352100,"type":"EP","size":1,"picId_str":"109951165911933976"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/HffyxGwKQ1uNi--z9VWu2Q==/109951165889554418.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165889554418,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/HffyxGwKQ1uNi--z9VWu2Q==/109951165889554418.jpg","commentThreadId":"R_AL_3_125972210","publishTime":1618416000000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165889554418,"subType":"录音室版","name":"Gearing Up","id":125972210,"type":"Single","size":1,"picId_str":"109951165889554418"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/U-RF7SKGfvD22iAKvQkTig==/109951165849435914.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165849435914,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"},{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"Substantial","id":76807,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/U-RF7SKGfvD22iAKvQkTig==/109951165849435914.jpg","commentThreadId":"R_AL_3_125397108","publishTime":1617292800000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165849435914,"subType":"录音室版","name":"Loyal to the beat","id":125397108,"type":"专辑","size":2,"picId_str":"109951165849435914"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/o2KCyPb069BHEmCTNX2YoA==/109951165832649734.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165832649734,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/o2KCyPb069BHEmCTNX2YoA==/109951165832649734.jpg","commentThreadId":"R_AL_3_125148446","publishTime":1616688000000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165832649734,"subType":"录音室版","name":"危机合约 黄铁·利刃·燃灰OST","id":125148446,"type":"专辑","size":6,"picId_str":"109951165832649734"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/7zCl-PsRYwiPgO2fHr7axg==/109951165805982281.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165805982281,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"},{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"THE EITHER","id":12797039,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/7zCl-PsRYwiPgO2fHr7axg==/109951165805982281.jpg","commentThreadId":"R_AL_3_124465362","publishTime":1615824000000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165805982281,"subType":"录音室版","name":"Daydaydream","id":124465362,"type":"EP","size":2,"picId_str":"109951165805982281"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/2kwGiTd5q2jOA-ykx1gg_A==/109951165790112493.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165790112493,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/2kwGiTd5q2jOA-ykx1gg_A==/109951165790112493.jpg","commentThreadId":"R_AL_3_124085458","publishTime":1615305600000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165790112493,"subType":"录音室版","name":"源石尘行动OST","id":124085458,"type":"专辑","size":4,"picId_str":"109951165790112493"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/McXQovexbrA86ESvF9ZC4w==/109951165753883139.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165753883139,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/McXQovexbrA86ESvF9ZC4w==/109951165753883139.jpg","commentThreadId":"R_AL_3_123448670","publishTime":1614096000000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165753883139,"subType":"录音室版","name":"观心","id":123448670,"type":"EP","size":1,"picId_str":"109951165753883139"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/BmOewyuJvyzXtTMiquTG0g==/109951165698820755.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165698820755,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/BmOewyuJvyzXtTMiquTG0g==/109951165698820755.jpg","commentThreadId":"R_AL_3_122634968","publishTime":1612627200000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165698820755,"subType":"录音室版","name":"更阑影","id":122634968,"type":"EP","size":1,"picId_str":"109951165698820755"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/ZhM-qMsDIYr0N54nS4SwQg==/109951165693727503.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165693727503,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/ZhM-qMsDIYr0N54nS4SwQg==/109951165693727503.jpg","commentThreadId":"R_AL_3_122573354","publishTime":1612454400000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165693727503,"subType":"录音室版","name":"尽波澜","id":122573354,"type":"EP","size":1,"picId_str":"109951165693727503"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/dGEnBiGNilMWbcKEXPeN8Q==/109951165644228090.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165644228090,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/dGEnBiGNilMWbcKEXPeN8Q==/109951165644228090.jpg","commentThreadId":"R_AL_3_121891536","publishTime":1611158400000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165644228090,"subType":"录音室版","name":"明日方舟OST2","id":121891536,"type":"专辑","size":12,"picId_str":"109951165644228090"},{"songs":[],"paid":false,"onSale":false,"mark":0,"blurPicUrl":"https://p2.music.126.net/Zf9J9nQyaBvtDitK4UBhWg==/109951165609480670.jpg","companyId":0,"description":"","status":0,"copyrightId":1416293,"picId":109951165609480670,"artist":{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":109951164481881457,"alias":["明日方舟","Arknights"],"picUrl":"https://p2.music.126.net/P4AH7I3NDtSq4FX07e5Lwg==/109951164481881457.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":100,"albumSize":50,"trans":"","name":"塞壬唱片-MSR","id":32540734,"picId_str":"109951164481881457","img1v1Id_str":"18686200114669622"},"artists":[{"img1v1Id":18686200114669622,"topicPerson":0,"followed":false,"picId":0,"alias":[],"picUrl":"https://p2.music.126.net/6y-UleORITEDbvrOLV0Q8A==/5639395138885805.jpg","img1v1Url":"https://p2.music.126.net/VnZiScyynLG7atLIZ2YPkw==/18686200114669622.jpg","briefDesc":"","musicSize":0,"albumSize":0,"trans":"","name":"塞壬唱片-MSR","id":32540734,"img1v1Id_str":"18686200114669622"}],"alias":[],"tags":"","picUrl":"https://p2.music.126.net/Zf9J9nQyaBvtDitK4UBhWg==/109951165609480670.jpg","commentThreadId":"R_AL_3_121249019","publishTime":1610035200000,"company":"塞壬唱片-MSR","briefDesc":"","pic":109951165609480670,"subType":"录音室版","name":"冬涤","id":121249019,"type":"EP","size":2,"picId_str":"109951165609480670"}],"more":true,"code":200} \ No newline at end of file diff --git a/tests/platforms/test_ncm_artist.py b/tests/platforms/test_ncm_artist.py new file mode 100644 index 0000000..5813540 --- /dev/null +++ b/tests/platforms/test_ncm_artist.py @@ -0,0 +1,49 @@ +from .utils import get_json +import pytest +import respx +import typing +import time +from httpx import Response + +if typing.TYPE_CHECKING: + import sys + sys.path.append('./src/plugins') + import nonebot_hk_reporter + +@pytest.fixture +def ncm_artist(plugin_module: 'nonebot_hk_reporter'): + return plugin_module.platform.platform_manager['ncm-artist'] + +@pytest.fixture(scope='module') +def ncm_artist_raw(): + return get_json('ncm_siren.json') + +@pytest.fixture(scope='module') +def ncm_artist_0(ncm_artist_raw): + return { + **ncm_artist_raw, + 'hotAlbums': ncm_artist_raw['hotAlbums'][1:] + } + +@pytest.fixture(scope='module') +def ncm_artist_1(ncm_artist_raw: dict): + res = ncm_artist_raw.copy() + res['hotAlbums'] = ncm_artist_raw['hotAlbums'][:] + res['hotAlbums'][0]['publishTime'] = int(time.time() * 1000) + return res + +@pytest.mark.asyncio +@respx.mock +async def test_fetch_new(ncm_artist, ncm_artist_0, ncm_artist_1, dummy_user_subinfo): + ncm_router = respx.get("https://music.163.com/api/artist/albums/32540734") + ncm_router.mock(return_value=Response(200, json=ncm_artist_0)) + target = '32540734' + res = await ncm_artist.fetch_new_post(target, [dummy_user_subinfo]) + assert(ncm_router.called) + assert(len(res) == 0) + ncm_router.mock(return_value=Response(200, json=ncm_artist_1)) + res2 = await ncm_artist.fetch_new_post(target, [dummy_user_subinfo]) + post = res2[0][1][0] + assert(post.target_type == 'ncm-artist') + assert(post.text == '新专辑发布：Y1K') + assert(post.url == 'https://music.163.com/#/album?id=131074504') diff --git a/tests/test_merge_pic.py b/tests/test_merge_pic.py index b82a4d6..10960b1 100644 --- a/tests/test_merge_pic.py +++ b/tests/test_merge_pic.py @@ -27,6 +27,7 @@ async def test_9_merge(plugin_module: 'nonebot_hk_reporter'): post = plugin_module.post.Post('', '', '', pics=merge_source_9) await post._pic_merge() assert len(post.pics) == 5 + await post.generate_messages() @pytest.mark.asyncio async def test_6_merge(plugin_module): diff --git a/tests/test_render.py b/tests/test_render.py index 6eda384..685f8e0 100644 --- a/tests/test_render.py +++ b/tests/test_render.py @@ -18,4 +18,3 @@ VuePress 由两部分组成：第一部分是一个极简静态网站生成器 每一个由 VuePress 生成的页面都带有预渲染好的 HTML，也因此具有非常好的加载性能和搜索引擎优化（SEO）。同时，一旦页面被加载，Vue 将接管这些静态内容，并将其转换成一个完整的单页应用（SPA），其他的页面则会只在用户浏览到的时候才按需加载。 ''') - print(res)