Merge pull request #3 from LEv145/dev

v 0.1.5

config.example.toml

@@ -1,5 +1,13 @@
 [bot]
 token = "..."
 
+
 [boltalka]
 client_name = "..."
+
+
+[message_event]
+channels_for_conversation = [
+    948183196439289866,
+    947954894990606447,
+]  # Optional

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "discoboltalka"
-version = "0.1.4"
+version = "0.1.5"
 description = "Discord bot for 'Demo Болталка'"
 authors = ["lev"]
 license = "MIT"

src/discoboltalka/api/__init__.py

@@ -1,6 +1,6 @@
 from .used_objects import ErrorEmbed
 from .modules.boltalka_api import BoltalkaAPI
-from .events import BoltalkaEvent
+from .events import BoltalkaEvents
 from .repositories import DialogRepository
 from .abstract_repositories import AbstractDialogRepository
 

src/discoboltalka/api/events.py

@@ -19,34 +19,42 @@
 _logger = logging.getLogger(__name__)
 
 
-class BoltalkaEvent():
+class BoltalkaEvents():
     def __init__(
         self,
         boltalka_api: BoltalkaAPI,
         dialog_repository: AbstractDialogRepository,
+        channels_for_conversation: list | None = None,
     ) -> None:
         self._boltalka_api = boltalka_api
         self._dialog_repository = dialog_repository
+        self._channels_for_conversation = channels_for_conversation
 
     async def on_guild_message_create(self, event: hikari.GuildMessageCreateEvent) -> None:
-        rest_client = event.app.rest
-        app = event.app
-
-        if not isinstance(app, hikari.GatewayBot):
+        if not isinstance(event.app, hikari.GatewayBot):
             raise RuntimeError("App should be 'hikari.GatewayBot'")
 
-        content = event.message.content
-        if event.is_bot or event.content is None:
-            return
 
-        # If client was pinged
-        if app.cache.get_me().id not in event.message.mentions.users:
+        if (
+            event.is_bot
+            or event.message.content is None
+            # Favorable conditions
+            or (
+                # If client wasn't pinged
+                event.app.cache.get_me().id not in event.message.mentions.users
+                and (
+                    self._channels_for_conversation is not None
+                    and int(event.message.channel_id) not in self._channels_for_conversation
+                )
+            )
+        ):
             return
 
+
         # Prepare content
         user_request = await self._clean_content_from_guild_message_create_event(
             event=event,
-            content=content,
+            content=event.message.content,
         )
         if not user_request:
             return
@@ -57,7 +65,7 @@ async def on_guild_message_create(self, event: hikari.GuildMessageCreateEvent) -
         _logger.debug(f"Boltalka context: {context}")
 
         try:
-            async with rest_client.trigger_typing(event.message.channel_id):
+            async with event.app.rest.trigger_typing(event.message.channel_id):
                 boltalka_phrases = await self._boltalka_api.predict([context])
         except ValidationError:
             await event.message.respond(

src/discoboltalka/api/used_objects/__init__.py

@@ -1,6 +1 @@
 from .embeds import ErrorEmbed
-
-
-__all__ = (
-    "ErrorEmbed",
-)

src/discoboltalka/application/config/__init__.py

@@ -1,10 +1,10 @@
-from .models import MainConfig, BotConfig, BoltalkaConfig
-from .loader import TomlConfigLoader
-
-
-__all__ = (
-    "BoltalkaConfig",
-    "BotConfig",
-    "MainConfig",
-    "TomlConfigLoader",
+from .models import (
+    MainConfig,
+    BotConfig,
+    BoltalkaConfig,
+    MessageEventConfig,
+)
+from .loader import (
+    ABCLoader,
+    TomlConfigLoader,
 )

src/discoboltalka/application/config/loader.py

@@ -7,6 +7,7 @@
     MainConfig,
     BotConfig,
     BoltalkaConfig,
+    MessageEventConfig,
 )
 
 import toml
@@ -45,9 +46,19 @@ def load(self) -> MainConfig:
         except KeyError as exception:
             raise InvalidConfig() from exception
 
+        try:
+            message_event_raw_config = config_raw_data["message_event"]
+            message_event_config = MessageEventConfig(
+                channels_for_conversation=message_event_raw_config.get("channels_for_conversation"),
+            )
+        except KeyError as exception:
+            raise InvalidConfig() from exception
+
+
         return MainConfig(
             bot_config=bot_config,
             boltalka_config=boltalka_config,
+            message_event_config=message_event_config,
         )
 
 

src/discoboltalka/application/config/models.py

@@ -7,6 +7,7 @@
 class MainConfig():
     bot_config: BotConfig
     boltalka_config: BoltalkaConfig
+    message_event_config: MessageEventConfig
 
 
 @dataclass
@@ -18,3 +19,7 @@ class BotConfig():
 class BoltalkaConfig():
     client_name: str
 
+
+@dataclass
+class MessageEventConfig():
+    channels_for_conversation: list | None

src/discoboltalka/application/logic.py

@@ -6,7 +6,7 @@
 
 from discoboltalka.api import (
     BoltalkaAPI,
-    BoltalkaEvent,
+    BoltalkaEvents,
     DialogRepository,
 )
 
@@ -22,9 +22,10 @@ async def async_main() -> None:
         client_session=client_session,
         client_name=config.boltalka_config.client_name,
     )
-    boltalka_event = BoltalkaEvent(
+    boltalka_event = BoltalkaEvents(
         boltalka_api=boltalka_api,
         dialog_repository=DialogRepository(),
+        channels_for_conversation=config.message_event_config.channels_for_conversation,
     )
 
     bot = hikari.GatewayBot(