kaslo/synapse
1
0
Fork 0
Code Packages Releases 124 Wiki Activity

Make soft_limit optional

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2025-10-13 11:50:50 +01:00
parent 8ba5e4a055
commit 5c08e04985
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/api/errors.py
View File

@@ -525,7 +525,7 @@ class MSC4335UserLimitExceededError(SynapseError):
code: int, code: int,
msg: str, msg: str,
info_uri: str, info_uri: str,
soft_limit: bool, soft_limit: bool = False,
increase_uri: Optional[str] = None, increase_uri: Optional[str] = None,
): ):
if soft_limit and increase_uri is None: if soft_limit and increase_uri is None:
@@ -533,8 +533,11 @@ class MSC4335UserLimitExceededError(SynapseError):
additional_fields: dict[str, Union[str, bool]] = { additional_fields: dict[str, Union[str, bool]] = {
"org.matrix.msc4335.info_uri": info_uri, "org.matrix.msc4335.info_uri": info_uri,
"org.matrix.msc4335.soft_limit": soft_limit,
} }
if soft_limit:
additional_fields["org.matrix.msc4335.soft_limit"] = soft_limit
if soft_limit and increase_uri is not None: if soft_limit and increase_uri is not None:
additional_fields["org.matrix.msc4335.increase_uri"] = increase_uri additional_fields["org.matrix.msc4335.increase_uri"] = increase_uri

2
tests/rest/client/test_media.py
View File

@@ -3087,7 +3087,7 @@ class MediaUploadLimits(unittest.HomeserverTestCase):
self.assertEqual( self.assertEqual(
channel.json_body["org.matrix.msc4335.info_uri"], "https://example.com" channel.json_body["org.matrix.msc4335.info_uri"], "https://example.com"
) )
self.assertEqual(channel.json_body["org.matrix.msc4335.soft_limit"], False) self.assertEquals(hasattr(channel.json_body, "org.matrix.msc4335.increase_uri"), False)
@override_config( @override_config(
{ {