diff options
author | j.r | 2022-01-16 19:32:53 +0100 |
---|---|---|
committer | j.r | 2022-01-16 19:32:53 +0100 |
commit | 5c9fdd91d381d666777efdfbc19c3ac3f62b7a7c (patch) | |
tree | f09be711188f0fb940602704889acd002e2cca8e | |
parent | b021e21c9eb48f9786a3e16b84e52697e8414083 (diff) | |
download | aur-5c9fdd91d381d666777efdfbc19c3ac3f62b7a7c.tar.gz |
telegram-tg: fix for libtd 1.7.10
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0002-Update-to-TDLib-1.7.10.patch | 82 | ||||
-rw-r--r-- | PKGBUILD | 9 |
3 files changed, 91 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = telegram-tg pkgdesc = terminal telegram client that really works pkgver = 0.17.0 - pkgrel = 4 + pkgrel = 5 url = https://github.com/paul-nameless/tg arch = any license = Unlicense @@ -17,7 +17,9 @@ pkgbase = telegram-tg conflicts = telegram-tg-git source = telegram-tg-0.17.0.tar.gz::https://github.com/paul-nameless/tg/archive/v0.17.0.tar.gz source = 0001-Change-setup.py-to-accept-new-python-telegram-ver.patch + source = 0002-Update-to-TDLib-1.7.10.patch md5sums = a9b619805bf79f6f92093e3f96e54125 md5sums = 1977134e8c8fcd093d7081877711255d + md5sums = 84f26c2df9961f4f88f5f8b20daa0b18 pkgname = telegram-tg diff --git a/0002-Update-to-TDLib-1.7.10.patch b/0002-Update-to-TDLib-1.7.10.patch new file mode 100644 index 000000000000..7bd3692dd37a --- /dev/null +++ b/0002-Update-to-TDLib-1.7.10.patch @@ -0,0 +1,82 @@ +From 42ebe34dd571d26967c5cdbb9f5c4352f613554f Mon Sep 17 00:00:00 2001 +From: Andrey Androsov <irondrondron@gmail.com> +Date: Fri, 14 Jan 2022 23:36:57 +0200 +Subject: [PATCH] Update to TDLib 1.7.10 + +--- + tg/controllers.py | 2 +- + tg/models.py | 2 +- + tg/msg.py | 2 +- + tg/views.py | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tg/controllers.py b/tg/controllers.py +index afaf86b..ef3f6a6 100644 +--- a/tg/controllers.py ++++ b/tg/controllers.py +@@ -873,7 +873,7 @@ def notify_for_message(self, chat_id: int, msg: MsgProxy) -> None: + return + + # notify +- if self.model.is_me(msg["sender"].get("user_id")): ++ if self.model.is_me(msg["sender_id"].get("user_id")): + return + user = self.model.users.get_user(msg.sender_id) + name = f"{user['first_name']} {user['last_name']}" +diff --git a/tg/models.py b/tg/models.py +index 15f7ec7..98409bb 100644 +--- a/tg/models.py ++++ b/tg/models.py +@@ -175,7 +175,7 @@ def edit_message(self, text: str) -> bool: + return False + + def can_be_deleted(self, chat_id: int, msg: Dict[str, Any]) -> bool: +- c_id = msg["sender"].get("chat_id") or msg["sender"].get("user_id") ++ c_id = msg["sender_id"].get("chat_id") or msg["sender_id"].get("user_id") + if chat_id == c_id: + return msg["can_be_deleted_only_for_self"] + return msg["can_be_deleted_for_all_users"] +diff --git a/tg/msg.py b/tg/msg.py +index 5c35ef4..c9e56e0 100644 +--- a/tg/msg.py ++++ b/tg/msg.py +@@ -220,7 +220,7 @@ def chat_id(self) -> int: + + @property + def sender_id(self) -> int: +- return self.msg["sender"].get("user_id") or self.msg["sender"].get( ++ return self.msg["sender_id"].get("user_id") or self.msg["sender_id"].get( + "chat_id" + ) + +diff --git a/tg/views.py b/tg/views.py +index 20e6756..3facfc2 100644 +--- a/tg/views.py ++++ b/tg/views.py +@@ -262,7 +262,7 @@ def _get_flags(self, chat: Dict[str, Any]) -> str: + msg = chat.get("last_message") + if ( + msg +- and self.model.is_me(msg["sender"].get("user_id")) ++ and self.model.is_me(msg["sender_id"].get("user_id")) + and msg["id"] > chat["last_read_outbox_message_id"] + and not self.model.is_me(chat["id"]) + ): +@@ -270,7 +270,7 @@ def _get_flags(self, chat: Dict[str, Any]) -> str: + flags.append("unseen") + elif ( + msg +- and self.model.is_me(msg["sender"].get("user_id")) ++ and self.model.is_me(msg["sender_id"].get("user_id")) + and msg["id"] <= chat["last_read_outbox_message_id"] + ): + flags.append("seen") +@@ -610,7 +610,7 @@ def get_last_msg( + if not last_msg: + return None, "<No messages yet>" + return ( +- last_msg["sender"].get("user_id"), ++ last_msg["sender_id"].get("user_id"), + parse_content(MsgProxy(last_msg), users), + ) + @@ -2,7 +2,7 @@ _pkgname=tg pkgname=telegram-$_pkgname pkgver=0.17.0 -pkgrel=4 +pkgrel=5 pkgdesc="terminal telegram client that really works" arch=('any') url="https://github.com/paul-nameless/tg" @@ -18,14 +18,17 @@ optdepends=( ) conflicts=('telegram-tg-git') source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz" - "0001-Change-setup.py-to-accept-new-python-telegram-ver.patch") + "0001-Change-setup.py-to-accept-new-python-telegram-ver.patch" + "0002-Update-to-TDLib-1.7.10.patch") md5sums=('a9b619805bf79f6f92093e3f96e54125' - '1977134e8c8fcd093d7081877711255d') + '1977134e8c8fcd093d7081877711255d' + '84f26c2df9961f4f88f5f8b20daa0b18') prepare() { cd "$srcdir/$_pkgname-$pkgver" patch -p1 -i "$srcdir/0001-Change-setup.py-to-accept-new-python-telegram-ver.patch" + patch -p1 -i "$srcdir/0002-Update-to-TDLib-1.7.10.patch" } build() { |