Change emojis for book

exts/imports/utils.py

@@ -4,6 +4,7 @@ import asyncio
 import discord
 from discord.ext.commands.formatter import Paginator as DannyPag
 from . import checks
+from geeksbot import Geeksbot
 import re
 import typing
 
@@ -220,51 +221,40 @@ class Paginator:
 class Book:
     def __init__(self, pag: Paginator, ctx: typing.Tuple[discord.Message,
                                                          discord.TextChannel,
-                                                         discord.ext.commands.Bot]):
+                                                         Geeksbot,
+                                                         discord.Message]) -> None:
         if pag == Paginator():
             raise RuntimeError('Cannot create a book out of an empty Paginator.')
 
         self._pages = pag.process_pages()
         self._len_pages = len(self._pages)
         self._current_page = 0
-        self._message, self._channel, self._bot = ctx
+        self._message, self._channel, self._bot, self._calling_message = ctx
         self._locked = True
 
-    def advance_page(self, count: int=1):
+    def advance_page(self) -> None:
-        self._current_page += count
+        self._current_page += 1
         if self._current_page >= self._len_pages:
-            self._current_page = self._len_pages
-
-    def reverse_page(self, count: int=1):
-        self._current_page -= count
-        if self._current_page <= 0:
             self._current_page = 0
 
-    async def display_page(self):
+    def reverse_page(self) -> None:
-        await self._message.edit(content=self._pages[self._current_page])
+        self._current_page += -1
-
+        if self._current_page < 0:
-        try:
+            self._current_page = self._len_pages - 1
-            if not self._current_page == 0:
+
-                await self._message.add_reaction(self._bot.unicode_emojis['start'])
+    async def display_page(self) -> None:
-            if not self._current_page < 10:
+        if isinstance(self._pages[self._current_page], discord.Embed):
-                await self._message.add_reaction(self._bot.unicode_emojis['rewind'])
+            await self._message.edit(content=None, embed=self._pages[self._current_page])
-            if not self._current_page == 0:
+        else:
-                await self._message.add_reaction(self._bot.unicode_emojis['back'])
+            await self._message.edit(content=self._pages[self._current_page], embed=None)
-            if self._len_pages > 1:
+
-                await self._message.add_reaction(self._bot.unicode_emojis['hash'])
+        for reaction in self._bot.book_emojis:
-            if not self._current_page == self._len_pages - 1:
+            try:
-                await self._message.add_reaction(self._bot.unicode_emojis['forward'])
+                await self._message.add_reaction(reaction)
-            if not self._current_page > self._len_pages - 11:
+            except (discord.Forbidden, KeyError):
-                await self._message.add_reaction(self._bot.unicode_emojis['fast_forward'])
+                pass
-            if not self._current_page == self._len_pages - 1:
+
-                await self._message.add_reaction(self._bot.unicode_emojis['end'])
+#    async def create_book(self) -> None:
-            await self._message.add_reaction(self._bot.unicode_emojis['close'])
-            if self._locked:
-                await self._message.add_reaction(self._bot.unicode_emojis['open_lock'])
-            else:
-                await self._message.add_reaction(self._bot.unicode_emojis['lock'])
-        except (discord.Forbidden, KeyError):
-            pass
 
 
 

geeksbot.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, List
 
 import discord
 from discord.ext import commands
@@ -80,16 +80,16 @@ class Geeksbot(commands.Bot):
                                         'boom': '💥',
                                         'left_fist': '🤛',
                                         'lock': '🔒',
-                                        'open_lock': '🔓',
-                                        'back': '◀',
-                                        'forward': '▶',
-                                        'fast_forward': '⏩',
-                                        'rewind': '⏪',
-                                        'end': '⏭',
-                                        'start': '⏮',
-                                        'hash': '#\N{COMBINING ENCLOSING KEYCAP}',
-                                        'close': '🇽',
                                         }
+        self.book_emojis: List[str] = [
+                                        '🔓',
+                                        '⏮',
+                                        '◀',
+                                        '#\N{COMBINING ENCLOSING KEYCAP}',
+                                        '▶',
+                                        '⏭',
+                                        '🇽',
+                                        ]
 
     async def logout(self):
         await self.db_con.close()