Big performance refactoring & various improvements
Instead of passing all sorts of events for the JS to handle and manually add to different data models, we now handle everything we can in Python. For any change, the python models send a sync event with their contents (no more than 4 times per second) to JS, and the QSyncable library's JsonListModel takes care of converting it to a QML ListModel and sending the appropriate signals. The SortFilterProxyModel library is not used anymore, the only case where we need to filter/sort something now is when the user interacts with the "Filter rooms" or "Filter members" fields. These cases are handled by a simple JS function. We now keep separated room and timeline models for different accounts, the previous approach of sharing all the data we could between accounts created a lot of complications (local echoes, decrypted messages replacing others, etc). The users's own account profile changes are now hidden in the timeline. On startup, if all events for a room were only own profile changes, more events will be loaded. Any kind of image format supported by Qt is now handled by the pyotherside image provider, instead of just PNG/JPG. SVGs which previously caused errors are supported as well. The typing members bar paddings/margins are fixed. The behavior of the avatar/"upload a profile picture" overlay is fixed. Config files read from disk are now cached (TODO: make them reloadable again). Pylint is not used anymore because of all its annoying false warnings and lack of understanding for dataclasses, it is replaced by flake8 with a custom config and various plugins. Debug mode is now considered on if the program was compiled with the right option, instead of taking an argument from CLI. When on, C++ will set a flag in the Window QML component. The loading screen is now unloaded after the UI is ready, where previously it just stayed in the background invisible and wasted CPU. The overall refactoring and improvements make us now able to handle rooms with thousand of members and no lazy-loading, where previously everything would freeze and simply scrolling up to load past events in any room would block the UI for a few seconds.
This commit is contained in:
miruka
@@ -12,18 +12,15 @@ from datetime import datetime
|
||||
from enum import Enum
|
||||
from pathlib import Path
|
||||
from types import ModuleType
|
||||
from typing import DefaultDict, Dict, Optional, Type, Union
|
||||
from typing import DefaultDict, Dict, Optional, Set, Tuple, Type, Union
|
||||
from uuid import uuid4
|
||||
|
||||
import filetype
|
||||
|
||||
import nio
|
||||
from nio.rooms import MatrixRoom
|
||||
|
||||
from . import __about__
|
||||
from .events import rooms, users
|
||||
from .events.rooms import TimelineEventReceived
|
||||
from . import __about__, utils
|
||||
from .html_filter import HTML_FILTER
|
||||
from .models.items import Account, Event, Member, Room
|
||||
from .models.model_store import ModelStore
|
||||
|
||||
|
||||
class UploadError(Enum):
|
||||
@@ -38,19 +35,11 @@ class MatrixClient(nio.AsyncClient):
|
||||
user: str,
|
||||
homeserver: str = "https://matrix.org",
|
||||
device_id: Optional[str] = None) -> None:
|
||||
# TODO: ensure homeserver starts with a scheme://
|
||||
|
||||
from .backend import Backend
|
||||
self.backend: Backend = backend
|
||||
|
||||
self.sync_task: Optional[asyncio.Future] = None
|
||||
|
||||
self.send_locks: DefaultDict[str, asyncio.Lock] = \
|
||||
DefaultDict(asyncio.Lock) # {room_id: lock}
|
||||
|
||||
store = Path(self.backend.app.appdirs.user_data_dir) / "encryption"
|
||||
store = Path(backend.app.appdirs.user_data_dir) / "encryption"
|
||||
store.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
# TODO: ensure homeserver starts by a scheme://
|
||||
# TODO: pass a ClientConfig with a pickle key
|
||||
super().__init__(
|
||||
homeserver = homeserver,
|
||||
@@ -59,12 +48,31 @@ class MatrixClient(nio.AsyncClient):
|
||||
store_path = store,
|
||||
)
|
||||
|
||||
from .backend import Backend
|
||||
self.backend: Backend = backend
|
||||
self.models: ModelStore = self.backend.models
|
||||
|
||||
self.sync_task: Optional[asyncio.Future] = None
|
||||
self.first_sync_happened: asyncio.Event = asyncio.Event()
|
||||
|
||||
self.send_locks: DefaultDict[str, asyncio.Lock] = \
|
||||
DefaultDict(asyncio.Lock) # {room_id: lock}
|
||||
|
||||
self.past_tokens: Dict[str, str] = {} # {room_id: token}
|
||||
self.fully_loaded_rooms: Set[str] = set() # {room_id}
|
||||
self.loaded_once_rooms: Set[str] = set() # {room_id}
|
||||
|
||||
self.local_echoes_uuid: Set[str] = set()
|
||||
self.resolved_echoes: Dict[str, str] = {} # {event_id: echo_uuid}
|
||||
|
||||
self.skipped_events: DefaultDict[str, int] = DefaultDict(lambda: 0)
|
||||
|
||||
self.connect_callbacks()
|
||||
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return "%s(user_id=%r, homeserver=%r, device_id=%r)" % (
|
||||
type(self).__name__, self.user_id, self.homeserver, self.device_id
|
||||
type(self).__name__, self.user_id, self.homeserver, self.device_id,
|
||||
)
|
||||
|
||||
|
||||
@@ -86,17 +94,10 @@ class MatrixClient(nio.AsyncClient):
|
||||
with suppress(AttributeError):
|
||||
self.add_event_callback(getattr(self, f"on{name}"), class_)
|
||||
|
||||
|
||||
async def start_syncing(self) -> None:
|
||||
self.sync_task = asyncio.ensure_future(
|
||||
self.sync_forever(timeout=10_000)
|
||||
self.add_ephemeral_callback(
|
||||
self.onTypingNoticeEvent, nio.events.TypingNoticeEvent,
|
||||
)
|
||||
|
||||
def callback(task):
|
||||
raise task.exception()
|
||||
|
||||
self.sync_task.add_done_callback(callback)
|
||||
|
||||
|
||||
@property
|
||||
def default_device_name(self) -> str:
|
||||
@@ -107,19 +108,19 @@ class MatrixClient(nio.AsyncClient):
|
||||
|
||||
async def login(self, password: str, device_name: str = "") -> None:
|
||||
response = await super().login(
|
||||
password, device_name or self.default_device_name
|
||||
password, device_name or self.default_device_name,
|
||||
)
|
||||
|
||||
if isinstance(response, nio.LoginError):
|
||||
print(response)
|
||||
log.error(response)
|
||||
else:
|
||||
await self.start_syncing()
|
||||
await self.start()
|
||||
|
||||
|
||||
async def resume(self, user_id: str, token: str, device_id: str) -> None:
|
||||
response = nio.LoginResponse(user_id, device_id, token)
|
||||
await self.receive_response(response)
|
||||
await self.start_syncing()
|
||||
await self.start()
|
||||
|
||||
|
||||
async def logout(self) -> None:
|
||||
@@ -131,27 +132,29 @@ class MatrixClient(nio.AsyncClient):
|
||||
await self.close()
|
||||
|
||||
|
||||
async def request_user_update_event(self, user_id: str) -> None:
|
||||
if user_id in self.backend.pending_profile_requests:
|
||||
return
|
||||
self.backend.pending_profile_requests.add(user_id)
|
||||
async def start(self) -> None:
|
||||
def on_profile_response(future) -> None:
|
||||
resp = future.result()
|
||||
if isinstance(resp, nio.ProfileGetResponse):
|
||||
account = self.models[Account][self.user_id]
|
||||
account.profile_updated = datetime.now()
|
||||
account.display_name = resp.displayname or ""
|
||||
account.avatar_url = resp.avatar_url or ""
|
||||
|
||||
response = await self.get_profile(user_id)
|
||||
ft = asyncio.ensure_future(self.backend.get_profile(self.user_id))
|
||||
ft.add_done_callback(on_profile_response)
|
||||
|
||||
if isinstance(response, nio.ProfileGetError):
|
||||
log.warning("%s: %s", user_id, response)
|
||||
def on_unexpected_sync_stop(future) -> None:
|
||||
raise future.exception()
|
||||
|
||||
users.UserUpdated(
|
||||
user_id = user_id,
|
||||
display_name = getattr(response, "displayname", "") or "",
|
||||
avatar_url = getattr(response, "avatar_url", "") or "",
|
||||
self.sync_task = asyncio.ensure_future(
|
||||
self.sync_forever(timeout=10_000),
|
||||
)
|
||||
|
||||
self.backend.pending_profile_requests.discard(user_id)
|
||||
self.sync_task.add_done_callback(on_unexpected_sync_stop)
|
||||
|
||||
|
||||
@property
|
||||
def all_rooms(self) -> Dict[str, MatrixRoom]:
|
||||
def all_rooms(self) -> Dict[str, nio.MatrixRoom]:
|
||||
return {**self.invited_rooms, **self.rooms}
|
||||
|
||||
|
||||
@@ -162,36 +165,48 @@ class MatrixClient(nio.AsyncClient):
|
||||
text = text[1:]
|
||||
|
||||
if text.startswith("/me ") and not escape:
|
||||
event_type = nio.RoomMessageEmote
|
||||
event_type = nio.RoomMessageEmote.__name__
|
||||
text = text[len("/me "): ]
|
||||
content = {"body": text, "msgtype": "m.emote"}
|
||||
to_html = HTML_FILTER.from_markdown_inline(text, outgoing=True)
|
||||
echo_html = HTML_FILTER.from_markdown_inline(text)
|
||||
else:
|
||||
event_type = nio.RoomMessageText
|
||||
event_type = nio.RoomMessageText.__name__
|
||||
content = {"body": text, "msgtype": "m.text"}
|
||||
to_html = HTML_FILTER.from_markdown(text, outgoing=True)
|
||||
echo_html = HTML_FILTER.from_markdown(text)
|
||||
|
||||
if to_html not in (html.escape(text), f"<p>{html.escape(text)}</p>"):
|
||||
content["format"] = "org.matrix.custom.html"
|
||||
content["formatted_body"] = to_html
|
||||
|
||||
TimelineEventReceived(
|
||||
event_type = event_type,
|
||||
room_id = room_id,
|
||||
event_id = f"local_echo.{uuid4()}",
|
||||
uuid = str(uuid4())
|
||||
self.local_echoes_uuid.add(uuid)
|
||||
|
||||
our_info = self.models[Member, room_id][self.user_id]
|
||||
display_content = content.get("formatted_body") or content["body"]
|
||||
|
||||
local = Event(
|
||||
client_id = f"echo-{uuid}",
|
||||
event_id = "",
|
||||
event_type = event_type,
|
||||
date = datetime.now(),
|
||||
content = display_content,
|
||||
inline_content = HTML_FILTER.filter_inline(display_content),
|
||||
is_local_echo = True,
|
||||
|
||||
sender_id = self.user_id,
|
||||
date = datetime.now(),
|
||||
content = echo_html,
|
||||
is_local_echo = True,
|
||||
sender_name = our_info.display_name,
|
||||
sender_avatar = our_info.avatar_url,
|
||||
)
|
||||
for user_id in self.models[Account]:
|
||||
if user_id in self.models[Member, room_id]:
|
||||
self.models[Event, user_id, room_id][f"echo-{uuid}"] = local
|
||||
|
||||
async with self.send_locks[room_id]:
|
||||
response = await self.room_send(
|
||||
room_id = room_id,
|
||||
message_type = "m.room.message",
|
||||
content = content,
|
||||
tx_id = uuid,
|
||||
ignore_unverified_devices = True,
|
||||
)
|
||||
|
||||
@@ -199,44 +214,62 @@ class MatrixClient(nio.AsyncClient):
|
||||
log.error("Failed to send message: %s", response)
|
||||
|
||||
|
||||
async def load_past_events(self, room_id: str, limit: int = 25) -> bool:
|
||||
if room_id in self.backend.fully_loaded_rooms:
|
||||
async def load_past_events(self, room_id: str) -> bool:
|
||||
if room_id in self.fully_loaded_rooms:
|
||||
return False
|
||||
|
||||
await self.first_sync_happened.wait()
|
||||
|
||||
response = await self.room_messages(
|
||||
room_id = room_id,
|
||||
start = self.backend.past_tokens[room_id],
|
||||
limit = limit,
|
||||
start = self.past_tokens[room_id],
|
||||
limit = 100 if room_id in self.loaded_once_rooms else 25,
|
||||
)
|
||||
|
||||
self.loaded_once_rooms.add(room_id)
|
||||
more_to_load = True
|
||||
|
||||
if self.backend.past_tokens[room_id] == response.end:
|
||||
self.backend.fully_loaded_rooms.add(room_id)
|
||||
if self.past_tokens[room_id] == response.end:
|
||||
self.fully_loaded_rooms.add(room_id)
|
||||
more_to_load = False
|
||||
|
||||
self.backend.past_tokens[room_id] = response.end
|
||||
self.past_tokens[room_id] = response.end
|
||||
|
||||
for event in response.chunk:
|
||||
for cb in self.event_callbacks:
|
||||
if (cb.filter is None or isinstance(event, cb.filter)):
|
||||
await cb.func(
|
||||
self.all_rooms[room_id], event, from_past=True
|
||||
)
|
||||
await cb.func(self.all_rooms[room_id], event)
|
||||
|
||||
return more_to_load
|
||||
|
||||
|
||||
async def load_rooms_without_visible_events(self) -> None:
|
||||
for room_id in self.models[Room, self.user_id]:
|
||||
asyncio.ensure_future(
|
||||
self._load_room_without_visible_events(room_id),
|
||||
)
|
||||
|
||||
|
||||
async def _load_room_without_visible_events(self, room_id: str) -> None:
|
||||
events = self.models[Event, self.user_id, room_id]
|
||||
more = True
|
||||
|
||||
while self.skipped_events[room_id] and not events and more:
|
||||
more = await self.load_past_events(room_id)
|
||||
|
||||
|
||||
async def room_forget(self, room_id: str) -> None:
|
||||
await super().room_forget(room_id)
|
||||
rooms.RoomForgotten(user_id=self.user_id, room_id=room_id)
|
||||
self.models[Room, self.user_id].pop(room_id, None)
|
||||
self.models.pop([Event, self.user_id, room_id], None)
|
||||
self.models.pop([Member, room_id], None)
|
||||
|
||||
|
||||
async def upload_file(self, path: Union[Path, str]) -> str:
|
||||
path = Path(path)
|
||||
|
||||
with open(path, "rb") as file:
|
||||
mime = filetype.guess_mime(file)
|
||||
mime = utils.guess_mime(file)
|
||||
file.seek(0, 0)
|
||||
|
||||
resp = await self.upload(file, mime, path.name)
|
||||
@@ -253,7 +286,7 @@ class MatrixClient(nio.AsyncClient):
|
||||
return UploadError.unknown.value
|
||||
|
||||
|
||||
async def set_avatar_from_file(self, path: Union[Path, str]
|
||||
async def set_avatar_from_file(self, path: Union[Path, str],
|
||||
) -> Union[bool, str]:
|
||||
resp = await self.upload_file(path)
|
||||
|
||||
@@ -264,30 +297,153 @@ class MatrixClient(nio.AsyncClient):
|
||||
return True
|
||||
|
||||
|
||||
# Functions to register data into models
|
||||
|
||||
async def set_room_last_event(self, room_id: str, item: Event) -> None:
|
||||
room = self.models[Room, self.user_id][room_id]
|
||||
|
||||
if room.last_event is None:
|
||||
room.last_event = item.__dict__
|
||||
return
|
||||
|
||||
for_us = item.target_id in self.backend.clients
|
||||
is_member_ev = item.event_type == nio.RoomMemberEvent.__name__
|
||||
|
||||
# If there were no better events available to show previously
|
||||
prev_is_member_ev = \
|
||||
room.last_event["event_type"] == nio.RoomMemberEvent.__name__
|
||||
|
||||
if is_member_ev and for_us and not prev_is_member_ev:
|
||||
return
|
||||
|
||||
if item.date < room.last_event["date"]: # If this is a past event
|
||||
return
|
||||
|
||||
room.last_event = item.__dict__
|
||||
|
||||
|
||||
async def register_nio_room(self, room: nio.MatrixRoom, left: bool = False,
|
||||
) -> None:
|
||||
# Generate the room name
|
||||
name = room.name or room.canonical_alias
|
||||
if not name:
|
||||
name = room.group_name()
|
||||
name = "" if name == "Empty room?" else name
|
||||
|
||||
# Add room
|
||||
try:
|
||||
last_ev = self.models[Room, self.user_id][room.room_id].last_event
|
||||
except KeyError:
|
||||
last_ev = None
|
||||
|
||||
self.models[Room, self.user_id][room.room_id] = Room(
|
||||
room_id = room.room_id,
|
||||
display_name = name,
|
||||
avatar_url = room.gen_avatar_url or "",
|
||||
topic = room.topic or "",
|
||||
inviter_id = getattr(room, "inviter", "") or "",
|
||||
left = left,
|
||||
filter_string = " ".join({name, room.topic or ""}).strip(),
|
||||
last_event = last_ev,
|
||||
)
|
||||
|
||||
# Add the room members to the added room
|
||||
new_dict = {
|
||||
user_id: Member(
|
||||
user_id = user_id,
|
||||
display_name = room.user_name(user_id) # disambiguated
|
||||
if member.display_name else "",
|
||||
avatar_url = member.avatar_url or "",
|
||||
typing = user_id in room.typing_users,
|
||||
power_level = member.power_level,
|
||||
filter_string = " ".join({
|
||||
member.name, room.user_name(user_id),
|
||||
}).strip(),
|
||||
) for user_id, member in room.users.items()
|
||||
}
|
||||
self.models[Member, room.room_id].update(new_dict)
|
||||
|
||||
|
||||
async def get_member_name_avatar(self, room_id: str, user_id: str,
|
||||
) -> Tuple[str, str]:
|
||||
try:
|
||||
item = self.models[Member, room_id][user_id]
|
||||
except KeyError: # e.g. user is not anymore in the room
|
||||
info = await self.backend.get_profile(user_id)
|
||||
|
||||
return (info.displayname or "", info.avatar_url or "") \
|
||||
if isinstance(info, nio.ProfileGetResponse) else \
|
||||
("", "")
|
||||
else:
|
||||
return (item.display_name, item.avatar_url)
|
||||
|
||||
|
||||
async def register_nio_event(self,
|
||||
room: nio.MatrixRoom,
|
||||
ev: nio.Event,
|
||||
content: str) -> None:
|
||||
|
||||
await self.register_nio_room(room)
|
||||
|
||||
sender_name, sender_avatar = \
|
||||
await self.get_member_name_avatar(room.room_id, ev.sender)
|
||||
|
||||
target_id = getattr(ev, "state_key", "") or ""
|
||||
|
||||
target_name, target_avatar = \
|
||||
await self.get_member_name_avatar(room.room_id, target_id) \
|
||||
if target_id else ("", "")
|
||||
|
||||
# Create Event ModelItem
|
||||
item = Event(
|
||||
client_id = ev.event_id,
|
||||
event_id = ev.event_id,
|
||||
event_type = type(ev).__name__,
|
||||
content = content,
|
||||
inline_content = HTML_FILTER.filter_inline(content),
|
||||
date = datetime.fromtimestamp(ev.server_timestamp / 1000),
|
||||
|
||||
sender_id = ev.sender,
|
||||
sender_name = sender_name,
|
||||
sender_avatar = sender_avatar,
|
||||
|
||||
target_id = target_id,
|
||||
target_name = target_name,
|
||||
target_avatar = target_avatar,
|
||||
)
|
||||
|
||||
# Add the Event to model
|
||||
if ev.transaction_id in self.local_echoes_uuid:
|
||||
self.resolved_echoes[ev.event_id] = ev.transaction_id
|
||||
self.local_echoes_uuid.discard(ev.transaction_id)
|
||||
item.client_id = f"echo-{ev.transaction_id}"
|
||||
|
||||
elif ev.sender in self.backend.clients:
|
||||
client = self.backend.clients[ev.sender]
|
||||
|
||||
# Wait until our other account has no more pending local echoes,
|
||||
# so that we can know if this event should replace an echo
|
||||
# from that client by finding its ID in the resolved_echoes dict.
|
||||
# Server only gives back the transaction ID to the original sender.
|
||||
while client.local_echoes_uuid: # while there are pending echoes
|
||||
await asyncio.sleep(0.1)
|
||||
|
||||
with suppress(KeyError):
|
||||
item.client_id = f"echo-{client.resolved_echoes[ev.event_id]}"
|
||||
|
||||
self.models[Event, self.user_id, room.room_id][item.client_id] = item
|
||||
|
||||
await self.set_room_last_event(room.room_id, item)
|
||||
|
||||
|
||||
# Callbacks for nio responses
|
||||
|
||||
async def onSyncResponse(self, resp: nio.SyncResponse) -> None:
|
||||
up = rooms.RoomUpdated.from_nio
|
||||
|
||||
for room_id, info in resp.rooms.invite.items():
|
||||
room = self.invited_rooms[room_id]
|
||||
|
||||
for member in room.users.values():
|
||||
users.UserUpdated.from_nio(member)
|
||||
|
||||
up(self.user_id, "Invites", room, info)
|
||||
|
||||
for room_id, info in resp.rooms.join.items():
|
||||
room = self.rooms[room_id]
|
||||
|
||||
for member in room.users.values():
|
||||
users.UserUpdated.from_nio(member)
|
||||
|
||||
if room_id not in self.backend.past_tokens:
|
||||
self.backend.past_tokens[room_id] = info.timeline.prev_batch
|
||||
|
||||
up(self.user_id, "Rooms", room, info)
|
||||
if room_id not in self.past_tokens:
|
||||
self.past_tokens[room_id] = info.timeline.prev_batch
|
||||
|
||||
# TODO: way of knowing if a nio.MatrixRoom is left
|
||||
for room_id, info in resp.rooms.leave.items():
|
||||
# TODO: handle in nio, these are rooms that were left before
|
||||
# starting the client.
|
||||
@@ -299,7 +455,12 @@ class MatrixClient(nio.AsyncClient):
|
||||
if isinstance(ev, nio.RoomMemberEvent):
|
||||
await self.onRoomMemberEvent(self.rooms[room_id], ev)
|
||||
|
||||
up(self.user_id, "Left", self.rooms[room_id], info)
|
||||
await self.register_nio_room(self.rooms[room_id], left=True)
|
||||
|
||||
if not self.first_sync_happened.is_set():
|
||||
asyncio.ensure_future(self.load_rooms_without_visible_events())
|
||||
|
||||
self.first_sync_happened.set()
|
||||
|
||||
|
||||
async def onErrorResponse(self, resp: nio.ErrorResponse) -> None:
|
||||
@@ -310,55 +471,45 @@ class MatrixClient(nio.AsyncClient):
|
||||
log.warning(repr(resp))
|
||||
|
||||
|
||||
# Callbacks for nio events
|
||||
|
||||
# Callbacks for nio room events
|
||||
# Content: %1 is the sender, %2 the target (ev.state_key).
|
||||
# pylint: disable=unused-argument
|
||||
|
||||
async def onRoomMessageText(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomMessageText(self, room, ev) -> None:
|
||||
co = HTML_FILTER.filter(
|
||||
ev.formatted_body
|
||||
if ev.format == "org.matrix.custom.html" else html.escape(ev.body)
|
||||
if ev.format == "org.matrix.custom.html" else html.escape(ev.body),
|
||||
)
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomMessageEmote(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomMessageEmote(self, room, ev) -> None:
|
||||
co = HTML_FILTER.filter_inline(
|
||||
ev.formatted_body
|
||||
if ev.format == "org.matrix.custom.html" else html.escape(ev.body)
|
||||
if ev.format == "org.matrix.custom.html" else html.escape(ev.body),
|
||||
)
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
# async def onRoomMessageImage(self, room, ev, from_past=False) -> None:
|
||||
# import json; print("RMI", json.dumps( ev.__dict__ , indent=4))
|
||||
|
||||
# async def onRoomEncryptedImage(self, room, ev, from_past=False) -> None:
|
||||
# import json; print("REI", json.dumps( ev.__dict__ , indent=4))
|
||||
|
||||
|
||||
async def onRoomCreateEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomCreateEvent(self, room, ev) -> None:
|
||||
co = "%1 allowed users on other matrix servers to join this room." \
|
||||
if ev.federate else \
|
||||
"%1 blocked users on other matrix servers from joining this room."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomGuestAccessEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomGuestAccessEvent(self, room, ev) -> None:
|
||||
allowed = "allowed" if ev.guest_access else "forbad"
|
||||
co = f"%1 {allowed} guests to join the room."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomJoinRulesEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomJoinRulesEvent(self, room, ev) -> None:
|
||||
access = "public" if ev.join_rule == "public" else "invite-only"
|
||||
co = f"%1 made the room {access}."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomHistoryVisibilityEvent(self, room, ev, from_past=False
|
||||
) -> None:
|
||||
async def onRoomHistoryVisibilityEvent(self, room, ev) -> None:
|
||||
if ev.history_visibility == "shared":
|
||||
to = "all room members"
|
||||
elif ev.history_visibility == "world_readable":
|
||||
@@ -373,20 +524,22 @@ class MatrixClient(nio.AsyncClient):
|
||||
json.dumps(ev.__dict__, indent=4))
|
||||
|
||||
co = f"%1 made future room history visible to {to}."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onPowerLevelsEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onPowerLevelsEvent(self, room, ev) -> None:
|
||||
co = "%1 changed the room's permissions." # TODO: improve
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def get_room_member_event_content(self, ev) -> Optional[str]:
|
||||
async def process_room_member_event(self, room, ev) -> Optional[str]:
|
||||
prev = ev.prev_content
|
||||
now = ev.content
|
||||
membership = ev.membership
|
||||
prev_membership = ev.prev_membership
|
||||
ev_date = datetime.fromtimestamp(ev.server_timestamp / 1000)
|
||||
|
||||
# Membership changes
|
||||
if not prev or membership != prev_membership:
|
||||
reason = f" Reason: {now['reason']}" if now.get("reason") else ""
|
||||
|
||||
@@ -421,17 +574,12 @@ class MatrixClient(nio.AsyncClient):
|
||||
if membership == "ban":
|
||||
return f"%1 banned %2 from the room.{reason}"
|
||||
|
||||
|
||||
if ev.sender in self.backend.clients:
|
||||
# Don't put our own name/avatar changes in the timeline
|
||||
return None
|
||||
|
||||
# Profile changes
|
||||
changed = []
|
||||
|
||||
if prev and now["avatar_url"] != prev["avatar_url"]:
|
||||
changed.append("profile picture") # TODO: <img>s
|
||||
|
||||
|
||||
if prev and now["displayname"] != prev["displayname"]:
|
||||
changed.append('display name from "{}" to "{}"'.format(
|
||||
prev["displayname"] or ev.state_key,
|
||||
@@ -439,6 +587,19 @@ class MatrixClient(nio.AsyncClient):
|
||||
))
|
||||
|
||||
if changed:
|
||||
# Update our account profile if the event is newer than last update
|
||||
if ev.state_key == self.user_id:
|
||||
account = self.models[Account][self.user_id]
|
||||
|
||||
if account.profile_updated < ev_date:
|
||||
account.profile_updated = ev_date
|
||||
account.display_name = now["displayname"] or ""
|
||||
account.avatar_url = now["avatar_url"] or ""
|
||||
|
||||
if ev.state_key in self.backend.clients or len(room.users) > 50:
|
||||
self.skipped_events[room.room_id] += 1
|
||||
return None
|
||||
|
||||
return "%1 changed their {}.".format(" and ".join(changed))
|
||||
|
||||
log.warning("Invalid member event - %s",
|
||||
@@ -446,48 +607,65 @@ class MatrixClient(nio.AsyncClient):
|
||||
return None
|
||||
|
||||
|
||||
async def onRoomMemberEvent(self, room, ev, from_past=False) -> None:
|
||||
co = await self.get_room_member_event_content(ev)
|
||||
async def onRoomMemberEvent(self, room, ev) -> None:
|
||||
co = await self.process_room_member_event(room, ev)
|
||||
|
||||
if co is not None:
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
if co is None:
|
||||
# This is run from register_nio_event otherwise
|
||||
await self.register_nio_room(room)
|
||||
else:
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomAliasEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomAliasEvent(self, room, ev) -> None:
|
||||
co = f"%1 set the room's main address to {ev.canonical_alias}."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomNameEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomNameEvent(self, room, ev) -> None:
|
||||
co = f"%1 changed the room's name to \"{ev.name}\"."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomTopicEvent(self, room, ev, from_past=False) -> None:
|
||||
async def onRoomTopicEvent(self, room, ev) -> None:
|
||||
co = f"%1 changed the room's topic to \"{ev.topic}\"."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onRoomEncryptionEvent(self, room, ev, from_past=False) -> None:
|
||||
co = f"%1 turned on encryption for this room."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
async def onRoomEncryptionEvent(self, room, ev) -> None:
|
||||
co = "%1 turned on encryption for this room."
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onOlmEvent(self, room, ev, from_past=False) -> None:
|
||||
co = f"%1 sent an undecryptable olm message."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
async def onOlmEvent(self, room, ev) -> None:
|
||||
co = "%1 sent an undecryptable olm message."
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onMegolmEvent(self, room, ev, from_past=False) -> None:
|
||||
co = f"%1 sent an undecryptable message."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
async def onMegolmEvent(self, room, ev) -> None:
|
||||
co = "%1 sent an undecryptable message."
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onBadEvent(self, room, ev, from_past=False) -> None:
|
||||
co = f"%1 sent a malformed event."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
async def onBadEvent(self, room, ev) -> None:
|
||||
co = "%1 sent a malformed event."
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
async def onUnknownBadEvent(self, room, ev, from_past=False) -> None:
|
||||
co = f"%1 sent an event this client doesn't understand."
|
||||
TimelineEventReceived.from_nio(room, ev, content=co)
|
||||
async def onUnknownBadEvent(self, room, ev) -> None:
|
||||
co = "%1 sent an event this client doesn't understand."
|
||||
await self.register_nio_event(room, ev, content=co)
|
||||
|
||||
|
||||
# Callbacks for nio ephemeral events
|
||||
|
||||
async def onTypingNoticeEvent(self, room, ev) -> None:
|
||||
# Prevent recent past typing notices from being shown for a split
|
||||
# second on client startup:
|
||||
if not self.first_sync_happened.is_set():
|
||||
return
|
||||
|
||||
self.models[Room, self.user_id][room.room_id].typing_members = sorted(
|
||||
room.user_name(user_id) for user_id in ev.users
|
||||
if user_id not in self.backend.clients
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user