Mirrors/tg
2
0
Fork 0
mirror of https://github.com/paul-nameless/tg synced 2024-11-22 20:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not notify new msgs if chat is muted

Browse source 
Mark muted chats
Fix bug with msgs longer than status's width
Add vertical line separtor between chats and msgs
Update chat view
This commit is contained in:
Paul Nameless 2020-05-12 19:01:29 +08:00
parent f36eef5b39
commit 73d8067f53
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tg/controllers/__init__.py
View file

@ -260,6 +260,21 @@ class Controller:
if msg.file_id and msg.size <= config.max_download_size:
self.download(msg.file_id, chat_id, msg["id"])
# do not notify, if muted
# TODO: optimize
chat = None
for i, chat in enumerate(self.model.chats.chats):
if chat_id == chat["id"]:
chat = chat
break
if (
chat
and chat["notification_settings"]["mute_for"]
or chat["notification_settings"]["use_default_mute_for"]
):
return
# notify
user_id = msg["sender_user_id"]
if msg["sender_user_id"] == self.model.get_me()["id"]:

38
tg/views/__init__.py
View file

@ -82,7 +82,7 @@ class StatusView:
self.win.clear()
if not msg:
return
self.win.addstr(0, 0, msg[: self.w])
self.win.addstr(0, 0, msg[: self.w - 1])
self._refresh()
def get_input(self, msg="") -> Optional[str]:
@ -129,26 +129,28 @@ class ChatView:
def draw(self, current: int, chats: List[Dict[str, Any]]) -> None:
self.win.erase()
# self.win.vline(0, self.w-1, curses.ACS_VLINE, self.h)
self.win.vline(0, self.w - 1, curses.ACS_VLINE, self.h)
for i, chat in enumerate(chats):
date, title, unread, last_msg = (
date, title, unread_count, last_msg = (
get_date(chat),
chat["title"],
chat["unread_count"],
get_last_msg(chat),
)
last_msg = " " + emoji_pattern.sub(r"?", last_msg)
# last_msg = " " + emoji_pattern.sub(r"?", last_msg)
# last_msg = emoji.demojize(last_msg)
last_msg = " " + last_msg.replace("\n", " ")
msg_color = get_color(white, -1)
unread_color = get_color(magenta, -1)
attrs = [get_color(cyan, -1), get_color(blue, -1), msg_color]
if i == current:
attrs = [attr | reverse for attr in attrs]
msg_color |= reverse
unread_color |= reverse
offset = 0
for attr, elem in zip(attrs, [" {} ".format(date), title]):
for attr, elem in zip(attrs, ["{} ".format(date), title]):
if offset > self.w:
break
self.win.addstr(i, offset, elem[: self.w - offset - 1], attr)
@ -158,16 +160,20 @@ class ChatView:
continue
attr = msg_color
msg = last_msg[: self.w - offset - 1]
if len(msg) < self.w:
msg += " " * (self.w - offset - len(msg) - 1)
n = self.w - offset - 1
msg = last_msg[:n]
self.win.addstr(i, offset, msg, attr)
unread = ""
if unread_count:
unread = f"{unread_count} "
if chat["notification_settings"]["mute_for"]:
unread = f"muted {unread}"
if unread:
unread = " " + unread
attr = unread_color
unread = " " + str(unread) + " "
self.win.addstr(i, self.w - len(unread) - 1, unread, attr)
self._refresh()
@ -197,11 +203,11 @@ class MsgView:
dt, user_id, msg = self._parse_msg(msg)
user_id = self._get_user_by_id(user_id)
msg = msg.replace("\n", " ")
# remove utf-8 characters that take > 1 bytes to print
# count wide character utf-8 symbols that take > 1 bytes to print
# it causes invalid offset
msg = emoji_pattern.sub(r"?", msg)
wide_char_len = sum(map(len, emoji_pattern.findall(msg)))
elements = (" {} ".format(dt), user_id, " " + msg)
total_len = sum(len(e) for e in elements)
total_len = sum(len(e) for e in elements) + wide_char_len
needed_lines = (total_len // self.w) + 1
line_num -= needed_lines
if line_num <= 0:
@ -266,7 +272,7 @@ def get_date(chat: Dict[str, Any]) -> str:
dt = datetime.fromtimestamp(last_msg["date"])
if datetime.today().date() == dt.date():
return dt.strftime("%H:%M")
return dt.strftime("%d/%b/%y")
return dt.strftime("%d %b %y")
def parse_content(content: Dict[str, Any]) -> str: