This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Add a user directory #2252
Merged
Add a user directory #2252
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
synapse/handlers/user_directory.py
Outdated
| None if the field in the events either both match `public_value` o | ||
| neither do, i.e. there has been no change. | ||
| True if it didnt match `public_value` but now does | ||
| Falsse if it did match `public_value` but now doesn't |
synapse/handlers/user_directory.py
Outdated
| `shared` to `world_readable` (`public_value`). | ||
|
|
||
| Returns: | ||
| None if the field in the events either both match `public_value` o |
synapse/handlers/user_directory.py
Outdated
| defer.returnValue(None) | ||
|
|
||
| prev_hist_vis = None | ||
| hist_vis = None |
synapse/handlers/user_directory.py
Outdated
| if change: | ||
| yield self._handle_new_user(room_id, user_id, profile) | ||
| else: | ||
| yield self._handle_remove_user(room_id, user_id) |
There was a problem hiding this comment.
It looks like lines 204-221 are duplicates of 172-197. Maybe lift them into a function?
| avatar_url TEXT | ||
| ); | ||
|
|
||
| CREATE INDEX user_directory_room_idx ON user_directory(room_id); |
There was a problem hiding this comment.
Maybe add a UNIQUE index.
There was a problem hiding this comment.
Probably not on room_id, no.
But I've added one to user_id.
| WHERE stream_id > ? | ||
| GROUP BY stream_id | ||
| ORDER BY stream_id ASC | ||
| LIMIT 100 |
erikjohnston
force-pushed
the
erikj/user_dir
branch
from
c6942b7 to
036362e
Compare
synapse/handlers/user_directory.py
Outdated
|
|
||
| Returns: | ||
| None if the field in the events either both match `public_value` | ||
| neither do, i.e. there has been no change. |
There was a problem hiding this comment.
Should this be "or if neither do" ?
- Check if room is public when a user joins before adding to user dir - Fix typo of field name "content.join_rules" -> "content.join_rule"
| elif value != public_value and prev_value == public_value: | ||
| defer.returnValue(False) | ||
| else: | ||
| defer.returnValue(None) |
There was a problem hiding this comment.
You could write this as:
old_value_is_public = prev_value == public_value
new_value_is_public = value == public_value
if old_value_is_public == new_value_is_public:
defer.returnValue(None)
else:
defer.returnValue(new_value_is_public)I'm not sure if it is clearer or not.
There was a problem hiding this comment.
I don't find it any more readable tbh
synapse/handlers/user_directory.py
Outdated
| prev_value = prev_event.content.get(key_name, None) | ||
|
|
||
| if event: | ||
| value = event.content.get(key_name, None) |
There was a problem hiding this comment.
The None is redundant.
erikjohnston
force-pushed
the
erikj/user_dir
branch
from
0d13a1f to
d5477c7
Compare
NegativeMjark
approved these changes
Jun 1, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.