OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix all the typos

pull/2382/head
Erik Johnston 2017-07-24 14:05:09 +01:00
parent b76ef6ccb8
commit ed666d3969
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/storage/group_server.py
View File

@ -643,7 +643,7 @@ class GroupServerStore(SQLBaseStore):
}, },
retcol="is_admin", retcol="is_admin",
allow_none=True, allow_none=True,
desc="is_user_adim_in_group", desc="is_user_admin_in_group",
) )
def add_group_invite(self, group_id, user_id): def add_group_invite(self, group_id, user_id):
@ -672,14 +672,13 @@ class GroupServerStore(SQLBaseStore):
allow_none=True, allow_none=True,
) )
@defer.inlineCallbacks
def get_users_membership_info_in_group(self, group_id, user_id): def get_users_membership_info_in_group(self, group_id, user_id):
"""Get a dict describing the memebrship of a user in a group. """Get a dict describing the membership of a user in a group.
Example if joined: Example if joined:
{ {
"memebrship": "joined", "membership": "joined",
"is_public": True, "is_public": True,
"is_privileged": False, "is_privileged": False,
} }
@ -688,6 +687,7 @@ class GroupServerStore(SQLBaseStore):
""" """
def _get_users_membership_in_group_txn(txn): def _get_users_membership_in_group_txn(txn):
row = self._simple_select_one_txn( row = self._simple_select_one_txn(
txn,
table="group_users", table="group_users",
keyvalues={ keyvalues={
"group_id": group_id, "group_id": group_id,
@ -695,30 +695,29 @@ class GroupServerStore(SQLBaseStore):
}, },
retcols=("is_admin", "is_public"), retcols=("is_admin", "is_public"),
allow_none=True, allow_none=True,
desc="is_user_adim_in_group",
) )
if row: if row:
return { return {
"memebrship": "joined", "membership": "joined",
"is_public": row["is_public"], "is_public": row["is_public"],
"is_privileged": row["is_admin"], "is_privileged": row["is_admin"],
} }
row = self._simple_select_one_onecol_txn( row = self._simple_select_one_onecol_txn(
txn,
table="group_invites", table="group_invites",
keyvalues={ keyvalues={
"group_id": group_id, "group_id": group_id,
"user_id": user_id, "user_id": user_id,
}, },
retcol="user_id", retcol="user_id",
desc="is_user_invited_to_local_group",
allow_none=True, allow_none=True,
) )
if row: if row:
return { return {
"memebrship": "invited", "membership": "invited",
} }
return {} return {}