MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 03:43:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2454 from matrix-org/erikj/groups_sync_creator

Browse source 
Ensure that creator of group sees group down /sync
This commit is contained in:
Erik Johnston 2017-09-19 11:21:26 +01:00 committed by GitHub
commit 47d9848dc4
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
synapse/handlers/groups_local.py
View file

@ -136,12 +136,38 @@ class GroupsLocalHandler(object):
res = yield self.groups_server_handler.create_group(
group_id, user_id, content
)
defer.returnValue(res)
local_attestation = None
remote_attestation = None
else:
local_attestation = self.attestations.create_attestation(group_id, user_id)
content["attestation"] = local_attestation
content["user_profile"] = yield self.profile_handler.get_profile(user_id)
res = yield self.transport_client.create_group(
get_domain_from_id(group_id), group_id, user_id, content,
content["user_profile"] = yield self.profile_handler.get_profile(user_id)
res = yield self.transport_client.create_group(
get_domain_from_id(group_id), group_id, user_id, content,
)
remote_attestation = res["attestation"]
yield self.attestations.verify_attestation(
remote_attestation,
group_id=group_id,
user_id=user_id,
)
is_publicised = content.get("publicise", False)
token = yield self.store.register_user_group_membership(
group_id, user_id,
membership="join",
is_admin=True,
local_attestation=local_attestation,
remote_attestation=remote_attestation,
is_publicised=is_publicised,
)
self.notifier.on_new_event(
"groups_key", token, users=[user_id],
)
defer.returnValue(res)
@defer.inlineCallbacks

1
synapse/handlers/sync.py
View file

@ -637,6 +637,7 @@ class SyncHandler(object):
if membership == "join":
if gtype == "membership":
# TODO: Add profile
content.pop("membership", None)
joined[group_id] = content["content"]
else: