move strings to their own files and unify plate info format

Author: alissonlauffer

README.rst

@@ -10,4 +10,4 @@ Usage
 -----
 
 -  Inline: ``@InfoPlacaBot PLACA``
--  In chat: just send the plate on the MERCOSUL or legacy formats.
+-  In chat: just send the plate on the Mercosul or legacy formats.

infoplaca/bot_strings.py

@@ -1,8 +1,6 @@
 from pyrogram import Client, filters
 from pyrogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup
 
-from ..bot_strings import donate, hlp
-
 
 @Client.on_callback_query(filters.regex(r"donate"))
 async def etanod(c: Client, m: CallbackQuery):
@@ -16,23 +14,12 @@ async def etanod(c: Client, m: CallbackQuery):
             [InlineKeyboardButton(text="◀️ Voltar", callback_data="help")],
         ]
     )
-    await m.edit_message_text(donate, reply_markup=keyboard)
-
+    await m.edit_message_text(
+        """Ajude no desenvolvimento e manutenção de nossos projetos.
 
-@Client.on_callback_query(filters.regex(r"help"))
-async def pleh(c: Client, m: CallbackQuery):
-    keyvoard = InlineKeyboardMarkup(
-        inline_keyboard=[
-            [InlineKeyboardButton(text="💵 Colabore", callback_data="donate")],
-            [InlineKeyboardButton(text="💻 Meu desenvolvedor", url="t.me/khaledsecond")],
-            [
-                InlineKeyboardButton(
-                    text="🔎 Consulte inline", switch_inline_query_current_chat=""
-                )
-            ],
-        ]
+Qualquer valor nos ajuda! 👋🤖""",
+        reply_markup=keyboard,
     )
-    await m.edit_message_text(hlp, reply_markup=keyvoard)
 
 
 @Client.on_callback_query(filters.regex(r"gpix"))

infoplaca/plugins/callback.py

@@ -1,6 +1,3 @@
-import re
-from datetime import datetime as l
-
 import httpx
 from pyrogram import Client, filters
 from pyrogram.types import (
@@ -13,8 +10,7 @@
 
 from config import PLATES_ENDPOINT
 
-from ..bot_strings import template
-from ..utils import PLATE_REGEX, format_plate, hc
+from ..utils import PLATE_REGEX, format_plate, format_plate_info, hc
 
 
 @Client.on_inline_query(filters.regex(PLATE_REGEX))
@@ -69,19 +65,7 @@ async def plate_search_inline(c: Client, m: InlineQuery):
                     title=f"Resultado para: {format_plate(plate)}",
                     thumb_url="https://piics.ml/i/015.png",
                     input_message_content=InputTextMessageContent(
-                        template.format(
-                            l.now().strftime("%d/%m/%Y às %H:%M:%S"),
-                            format_plate(plate),
-                            rjson["chassi"].rjust(17, "*")
-                            if rjson["chassi"]
-                            else "Não informado",
-                            rjson["modelo"],
-                            rjson["cor"].upper(),
-                            rjson["ano"],
-                            rjson["municipio"].upper(),
-                            rjson["uf"],
-                            rjson["situacao"],
-                        )
+                        format_plate_info(rjson)
                     ),
                 )
             ]

infoplaca/plugins/inline.py

@@ -1,13 +1,10 @@
-from datetime import datetime as l
-
 import httpx
 from pyrogram import Client, filters
 from pyrogram.types import Message
 
 from config import PLATES_ENDPOINT
 
-from ..bot_strings import template
-from ..utils import PLATE_REGEX, format_plate, hc
+from ..utils import PLATE_REGEX, format_plate_info, hc
 
 
 @Client.on_message(filters.regex(PLATE_REGEX) & ~filters.via_bot)
@@ -28,17 +25,4 @@ async def plate_search(c: Client, m: Message):
         await m.reply_text(f"⚠️ <b>{rjson['mensagemRetorno']}.</b>", quote=True)
 
     else:
-        await m.reply_text(
-            template.format(
-                l.now().strftime("%d/%m/%Y às %H:%M:%S"),
-                format_plate(plate),
-                rjson["chassi"].rjust(17, "*") if rjson["chassi"] else "Não informado",
-                rjson["modelo"],
-                rjson["cor"].upper(),
-                rjson["ano"],
-                rjson["municipio"].upper(),
-                rjson["uf"],
-                rjson["situacao"],
-            ),
-            quote=True,
-        )
+        await m.reply_text(format_plate_info(rjson), quote=True)

infoplaca/plugins/listen.py

@@ -1,7 +1,11 @@
 from pyrogram import Client, filters
-from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
+from pyrogram.types import (
+    CallbackQuery,
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
+    Message,
+)
 
-from ..bot_strings import hlp, strt
 from ..database import add_user
 
 
@@ -18,16 +22,43 @@ async def start(c: Client, m: Message):
             ]
         ]
     )
-    await m.reply_text(strt, reply_markup=keybaard)
+    await m.reply_text(
+        "Digite a placa ou clique no botão abaixo.", reply_markup=keybaard
+    )
 
 
 # HELP COMMAND
 @Client.on_message(filters.command("help", ["/", "!"]))
-async def help(c: Client, m: Message):
-    keyboard = InlineKeyboardMarkup(
+@Client.on_callback_query(filters.regex(r"help"))
+async def pleh(c: Client, m: CallbackQuery):
+    keyvoard = InlineKeyboardMarkup(
         inline_keyboard=[
             [InlineKeyboardButton(text="💵 Colabore", callback_data="donate")],
-            [InlineKeyboardButton(text="💻 Meu desenvolvedor", url="t.me/khaledsecond")],
+            [
+                InlineKeyboardButton(
+                    text="💻 Meu desenvolvedor", url="https://t.me/khaledsecond"
+                )
+            ],
+            [
+                InlineKeyboardButton(
+                    text="🔎 Consulte inline", switch_inline_query_current_chat=""
+                )
+            ],
         ]
     )
-    await m.reply_text(hlp, reply_markup=keyboard)
+
+    await m.edit_message_text(
+        """Olá 👋, aqui é a área de ajuda do <b>InfoPlaca</b>.
+
+ℹ️ <b>Informações básicas:</b>
+Para consultar uma placa, envie no formato <code>ABC-1234</code> ou <code>ABC1234</code> (Mercosul).
+<i>*Disponível para qualquer veículo.</i>
+
+O uso também pode ser via inline, digite: <code>@InfoPlacaBot PLACA</code> no campo de texto.
+<i>*Atalho na mensagem de start.</i>
+
+
+
+🤖 Quer colaborar nossos projetos? Clique no botão abaixo e apoie o meu desenvolvimento!""",
+        reply_markup=keyvoard,
+    )

infoplaca/plugins/start.py

@@ -14,3 +14,28 @@ def format_plate(plate: str) -> str:
     if groups[2].isnumeric():
         return f"{groups[1]}-{groups[2]}"
     return f"{groups[1]}{groups[2]}"
+
+
+def format_plate_info(info: dict) -> str:
+    return """ℹ️ <b>Informações da Placa</b>
+📆 <i>Informações atualizadas em {}</i>
+
+<b>Placa:</b> <code>{}</code>
+<b>Chassi:</b> <code>{}</code>
+<b>Modelo:</b> <code>{}</code>
+<b>Cor:</b> <code>{}</code>
+<b>Ano:</b> <code>{}</code>
+<b>Cidade:</b> <code>{} - {}</code>
+<b>Situação:</b> <code>{}</code>
+
+@InfoPlacaBot""".format(
+        info["data"],
+        format_plate(info["placa"]),
+        info["chassi"].rjust(17, "*") if info["chassi"] else "Não informado",
+        info["modelo"].title(),
+        info["cor"].title(),
+        info["ano"],
+        info["municipio"].title(),
+        info["uf"],
+        info["situacao"],
+    )