Skip to content

Commit 0fbbfc3

Browse files
Jeffjagerman
authored andcommitted
get rid of banal compaction of permissions, we'll use xz if we want compression later
1 parent ed07070 commit 0fbbfc3

File tree

2 files changed

+1
-44
lines changed

2 files changed

+1
-44
lines changed

sogs/routes/rooms.py

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -278,44 +278,19 @@ def update_room(room):
278278
return jsonify({})
279279

280280

281-
def compact_permissions(perms):
282-
""" take a dict of user permssions and convert them into a compact form """
283-
compact = str()
284-
keys = list(perms.keys())
285-
keys.sort()
286-
for k in keys:
287-
if not perms[k]:
288-
compact += '-'
289-
if k == 'admin':
290-
compact += 'A'
291-
else:
292-
compact += k[0]
293-
compact += ','
294-
if keys:
295-
compact = compact[:-1]
296-
return compact
297-
298-
299281
@rooms.get("/room/<Room:room>/permInfo")
300282
@auth.mod_required
301283
def get_permission_info(room):
302284
"""
303285
Fetches permissions about the room, like ban info etc.
304286
305-
# Query Parameters
306-
307-
- `compact` — Set to 1 if we should we send each permission as a "compacted" string.
308-
309287
# Return Value
310288
311289
dict of session_id to current permissions,
312290
if compact is set to 1 this will be a string,
313291
otherwise it will be a dict containing the name of the permission mapped to a boolean value.
314292
"""
315-
perms = room.permissions
316-
if request.args.get("compact", type=int, default=0):
317-
perms = {key: compact_permissions(perms[key]) for key in perms}
318-
return jsonify(perms)
293+
return jsonify(room.permissions)
319294

320295

321296
@rooms.get("/room/<Room:room>/futurePermInfo")

sogs/utils.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,3 @@ def add_session_message_padding(data: Union[bytes, memoryview], length):
182182
data = bytes(data)
183183
data += b'\x80' + b'\x00' * (length - len(data) - 1)
184184
return data
185-
186-
187-
def compact_permissions(perms):
188-
""" take a dict of user permssions and convert them into a compact form """
189-
compact = str()
190-
keys = list(perms.keys())
191-
keys.sort()
192-
for k in keys:
193-
if not perms[k]:
194-
compact += '-'
195-
if k == 'admin':
196-
compact += 'A'
197-
else:
198-
compact += k[0]
199-
compact += ','
200-
if keys:
201-
compact = compact[:-1]
202-
return compact

0 commit comments

Comments
 (0)