fuck merge conflicts

Merged with 0.7.4 release

src/backend/matrix_client.py

@@ -115,7 +115,6 @@ class MatrixImageInfo(NamedTuple):
 
 
 class MatrixClient(nio.AsyncClient):
-<<<<<<< HEAD
 	"""A client for an account to interact with a matrix homeserver."""
 
 	user_id_regex		  = re.compile(r"^@.+:.+")
@@ -2473,7 +2472,6 @@ class MatrixClient(nio.AsyncClient):
 			content=key, hidden=True, **fields,
 		)
 
-
 	async def register_message_replacement(
 		self,
 		room:				   nio.MatrixRoom,
@@ -2541,7 +2539,6 @@ class MatrixClient(nio.AsyncClient):
 			hidden=True, **fields,
 		)
 
-
 	async def register_nio_event(
 		self,
 		room:				   nio.MatrixRoom,
@@ -2626,6 +2623,7 @@ class MatrixClient(nio.AsyncClient):
 		if from_us and tx_id and f"echo-{tx_id}" in model:
 			item.id							 = f"echo-{tx_id}"
 			self.event_to_echo_ids[ev.event_id] = item.id
+
 		reactions = self.unassigned_reaction_events.get(item.id, {})
 		for key, senders in reactions.items():  # update reactions
 			if key not in item.reactions:

src/backend/models/items.py

@@ -32,6 +32,7 @@ class TypeSpecifier(AutoStrEnum):
 	ReactionRedaction = auto()
 	MessageReplace    = auto()
 
+
 class PingStatus(AutoStrEnum):
 	"""Enum for the status of a homeserver ping operation."""
 
@@ -360,10 +361,8 @@ class Event(ModelItem):
 	mentions:		  List[Tuple[str, str]] = field(default_factory=list)
 
 	reactions:		 Dict[str, Dict[str, Any]] = field(default_factory=dict)
-
 	replaced:		  bool				  = False
 	content_history:   List[Dict[str, Any]]  = field(default_factory=list)
-
 	type_specifier: TypeSpecifier = TypeSpecifier.Unset
 
 	target_id:	 str = ""
@@ -443,5 +442,4 @@ class Event(ModelItem):
 			return json.dumps(source_dict)
 		if field == "content_history":
 			return serialize_value_for_qml(self.content_history)
-
 		return super().serialized_field(field)

src/backend/nio_callbacks.py

@@ -619,6 +619,7 @@ class NioCallbacks:
 
 		await self.client.register_nio_event(room, ev, content=co)
 
+	# Room events, invite events and misc events callbacks
 	async def onRoomNameEvent(
 		self, room: nio.MatrixRoom, ev: nio.RoomNameEvent,
 	) -> None:
@@ -629,8 +630,6 @@ class NioCallbacks:
 
 		await self.client.register_nio_event(room, ev, content=co)
 
-	# Room events, invite events and misc events callbacks
-
 	async def onRoomMessageText(
 		self, room: nio.MatrixRoom, ev: nio.RoomMessageText,
 	) -> None: