From 68478a0e45b58ca6932bc351f19687b628a5fffc Mon Sep 17 00:00:00 2001 From: Hehesheng Date: Fri, 7 Jun 2024 01:08:32 +0800 Subject: [PATCH] fix: change to static method --- backend/TgFileSystemClient.py | 6 +++--- backend/UserManager.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/TgFileSystemClient.py b/backend/TgFileSystemClient.py index f8fd606..da38a49 100644 --- a/backend/TgFileSystemClient.py +++ b/backend/TgFileSystemClient.py @@ -7,7 +7,7 @@ import os import functools import traceback import logging -from typing import Union, Optional +from typing import Union, Optional, Literal from telethon import TelegramClient, types, hints, events from telethon.custom import QRLogin @@ -128,7 +128,7 @@ class TgFileSystemClient(object): msg: types.Message = event.message self.db.insert_by_message(self.me, msg) - async def login(self, mode: Union["phone", "qrcode"] = "qrcode") -> str: + async def login(self, mode: Literal["phone", "qrcode"] = "qrcode") -> str: if self.is_valid(): return "" if mode == "phone": @@ -184,7 +184,7 @@ class TgFileSystemClient(object): async def _cache_whitelist_chat2(self): for chat_id in self.client_param.whitelist_chat: async for msg in self.client.iter_messages(chat_id): - if len(self.db.get_msg_by_unique_id(self.db.generate_unique_id_by_msg(self.me, msg))) != 0: + if len(self.db.get_msg_by_unique_id(UserManager.generate_unique_id_by_msg(self.me, msg))) != 0: continue self.db.insert_by_message(self.me, msg) logger.info(f"{chat_id} quit cache task.") diff --git a/backend/UserManager.py b/backend/UserManager.py index a49ab3a..d61239d 100644 --- a/backend/UserManager.py +++ b/backend/UserManager.py @@ -50,7 +50,8 @@ class UserManager(object): def update_message(self) -> None: raise NotImplementedError - def generate_unique_id_by_msg(self, me: types.User, msg: types.Message) -> str: + @staticmethod + def generate_unique_id_by_msg(me: types.User, msg: types.Message) -> str: user_id = me.id chat_id = msg.chat_id msg_id = msg.id