some renames

shueteam · Apr 9, 2020 · f3400eb · f3400eb
1 parent ae0b21c
commit f3400eb
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/examples/bots/clones_bot_example.py b/examples/bots/clones_bot_example.py
@@ -2,18 +2,18 @@
 create many bots with the same functionality
 """
 
-from vkwave.bots.easy import SimpleLongPollGroupBot, TaskManager, ClonesBot
+from vkwave.bots.easy import SimpleLongPollBot, TaskManager, ClonesBot
 
 
-bot = SimpleLongPollGroupBot(tokens=["Bot0TOKEN"], group_id=444, )
+bot = SimpleLongPollBot(tokens=["Bot0TOKEN"], group_id=444, )
 
 
 @bot.message_handler(bot.text_filter("123"))
-async def simple(event: bot.SimpleEvent):
+async def simple(event: bot.SimpleBotEvent):
     await event.answer("HELLO")
 
 
-clones = ClonesBot(bot, SimpleLongPollGroupBot("Bot1TOKEN", 192868628), SimpleLongPollGroupBot("Bot2TOKEN", 172702125))
+clones = ClonesBot(bot, SimpleLongPollBot("Bot1TOKEN", 192868628), SimpleLongPollBot("Bot2TOKEN", 172702125))
 
 clones.run_all_bots()
 

diff --git a/examples/bots/hello_world_bot.py b/examples/bots/hello_world_bot.py
@@ -1,6 +1,6 @@
-from vkwave.bots.easy import SimpleLongPollGroupBot
+from vkwave.bots.easy import SimpleLongPollBot
 
-bot = SimpleLongPollGroupBot(tokens="MyToken", group_id=123456789)
+bot = SimpleLongPollBot(tokens="MyToken", group_id=123456789)
 
 
 @bot.message_handler()

diff --git a/examples/bots/simple_bot_example.py b/examples/bots/simple_bot_example.py
@@ -1,19 +1,19 @@
-from vkwave.bots.easy import SimpleLongPollGroupBot, TaskManager
+from vkwave.bots.easy import SimpleLongPollBot, TaskManager
 
 
-bot = SimpleLongPollGroupBot(tokens="MyToken", group_id=123456789)
+bot = SimpleLongPollBot(tokens="MyToken", group_id=123456789)
 
 # or if you want do a lot of requests without 'to many requests' errors
 # bot = SimpleLongPollBot(tokens=["MyToken1", "MyToken2", "MyToken3"], group_id=123456789)
 
 
 @bot.message_handler(bot.text_filter("hello"))
-async def simple(event: bot.SimpleEvent):
+async def simple(event: bot.SimpleBotEvent):
     await event.answer("hello from vkwave!")
 
 
 @bot.message_handler(bot.command_filter(commands=["start"]))
-async def start(event: bot.SimpleEvent):
+async def start(event: bot.SimpleBotEvent):
     user_data = (
         await bot.api_context.users.get(user_ids=event.object.object.message.peer_id)
     ).response[0]

diff --git a/examples/bots/vkscript_example.py b/examples/bots/vkscript_example.py
@@ -1,9 +1,9 @@
 from vkwave.api.methods import APIOptionsRequestContext
-from vkwave.bots.easy import SimpleLongPollGroupBot, TaskManager
+from vkwave.bots.easy import SimpleLongPollBot, TaskManager
 from vkwave.vkscript import execute
 from vkwave.types.responses import ExecuteResponse
 
-bot = SimpleLongPollGroupBot(
+bot = SimpleLongPollBot(
     tokens=["123"],
     group_id=456,
 )
@@ -24,7 +24,7 @@ def get_subs_names(api: APIOptionsRequestContext, group_id: int):
 
 
 @bot.message_handler(bot.text_filter("follow"))
-async def simple(event: bot.SimpleEvent):
+async def simple(event: bot.SimpleBotEvent):
     """
     Get name of each subscriber
     """

diff --git a/readme.md b/readme.md
@@ -4,7 +4,7 @@
 
 
 ```python
-from vkwave.bots.easy.easy_bot import SimpleLongPollGroupBot
+from vkwave.bots.easy.easy_bot import SimpleLongPollBot
 
 bot = SimpleLongPollBot(tokens="MyToken", group_id=123456789)
 

diff --git a/vkwave/bots/easy/__init__.py b/vkwave/bots/easy/__init__.py
@@ -1,2 +1,2 @@
-from .easy_bot import SimpleLongPollGroupBot, ClonesBot
+from .easy_bot import SimpleLongPollBot, ClonesBot
 from .task_manager import TaskManager
diff --git a/vkwave/bots/easy/easy_bot.py b/vkwave/bots/easy/easy_bot.py
@@ -49,7 +49,7 @@ def create_api_session_aiohttp(token: str) -> _APIContextManager:
     return _APIContextManager(token)
 
 
-class SimpleEvent(BotEvent):
+class SimpleBotEvent(BotEvent):
     def __init__(self, event: BotEvent):
         super().__init__(event.object, event.api_ctx)
 
@@ -88,11 +88,11 @@ async def answer(
         )
 
 
-class SimpleLongPollGroupBot:
+class SimpleLongPollBot:
     def __init__(
         self, tokens: typing.Union[str, typing.List[str]], group_id: int,
     ):
-        self.SimpleEvent = SimpleEvent
+        self.SimpleBotEvent = SimpleBotEvent
         self.api_session = create_api_session_aiohttp(tokens)
         self.api_context = self.api_session.api.get_context()
         self._lp = BotLongpoll(self.api_context, BotLongpollData(group_id))
@@ -115,7 +115,7 @@ def __init__(self, func: typing.Callable[[BaseEvent], typing.Awaitable[typing.An
             self.func = func
 
         async def execute(self, event: BotEvent) -> typing.Any:
-            new_event = SimpleEvent(event)
+            new_event = SimpleBotEvent(event)
             return await self.func(new_event)
 
     def message_handler(self, *filters: BaseFilter):
@@ -145,10 +145,10 @@ class ClonesBot:
     Create many bots with the same functionality
     """
 
-    def __init__(self, base_bot: SimpleLongPollGroupBot, *clones: SimpleLongPollGroupBot):
+    def __init__(self, base_bot: SimpleLongPollBot, *clones: SimpleLongPollBot):
         self.base_bot = base_bot
         self.router = self.base_bot.router
-        self.clones: typing.Tuple[SimpleLongPollGroupBot] = clones
+        self.clones: typing.Tuple[SimpleLongPollBot] = clones
 
     def run_all_bots(self, loop: typing.Optional[asyncio.AbstractEventLoop] = None):
         loop = loop or asyncio.get_event_loop()