iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Bridge room meta to Matrix as correct ghost user if possible

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-15 22:22:51 +03:00
parent eea059c0d3
commit d33460e3bd
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/portal/metadata.py
+25 -9
View File
@@ -13,7 +13,7 @@
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
from typing import List, Optional, Tuple, Union, TYPE_CHECKING from typing import List, Optional, Tuple, Union, Callable, TYPE_CHECKING
from abc import ABC from abc import ABC
import asyncio import asyncio
@@ -31,6 +31,7 @@ from telethon.tl.types import (
from mautrix.errors import MForbidden from mautrix.errors import MForbidden
from mautrix.types import (RoomID, UserID, RoomCreatePreset, EventType, Membership, Member, from mautrix.types import (RoomID, UserID, RoomCreatePreset, EventType, Membership, Member,
PowerLevelStateEventContent, RoomAlias) PowerLevelStateEventContent, RoomAlias)
from mautrix.appservice import IntentAPI
from ..types import TelegramID from ..types import TelegramID
from ..context import Context from ..context import Context
@@ -562,28 +563,41 @@ class PortalMetadata(BasePortal, ABC):
self.save() self.save()
return True return True
async def _update_about(self, about: str, save: bool = False) -> bool: async def _try_use_intent(self, sender: Optional['p.Puppet'], action: Callable[[IntentAPI], None]) -> None:
if sender:
try:
await action(sender.intent_for(self))
except MForbidden:
await action(self.main_intent)
else:
await action(self.main_intent)
async def _update_about(self, about: str, sender: Optional['p.Puppet'] = None,
save: bool = False) -> bool:
if self.about == about: if self.about == about:
return False return False
self.about = about self.about = about
await self.main_intent.set_room_topic(self.mxid, self.about) await self._try_use_intent(sender,
lambda intent: intent.set_room_topic(self.mxid, self.about))
if save: if save:
self.save() self.save()
return True return True
async def _update_title(self, title: str, save: bool = False) -> bool: async def _update_title(self, title: str, sender: Optional['p.Puppet'] = None,
save: bool = False) -> bool:
if self.title == title: if self.title == title:
return False return False
self.title = title self.title = title
await self.main_intent.set_room_name(self.mxid, self.title) await self._try_use_intent(sender,
lambda intent: intent.set_room_name(self.mxid, self.title))
if save: if save:
self.save() self.save()
return True return True
async def _update_avatar(self, user: 'AbstractUser', photo: TypeChatPhoto, save: bool = False async def _update_avatar(self, user: 'AbstractUser', photo: TypeChatPhoto,
) -> bool: sender: Optional['p.Puppet'] = None, save: bool = False) -> bool:
if isinstance(photo, ChatPhoto): if isinstance(photo, ChatPhoto):
loc = InputPeerPhotoFileLocation( loc = InputPeerPhotoFileLocation(
peer=await self.get_input_entity(user), peer=await self.get_input_entity(user),
@@ -602,14 +616,16 @@ class PortalMetadata(BasePortal, ABC):
raise ValueError(f"Unknown photo type {type(photo)}") raise ValueError(f"Unknown photo type {type(photo)}")
if self.photo_id != photo_id: if self.photo_id != photo_id:
if not photo_id: if not photo_id:
await self.main_intent.set_room_avatar(self.mxid, None) await self._try_use_intent(sender,
lambda intent: intent.set_room_avatar(self.mxid, None))
self.photo_id = "" self.photo_id = ""
if save: if save:
self.save() self.save()
return True return True
file = await util.transfer_file_to_matrix(user.client, self.main_intent, loc) file = await util.transfer_file_to_matrix(user.client, self.main_intent, loc)
if file: if file:
await self.main_intent.set_room_avatar(self.mxid, file.mxc) await self._try_use_intent(sender, lambda intent: intent.set_room_avatar(self.mxid,
file.mxc))
self.photo_id = photo_id self.photo_id = photo_id
if save: if save:
self.save() self.save()
mautrix_telegram/portal/telegram.py
+3 -3
View File
@@ -481,11 +481,11 @@ class PortalTelegram(BasePortal, ABC):
if should_ignore or not self.mxid: if should_ignore or not self.mxid:
return return
if isinstance(action, MessageActionChatEditTitle): if isinstance(action, MessageActionChatEditTitle):
await self._update_title(action.title, save=True) await self._update_title(action.title, sender=sender, save=True)
elif isinstance(action, MessageActionChatEditPhoto): elif isinstance(action, MessageActionChatEditPhoto):
await self._update_avatar(source, action.photo, save=True) await self._update_avatar(source, action.photo, sender=sender, save=True)
elif isinstance(action, MessageActionChatDeletePhoto): elif isinstance(action, MessageActionChatDeletePhoto):
await self._update_avatar(source, ChatPhotoEmpty(), save=True) await self._update_avatar(source, ChatPhotoEmpty(), sender=sender, save=True)
elif isinstance(action, MessageActionChatAddUser): elif isinstance(action, MessageActionChatAddUser):
for user_id in action.users: for user_id in action.users:
await self._add_telegram_user(TelegramID(user_id), source) await self._add_telegram_user(TelegramID(user_id), source)