Skip to content
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

Add support for MSC4717: service members 🫡 #4335

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Conversation

poljar
Copy link
Contributor

@poljar poljar commented Nov 27, 2024

Depends on #4228, only the second commit here is relevant.

This adds support for service members to be excluded from the room display name calculation logic as described in MSC4717.

@poljar poljar requested a review from a team as a code owner November 27, 2024 08:50
@poljar poljar requested review from bnjbvr and removed request for a team November 27, 2024 08:50
@poljar poljar force-pushed the poljar/service-members branch 3 times, most recently from 3c1875d to 0ecbbc2 Compare November 28, 2024 10:36
Copy link
Member

@bnjbvr bnjbvr left a comment

Choose a reason for hiding this comment

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

Looks good on principle, thanks! Should we move the dependent PR forward first? (If so: feel free to steal the review on it, I have lost context, and I'm not sure if it's ready for review or if it's expecting more work)

crates/matrix-sdk-base/src/rooms/normal.rs Outdated Show resolved Hide resolved
crates/matrix-sdk-base/src/rooms/normal.rs Outdated Show resolved Hide resolved
crates/matrix-sdk-base/src/rooms/normal.rs Show resolved Hide resolved
@poljar poljar force-pushed the poljar/service-members branch from 0ecbbc2 to e7bc8f6 Compare November 29, 2024 13:01
@poljar poljar changed the base branch from main to poljar/member-factory November 29, 2024 13:02
@poljar poljar force-pushed the poljar/member-factory branch from a486941 to 0815468 Compare November 29, 2024 19:00
Base automatically changed from poljar/member-factory to main November 30, 2024 08:20
@bnjbvr bnjbvr requested review from bnjbvr and removed request for bnjbvr December 2, 2024 09:11
@bnjbvr
Copy link
Member

bnjbvr commented Dec 2, 2024

(Removed review request until the dependent PR is merged first.)

@poljar
Copy link
Contributor Author

poljar commented Dec 2, 2024

(Removed review request until the dependent PR is merged first.)

Why?

@bnjbvr
Copy link
Member

bnjbvr commented Dec 2, 2024

Because OP reads:

Depends on #4228

@poljar
Copy link
Contributor Author

poljar commented Dec 2, 2024

Because OP reads:

Depends on #4228

Ok but you reviewed the PR event though OP read that same message. Then I addressed all of your review comments except one.

Now you're telling me that you won't review it because OP reads this message. I'm asking why you changed your mind and why do you think that #4228 needs to be merged before this one is reviewed?

They are conceptually unrelated, they are tied together because Ruma had breaking changes.

On the topic of #4228, seems that the author also addressed your concerns but is as well waiting on your review.

@bnjbvr
Copy link
Member

bnjbvr commented Dec 2, 2024

If the code i need to review is meant to change, and that change is expected in an obvious way (in this case, because we'll update the ref to Ruma's source), then I prefer to wait on the final version of the code before doing the review. In any case, feel free to steal the review of the dependent PR; I am not bound to it in any ways, and I would appreciate the support in sharing the review load 🙏

@poljar poljar force-pushed the poljar/service-members branch from e7bc8f6 to fbd158e Compare December 2, 2024 15:37
Copy link

codecov bot commented Dec 2, 2024

Codecov Report

Attention: Patch coverage is 95.83333% with 1 line in your changes missing coverage. Please review.

Project coverage is 85.17%. Comparing base (ee30008) to head (97439b3).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
crates/matrix-sdk-base/src/rooms/normal.rs 95.83% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4335      +/-   ##
==========================================
+ Coverage   85.15%   85.17%   +0.01%     
==========================================
  Files         280      280              
  Lines       30861    30879      +18     
==========================================
+ Hits        26281    26301      +20     
+ Misses       4580     4578       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@poljar poljar force-pushed the poljar/service-members branch from fbd158e to 3f01945 Compare December 3, 2024 12:09
Copy link
Member

@bnjbvr bnjbvr left a comment

Choose a reason for hiding this comment

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

Thanks! Only reviewed the second commit, assuming we'll wait for the dependent PR to be first reviewed and merged before landing this.

crates/matrix-sdk-base/src/rooms/normal.rs Outdated Show resolved Hide resolved
crates/matrix-sdk-base/src/rooms/normal.rs Outdated Show resolved Hide resolved
crates/matrix-sdk-base/src/rooms/normal.rs Outdated Show resolved Hide resolved
Introduce support for MSC4171, enabling the designation of certain users
as service members. These flagged users are excluded from the room
display name calculation.

MSC: matrix-org/matrix-spec-proposals#4171
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants