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

Add ignore user API support #1389

Merged
merged 12 commits into from
Sep 17, 2017
Merged

Conversation

turt2live
Copy link
Member

@turt2live turt2live commented Sep 14, 2017

General ticket: element-hq/element-web#1490

Requires

Adds element-hq/element-web#1767

Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in.

Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
@turt2live turt2live changed the title [WIP] Add ignore user API support Add ignore user API support Sep 15, 2017
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
@@ -228,6 +257,7 @@ module.exports = React.createClass({
}

this._refreshMediaDevices();
this._refreshIgnoredUsers();
Copy link
Member

Choose a reason for hiding this comment

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

I guess technically we might want to also _refreshIgnoreUsers() when we receive an ignoring event from the js-sdk. But that's such an edge case i'm happy to ignore it for now :)

Copy link
Member

@ara4n ara4n Sep 17, 2017

Choose a reason for hiding this comment

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

(although given we already have an onAction() here, surely it's just 3 lines to add in a:

case 'ignore_state_changed':
                this._refreshIgnoredUsers();
                break;

...which almost seems worth it.)

Signed-off-by: Travis Ralston <travpc@gmail.com>
@ara4n
Copy link
Member

ara4n commented Sep 17, 2017

this looks excellent - thank you!!! sorry it took us a few days to get to it; with lúke away, me stuck in funding hell and dave up to his eyeballs in perf work we're a bit undermanned.

@ara4n ara4n merged commit 6a53b7b into matrix-org:develop Sep 17, 2017
@turt2live
Copy link
Member Author

Thanks @ara4n! 2 days is pretty good compared to some of the other projects I contribute to (/me glares at 2015 PR)

@ara4n
Copy link
Member

ara4n commented Sep 17, 2017

yeah, glad we don't have any like that... glances at #588 :((

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants