upgpkg: telegram-tg-git 0.18.0.r0.2a809fb-1

upstream release

3 files changed, 6 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0a1e01ce10d..ddddfe6989c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-tg-git
 	pkgdesc = terminal telegram client that really works
-	pkgver = 0.17.0.r8.c2f5fca
-	pkgrel = 3
+	pkgver = 0.18.0.r0.2a809fb
+	pkgrel = 1
 	url = https://github.com/paul-nameless/tg
 	arch = any
 	license = Unlicense
@@ -19,9 +19,7 @@ pkgbase = telegram-tg-git
 	conflicts = telegram-tg
 	source = telegram-tg::git+https://github.com/paul-nameless/tg.git
 	source = 0001-Change-setup.py-to-accept-new-python-telegram-ver.patch
-	source = 0002-Update-to-TDLib-1.7.10.patch
 	md5sums = SKIP
 	md5sums = 1977134e8c8fcd093d7081877711255d
-	md5sums = 84f26c2df9961f4f88f5f8b20daa0b18
 
 pkgname = telegram-tg-git
diff --git a/0002-Update-to-TDLib-1.7.10.patch b/0002-Update-to-TDLib-1.7.10.patch
deleted file mode 100644
index 7bd3692dd37a..000000000000
--- a/0002-Update-to-TDLib-1.7.10.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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),
-     )
- 
diff --git a/PKGBUILD b/PKGBUILD
index 1fb78bb6ef54..f63b3f6ef220 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: j.r <j.r@jugendhacker.de>
 _pkgname=telegram-tg
 pkgname=$_pkgname-git
-pkgver=0.17.0.r8.c2f5fca
-pkgrel=3
+pkgver=0.18.0.r0.2a809fb
+pkgrel=1
 pkgdesc="terminal telegram client that really works"
 arch=(any)
 url="https://github.com/paul-nameless/tg"
@@ -20,11 +20,9 @@ optdepends=(
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=("$_pkgname::git+https://github.com/paul-nameless/tg.git"
-	"0001-Change-setup.py-to-accept-new-python-telegram-ver.patch"
-	"0002-Update-to-TDLib-1.7.10.patch")
+	"0001-Change-setup.py-to-accept-new-python-telegram-ver.patch")
 md5sums=('SKIP'
-         '1977134e8c8fcd093d7081877711255d'
-         '84f26c2df9961f4f88f5f8b20daa0b18')
+         '1977134e8c8fcd093d7081877711255d')
 
 pkgver() {
 	cd "$srcdir/$_pkgname"
@@ -36,7 +34,6 @@ prepare() {
 	cd "$srcdir/$_pkgname"
 
 	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() {