lovely-projects/mautrix-signal
lovely-projects/mautrix-signal
1
0
Fork 0
mirror of https://github.com/mautrix/signal.git synced 2025-03-14 14:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #345 from maltee1/failed_invite_check_members

Browse source 
don't kick ghost on GroupPatchNotAcceptedError if they are in the signal group
This commit is contained in:
Tulir Asokan 2023-03-19 13:05:30 +02:00 • committed by GitHub
commit 14610ceb54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mausignald/errors.py
View file

@ -114,6 +114,10 @@ class NoSuchAccountError(ResponseError):
pass
class GroupPatchNotAcceptedError(ResponseError):
pass
response_error_types = {
"invalid_request": RequestValidationFailure,
"TimeoutException": TimeoutException,
@ -129,6 +133,7 @@ response_error_types = {
"UnregisteredUserError": UnregisteredUserError,
"ProfileUnavailableError": ProfileUnavailableError,
"NoSuchAccountError": NoSuchAccountError,
"GroupPatchNotAcceptedError": GroupPatchNotAcceptedError,
# TODO add rest from https://gitlab.com/signald/signald/-/tree/main/src/main/java/io/finn/signald/clientprotocol/v1/exceptions
}

8
mautrix_signal/portal.py
View file

@ -28,6 +28,7 @@ import time
from mausignald.errors import (
AttachmentTooLargeError,
GroupPatchNotAcceptedError,
NotConnected,
ProfileUnavailableError,
RPCError,
@ -860,6 +861,13 @@ class Portal(DBPortal, BasePortal):
invited_by.username, self.chat_id, add_members=[user.address]
)
self.revision = update_meta.revision
except GroupPatchNotAcceptedError as e:
update_meta = await self.signal.get_group(invited_by.username, self.chat_id)
if (
user.address not in update_meta.members
and user.address not in update_meta.pending_members
):
raise RejectMatrixInvite(str(e)) from e
except RPCError as e:
raise RejectMatrixInvite(str(e)) from e
if user.mxid == self.config["bridge.relay.relaybot"] != "@relaybot:example.com":