diff options
| author | Erik Johnston <erik@matrix.org> | 2017-07-14 14:03:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-07-14 14:03:54 +0100 |
| commit | 85fda57208bb79e54fe473fda64351f04ffe1cda (patch) | |
| tree | 2755d2c6fc033cd51bd076a4c8b22f308a8744ed /synapse/storage/group_server.py | |
| parent | Correctly increment orders (diff) | |
| download | synapse-85fda57208bb79e54fe473fda64351f04ffe1cda.tar.xz | |
Add DEFAULT_ROLE_ID
Diffstat (limited to 'synapse/storage/group_server.py')
| -rw-r--r-- | synapse/storage/group_server.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py index c23dc79ca5..e8a799d8c7 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py @@ -24,7 +24,8 @@ import ujson as json # The category ID for the "default" category. We don't store as null in the # database to avoid the fun of null != null -_DEFAULT_CATEGORY_ID = "default" +_DEFAULT_CATEGORY_ID = "" +_DEFAULT_ROLE_ID = "" class GroupServerStore(SQLBaseStore): @@ -426,7 +427,7 @@ class GroupServerStore(SQLBaseStore): added to the end. """ if role_id is None: - role_id = _DEFAULT_CATEGORY_ID + role_id = _DEFAULT_ROLE_ID else: role_exists = self._simple_select_one_onecol_txn( txn, @@ -523,7 +524,7 @@ class GroupServerStore(SQLBaseStore): def remove_user_from_summary(self, group_id, user_id, role_id): if role_id is None: - role_id = _DEFAULT_CATEGORY_ID + role_id = _DEFAULT_ROLE_ID return self._simple_delete( table="group_summary_users", @@ -563,7 +564,7 @@ class GroupServerStore(SQLBaseStore): { "user_id": row[0], "is_public": row[1], - "role_id": row[2] if row[2] != _DEFAULT_CATEGORY_ID else None, + "role_id": row[2] if row[2] != _DEFAULT_ROLE_ID else None, "order": row[3], } for row in txn |