Merge pull request #6 from turt2live/travis/fix-members

When using the joined_members API, use the joined keyword

Author: tulir

mautrix_appservice/intent_api.py

@@ -849,9 +849,10 @@ def get_room_joined_memberships(self, room_id: str) -> Awaitable[dict]:
 
     async def get_room_members(self, room_id: str, allowed_memberships: Tuple[str, ...] = ("join",)
                                ) -> List[str]:
-        memberships = (await self.get_room_joined_memberships(room_id)
-                       if allowed_memberships == ("join",)
-                       else await self.get_room_memberships(room_id))
+        if allowed_memberships == ("join",):
+            memberships = await self.get_room_joined_memberships(room_id)
+            return memberships["joined"].keys()
+        memberships = await self.get_room_memberships(room_id)
         return [membership["state_key"] for membership in memberships["chunk"] if
                 membership["content"]["membership"] in allowed_memberships]