diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index db7fb441..0e59d70a 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -3161,7 +3161,13 @@ class Portal(DBPortal, BasePortal): ) return - self.log.debug("Handling Telegram message %d@%d from %s", evt.id, tg_space, sender.tgid) + self.log.debug( + "Handling Telegram message %d@%d from %s (ts: %s)", + evt.id, + tg_space, + sender.tgid if sender else None, + evt.date, + ) self.log.trace("Message content: %s", evt) if sender and not sender.displayname: diff --git a/mautrix_telegram/portal_util/power_levels.py b/mautrix_telegram/portal_util/power_levels.py index 1b51300c..b1a497b8 100644 --- a/mautrix_telegram/portal_util/power_levels.py +++ b/mautrix_telegram/portal_util/power_levels.py @@ -80,11 +80,7 @@ def get_base_power_levels( levels.events_default = overrides.get( "events_default", 50 - if ( - portal.peer_type == "channel" - and not entity.megagroup - or entity.default_banned_rights.send_messages - ) + if portal.peer_type == "channel" and not entity.megagroup or dbr.send_messages else 0, ) for evt_type, value in overrides.get("events", {}).items(): diff --git a/requirements.txt b/requirements.txt index 4af94dbc..4e3e0efd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ aiohttp>=3,<4 yarl>=1,<2 mautrix>=0.16.4,<0.17 #telethon>=1.24,<1.25 -tulir-telethon==1.25.0a8 +tulir-telethon==1.25.0a10 asyncpg>=0.20,<0.26 mako>=1,<2 setuptools