From ab48e9656cc93d8228939078a842a252f5a4b7b8 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Wed, 28 Apr 2021 11:00:01 +0800 Subject: [PATCH] remove zhiding --- .../nonebot_hk_reporter/platform/platform.py | 1 - .../nonebot_hk_reporter/platform/weibo.py | 33 ------------------- 2 files changed, 34 deletions(-) diff --git a/src/plugins/nonebot_hk_reporter/platform/platform.py b/src/plugins/nonebot_hk_reporter/platform/platform.py index a50a2f7..809ea17 100644 --- a/src/plugins/nonebot_hk_reporter/platform/platform.py +++ b/src/plugins/nonebot_hk_reporter/platform/platform.py @@ -96,7 +96,6 @@ class PlatformProto(metaclass=RegistryMeta): return self.cache[post_id] def _do_filter_common(self, raw_post_list: list[RawPost], exists_posts_set: set) -> list[RawPost]: - import ipdb; ipdb.set_trace() res = [] for raw_post in raw_post_list: post_id = self.get_id(raw_post) diff --git a/src/plugins/nonebot_hk_reporter/platform/weibo.py b/src/plugins/nonebot_hk_reporter/platform/weibo.py index 53817ca..e887aef 100644 --- a/src/plugins/nonebot_hk_reporter/platform/weibo.py +++ b/src/plugins/nonebot_hk_reporter/platform/weibo.py @@ -17,7 +17,6 @@ class Weibo(Platform): 1: '转发', 2: '视频', 3: '图文', - 50: '撤置顶' } enable_tag = False platform_name = 'weibo' @@ -67,8 +66,6 @@ class Weibo(Platform): return None def get_category(self, raw_post: RawPost) -> Category: - if (custom_cat := raw_post.get('_type')): - return Category(custom_cat) if raw_post['mblog'].get('retweeted_status'): return Category(1) elif raw_post['mblog'].get('page_info') and raw_post['mblog']['page_info'].get('type') == 'video': @@ -80,33 +77,6 @@ class Weibo(Platform): text = raw_text.replace('
', '\n') return bs(text, 'html.parser').text - def _get_top(self, raw_post_list: list[RawPost]) -> Optional[RawPost]: - for raw_post in raw_post_list: - if raw_post['card_type'] == 9: - if raw_post['mblog'].get('isTop'): - return raw_post - return None - - async def filter_common(self, target: Target, raw_post_list: list[RawPost]) -> list[RawPost]: - if not self.inited.get(target, False): - self.top[target] = self._get_top(raw_post_list) - await super().filter_common(target, raw_post_list) - return [] - else: - if not raw_post_list: - return [] - new_post = self._get_top(raw_post_list) - res = await super().filter_common(target, raw_post_list) - if (self.top[target] is not None and new_post is None) or \ - (self.top[target] is not None and new_post is not None and self.get_id(self.top[target]) != self.get_id(new_post)): - if new_post: - logger.info('cancel top: {}'.format(new_post)) - else: - logger.info('cancel top: {}'.format(raw_post_list)) - res.append({'_type': 50, 'target': self.top[target]['mblog']['user']['screen_name']}) - self.top[target] = new_post - return res - async def parse(self, raw_post: RawPost) -> Post: header = { 'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9', @@ -120,9 +90,6 @@ class Weibo(Platform): 'user-agent': 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) ' 'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.72 ' 'Mobile Safari/537.36'} - if raw_post.get('_type') == 50: - # cancel top - return Post('weibo', text="撤置顶", url='', pics=[], target_name=raw_post['target'], override_use_pic=False) info = raw_post['mblog'] if info['isLongText'] or info['pic_num'] > 9: async with httpx.AsyncClient() as client: