From 4618f9edb8702fa33e3c219b325f094f5d18bae6 Mon Sep 17 00:00:00 2001 From: kirill Date: Sun, 23 Mar 2025 00:20:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F,=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20=D1=87=D1=83?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BE=D1=80=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=8D?= =?UTF-8?q?=D1=82=D1=83=20=D1=88=D1=82=D1=83=D1=87=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- main.py | 15 ++++++++------- src/app.py | 2 +- src/widgets.py | 7 +++++-- 4 files changed, 17 insertions(+), 11 deletions(-) mode change 100644 => 100755 main.py diff --git a/README.md b/README.md index c3bc91b..8f54732 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# Telegram-TUI +# Тальк + +Тальк — клиент Telegram с текстовым пользовательским интерфейсом, написанный на Python, Telethon и Textual. diff --git a/main.py b/main.py old mode 100644 new mode 100755 index 4c7f349..6d72a2c --- a/main.py +++ b/main.py @@ -1,7 +1,8 @@ -"""Файл инициализации приложения""" - -from src.app import TelegramTUI - -if __name__ == "__main__": - tg = TelegramTUI() - tg.run() +#!/usr/bin/python +"""Файл инициализации приложения""" + +from src.app import TelegramTUI + +if __name__ == "__main__": + tg = TelegramTUI() + tg.run() diff --git a/src/app.py b/src/app.py index 80f5021..32ba7b8 100644 --- a/src/app.py +++ b/src/app.py @@ -11,7 +11,7 @@ class TelegramTUI(App): CSS_PATH = "style.tcss" async def on_mount(self) -> None: - self.telegram_client = TelegramClient("user2", api_id, api_hash) + self.telegram_client = TelegramClient("user", api_id, api_hash) await self.telegram_client.connect() chat_screen = ChatScreen(telegram_client=self.telegram_client) diff --git a/src/widgets.py b/src/widgets.py index 17ac345..f8926fe 100644 --- a/src/widgets.py +++ b/src/widgets.py @@ -51,7 +51,7 @@ class Chat(Widget): def compose(self) -> ComposeResult: with Horizontal(): - yield Label(f"┌───┐\n│ {self.username[:1]} │\n└───┘") + yield Label(f"┌───┐\n│ {self.username[:1]:1} │\n└───┘") with Vertical(): yield Label(self.username, id="name") yield Label(self.msg, id="last_msg") @@ -128,7 +128,10 @@ class Dialog(Widget): msg.message = str(messages[i].message) #TODO: завести это: - is_me = messages[i].from_id.user_id == self.me.id + try: + is_me = messages[i].from_id.user_id == self.me.id + except: + is_me = False msg.is_me = is_me msg.username = utils.get_display_name(messages[i].sender)