mirror of
https://github.com/avitoras/telegram-tui.git
synced 2025-07-27 11:20:31 +00:00
Merge branch 'dev' into kldk_dev
This commit is contained in:
commit
bc897fe7db
@ -64,7 +64,7 @@ class ChatScreen(Screen):
|
|||||||
self,
|
self,
|
||||||
name = None,
|
name = None,
|
||||||
id = None,
|
id = None,
|
||||||
classes = None,
|
classes = None,
|
||||||
telegram_client: TelegramClient | None = None
|
telegram_client: TelegramClient | None = None
|
||||||
):
|
):
|
||||||
super().__init__(name, id, classes)
|
super().__init__(name, id, classes)
|
||||||
@ -145,5 +145,5 @@ class ChatScreen(Screen):
|
|||||||
with Horizontal(id="chats"):
|
with Horizontal(id="chats"):
|
||||||
yield VerticalScroll(Static(id="chat_container"))
|
yield VerticalScroll(Static(id="chat_container"))
|
||||||
#TODO: сделать кнопку чтобы прогрузить больше чатов
|
#TODO: сделать кнопку чтобы прогрузить больше чатов
|
||||||
|
|
||||||
yield Dialog(telegram_client=self.telegram_client)
|
yield Dialog(telegram_client=self.telegram_client)
|
||||||
|
@ -27,8 +27,7 @@ class Chat(Widget):
|
|||||||
)
|
)
|
||||||
global personid
|
global personid
|
||||||
personid = 0
|
personid = 0
|
||||||
self.notify = notify_func
|
self.notify = notify_fun
|
||||||
|
|
||||||
|
|
||||||
def _on_click(self):
|
def _on_click(self):
|
||||||
global personid
|
global personid
|
||||||
@ -56,7 +55,6 @@ class Dialog(Widget):
|
|||||||
self.messages = []
|
self.messages = []
|
||||||
for messages1 in self.telegram_client.iter_dialogs(self.personid, limit=5):
|
for messages1 in self.telegram_client.iter_dialogs(self.personid, limit=5):
|
||||||
messages.append(messages1.text)
|
messages.append(messages1.text)
|
||||||
|
|
||||||
|
|
||||||
def compose(self):
|
def compose(self):
|
||||||
messages = self.messages
|
messages = self.messages
|
||||||
@ -67,7 +65,7 @@ class Dialog(Widget):
|
|||||||
yield Message(message=messages[2], is_me=False)
|
yield Message(message=messages[2], is_me=False)
|
||||||
yield Message(message=messages[3], is_me=True)
|
yield Message(message=messages[3], is_me=True)
|
||||||
yield Message(message=messages[4], is_me=False)
|
yield Message(message=messages[4], is_me=False)
|
||||||
|
|
||||||
# должно быть примерно
|
# должно быть примерно
|
||||||
# is_me = message.from_id == client.get_peer_id("me")
|
# is_me = message.from_id == client.get_peer_id("me")
|
||||||
|
|
||||||
@ -86,8 +84,6 @@ class Dialog(Widget):
|
|||||||
self.app.notify("Нажато отправить")
|
self.app.notify("Нажато отправить")
|
||||||
self.message_text = self.query_one("#msg_input").value
|
self.message_text = self.query_one("#msg_input").value
|
||||||
await self.telegram_client.send_message(personid, str(self.message_text))
|
await self.telegram_client.send_message(personid, str(self.message_text))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Message(Widget):
|
class Message(Widget):
|
||||||
"""Класс виджета сообщений для окна диалога"""
|
"""Класс виджета сообщений для окна диалога"""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user