Skip to content

[FIX] Prune messages not applying the user filter #22506

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.

Sign up for GitHub

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

Jump to bottom
Merged
sampaiodiego merged 1 commit into from
Jun 30, 2021
Merged

[FIX] Prune messages not applying the user filter #22506

sampaiodiego merged 1 commit into from
Jun 30, 2021

Conversation

@sampaiodiego
Copy link
Member

@sampaiodiego sampaiodiego commented Jun 29, 2021

Proposed changes (including videos or screenshots)

The issue was that rooms.cleanHistory endpoint receives a param called users but frontend was passing a param called fromUsers instead, causing it to ignore the selected users from the UI.

Issue(s)

Steps to test or reproduce

Further comments

@sampaiodiego sampaiodiego requested a review from a team June 29, 2021 13:24
@sampaiodiego sampaiodiego added this to the 3.15.3 milestone Jun 30, 2021
d-gubert
d-gubert reviewed Jun 30, 2021
View reviewed changes
app/api/server/v1/rooms.js
Comment on lines +179 to +182
excludePinned: [true, 'true', 1, '1'].includes(excludePinned),
filesOnly: [true, 'true', 1, '1'].includes(filesOnly),
ignoreThreads: [true, 'true', 1, '1'].includes(ignoreThreads),
ignoreDiscussion: [true, 'true', 1, '1'].includes(ignoreDiscussion),
Copy link
Member

@d-gubert d-gubert Jun 30, 2021

Choose a reason for hiding this comment

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

Wondering if this could be moved into a util function, e.g. isTruthy or isParamSet for the scope of APIs. Surely would make this more readable :)

Of course, this can be done in another opportunity as we move on with this important hotfix

Copy link
Member Author

@sampaiodiego sampaiodiego Jun 30, 2021

Choose a reason for hiding this comment

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

yep, definitely.. this should be standardized and used across the code base 👍

@dougfabris
Copy link
Member

dougfabris commented Jun 30, 2021

@sampaiodiego ooops! my fault 😞 Thanks for the fix!

