fix(matrix): match fork/main formatting exactly

This commit is contained in:
Alexander Minges
2026-02-20 18:17:27 +01:00
parent 13561772ad
commit fcece3ec62

View File

@@ -500,9 +500,7 @@ class MatrixChannel(BaseChannel):
) -> str | None: ) -> str | None:
"""Upload one local file to Matrix and send it as a media message.""" """Upload one local file to Matrix and send it as a media message."""
if not self.client: if not self.client:
return MATRIX_ATTACHMENT_UPLOAD_FAILED_TEMPLATE.format( return MATRIX_ATTACHMENT_UPLOAD_FAILED_TEMPLATE.format(path.name or MATRIX_DEFAULT_ATTACHMENT_NAME)
path.name or MATRIX_DEFAULT_ATTACHMENT_NAME
)
resolved = path.expanduser().resolve(strict=False) resolved = path.expanduser().resolve(strict=False)
filename = safe_filename(resolved.name) or MATRIX_DEFAULT_ATTACHMENT_NAME filename = safe_filename(resolved.name) or MATRIX_DEFAULT_ATTACHMENT_NAME
@@ -1027,7 +1025,10 @@ class MatrixChannel(BaseChannel):
limit_bytes = await self._effective_media_limit_bytes() limit_bytes = await self._effective_media_limit_bytes()
declared_size = self._event_declared_size_bytes(event) declared_size = self._event_declared_size_bytes(event)
if declared_size is not None and declared_size > limit_bytes: if (
declared_size is not None
and declared_size > limit_bytes
):
logger.warning( logger.warning(
"Matrix attachment skipped in room {}: declared size {} exceeds limit {}", "Matrix attachment skipped in room {}: declared size {} exceeds limit {}",
room.room_id, room.room_id,