v0.1.16.6 - removed plugin handlers, greeting only in new chats, side

Author: sidor0912

FunPayAPI/account.py

@@ -304,6 +304,8 @@ def get_subcategory_public_lots(self, subcategory_type: enums.SubCategoryTypes,
             description = description.text if description else None
             server = offer.find("div", class_="tc-server")
             server = server.text if server else None
+            side = offer.find("div", class_="tc-side")
+            side = side.text if side else None
             tc_price = offer.find("div", {"class": "tc-price"})
             if subcategory_type is types.SubCategoryTypes.COMMON:
                 price = float(tc_price["data-s"])
@@ -344,7 +346,8 @@ def get_subcategory_public_lots(self, subcategory_type: enums.SubCategoryTypes,
                 if i in attributes:
                     del attributes[i]
 
-            lot_obj = types.LotShortcut(offer_id, server, description, amount, price, currency, subcategory_obj, seller,
+            lot_obj = types.LotShortcut(offer_id, server, side, description, amount, price, currency, subcategory_obj,
+                                        seller,
                                         auto, promo, attributes, str(offer))
             result.append(lot_obj)
         return result
@@ -387,6 +390,8 @@ def get_my_subcategory_lots(self, subcategory_id: int,
             description = description.text if description else None
             server = offer.find("div", class_="tc-server")
             server = server.text if server else None
+            side = offer.find("div", class_="tc-side")
+            side = side.text if side else None
             tc_price = offer.find("div", class_="tc-price")
             price = float(tc_price["data-s"])
             if currency is None:
@@ -398,7 +403,7 @@ def get_my_subcategory_lots(self, subcategory_id: int,
             amount = tc_amount.text.replace(" ", "") if tc_amount else None
             amount = int(amount) if amount and amount.isdigit() else None
             active = "warning" not in offer.get("class", [])
-            lot_obj = types.MyLotShortcut(offer_id, server, description, amount, price, currency, subcategory_obj,
+            lot_obj = types.MyLotShortcut(offer_id, server, side, description, amount, price, currency, subcategory_obj,
                                           auto, active, str(offer))
             result.append(lot_obj)
         return result
@@ -1113,6 +1118,8 @@ def get_user(self, user_id: int, locale: Literal["ru", "en", "uk"] | None = None
                 description = description.text if description else None
                 server = j.find("div", class_="tc-server")
                 server = server.text if server else None
+                side = j.find("div", class_="tc-side")
+                side = side.text if side else None
                 auto = j.find("i", class_="auto-dlv-icon") is not None
                 tc_price = j.find("div", {"class": "tc-price"})
                 tc_amount = j.find("div", class_="tc-amount")
@@ -1126,7 +1133,8 @@ def get_user(self, user_id: int, locale: Literal["ru", "en", "uk"] | None = None
                     currency = parse_currency(tc_price.find("span", class_="unit").text)
                     if self.currency != currency:
                         self.currency = currency
-                lot_obj = types.LotShortcut(offer_id, server, description, amount, price, currency, subcategory_obj,
+                lot_obj = types.LotShortcut(offer_id, server, side, description, amount, price, currency,
+                                            subcategory_obj,
                                             None, auto,
                                             None, None, str(j))
                 user_obj.add_lot(lot_obj)

FunPayAPI/types.py

@@ -953,6 +953,9 @@ class LotShortcut:
     :param server: название сервера (если указан в лоте).
     :type server: :obj:`str` or :obj:`None`
 
+    :param side: название стороны (если указана в лоте).
+    :type side: :obj:`str` or :obj:`None`
+
     :param description: краткое описание (название) лота.
     :type description: :obj:`str` or :obj:`None`
 
@@ -969,7 +972,7 @@ class LotShortcut:
     :type html: :obj:`str`
     """
 
-    def __init__(self, id_: int | str, server: str | None,
+    def __init__(self, id_: int | str, server: str | None, side: str | None,
                  description: str | None, amount: int | None, price: float, currency: Currency,
                  subcategory: SubCategory | None,
                  seller: SellerShortcut | None, auto: bool, promo: bool | None, attributes: dict[str, int | str] | None,
@@ -980,6 +983,8 @@ def __init__(self, id_: int | str, server: str | None,
         """ID лота."""
         self.server: str | None = server
         """Название сервера (если указан)."""
+        self.side: str | None = side
+        """Сторона (если указана)."""
         self.description: str | None = description
         """Краткое описание (название) лота."""
         self.title: str | None = description
@@ -1017,6 +1022,9 @@ class MyLotShortcut:
     :param server: название сервера (если указан в лоте).
     :type server: :obj:`str` or :obj:`None`
 
+    :param side: название стороны (если указана в лоте).
+    :type side: :obj:`str` or :obj:`None`
+
     :param description: краткое описание (название) лота.
     :type description: :obj:`str` or :obj:`None`
 
@@ -1033,7 +1041,7 @@ class MyLotShortcut:
     :type html: :obj:`str`
     """
 
-    def __init__(self, id_: int | str, server: str | None,
+    def __init__(self, id_: int | str, server: str | None, side: str | None,
                  description: str | None, amount: int | None, price: float, currency: Currency,
                  subcategory: SubCategory | None, auto: bool, active: bool,
                  html: str):
@@ -1043,6 +1051,8 @@ def __init__(self, id_: int | str, server: str | None,
         """ID лота."""
         self.server: str | None = server
         """Название сервера (если указан)."""
+        self.side: str | None = side
+        """Сторона (если указана)."""
         self.description: str | None = description
         """Краткое описание (название) лота."""
         self.title: str | None = description

FunPayAPI/updater/runner.py

@@ -86,8 +86,6 @@ def __init__(self, account: Account, disable_message_requests: bool = False,
         """Экземпляр аккаунта, к которому привязан Runner."""
         self.account.runner = self
 
-        self.__msg_time_re = re.compile(r"\d{2}:\d{2}")
-
     def get_updates(self) -> dict:
         """
         Запрашивает список событий FunPay.

Utils/config_loader.py

@@ -108,6 +108,7 @@ def load_main_config(config_path: str):
 
         "Greetings": {
             "ignoreSystemMessages": ["0", "1"],
+            "onlyNewChats": ["0", "1"],
             "sendGreetings": ["0", "1"],
             "greetingsText": "any",
             "greetingsCooldown": "any"
@@ -220,6 +221,11 @@ def load_main_config(config_path: str):
                 config.set(section_name, param_name, "🐦")
                 with open("configs/_main.cfg", "w", encoding="utf-8") as f:
                     config.write(f)
+            elif section_name == "Greetings" and param_name == "onlyNewChats" and param_name not in config[
+                section_name]:
+                config.set("Greetings", "onlyNewChats", "0")
+                with open("configs/_main.cfg", "w", encoding="utf-8") as f:
+                    config.write(f)
 
             # END OF UPDATE
 

cardinal.py

@@ -146,9 +146,14 @@ def __init__(self, main_config: ConfigParser,
         self.profile_last_tag: str | None = None
         # Тег последнего event'а, после которого обновлялось состояние лотов.
         self.last_state_change_tag: str | None = None
+        # Тег последнего event'а, перед которым пороговое значение для определения новых чатов.
+        self.last_greeting_chat_id_threshold_change_tag: str | None = None
+        self.greeting_threshold_chat_ids = set()  # ID чатов для последующего обновления  self.greeting_chat_id_threshold
         self.blacklist = cardinal_tools.load_blacklist()  # ЧС.
         self.old_users = cardinal_tools.load_old_users(
             float(self.MAIN_CFG["Greetings"]["greetingsCooldown"]))  # Уже написавшие пользователи.
+        self.greeting_chat_id_threshold = max(self.old_users.keys(), default=0)
+        # пороговое значение для определения новых чатов (для приветствия)
 
         # Хэндлеры
         self.pre_init_handlers = []
@@ -853,7 +858,8 @@ def run_handlers(self, handlers_list: list[Callable], args) -> None:
         """
         for func in handlers_list:
             try:
-                if getattr(func, "plugin_uuid") is None or self.plugins[getattr(func, "plugin_uuid")].enabled:
+                plugin_uuid = getattr(func, "plugin_uuid")
+                if plugin_uuid is None or (plugin_uuid in self.plugins and self.plugins[plugin_uuid].enabled):
                     func(*args)
             except Exception as ex:
                 text = _("crd_handler_err")

first_setup.py

@@ -50,6 +50,7 @@
 
     "Greetings": {
         "ignoreSystemMessages": "0",
+        "onlyNewChats": "0",
         "sendGreetings": "0",
         "greetingsText": "Привет, $chat_name!",
         "greetingsCooldown": "2"

handlers.py

@@ -68,6 +68,14 @@ def save_init_chats_handler(c: Cardinal, e: InitialChatEvent):
         cardinal_tools.cache_old_users(c.old_users)
 
 
+def update_threshold_on_initial_chat(c: Cardinal, e: InitialChatEvent):
+    """
+    Обновляет пороговое значение для определения новых чатов.
+    """
+    if e.chat.id > c.greeting_chat_id_threshold:
+        c.greeting_chat_id_threshold = e.chat.id
+
+
 # NEW MESSAGE / LAST CHAT MESSAGE CHANGED
 def old_log_msg_handler(c: Cardinal, e: LastChatMessageChangedEvent):
     """
@@ -106,6 +114,25 @@ def log_msg_handler(c: Cardinal, e: NewMessageEvent):
     MSG_LOG_LAST_STACK_ID = e.stack.id()
 
 
+def update_threshold_on_last_message_change(c: Cardinal, e: LastChatMessageChangedEvent | NewMessageEvent):
+    """
+    Обновляет пороговое значение для определения новых чатов.
+    """
+    # Должно выполняться после greetings_handler для корректной обработки
+    # c.greeting_threshold_chat_ids (чтобы не спамило приветствиями)
+    if not c.old_mode_enabled:
+        if isinstance(e, LastChatMessageChangedEvent):
+            return
+        chat_id = e.message.chat_id
+    else:
+        chat_id = e.chat.id
+    if e.runner_tag != c.last_greeting_chat_id_threshold_change_tag:
+        c.greeting_chat_id_threshold = max([c.greeting_chat_id_threshold, *c.greeting_threshold_chat_ids])
+        c.greeting_threshold_chat_ids = set()
+        c.last_greeting_chat_id_threshold_change_tag = e.runner_tag
+    c.greeting_threshold_chat_ids.add(chat_id)
+
+
 def greetings_handler(c: Cardinal, e: NewMessageEvent | LastChatMessageChangedEvent):
     """
     Отправляет приветственное сообщение.
@@ -120,8 +147,10 @@ def greetings_handler(c: Cardinal, e: NewMessageEvent | LastChatMessageChangedEv
     else:
         obj = e.chat
         chat_id, chat_name, mtype, its_me, badge = obj.id, obj.name, obj.last_message_type, not obj.unread, None
-    if any([time.time() - c.old_users.get(chat_id, 0) < float(
-            c.MAIN_CFG["Greetings"]["greetingsCooldown"]) * 24 * 60 * 60,
+    if any([c.MAIN_CFG["Greetings"].getboolean("onlyNewChats") and
+            (chat_id <= c.greeting_chat_id_threshold or chat_id in c.greeting_threshold_chat_ids),
+            time.time() - c.old_users.get(chat_id, 0) < float(
+                c.MAIN_CFG["Greetings"]["greetingsCooldown"]) * 24 * 60 * 60,
             its_me, mtype in (MessageTypes.DEAR_VENDORS, MessageTypes.ORDER_CONFIRMED_BY_ADMIN), badge is not None,
             (mtype is not MessageTypes.NON_SYSTEM and c.MAIN_CFG["Greetings"].getboolean("ignoreSystemMessages"))]):
         return
@@ -135,15 +164,19 @@ def add_old_user_handler(c: Cardinal, e: NewMessageEvent | LastChatMessageChange
     """
     Добавляет пользователя в список написавших.
     """
+    if not c.MAIN_CFG["Greetings"].getboolean("sendGreetings") or c.MAIN_CFG["Greetings"].getboolean("onlyNewChats"):
+        return
+
     if not c.old_mode_enabled:
         if isinstance(e, LastChatMessageChangedEvent):
             return
         chat_id, mtype = e.message.chat_id, e.message.type
     else:
         chat_id, mtype = e.chat.id, e.chat.last_message_type
 
-    if not c.MAIN_CFG["Greetings"].getboolean("sendGreetings") or mtype == MessageTypes.DEAR_VENDORS:
+    if mtype == MessageTypes.DEAR_VENDORS:
         return
+
     c.old_users[chat_id] = int(time.time())
     cardinal_tools.cache_old_users(c.old_users)
 
@@ -506,13 +539,9 @@ def setup_event_attributes_handler(c: Cardinal, e: NewOrderEvent, *args):
     lot_description = e.order.description
     # пробуем найти лот, чтобы не выдавать по строке, которую вписал покупатель при оформлении заказа
     for lot in sorted(list(c.profile.get_sorted_lots(2).get(e.order.subcategory, {}).values()),
-                      key=lambda l: len(f"{l.server}, {l.description}"), reverse=True):
-        if lot.server and lot.description:
-            temp_desc = f"{lot.server}, {lot.description}"
-        elif lot.server:
-            temp_desc = lot.server
-        else:
-            temp_desc = lot.description
+                      key=lambda l: len(f"{l.server}, {l.side}, {l.description}"), reverse=True):
+
+        temp_desc = ", ".join([i for i in [lot.server, lot.side, lot.description] if i])
 
         if temp_desc in e.order.description:
             lot_description = temp_desc
@@ -820,10 +849,11 @@ def send_bot_started_notification_handler(c: Cardinal, *args):
             continue
 
 
-BIND_TO_INIT_MESSAGE = [save_init_chats_handler]
+BIND_TO_INIT_MESSAGE = [save_init_chats_handler, update_threshold_on_initial_chat]
 
 BIND_TO_LAST_CHAT_MESSAGE_CHANGED = [old_log_msg_handler,
                                      greetings_handler,
+                                     update_threshold_on_last_message_change,
                                      add_old_user_handler,
                                      send_response_handler,
                                      process_review_handler,
@@ -833,6 +863,7 @@ def send_bot_started_notification_handler(c: Cardinal, *args):
 
 BIND_TO_NEW_MESSAGE = [log_msg_handler,
                        greetings_handler,
+                       update_threshold_on_last_message_change,
                        add_old_user_handler,
                        send_response_handler,
                        process_review_handler,

locales/en.py

@@ -114,6 +114,7 @@
 # Greeting settings
 gr_greetings = "{} Greet users"
 gr_ignore_sys_msgs = "{} Ignore system messages"
+gr_only_new_chats = "{} Only in new chats"
 gr_edit_message = "✏️ Change the text of the welcome message"
 gr_edit_cooldown = "⏱️ Cooldown: {} days"
 

locales/ru.py

@@ -114,6 +114,7 @@
 # Настройки приветствия
 gr_greetings = "{} Приветствовать пользователей"
 gr_ignore_sys_msgs = "{} Игнорировать системные сообщения"
+gr_only_new_chats = "{} Только в новых диалогах"
 gr_edit_message = "✏️ Изменить текст приветственного сообщения"
 gr_edit_cooldown = "⏱️ Кулдаун: {} дн."
 

main.py

@@ -56,7 +56,7 @@
 ......................','.",`............ ..................
 ............................................................"""
 
-VERSION = "0.1.16.5"
+VERSION = "0.1.16.6"
 
 Utils.cardinal_tools.set_console_title(f"FunPay Cardinal v{VERSION}")