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

Exclude functional members from DM detection #9124

Merged
merged 4 commits into from
Aug 1, 2022
Merged

Exclude functional members from DM detection #9124

merged 4 commits into from
Aug 1, 2022
+312 −27

Conversation

weeman1337
Copy link
Contributor

@weeman1337 weeman1337 commented Aug 1, 2022 •
edited by github-actions bot
Loading

fixes element-hq/element-web#22894

Notes: 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before

Here's what your changelog entry will look like:

🐛 Bug Fixes

@weeman1337 weeman1337 added the T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems label Aug 1, 2022
@weeman1337 weeman1337 force-pushed the weeman1337/dm-bot-fix branch from 7be8064 to 25fd1cd Compare August 1, 2022 09:45
@weeman1337 weeman1337 marked this pull request as ready for review August 1, 2022 12:22
@weeman1337 weeman1337 requested a review from a team as a code owner August 1, 2022 12:22
weeman1337
weeman1337 commented Aug 1, 2022
View reviewed changes
test/utils/dm/findDMForUser-test.ts
}));

describe("findDMRoom", () => {
describe("findDMForUser", () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This file contained the wrong test 😆
While splitting up the „start DM only on first message“ PR I seem to have mixed it up.

robintown
robintown approved these changes Aug 1, 2022
View reviewed changes
Copy link
Member

@robintown robintown left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good besides a couple comments

src/utils/dm/findDMForUser.ts Outdated Show resolved Hide resolved
src/utils/room/getFunctionalMembers.ts Outdated Show resolved Hide resolved
test/test-utils/test-utils.ts Outdated Show resolved Hide resolved
@weeman1337 weeman1337 requested a review from robintown August 1, 2022 15:24
@weeman1337 weeman1337 merged commit f10e3ab into develop Aug 1, 2022
@weeman1337 weeman1337 deleted the weeman1337/dm-bot-fix branch August 1, 2022 17:28
gaelgatelement pushed a commit that referenced this pull request Aug 8, 2022
@weeman1337 @gaelgatelement
Exclude functional members from DM detection (#9124)
333869e 
* Exclude functional members from DM detection

* Fix getRoomFunctionalMembers test

* Simplify getFunctionalMembers

* Remove unnecessary filter
su-ex added a commit to SchildiChat/element-desktop that referenced this pull request Aug 22, 2022
@su-ex
Merge tag 'v1.11.3' into sc
71f1282 
* Improve auth aria attributes and semantics ([\#22948](element-hq/element-web#22948)).
* Device manager - New device tile info design ([\#9122](matrix-org/matrix-react-sdk#9122)). Contributed by @kerryarchibald.
* Device manager generic settings subsection component ([\#9147](matrix-org/matrix-react-sdk#9147)). Contributed by @kerryarchibald.
* Migrate the hidden read receipts flag to new "send read receipts" option ([\#9141](matrix-org/matrix-react-sdk#9141)).
* Live location sharing - share location at most every 5 seconds ([\#9148](matrix-org/matrix-react-sdk#9148)). Contributed by @kerryarchibald.
* Increase max length of voice messages to 15m ([\#9133](matrix-org/matrix-react-sdk#9133)). Fixes element-hq/element-web#18620.
* Move pin drop out of labs ([\#9135](matrix-org/matrix-react-sdk#9135)).
* Start DM on first message ([\#8612](matrix-org/matrix-react-sdk#8612)). Fixes element-hq/element-web#14736.
* Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\#9129](matrix-org/matrix-react-sdk#9129)).
* The Welcome Home Screen: Dedicated Download Apps Dialog ([\#9120](matrix-org/matrix-react-sdk#9120)). Fixes element-hq/element-web#22921. Contributed by @justjanne.
* The Welcome Home Screen: "Submit Feedback" pane ([\#9090](matrix-org/matrix-react-sdk#9090)). Fixes element-hq/element-web#22918. Contributed by @justjanne.
* New User Onboarding Task List ([\#9083](matrix-org/matrix-react-sdk#9083)). Fixes element-hq/element-web#22919. Contributed by @justjanne.
* Add support for disabling spell checking ([\#8604](matrix-org/matrix-react-sdk#8604)). Fixes element-hq/element-web#21901.
* Live location share - leave maximised map open when beacons expire ([\#9098](matrix-org/matrix-react-sdk#9098)). Contributed by @kerryarchibald.
* Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\#9193](matrix-org/matrix-react-sdk#9193)).
* Use stable reference for active tab in tabbedView ([\#9145](matrix-org/matrix-react-sdk#9145)). Contributed by @kerryarchibald.
* Fix pillification sometimes doubling up ([\#9152](matrix-org/matrix-react-sdk#9152)). Fixes element-hq/element-web#23036.
* Fix composer padding ([\#9137](matrix-org/matrix-react-sdk#9137)). Fixes element-hq/element-web#22992.
* Fix highlights not being applied to plaintext messages ([\#9126](matrix-org/matrix-react-sdk#9126)). Fixes element-hq/element-web#22787.
* Fix dismissing edit composer when change was undone ([\#9109](matrix-org/matrix-react-sdk#9109)). Fixes element-hq/element-web#22932.
* 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\#9124](matrix-org/matrix-react-sdk#9124)). Fixes element-hq/element-web#22894.
* Apply inline start padding to selected lines on modern layout only ([\#9006](matrix-org/matrix-react-sdk#9006)). Fixes element-hq/element-web#22768. Contributed by @luixxiul.
* Peek into world-readable rooms from spotlight ([\#9115](matrix-org/matrix-react-sdk#9115)). Fixes element-hq/element-web#22862.
* Use default styling on nested numbered lists due to MD being sensitive ([\#9110](matrix-org/matrix-react-sdk#9110)). Fixes element-hq/element-web#22935.
* Fix replying using chat effect commands ([\#9101](matrix-org/matrix-react-sdk#9101)). Fixes element-hq/element-web#22824.
su-ex added a commit to SchildiChat/element-web that referenced this pull request Aug 22, 2022
@su-ex
Merge tag 'v1.11.3' into sc
d397360 
* Improve auth aria attributes and semantics ([\element-hq#22948](element-hq#22948)).
* Device manager - New device tile info design ([\element-hq#9122](matrix-org/matrix-react-sdk#9122)). Contributed by @kerryarchibald.
* Device manager generic settings subsection component ([\element-hq#9147](matrix-org/matrix-react-sdk#9147)). Contributed by @kerryarchibald.
* Migrate the hidden read receipts flag to new "send read receipts" option ([\element-hq#9141](matrix-org/matrix-react-sdk#9141)).
* Live location sharing - share location at most every 5 seconds ([\element-hq#9148](matrix-org/matrix-react-sdk#9148)). Contributed by @kerryarchibald.
* Increase max length of voice messages to 15m ([\element-hq#9133](matrix-org/matrix-react-sdk#9133)). Fixes element-hq#18620.
* Move pin drop out of labs ([\element-hq#9135](matrix-org/matrix-react-sdk#9135)).
* Start DM on first message ([\element-hq#8612](matrix-org/matrix-react-sdk#8612)). Fixes element-hq#14736.
* Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\element-hq#9129](matrix-org/matrix-react-sdk#9129)).
* The Welcome Home Screen: Dedicated Download Apps Dialog ([\element-hq#9120](matrix-org/matrix-react-sdk#9120)). Fixes element-hq#22921. Contributed by @justjanne.
* The Welcome Home Screen: "Submit Feedback" pane ([\element-hq#9090](matrix-org/matrix-react-sdk#9090)). Fixes element-hq#22918. Contributed by @justjanne.
* New User Onboarding Task List ([\element-hq#9083](matrix-org/matrix-react-sdk#9083)). Fixes element-hq#22919. Contributed by @justjanne.
* Add support for disabling spell checking ([\element-hq#8604](matrix-org/matrix-react-sdk#8604)). Fixes element-hq#21901.
* Live location share - leave maximised map open when beacons expire ([\element-hq#9098](matrix-org/matrix-react-sdk#9098)). Contributed by @kerryarchibald.
* Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\element-hq#9193](matrix-org/matrix-react-sdk#9193)).
* Use stable reference for active tab in tabbedView ([\#9145](matrix-org/matrix-react-sdk#9145)). Contributed by @kerryarchibald.
* Fix pillification sometimes doubling up ([\element-hq#9152](matrix-org/matrix-react-sdk#9152)). Fixes element-hq#23036.
* Fix highlights not being applied to plaintext messages ([\element-hq#9126](matrix-org/matrix-react-sdk#9126)). Fixes element-hq#22787.
* Fix dismissing edit composer when change was undone ([\element-hq#9109](matrix-org/matrix-react-sdk#9109)). Fixes element-hq#22932.
* 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\element-hq#9124](matrix-org/matrix-react-sdk#9124)). Fixes element-hq#22894.
* Apply inline start padding to selected lines on modern layout only ([\element-hq#9006](matrix-org/matrix-react-sdk#9006)). Fixes element-hq#22768. Contributed by @luixxiul.
* Peek into world-readable rooms from spotlight ([\element-hq#9115](matrix-org/matrix-react-sdk#9115)). Fixes element-hq#22862.
* Use default styling on nested numbered lists due to MD being sensitive ([\element-hq#9110](matrix-org/matrix-react-sdk#9110)). Fixes element-hq#22935.
* Fix replying using chat effect commands ([\element-hq#9101](matrix-org/matrix-react-sdk#9101)). Fixes element-hq#22824.
su-ex added a commit to SchildiChat/matrix-react-sdk that referenced this pull request Aug 22, 2022
@su-ex
Merge tag 'v3.52.0' into sc
434ba30 
* Device manager - New device tile info design ([\matrix-org#9122](matrix-org#9122)). Contributed by @kerryarchibald.
* Device manager generic settings subsection component ([\matrix-org#9147](matrix-org#9147)). Contributed by @kerryarchibald.
* Migrate the hidden read receipts flag to new "send read receipts" option ([\matrix-org#9141](matrix-org#9141)).
* Live location sharing - share location at most every 5 seconds ([\matrix-org#9148](matrix-org#9148)). Contributed by @kerryarchibald.
* Increase max length of voice messages to 15m ([\matrix-org#9133](matrix-org#9133)). Fixes element-hq/element-web#18620.
* Move pin drop out of labs ([\matrix-org#9135](matrix-org#9135)).
* Start DM on first message ([\matrix-org#8612](matrix-org#8612)). Fixes element-hq/element-web#14736.
* Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\matrix-org#9129](matrix-org#9129)).
* The Welcome Home Screen: Dedicated Download Apps Dialog ([\matrix-org#9120](matrix-org#9120)). Fixes element-hq/element-web#22921. Contributed by @justjanne.
* The Welcome Home Screen: "Submit Feedback" pane ([\matrix-org#9090](matrix-org#9090)). Fixes element-hq/element-web#22918. Contributed by @justjanne.
* New User Onboarding Task List ([\matrix-org#9083](matrix-org#9083)). Fixes element-hq/element-web#22919. Contributed by @justjanne.
* Add support for disabling spell checking ([\matrix-org#8604](matrix-org#8604)). Fixes element-hq/element-web#21901.
* Live location share - leave maximised map open when beacons expire ([\matrix-org#9098](matrix-org#9098)). Contributed by @kerryarchibald.
* Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\matrix-org#9193](matrix-org#9193)).
* Use stable reference for active tab in tabbedView ([\matrix-org#9145](matrix-org#9145)). Contributed by @kerryarchibald.
* Fix pillification sometimes doubling up ([\matrix-org#9152](matrix-org#9152)). Fixes element-hq/element-web#23036.
* Fix composer padding ([\matrix-org#9137](matrix-org#9137)). Fixes element-hq/element-web#22992.
* Fix highlights not being applied to plaintext messages ([\matrix-org#9126](matrix-org#9126)). Fixes element-hq/element-web#22787.
* Fix dismissing edit composer when change was undone ([\matrix-org#9109](matrix-org#9109)). Fixes element-hq/element-web#22932.
* 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\matrix-org#9124](matrix-org#9124)). Fixes element-hq/element-web#22894.
* Apply inline start padding to selected lines on modern layout only ([\matrix-org#9006](matrix-org#9006)). Fixes element-hq/element-web#22768. Contributed by @luixxiul.
* Peek into world-readable rooms from spotlight ([\matrix-org#9115](matrix-org#9115)). Fixes element-hq/element-web#22862.
* Use default styling on nested numbered lists due to MD being sensitive ([\matrix-org#9110](matrix-org#9110)). Fixes element-hq/element-web#22935.
* Fix replying using chat effect commands ([\matrix-org#9101](matrix-org#9101)). Fixes element-hq/element-web#22824.
* The first message in a DM can no longer be a sticker. This has been changed to avoid issues with the integration manager. ([\matrix-org#9180](matrix-org#9180)).
@tulir tulir mentioned this pull request Jul 19, 2024
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@robintown robintown robintown approved these changes

@germain-gg germain-gg Awaiting requested review from germain-gg germain-gg is a code owner automatically assigned from matrix-org/element-web-reviewers

@t3chguy t3chguy Awaiting requested review from t3chguy t3chguy is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Functional members (io.element.functional_members) is not considered when creating calls or (re)creating DMs.
2 participants
@weeman1337 @robintown