From ed666d396985c1fa2b9acb1c69199dd55670a88f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 24 Jul 2017 14:05:09 +0100
Subject: Fix all the typos

---
 synapse/storage/group_server.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 989a10eea6..357111e305 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -643,7 +643,7 @@ class GroupServerStore(SQLBaseStore):
             },
             retcol="is_admin",
             allow_none=True,
-            desc="is_user_adim_in_group",
+            desc="is_user_admin_in_group",
         )
 
     def add_group_invite(self, group_id, user_id):
@@ -672,14 +672,13 @@ class GroupServerStore(SQLBaseStore):
             allow_none=True,
         )
 
-    @defer.inlineCallbacks
     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:
 
             {
-                "memebrship": "joined",
+                "membership": "joined",
                 "is_public": True,
                 "is_privileged": False,
             }
@@ -688,6 +687,7 @@ class GroupServerStore(SQLBaseStore):
         """
         def _get_users_membership_in_group_txn(txn):
             row = self._simple_select_one_txn(
+                txn,
                 table="group_users",
                 keyvalues={
                     "group_id": group_id,
@@ -695,30 +695,29 @@ class GroupServerStore(SQLBaseStore):
                 },
                 retcols=("is_admin", "is_public"),
                 allow_none=True,
-                desc="is_user_adim_in_group",
             )
 
             if row:
                 return {
-                    "memebrship": "joined",
+                    "membership": "joined",
                     "is_public": row["is_public"],
                     "is_privileged": row["is_admin"],
                 }
 
             row = self._simple_select_one_onecol_txn(
+                txn,
                 table="group_invites",
                 keyvalues={
                     "group_id": group_id,
                     "user_id": user_id,
                 },
                 retcol="user_id",
-                desc="is_user_invited_to_local_group",
                 allow_none=True,
             )
 
             if row:
                 return {
-                    "memebrship": "invited",
+                    "membership": "invited",
                 }
 
             return {}
-- 
cgit 1.4.1