Commit e5ab1566 authored by Bart Ribbers's avatar Bart Ribbers Committed by Rasmus Thomsen

community/mautrix-telegram: upgrade to 0.8.2

parent dab9653f
From 729fa8eb46aa065d2bd0bbb64991438e16493d71 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 30 Jul 2020 21:26:20 +0300
Subject: [PATCH] Update Telethon
---
requirements.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 5ffa6be..140f1b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ python-magic>=0.4,<0.5
commonmark>=0.8,<0.10
aiohttp>=3,<4
mautrix>=0.5.8,<0.6
-telethon>=1.13,<1.15
+telethon>=1.13,<1.17
telethon-session-sqlalchemy>=0.2.14,<0.3
From 993354bce5de9c8fa1bc0acf410d7e17868d3175 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 27 Jul 2020 13:28:08 +0300
Subject: [PATCH] Update mautrix-python
---
mautrix_telegram/matrix.py | 2 +-
requirements.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py
index e1f2e7d..3a591e3 100644
--- a/mautrix_telegram/matrix.py
+++ b/mautrix_telegram/matrix.py
@@ -392,7 +392,7 @@ class MatrixHandler(BaseMatrixHandler):
def filter_matrix_event(self, evt: Event) -> bool:
if not isinstance(evt, (RedactionEvent, MessageEvent, StateEvent, EncryptedEvent)):
return True
- if evt.content.get("net.maunium.telegram.puppet", False):
+ if evt.content.get(self.az.real_user_content_key, False):
puppet = pu.Puppet.get_by_custom_mxid(evt.sender)
if puppet:
self.log.debug("Ignoring puppet-sent event %s", evt.event_id)
diff --git a/requirements.txt b/requirements.txt
index 9df12fa..140f1b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,6 @@ ruamel.yaml>=0.15.35,<0.17
python-magic>=0.4,<0.5
commonmark>=0.8,<0.10
aiohttp>=3,<4
-mautrix>=0.5.8,<0.6
+mautrix>=0.6,<0.7
telethon>=1.13,<1.17
telethon-session-sqlalchemy>=0.2.14,<0.3
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=mautrix-telegram
pkgver=0.8.1
pkgver=0.8.2
pkgrel=0
pkgdesc="A Matrix-Telegram hybrid puppeting/relaybot bridge"
url="https://github.com/tulir/mautrix-telegram"
......@@ -16,6 +16,8 @@ source="https://github.com/tulir/mautrix-telegram/archive/v$pkgver/mautrix-teleg
mautrix-telegram.initd
mautrix-telegram.confd
default-log-dir.patch
0001-update-telethon.patch
0002-update-mautrix.patch
"
build() {
......@@ -43,7 +45,9 @@ package() {
"$pkgdir"/usr/alembic.ini \
"$pkgdir"/usr/share/mautrix-telegram/
}
sha512sums="bd2ceb6c819996bfd7b27eb9ec42b3502a63c014aa00d83ebc1916a872f748e9c7e3fe682147cc8adba9ef3d4fafd50144a79d9daa8778c8314d7bb2ee17f73b mautrix-telegram-v0.8.1.tar.gz
sha512sums="4604201b7079a568f1d2a3f55f6ccde53930c651e9c5a78d3721c551fa4e480af6333166123ee27dd38f114a1eb163ae65c585d42ebdb1cd18f227d22e5f12b6 mautrix-telegram-v0.8.2.tar.gz
394e50290a212e0f68a9b4d53dfa181df3cc0494f01c88d701db018bc1ec454f0f92fd56b750c6229ffaf0d1b6832f9f2177a3a1444b9a3b92d23ad3194b566c mautrix-telegram.initd
7b3c15dd2d0671c4c777bcf4f2e905d9a0b639a54828313ac9db1a9793fde3d092e92f18aa896bff94b9a81db3df74b3de65661c6879cb648d36f5cec2437df0 mautrix-telegram.confd
7e75b46226c928f3aa64b13a3042eae7da164006b262f40ff5bbfdda9e91c80c2189a009735539d2349a638ad11c6ce0bf4bd93db12f485cb4906553283512c3 default-log-dir.patch"
7e75b46226c928f3aa64b13a3042eae7da164006b262f40ff5bbfdda9e91c80c2189a009735539d2349a638ad11c6ce0bf4bd93db12f485cb4906553283512c3 default-log-dir.patch
3a7d093ed60a5e282edc536f66f5c61f0c5c57619eb6572d1396a261563d3f70d2d1c1570fb58b86ee8b0c3cbb3843ed3c72e582cf311dfc07819d3b32719433 0001-update-telethon.patch
c6731cfff0cdc96b9a9cc48478e825ff855ffaffd3e3095c25a844e779e6289d053d7175ed5917ca413073f02da414d65b45d26aaad3641a6ab2694850735b2d 0002-update-mautrix.patch"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment