New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show heroes if a room has deleted name/canonical_alias #3851

Merged
merged 6 commits into from Sep 12, 2018

Conversation

Projects
None yet
2 participants
@ara4n
Member

ara4n commented Sep 12, 2018

No description provided.

@erikjohnston

a) would be good to have a comment about what we're checking for
b) its a bit confusing to the reader to only check the contents is non-empty, rather than having the relevant keys (with non-empty values?)
c) get_event will raise an error if the event can't be found or has been redacted, by default.

@ara4n

This comment has been minimized.

Member

ara4n commented Sep 12, 2018

@erikjohnston ptal again

# haven't been deleted.
if name_id:
name = yield self.store.get_event(name_id, allow_none=False)
if name.content:

This comment has been minimized.

@erikjohnston

erikjohnston Sep 12, 2018

Member

You also need to check that the returned event is not None

This comment has been minimized.

@ara4n

ara4n Sep 12, 2018

Member

oops, thanks

@@ -562,8 +562,21 @@ def compute_summary(self, room_id, sync_config, batch, state, now_token):
details.get(Membership.INVITE, empty_ms).count
)
if name_id or canonical_alias_id:
defer.returnValue(summary)
# if the room has a (non-deleted) name or canonical_alias, we can skip

This comment has been minimized.

@erikjohnston

erikjohnston Sep 12, 2018

Member

What do you mean by non-deleted? You can't delete state.

This comment has been minimized.

@ara4n

ara4n Sep 12, 2018

Member

well, people 'delete' it by blatting {} over it.

This comment has been minimized.

@ara4n

ara4n Sep 12, 2018

Member

clarified

ara4n added some commits Sep 12, 2018

@ara4n

This comment has been minimized.

Member

ara4n commented Sep 12, 2018

@erikjohnston ptal again

@ara4n ara4n assigned erikjohnston and unassigned ara4n Sep 12, 2018

@ara4n ara4n merged commit 2ac1abb into develop Sep 12, 2018

10 checks passed

Synapse Sytest Postgres (Commit) Build #6981 origin/matthew/fix_heroes_with_deleted_state succeeded in 5 min 42 sec
Details
Synapse Sytest Postgres (Merged PR) Build finished.
Details
Synapse Sytest SQLite (Commit) Build #7188 origin/matthew/fix_heroes_with_deleted_state succeeded in 3 min 46 sec
Details
Synapse Sytest SQLite (Merged PR) Build finished.
Details
ci/circleci: sytestpy2 Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgres Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@hawkowl hawkowl deleted the matthew/fix_heroes_with_deleted_state branch Sep 20, 2018

hawkowl added a commit that referenced this pull request Sep 24, 2018

Merge tag 'v0.33.5'
Features
--------

- Python 3.5 and 3.6 support is now in beta.
([\#3576](#3576))
- Implement `event_format` filter param in `/sync`
([\#3790](#3790))
- Add synapse_admin_mau:registered_reserved_users metric to expose
number of real reaserved users
([\#3846](#3846))

Bugfixes
--------

- Remove connection ID for replication prometheus metrics, as it creates
a large number of new series.
([\#3788](#3788))
- guest users should not be part of mau total
([\#3800](#3800))
- Bump dependency on pyopenssl 16.x, to avoid incompatibility with
recent Twisted.
([\#3804](#3804))
- Fix existing room tags not coming down sync when joining a room
([\#3810](#3810))
- Fix jwt import check
([\#3824](#3824))
- fix VOIP crashes under Python 3 (#3821)
([\#3835](#3835))
- Fix manhole so that it works with latest openssh clients
([\#3841](#3841))
- Fix outbound requests occasionally wedging, which can result in
federation breaking between servers.
([\#3845](#3845))
- Show heroes if room name/canonical alias has been deleted
([\#3851](#3851))
- Fix handling of redacted events from federation
([\#3859](#3859))
-  ([\#3874](#3874))
- Mitigate outbound federation randomly becoming wedged
([\#3875](#3875))

Internal Changes
----------------

- CircleCI tests now run on the potential merge of a PR.
([\#3704](#3704))
- http/ is now ported to Python 3.
([\#3771](#3771))
- Improve human readable error messages for threepid
registration/account update
([\#3789](#3789))
- Make /sync slightly faster by avoiding needless copies
([\#3795](#3795))
- handlers/ is now ported to Python 3.
([\#3803](#3803))
- Limit the number of PDUs/EDUs per federation transaction
([\#3805](#3805))
- Only start postgres instance for postgres tests on Travis CI
([\#3806](#3806))
- tests/ is now ported to Python 3.
([\#3808](#3808))
- crypto/ is now ported to Python 3.
([\#3822](#3822))
- rest/ is now ported to Python 3.
([\#3823](#3823))
- add some logging for the keyring queue
([\#3826](#3826))
- speed up lazy loading by 2-3x
([\#3827](#3827))
- Improved Dockerfile to remove build requirements after building
reducing the image size.
([\#3834](#3834))
- Disable lazy loading for incremental syncs for now
([\#3840](#3840))
- federation/ is now ported to Python 3.
([\#3847](#3847))
- Log when we retry outbound requests
([\#3853](#3853))
- Removed some excess logging messages.
([\#3855](#3855))
- Speed up purge history for rooms that have been previously purged
([\#3856](#3856))
- Refactor some HTTP timeout code.
([\#3857](#3857))
- Fix running merged builds on CircleCI
([\#3858](#3858))
- Fix typo in replication stream exception.
([\#3860](#3860))
- Add in flight real time metrics for Measure blocks
([\#3871](#3871))
- Disable buffering and automatic retrying in treq requests to prevent
timeouts. ([\#3872](#3872))
- mention jemalloc in the README
([\#3877](#3877))
- Remove unmaintained "nuke-room-from-db.sh" script
([\#3888](#3888))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment