From 83d9173cdcd8671dedf5400dde81caac21e37634 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 11:57:13 +0300
Subject: (Constants, TicTacToe): Added number emojis that will be shown in
 board and in reactions.

---
 bot/constants.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index ca9bb94a..0135124b 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -118,6 +118,19 @@ class Emojis:
     pull_request_closed = "<:PRClosed:629695470519713818>"
     merge = "<:PRMerged:629695470570176522>"
 
+    # TicTacToe Emojis
+    number_emojis = {
+        1: "\u0031",
+        2: "\u0032",
+        3: "\u0033",
+        4: "\u0034",
+        5: "\u0035",
+        6: "\u0036",
+        7: "\u0037",
+        8: "\u0038",
+        9: "\u0039"
+    }
+
 
 class Hacktoberfest(NamedTuple):
     voice_id = 514420006474219521
-- 
cgit v1.2.3


From 1abec1772f140f886b84fb43c394527553cb271a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 11:59:12 +0300
Subject: (Constants, TicTacToe): Added confirmation and declining emojis.

---
 bot/constants.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index 0135124b..a23c6bcc 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -130,6 +130,8 @@ class Emojis:
         8: "\u0038",
         9: "\u0039"
     }
+    confirmation = "\u2705"
+    decline = "\u274c"
 
 
 class Hacktoberfest(NamedTuple):
-- 
cgit v1.2.3


From fb9523b9c5e93ff30cdc58ac451e807da323c8b4 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 12:01:26 +0300
Subject: (Constants, TicTacToe): Added X and O emojis.

---
 bot/constants.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index a23c6bcc..d43cf4d3 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -132,6 +132,8 @@ class Emojis:
     }
     confirmation = "\u2705"
     decline = "\u274c"
+    x = "\U0001f1fd"
+    o = "\U0001f1f4"
 
 
 class Hacktoberfest(NamedTuple):
-- 
cgit v1.2.3


From 7a7385bf222c24f78356ea46331ae5d4abddb65a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 7 Apr 2020 19:33:05 +0300
Subject: (Constants, TicTacToe): Fixed number emojis contants, created helper
 function `send_board` to `Game` class.

---
 bot/constants.py                  | 18 +++++++++---------
 bot/exts/evergreen/tic_tac_toe.py | 23 +++++++++++++++++++++--
 2 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'bot/constants.py')

diff --git a/bot/constants.py b/bot/constants.py
index d43cf4d3..a8dd03e6 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -120,15 +120,15 @@ class Emojis:
 
     # TicTacToe Emojis
     number_emojis = {
-        1: "\u0031",
-        2: "\u0032",
-        3: "\u0033",
-        4: "\u0034",
-        5: "\u0035",
-        6: "\u0036",
-        7: "\u0037",
-        8: "\u0038",
-        9: "\u0039"
+        1: "\u0031\ufe0f\u20e3",
+        2: "\u0032\ufe0f\u20e3",
+        3: "\u0033\ufe0f\u20e3",
+        4: "\u0034\ufe0f\u20e3",
+        5: "\u0035\ufe0f\u20e3",
+        6: "\u0036\ufe0f\u20e3",
+        7: "\u0037\ufe0f\u20e3",
+        8: "\u0038\ufe0f\u20e3",
+        9: "\u0039\ufe0f\u20e3"
     }
     confirmation = "\u2705"
     decline = "\u274c"
diff --git a/bot/exts/evergreen/tic_tac_toe.py b/bot/exts/evergreen/tic_tac_toe.py
index 1a906535..55bbb7be 100644
--- a/bot/exts/evergreen/tic_tac_toe.py
+++ b/bot/exts/evergreen/tic_tac_toe.py
@@ -28,6 +28,11 @@ class Game:
         self.channel = channel
         self.players = players
         self.ctx = ctx
+        self.board = [
+            [Emojis.number_emojis[1], Emojis.number_emojis[2], Emojis.number_emojis[3]],
+            [Emojis.number_emojis[4], Emojis.number_emojis[5], Emojis.number_emojis[6]],
+            [Emojis.number_emojis[7], Emojis.number_emojis[8], Emojis.number_emojis[9]]
+        ]
 
         self.current = self.players[0]
         self.next = self.players[1]
@@ -74,9 +79,18 @@ class Game:
 
     async def add_reactions(self, msg: discord.Message) -> None:
         """Add number emojis to message."""
-        for nr in Emojis.number_emojis:
+        for nr in Emojis.number_emojis.values():
             await msg.add_reaction(nr)
 
+    async def send_board(self) -> discord.Message:
+        """Send board and return it's message."""
+        msg = ""
+        for line in self.board:
+            msg += " ".join(line)
+            msg += "\n"
+        message = await self.ctx.send(msg)
+        return message
+
 
 def is_channel_free() -> t.Callable:
     """Check is channel where command will be invoked free."""
@@ -113,7 +127,12 @@ class TicTacToe(Cog):
             ctx
         )
         self.games.append(game)
-        await game.get_confirmation()
+        confirmed, msg = await game.get_confirmation()
+
+        if not confirmed:
+            if msg:
+                await ctx.send(msg)
+            return
 
 
 def setup(bot: SeasonalBot) -> None:
-- 
cgit v1.2.3