@sampaiodiego sampaiodiego merged commit 39b2362 into develop Jun 30, 2021
@sampaiodiego sampaiodiego deleted the fix-prune-messages branch June 30, 2021 18:15
@sampaiodiego sampaiodiego mentioned this pull request Jul 1, 2021
Closed
sampaiodiego added a commit that referenced this pull request Jul 1, 2021
@sampaiodiego
[FIX] Prune messages from particular user(s) (#22506)
51b5ec1
@sampaiodiego sampaiodiego changed the title [FIX] Prune messages from particular user(s) [FIX] Prune messages not applying the user filter Jul 1, 2021
sampaiodiego added a commit that referenced this pull request Jul 1, 2021
@sampaiodiego
[FIX] Prune messages from particular user(s) (#22506)
027240e
@sampaiodiego sampaiodiego mentioned this pull request Jul 1, 2021
Merged
gabriellsh added a commit that referenced this pull request Jul 1, 2021
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into rewr…
5f32858 
…ite/create_disc

* 'develop' of github.com:RocketChat/Rocket.Chat: (27 commits)
  [IMPROVE] Preview message URLs only once (#22516)
  [FIX] Admin page crashing when commit hash is null (#22057)
  [FIX] Unnecessary space on members list footer (#22514)
  Chore: Review some dependencies (#22522)
  Chore: Meteor 2.2 and bump dependencies (#22399)
  Chore: Remove Sodium from the main client (#22459)
  [FIX] Prune messages from particular user(s) (#22506)
  [FIX] Livechat apps permission error (#22511)
  [IMPROVE] Message deletion modal #22508
  Update README.md
  Update README.md
  [IMPROVE] Add pagination to tags, and improve current Agents pagination
  [FIX] Rewrite CurrentChats to TS (#22424)
  [FIX] Sort AutocompleteDepartmentsMultiple (#22419)
  [FIX] Put title into AutocompleteDepartment components (#22417)
  [FIX] Bugs in AutoCompleteDepartment (#22414)
  [FIX] Closed chats doesn't show who picked the call (#22368)
  [FIX] Omnichannel Real Time Monitoring chart not displaying chats-per-agent and chats-per-department (#22406)
  [IMPROVE] Paginated multiselect for EE tags (#22315)
  [FIX] Units Edit and adds the option to hide own department in useDepartmentList
  ...
aditya-mitra added a commit to aditya-mitra/Rocket.Chat that referenced this pull request Jul 16, 2021
@aditya-mitra
Add Post Message Handler
f782799 
The custom message will be the sent for the first incoming in the channels selected by the OutOfOffice User
Added a second model OutOfOfficeRooms to effectively carry out search and send the OutOfOffice message

parent 6ef35ed
author aditya-mitra <[email protected]> 1625465055 +0530
committer aditya-mitra <[email protected]> 1626418539 +0530

Add Post Message Handler

The custom message will be the sent for the first incoming in the channels selected by the OutOfOffice User
Added a second model OutOfOfficeRooms to effectively carry out search and send the OutOfOffice message

add post message check

[FIX] Omnichannel - Fix issue with modals on room preview mode. (RocketChat#22541)

* Await error on main thread so meteor can handle it

* Fix an issue where clicking esc would trigger a room read on unsubscribed rooms

Co-authored-by: Renato Becker <[email protected]>

[FIX] Redirect to login after delete own account (RocketChat#22499)

[FIX] UIKit URL prop being ignored for buttons (RocketChat#22579)

Chore: Upgrade NPM dependencies (RocketChat#22562)

Chore: Upgrade Micro Services NPM dependencies (RocketChat#22561)

[FIX] Create Discussion modal - Parent room input not displaying correct room name RocketChat#22580

[IMPROVE] Rewrite OTR modals (RocketChat#22583)

* improve: rewrite accept otr modal

* improve: rewrite otr end modal

* improve: deny otr modal

* fix: lint

Co-authored-by: gabriellsh <[email protected]>

i18n: Language update from LingoHub 🤖 on 2021-07-05Z (RocketChat#22572)

* Language update from LingoHub 🤖

Project Name: Rocket.Chat
Project Link: https://translate.lingohub.com/rocketchat/dashboard/rocket-dot-chat
User: Robot LingoHub

Easy language translations with LingoHub 🚀

* remove translated variables

Co-authored-by: Robot LingoHub <[email protected]>
Co-authored-by: Diego Sampaio <[email protected]>

Chore: [Snyk] Security upgrade node-gcm from 0.14.4 to 1.0.0 (RocketChat#22582)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-1040724

[FIX] Livechat webhook request without headers (RocketChat#22589)

[IMPROVE] Rewrite Enter Encryption Password Modal (RocketChat#22456)

* improve: rewrite modal

* fix: modal props

* fix: translation key

* fix: review

Co-authored-by: gabriellsh <[email protected]>

[NEW] Convert Team to Channel (RocketChat#22476)

* wip

* Add extra param to listRoomsOfUser to filter rooms user can delete

* update the way permission was being checked

* new: convert team to channel

* fix: lastOwner warning

* fix: review

* improve: convert ChannelDesertationTable to ts

* Remove unused prop

Co-authored-by: Douglas Fabris <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: Tasso Evangelista <[email protected]>

[IMPROVE] Rewrite Save Encryption Password Modal (RocketChat#22447)

* improve: rewrite modal

* fix: translation keys

* fix: review

* fix: lint

Co-authored-by: gabriellsh <[email protected]>
Co-authored-by: Tasso Evangelista <[email protected]>

[FIX] Error in permission check for getLivechatDepartmentByNameOrId method in Apps (RocketChat#22545)

[FIX] Checks the list of agents if at least one is online (RocketChat#22584)

Co-authored-by: Diego Sampaio <[email protected]>

remove sent roomIds

change OutOfOffice to OutOfOfficeUser model

move date validation to update.ts

correction in renaming (should be plural)

add OutOfOfficeRooms model

post message handler added

fix lint errors

[IMPROVE] Sidebar icons margins (RocketChat#22498)

* Change components

* Update fuselage

Co-authored-by: Tasso Evangelista <[email protected]>

[FIX] Convert Team to Channel menu order RocketChat#22606

Co-authored-by: Tasso Evangelista <[email protected]>

[IMPROVE] Rewrite URL check modal (RocketChat#22540)

* fix modal not being called

* Rewrite url change modal

Co-authored-by: Douglas Fabris <[email protected]>

[FIX] Button overlapping modal RocketChat#22605

Co-authored-by: Tasso Evangelista <[email protected]>

[FIX] User cannot delete own files in contextualbar RocketChat#22595

Co-authored-by: gabriellsh <[email protected]>

Regression: Client crashing on startup (RocketChat#22610)

[FIX] Confirm owner change process when deleting own account (RocketChat#22609)

* fix: confirm owner change deleting own account

* fix: missing return statement

Co-authored-by: Tasso Evangelista <[email protected]>

[FIX] Markdown for UiKit blocks (RocketChat#22619)

Regression: Change the name of called methods in Users model (RocketChat#22620)

[NEW] REST endpoint to remove User from Role (RocketChat#20485)

* [WIP] added test

* [WIP] added api endpoint to remove role from user

* [WIP] added test with Subscription Scope

* Update roles.js

* fix endpoint params

* update tests

* remove .only

Co-authored-by: Lucas Sartor Chauvin <[email protected]>
Co-authored-by: Leonardo Ostjen Couto <[email protected]>

Create README.md (RocketChat#22615)

Add the Out of Office Scheduler

Out of Office will be auto-disabled at the endDate and auto-enabled at the startDate
Internally uses AgendaJS

[FIX] VisitorClientInfo not showing (RocketChat#22593)

* fix visitor info

* fix prettier error

* include host and ip

Co-authored-by: Martin Schoeler <[email protected]>

Chore: Use projection instead of fields to avoid error log (RocketChat#22629)

fixed - room still listed after delete (RocketChat#22613)

Co-authored-by: gabriellsh <[email protected]>

[FIX] Prune messages from particular user(s) (RocketChat#22506)

[FIX] Livechat apps permission error (RocketChat#22511)

Bump version to 3.16.1

[FIX] Livechat webhook request without headers (RocketChat#22589)

[FIX] Error in permission check for getLivechatDepartmentByNameOrId method in Apps (RocketChat#22545)

[FIX] Checks the list of agents if at least one is online (RocketChat#22584)

Co-authored-by: Diego Sampaio <[email protected]>

Regression: Change the name of called methods in Users model (RocketChat#22620)

Bump version to 3.16.2

Bump version to 3.16.3

[FIX] Info page - Instances card modal table width RocketChat#22627
@ggazzo ggazzo mentioned this pull request Jul 31, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@d-gubert d-gubert d-gubert left review comments

@dougfabris dougfabris dougfabris approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

3.15.3

Development

Successfully merging this pull request may close these issues.

4 participants

@sampaiodiego @dougfabris @d-gubert