Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Don't require alias in public room list. #664

Merged
merged 6 commits into from
Mar 23, 2016
Merged

Don't require alias in public room list. #664

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34473a9
Don't require alias in public room list.
erikjohnston Mar 23, 2016
0677fc1
Comment
erikjohnston Mar 23, 2016
b2802a1
Ensure published rooms have public join rules
erikjohnston Mar 23, 2016
84afeb4
Ensure all old public rooms have aliases
erikjohnston Mar 23, 2016
0c1a27b
SQLite and postgres doesn't share a true literal
erikjohnston Mar 23, 2016
b275765
Comment about weird SQL
erikjohnston Mar 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions synapse/handlers/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,53 +946,52 @@ def get_public_room_list(self):
@defer.inlineCallbacks
def handle_room(room_id):
aliases = yield self.store.get_aliases_for_room(room_id)
if not aliases:
defer.returnValue(None)

state = yield self.state_handler.get_current_state(room_id)
def get_state(etype, state_key):
return self.state_handler.get_current_state(room_id, etype, state_key)

result = {"aliases": aliases, "room_id": room_id}
result = {"room_id": room_id}
if aliases:
result["aliases"] = aliases
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should give an empty list rather than omit the key.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yeah, maybe. I just copied how the other keys worked (i.e. omitting the key)


name_event = state.get((EventTypes.Name, ""), None)
name_event = yield get_state(EventTypes.Name, "")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is so we don't have to pull in the entire room state for each room? Might be worth adding a comment explaining why we've pick this particular performance trade off.

if name_event:
name = name_event.content.get("name", None)
if name:
result["name"] = name

topic_event = state.get((EventTypes.Topic, ""), None)
topic_event = yield get_state(EventTypes.Topic, "")
if topic_event:
topic = topic_event.content.get("topic", None)
if topic:
result["topic"] = topic

canonical_event = state.get((EventTypes.CanonicalAlias, ""), None)
canonical_event = yield get_state(EventTypes.CanonicalAlias, "")
if canonical_event:
canonical_alias = canonical_event.content.get("alias", None)
if canonical_alias:
result["canonical_alias"] = canonical_alias

visibility_event = state.get((EventTypes.RoomHistoryVisibility, ""), None)
visibility_event = yield get_state(EventTypes.RoomHistoryVisibility, "")
visibility = None
if visibility_event:
visibility = visibility_event.content.get("history_visibility", None)
result["world_readable"] = visibility == "world_readable"

guest_event = state.get((EventTypes.GuestAccess, ""), None)
guest_event = yield get_state(EventTypes.GuestAccess, "")
guest = None
if guest_event:
guest = guest_event.content.get("guest_access", None)
result["guest_can_join"] = guest == "can_join"

avatar_event = state.get(("m.room.avatar", ""), None)
avatar_event = yield get_state("m.room.avatar", "")
if avatar_event:
avatar_url = avatar_event.content.get("url", None)
if avatar_url:
result["avatar_url"] = avatar_url

result["num_joined_members"] = sum(
1 for (event_type, _), ev in state.items()
if event_type == EventTypes.Member and ev.membership == Membership.JOIN
)
joined_users = yield self.store.get_users_in_room(room_id)
result["num_joined_members"] = len(joined_users)

defer.returnValue(result)

Expand Down