From 15c92160c1b25ade0ecb512c744a6ec5759f0ce6 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Tue, 20 Apr 2021 02:43:48 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Update=20command=20formatting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 royalpack/commands/answer.py    | 10 +++++-----
 royalpack/commands/ciaoruozi.py |  2 +-
 royalpack/commands/color.py     |  2 +-
 royalpack/commands/dog.py       |  2 +-
 royalpack/commands/emojify.py   |  2 +-
 royalpack/commands/fortune.py   |  2 +-
 royalpack/commands/login.py     |  2 +-
 royalpack/commands/man.py       |  2 +-
 royalpack/commands/ship.py      |  2 +-
 royalpack/commands/spell.py     |  2 +-
 royalpack/commands/whoami.py    |  3 +--
 11 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/royalpack/commands/answer.py b/royalpack/commands/answer.py
index e36eeb7f..d55c89d6 100644
--- a/royalpack/commands/answer.py
+++ b/royalpack/commands/answer.py
@@ -22,7 +22,7 @@ ANSWERS = [
     "🔵 Ovviamente.",
     "🔵 Questa domanda ha risposta affermativa.",
     "🔵 Hell yeah.",
-    "🔵 [url=https://www.youtube.com/watch?v=sq_Fm7qfRQk]YES! YES! YES![/url]",
+    "🔵 YES! YES! YES!",
     "🔵 yusssssss",
     "🔵 Non vedo perchè no",
     "🔵 Ha senso, ha perfettamente senso, nulla da obiettare, ha senso.",
@@ -32,7 +32,7 @@ ANSWERS = [
     # risposte "no": 19
     "❌ No.",
     "❌ Decisamente no!",
-    "❌ Uhm, secondo me sì. No, aspetta, ci ho ripensato. è un no.",
+    "❌ Uhm, secondo me sì. No, aspetta, ci ho ripensato. È un no.",
     "❌ No, no, e ancora NO!",
     "❌ Nope.",
     "❌ Direi proprio di no.",
@@ -43,9 +43,9 @@ ANSWERS = [
     "❌ Niente affatto!",
     "❌ Questa domanda ha risposta negativa.",
     "❌ Hell no.",
-    "❌ [url=https://www.youtube.com/watch?v=fKEZFRcuEqw]NO! NO! NO![/url]",
+    "❌ NO! NO! NO!",
     "❌ lolno",
-    "❌ [url=https://www.youtube.com/watch?v=5lbGAzo9RrM]NEIN NEIN NEIN NEIN[/url]",
+    "❌ NEIN NEIN NEIN NEIN",
     "❌ Delet dis",
     "❌ Nopety nope!",
     "❌ No, ma tienilo segreto.",
@@ -60,7 +60,7 @@ ANSWERS = [
     "❔ Dunno.",
     "❔ Perché lo chiedi a me?",
     "❔ Ah, non lo so io!",
-    "❔ ¯\\_(ツ)_/¯",
+    r"❔ ¯\_(ツ)_/¯",
     "❔ No idea.",
     "❔ Dunno.",
     "❔ Boooooh!",
diff --git a/royalpack/commands/ciaoruozi.py b/royalpack/commands/ciaoruozi.py
index 4ba6292e..6e6ffba1 100644
--- a/royalpack/commands/ciaoruozi.py
+++ b/royalpack/commands/ciaoruozi.py
@@ -14,7 +14,7 @@ async def ciaoruozi(*, _msg: engi.Message, _imp, **__):
         sender: royalnet_telethon.bullet.contents.TelegramUser = await _msg.sender
         # noinspection PyProtectedMember
         if sender._user.id == 112437036:
-            await _msg.reply(text="👋 Ciao me!")
+            await _msg.reply(text="👋 Ciao \uE01Bme\uE00B!")
 
     await _msg.reply(text="👋 Ciao Ruozi!")
 
diff --git a/royalpack/commands/color.py b/royalpack/commands/color.py
index d0ab2e4d..f03cde43 100644
--- a/royalpack/commands/color.py
+++ b/royalpack/commands/color.py
@@ -8,7 +8,7 @@ async def color(*, _msg: engi.Message, **__):
     """
 
     await _msg.reply(
-        text="I am sorry, unknown error occured during working with your request, Admin were notified"
+        text="\uE011I am sorry, unknown error occured during working with your request, Admin were notified\uE001"
     )
 
 
diff --git a/royalpack/commands/dog.py b/royalpack/commands/dog.py
index 11f37a6b..9bbe7637 100644
--- a/royalpack/commands/dog.py
+++ b/royalpack/commands/dog.py
@@ -187,7 +187,7 @@ async def dog_breedlist(*, _msg: engi.Message, **__):
     Elenca tutte le razze di dogghi disponibili! 🐶
     """
     msg = [
-        "🐶 Razze disponibili:",
+        "🐶 \uE01BRazze disponibili:\uE00B",
         ", ".join(_breeds),
     ]
 
diff --git a/royalpack/commands/emojify.py b/royalpack/commands/emojify.py
index cfeae2dc..2d053507 100644
--- a/royalpack/commands/emojify.py
+++ b/royalpack/commands/emojify.py
@@ -80,7 +80,7 @@ _emojis = {
 
 
 @engi.TeleportingConversation
-async def emojify(*, message: str, **__):
+async def emojify(*, _msg: engi.Message, message: str, **__):
     """
     Converti un messaggio in emoji.
     """
diff --git a/royalpack/commands/fortune.py b/royalpack/commands/fortune.py
index 287fb4df..a3b59ebf 100644
--- a/royalpack/commands/fortune.py
+++ b/royalpack/commands/fortune.py
@@ -29,7 +29,7 @@ _fortunes = [
     "🤖 Oggi il Royal Bot ti dirà qualcosa di molto utile!",
     "🏠 Oggi qualcuno si autoinviterà a casa tua!",
     "📵 Oggi passerai una bella giornata tranquilla senza che nessuno ti chiami!",
-    "🕸 Oggi cadrai trappola di una ragnatela! O ti arriverà in faccia.",
+    "🕸 Oggi cadrai trappola di una ragnatela! \uE011O ti arriverà in faccia.\uE001",
     "🔮 Oggi chiederai a @royalgamesbot di dirti la tua /fortune!",
     "👽 Oggi incontrerai gli UFI!!!1!!uno!",
     "🦾 Oggi uno scienziato pazzo ti proporrà di sostituire il tuo braccio con un braccio-razzo meccanico!",
diff --git a/royalpack/commands/login.py b/royalpack/commands/login.py
index b398be46..c5fc1bd6 100644
--- a/royalpack/commands/login.py
+++ b/royalpack/commands/login.py
@@ -144,7 +144,7 @@ async def prompt_login(channel: engi.Channel, verification_url: str, user_code:
         text=f"🌍 Effettua il RYGlogin al seguente URL, poi premi Confirm:\n"
              f"{verification_url}\n"
              f"\n"
-             f"(Codice: {user_code})"
+             f"\uE011(Codice: {user_code})\uE001"
     )
 
 
diff --git a/royalpack/commands/man.py b/royalpack/commands/man.py
index 80477c6f..3a215dd3 100644
--- a/royalpack/commands/man.py
+++ b/royalpack/commands/man.py
@@ -21,7 +21,7 @@ async def man(*, _msg: engi.Message, _router: engi.Router, commandname: str, **_
         pass
 
     msg = [
-        f"ℹ️ Manuale di {commandname}:",
+        f"ℹ️ Manuale di \uE011{commandname}\uE001:",
         f"{command.__doc__}",
     ]
 
diff --git a/royalpack/commands/ship.py b/royalpack/commands/ship.py
index 87fa9212..34c63dcc 100644
--- a/royalpack/commands/ship.py
+++ b/royalpack/commands/ship.py
@@ -45,7 +45,7 @@ async def ship(*, _msg: engi.Message, first: str, second: str, **__):
     # Send the message to the chat
     log.debug(f"Sending ship to the chat...")
     await _msg.reply(
-        text=f"💞 {first.capitalize()} + {second.capitalize()} = {combined.capitalize()}"
+        text=f"💞 {first.capitalize()} + {second.capitalize()} = \uE01B{combined.capitalize()}\uE00B"
     )
 
 
diff --git a/royalpack/commands/spell.py b/royalpack/commands/spell.py
index 4f916d2a..1d60a47d 100644
--- a/royalpack/commands/spell.py
+++ b/royalpack/commands/spell.py
@@ -9,7 +9,7 @@ async def spell(*, _msg: engi.Message, spellname: str, **__):
     """
     s = royalspells.Spell(spellname)
 
-    rows: list[str] = [f"✨ {s.name}"]
+    rows: list[str] = [f"✨ \uE01B{s.name}\uE00B"]
 
     if s.damage_component:
         dmg: royalspells.DamageComponent = s.damage_component
diff --git a/royalpack/commands/whoami.py b/royalpack/commands/whoami.py
index c3f281b0..f812b65a 100644
--- a/royalpack/commands/whoami.py
+++ b/royalpack/commands/whoami.py
@@ -11,9 +11,8 @@ async def whoami(*, _msg: engi.Message, _user: db.User, **__):
     Scopri con che RYGaccount sei loggato.
     """
 
-    # TODO: improve output
     if _user:
-        await _msg.reply(text=f"☀️ {_user.name}")
+        await _msg.reply(text=f"☀️ Sei loggato come \uE01B{_user.name}\uE00B!")
     else:
         await _msg.reply(text="☁️ Non hai effettuato il login.")