diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index b51ce51400490..28a9dea3ff8cb 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 3.16.1 +ENV RC_VERSION 3.16.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 3513ceb992cb0..94f0827ff0cfd 100644 --- a/.github/history.json +++ b/.github/history.json @@ -62223,6 +62223,90 @@ ] } ] + }, + "3.15.3": { + "node_version": "12.22.1", + "npm_version": "6.14.1", + "apps_engine_version": "1.26.0", + "mongo_versions": [ + "3.4", + "3.6", + "4.0", + "4.2" + ], + "pull_requests": [ + { + "pr": "22506", + "title": "[FIX] Prune messages not applying the user filter", + "userLogin": "sampaiodiego", + "milestone": "3.15.3", + "contributors": [ + "sampaiodiego" + ] + } + ] + }, + "3.16.2": { + "node_version": "12.22.1", + "npm_version": "6.14.1", + "apps_engine_version": "1.27.1", + "mongo_versions": [ + "3.4", + "3.6", + "4.0", + "4.2" + ], + "pull_requests": [ + { + "pr": "22620", + "title": "Regression: Change the name of called methods in Users model", + "userLogin": "tiagoevanp", + "milestone": "3.16.2", + "contributors": [ + "tiagoevanp", + "sampaiodiego" + ] + }, + { + "pr": "22619", + "title": "[FIX] Markdown for UiKit blocks", + "userLogin": "ggazzo", + "milestone": "3.16.2", + "contributors": [ + "ggazzo" + ] + }, + { + "pr": "22584", + "title": "[FIX] Checks the list of agents if at least one is online", + "userLogin": "tiagoevanp", + "milestone": "3.16.2", + "contributors": [ + "tiagoevanp", + "web-flow", + "sampaiodiego" + ] + }, + { + "pr": "22545", + "title": "[FIX] Error in permission check for getLivechatDepartmentByNameOrId method in Apps", + "userLogin": "d-gubert", + "description": "Update the Apps-Engine with a fix for the permission check on the `getLivechatDepartmentByNameOrId` method", + "milestone": "3.16.2", + "contributors": [ + "d-gubert" + ] + }, + { + "pr": "22589", + "title": "[FIX] Livechat webhook request without headers", + "userLogin": "ggazzo", + "milestone": "3.16.2", + "contributors": [ + "ggazzo" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index 32a6cdf49e0d9..a2201b115739e 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.16.1/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.16.2/download/" -o rocket.chat.tgz tar xf rocket.chat.tgz --strip 1 diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml index a0b5b2a0adff9..8435a5f162ba5 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.16.1 +version: 3.16.2 summary: Rocket.Chat server description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/ confinement: strict diff --git a/HISTORY.md b/HISTORY.md index cf78931cd6d31..1fde99fc78300 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,41 @@ +# 3.16.2 +`2021-07-08 ยท 4 ๐Ÿ› ยท 1 ๐Ÿ” ยท 4 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.22.1` +- NPM: `6.14.1` +- MongoDB: `3.4, 3.6, 4.0, 4.2` +- Apps-Engine: `1.27.1` + +### ๐Ÿ› Bug fixes + + +- Checks the list of agents if at least one is online ([#22584](https://github.com/RocketChat/Rocket.Chat/pull/22584)) + +- Error in permission check for getLivechatDepartmentByNameOrId method in Apps ([#22545](https://github.com/RocketChat/Rocket.Chat/pull/22545)) + + Update the Apps-Engine with a fix for the permission check on the `getLivechatDepartmentByNameOrId` method + +- Livechat webhook request without headers ([#22589](https://github.com/RocketChat/Rocket.Chat/pull/22589)) + +- Markdown for UiKit blocks ([#22619](https://github.com/RocketChat/Rocket.Chat/pull/22619)) + +
+๐Ÿ” Minor changes + + +- Regression: Change the name of called methods in Users model ([#22620](https://github.com/RocketChat/Rocket.Chat/pull/22620)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@d-gubert](https://github.com/d-gubert) +- [@ggazzo](https://github.com/ggazzo) +- [@sampaiodiego](https://github.com/sampaiodiego) +- [@tiagoevanp](https://github.com/tiagoevanp) + # 3.16.1 `2021-07-01 ยท 2 ๐Ÿ› ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` @@ -64,7 +101,7 @@ - Open modals in side effects outside React ([#22247](https://github.com/RocketChat/Rocket.Chat/pull/22247)) -- Remove "Game Center" setting ([#22232](https://github.com/RocketChat/Rocket.Chat/pull/22232)) +- Remove "Game Center" setting ([#22232](https://github.com/RocketChat/Rocket.Chat/pull/22232) by [@lolimay](https://github.com/lolimay)) ### ๐Ÿš€ Improvements @@ -398,6 +435,7 @@ ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ - [@Darshilp326](https://github.com/Darshilp326) +- [@lolimay](https://github.com/lolimay) - [@mrsimpson](https://github.com/mrsimpson) - [@rafaelblink](https://github.com/rafaelblink) - [@rexzing](https://github.com/rexzing) @@ -412,7 +450,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@lucassartor](https://github.com/lucassartor) - [@matheusbsilva137](https://github.com/matheusbsilva137) - [@murtaza98](https://github.com/murtaza98) @@ -424,6 +461,24 @@ - [@thassiov](https://github.com/thassiov) - [@tiagoevanp](https://github.com/tiagoevanp) +# 3.15.3 +`2021-07-01 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.22.1` +- NPM: `6.14.1` +- MongoDB: `3.4, 3.6, 4.0, 4.2` +- Apps-Engine: `1.26.0` + +### ๐Ÿ› Bug fixes + + +- Prune messages not applying the user filter ([#22506](https://github.com/RocketChat/Rocket.Chat/pull/22506)) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@sampaiodiego](https://github.com/sampaiodiego) + # 3.15.2 `2021-06-27 ยท 3 ๐Ÿ› ยท 1 ๐Ÿ” ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` @@ -1337,7 +1392,7 @@ ### ๐Ÿš€ Improvements -- **APPS:** Scheduler option to skip immediate execution of recurring jobs ([#21353](https://github.com/RocketChat/Rocket.Chat/pull/21353)) +- **APPS:** Scheduler option to skip immediate execution of recurring jobs ([#21353](https://github.com/RocketChat/Rocket.Chat/pull/21353) by [@lolimay](https://github.com/lolimay)) Create and schedule a task manually at `scheduleRecurring` method so the first iteration runs after the configured interval. This is accomplished by adding the setting `skipImmediate: true` when setting up the task. @@ -1697,6 +1752,7 @@ - [@cuonghuunguyen](https://github.com/cuonghuunguyen) - [@im-adithya](https://github.com/im-adithya) - [@joshi008](https://github.com/joshi008) +- [@lolimay](https://github.com/lolimay) - [@rafaelblink](https://github.com/rafaelblink) - [@sauravjoshi23](https://github.com/sauravjoshi23) - [@sumukhah](https://github.com/sumukhah) @@ -1713,7 +1769,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@ggazzo](https://github.com/ggazzo) - [@graywolf336](https://github.com/graywolf336) -- [@lolimay](https://github.com/lolimay) - [@lucassartor](https://github.com/lucassartor) - [@matheusbsilva137](https://github.com/matheusbsilva137) - [@murtaza98](https://github.com/murtaza98) @@ -2033,7 +2088,7 @@ - "Taken At" and "Average of Response Time" fields not rendering properly on Room Information panel ([#21365](https://github.com/RocketChat/Rocket.Chat/pull/21365) by [@rafaelblink](https://github.com/rafaelblink)) -- **Apps:** Fix Game Center icon disappeared after the React refactor ([#21091](https://github.com/RocketChat/Rocket.Chat/pull/21091)) +- **Apps:** Fix Game Center icon disappeared after the React refactor ([#21091](https://github.com/RocketChat/Rocket.Chat/pull/21091) by [@lolimay](https://github.com/lolimay)) - **APPS:** Warn message while installing app in air-gapped environment ([#20992](https://github.com/RocketChat/Rocket.Chat/pull/20992)) @@ -2406,6 +2461,7 @@ - [@cyberShaw](https://github.com/cyberShaw) - [@fcecagno](https://github.com/fcecagno) - [@im-adithya](https://github.com/im-adithya) +- [@lolimay](https://github.com/lolimay) - [@m-shreyansh](https://github.com/m-shreyansh) - [@rafaelblink](https://github.com/rafaelblink) - [@reda-alaoui](https://github.com/reda-alaoui) @@ -2425,7 +2481,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@lucassartor](https://github.com/lucassartor) - [@matheusbsilva137](https://github.com/matheusbsilva137) - [@murtaza98](https://github.com/murtaza98) @@ -2814,7 +2869,7 @@ ### After ![image](https://user-images.githubusercontent.com/2493803/107095261-3b019d80-67e7-11eb-8425-8612b03ac50a.png) -- Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653)) +- Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653) by [@lolimay](https://github.com/lolimay)) Update to latest patch version of the Apps-Engine with a fix for the Livechat bridge, as seen in https://github.com/RocketChat/Rocket.Chat.Apps-engine/pull/379 @@ -3045,6 +3100,7 @@ - [@aditya-mitra](https://github.com/aditya-mitra) - [@bhavayAnand9](https://github.com/bhavayAnand9) - [@im-adithya](https://github.com/im-adithya) +- [@lolimay](https://github.com/lolimay) - [@paulobernardoaf](https://github.com/paulobernardoaf) - [@pierreozoux](https://github.com/pierreozoux) - [@rafaelblink](https://github.com/rafaelblink) @@ -3060,7 +3116,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@lucassartor](https://github.com/lucassartor) - [@matheusbsilva137](https://github.com/matheusbsilva137) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) @@ -3135,7 +3190,7 @@ - Gif images aspect ratio on preview ([#20654](https://github.com/RocketChat/Rocket.Chat/pull/20654)) -- Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653)) +- Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653) by [@lolimay](https://github.com/lolimay)) Update to latest patch version of the Apps-Engine with a fix for the Livechat bridge, as seen in https://github.com/RocketChat/Rocket.Chat.Apps-engine/pull/379 @@ -3147,12 +3202,12 @@ ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ +- [@lolimay](https://github.com/lolimay) - [@yash-rajpal](https://github.com/yash-rajpal) ### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ - [@d-gubert](https://github.com/d-gubert) -- [@lolimay](https://github.com/lolimay) - [@renatobecker](https://github.com/renatobecker) - [@sampaiodiego](https://github.com/sampaiodiego) - [@tiagoevanp](https://github.com/tiagoevanp) @@ -3171,7 +3226,7 @@ - **Apps:** Apps Permission System ([#20078](https://github.com/RocketChat/Rocket.Chat/pull/20078)) -- **Apps:** IPreFileUpload event ([#20285](https://github.com/RocketChat/Rocket.Chat/pull/20285)) +- **Apps:** IPreFileUpload event ([#20285](https://github.com/RocketChat/Rocket.Chat/pull/20285) by [@lolimay](https://github.com/lolimay)) - **ENTERPRISE:** Automatic transfer of unanswered conversations to another agent ([#20090](https://github.com/RocketChat/Rocket.Chat/pull/20090)) @@ -3606,7 +3661,7 @@ - Update "Industry" setting ([#20510](https://github.com/RocketChat/Rocket.Chat/pull/20510)) -- Update Apps-Engine and permissions translations ([#20491](https://github.com/RocketChat/Rocket.Chat/pull/20491)) +- Update Apps-Engine and permissions translations ([#20491](https://github.com/RocketChat/Rocket.Chat/pull/20491) by [@lolimay](https://github.com/lolimay)) Update Apps-Engine version and apply changes in translations for the changed permissions. Please review the texts on the translation files to make sure they're clear. @@ -3630,6 +3685,7 @@ - [@dependabot[bot]](https://github.com/dependabot[bot]) - [@i-kychukov](https://github.com/i-kychukov) - [@ikyuchukov](https://github.com/ikyuchukov) +- [@lolimay](https://github.com/lolimay) - [@moniang](https://github.com/moniang) - [@rafaelblink](https://github.com/rafaelblink) - [@sushant52](https://github.com/sushant52) @@ -3645,7 +3701,6 @@ - [@dougfabris](https://github.com/dougfabris) - [@gabriellsh](https://github.com/gabriellsh) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@lucassartor](https://github.com/lucassartor) - [@murtaza98](https://github.com/murtaza98) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) @@ -4497,7 +4552,7 @@ ### ๐ŸŽ‰ New features -- **Apps:** Add new typing bridge method (Typing-Indicator) ([#19228](https://github.com/RocketChat/Rocket.Chat/pull/19228)) +- **Apps:** Add new typing bridge method (Typing-Indicator) ([#19228](https://github.com/RocketChat/Rocket.Chat/pull/19228) by [@lolimay](https://github.com/lolimay)) - **APPS:** New Scheduler API ([#19290](https://github.com/RocketChat/Rocket.Chat/pull/19290)) @@ -4757,6 +4812,7 @@ - [@dependabot[bot]](https://github.com/dependabot[bot]) - [@galshiff](https://github.com/galshiff) - [@jgribonvald](https://github.com/jgribonvald) +- [@lolimay](https://github.com/lolimay) - [@lucas-andre](https://github.com/lucas-andre) - [@rafaelblink](https://github.com/rafaelblink) @@ -4770,7 +4826,6 @@ - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) - [@graywolf336](https://github.com/graywolf336) -- [@lolimay](https://github.com/lolimay) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -4900,13 +4955,13 @@ - "Room avatar changed" system messages ([#18839](https://github.com/RocketChat/Rocket.Chat/pull/18839)) -- **Apps:** Add a Livechat API - setCustomFields ([#18912](https://github.com/RocketChat/Rocket.Chat/pull/18912)) +- **Apps:** Add a Livechat API - setCustomFields ([#18912](https://github.com/RocketChat/Rocket.Chat/pull/18912) by [@lolimay](https://github.com/lolimay)) -- **Apps:** Add a new upload API ([#18955](https://github.com/RocketChat/Rocket.Chat/pull/18955)) +- **Apps:** Add a new upload API ([#18955](https://github.com/RocketChat/Rocket.Chat/pull/18955) by [@lolimay](https://github.com/lolimay)) - **Apps:** Add support for new livechat guest's and room's events ([#18946](https://github.com/RocketChat/Rocket.Chat/pull/18946)) -- **Apps:** Add support to the "encoding" option in http requests from Apps ([#19002](https://github.com/RocketChat/Rocket.Chat/pull/19002)) +- **Apps:** Add support to the "encoding" option in http requests from Apps ([#19002](https://github.com/RocketChat/Rocket.Chat/pull/19002) by [@lolimay](https://github.com/lolimay)) - Apps-Engine v1.18.0 ([#19047](https://github.com/RocketChat/Rocket.Chat/pull/19047)) @@ -5064,9 +5119,9 @@ - Refactor: Omnichannel Realtime Monitoring ([#18666](https://github.com/RocketChat/Rocket.Chat/pull/18666)) -- Regression: Elements select & multiSelect not rendered correctly in the App Settings ([#19005](https://github.com/RocketChat/Rocket.Chat/pull/19005)) +- Regression: Elements select & multiSelect not rendered correctly in the App Settings ([#19005](https://github.com/RocketChat/Rocket.Chat/pull/19005) by [@lolimay](https://github.com/lolimay)) -- Regression: File upload via apps not working in some scenarios ([#18995](https://github.com/RocketChat/Rocket.Chat/pull/18995)) +- Regression: File upload via apps not working in some scenarios ([#18995](https://github.com/RocketChat/Rocket.Chat/pull/18995) by [@lolimay](https://github.com/lolimay)) - Regression: Fix login screen reactivity of external login providers ([#19033](https://github.com/RocketChat/Rocket.Chat/pull/19033)) @@ -5088,6 +5143,7 @@ - [@Karting06](https://github.com/Karting06) - [@d-sko](https://github.com/d-sko) - [@dependabot[bot]](https://github.com/dependabot[bot]) +- [@lolimay](https://github.com/lolimay) - [@lsignac](https://github.com/lsignac) - [@mrtndwrd](https://github.com/mrtndwrd) - [@thirsch](https://github.com/thirsch) @@ -5102,7 +5158,6 @@ - [@engelgabriel](https://github.com/engelgabriel) - [@gabriellsh](https://github.com/gabriellsh) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -6014,7 +6069,7 @@ - Discussion sort option even with discussions disabled ([#17963](https://github.com/RocketChat/Rocket.Chat/pull/17963)) -- double slashes in avatar url ([#17739](https://github.com/RocketChat/Rocket.Chat/pull/17739)) +- double slashes in avatar url ([#17739](https://github.com/RocketChat/Rocket.Chat/pull/17739) by [@lolimay](https://github.com/lolimay)) - Duplicated password placeholder ([#17898](https://github.com/RocketChat/Rocket.Chat/pull/17898) by [@mariaeduardacunha](https://github.com/mariaeduardacunha)) @@ -6128,7 +6183,7 @@ - Regression: Admin User Edit panel is broken ([#17992](https://github.com/RocketChat/Rocket.Chat/pull/17992)) -- Regression: App info broken ([#17979](https://github.com/RocketChat/Rocket.Chat/pull/17979)) +- Regression: App info broken ([#17979](https://github.com/RocketChat/Rocket.Chat/pull/17979) by [@lolimay](https://github.com/lolimay)) - Regression: Cannot save avatar change on admin ([#17999](https://github.com/RocketChat/Rocket.Chat/pull/17999)) @@ -6217,6 +6272,7 @@ - [@justinr1234](https://github.com/justinr1234) - [@knrt10](https://github.com/knrt10) - [@localguru](https://github.com/localguru) +- [@lolimay](https://github.com/lolimay) - [@lpilz](https://github.com/lpilz) - [@madhavmalhotra3089](https://github.com/madhavmalhotra3089) - [@mariaeduardacunha](https://github.com/mariaeduardacunha) @@ -6242,7 +6298,6 @@ - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) - [@graywolf336](https://github.com/graywolf336) -- [@lolimay](https://github.com/lolimay) - [@murtaza98](https://github.com/murtaza98) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) @@ -6374,7 +6429,7 @@ - **APPS-ENGINE:** Essentials mechanism ([#17656](https://github.com/RocketChat/Rocket.Chat/pull/17656)) -- **Apps-Engine:** New Livechat event handlers ([#17033](https://github.com/RocketChat/Rocket.Chat/pull/17033)) +- **Apps-Engine:** New Livechat event handlers ([#17033](https://github.com/RocketChat/Rocket.Chat/pull/17033) by [@lolimay](https://github.com/lolimay)) - **Apps-Engine:** New Room events ([#17487](https://github.com/RocketChat/Rocket.Chat/pull/17487)) @@ -6424,7 +6479,7 @@ ### ๐Ÿš€ Improvements -- **Apps-Engine:** App user as the default notifier ([#17050](https://github.com/RocketChat/Rocket.Chat/pull/17050)) +- **Apps-Engine:** App user as the default notifier ([#17050](https://github.com/RocketChat/Rocket.Chat/pull/17050) by [@lolimay](https://github.com/lolimay)) - Add env var to configure Chatpal URL and remove it from beta ([#16665](https://github.com/RocketChat/Rocket.Chat/pull/16665) by [@tkurz](https://github.com/tkurz)) @@ -6624,7 +6679,7 @@ - Upgrade Livechat Widget version to 1.5.0 ([#17710](https://github.com/RocketChat/Rocket.Chat/pull/17710)) -- Use Users.findOneByAppId instead of querying directly ([#16480](https://github.com/RocketChat/Rocket.Chat/pull/16480)) +- Use Users.findOneByAppId instead of querying directly ([#16480](https://github.com/RocketChat/Rocket.Chat/pull/16480) by [@lolimay](https://github.com/lolimay)) @@ -6641,6 +6696,7 @@ - [@huzaifahj](https://github.com/huzaifahj) - [@juzser](https://github.com/juzser) - [@kolorafa](https://github.com/kolorafa) +- [@lolimay](https://github.com/lolimay) - [@lpilz](https://github.com/lpilz) - [@machester4](https://github.com/machester4) - [@mariaeduardacunha](https://github.com/mariaeduardacunha) @@ -6663,7 +6719,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -6771,7 +6826,7 @@ - Add MMS support to Voxtelesys ([#17217](https://github.com/RocketChat/Rocket.Chat/pull/17217) by [@john08burke](https://github.com/john08burke)) -- Adds ability for Rocket.Chat Apps to create discussions ([#16683](https://github.com/RocketChat/Rocket.Chat/pull/16683)) +- Adds ability for Rocket.Chat Apps to create discussions ([#16683](https://github.com/RocketChat/Rocket.Chat/pull/16683) by [@lolimay](https://github.com/lolimay)) - Allow to send Agent custom fields through the Omnichannel CRM integration ([#16286](https://github.com/RocketChat/Rocket.Chat/pull/16286)) @@ -6962,6 +7017,7 @@ - [@ffauvel](https://github.com/ffauvel) - [@hullen](https://github.com/hullen) - [@john08burke](https://github.com/john08burke) +- [@lolimay](https://github.com/lolimay) - [@lpilz](https://github.com/lpilz) - [@ritwizsinha](https://github.com/ritwizsinha) - [@subham103](https://github.com/subham103) @@ -6975,7 +7031,6 @@ - [@d-gubert](https://github.com/d-gubert) - [@gabriellsh](https://github.com/gabriellsh) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@marceloschmidt](https://github.com/marceloschmidt) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) @@ -7125,7 +7180,7 @@ - Enterprise Edition ([#16944](https://github.com/RocketChat/Rocket.Chat/pull/16944)) -- Experimental Game Center (externalComponents implementation) ([#15123](https://github.com/RocketChat/Rocket.Chat/pull/15123)) +- Experimental Game Center (externalComponents implementation) ([#15123](https://github.com/RocketChat/Rocket.Chat/pull/15123) by [@lolimay](https://github.com/lolimay)) - Home button on sidebar ([#17052](https://github.com/RocketChat/Rocket.Chat/pull/17052)) @@ -7354,7 +7409,7 @@ ๐Ÿ” Minor changes -- [Apps] Lazy load categories and marketplaceVersion in admin - apps page ([#16258](https://github.com/RocketChat/Rocket.Chat/pull/16258)) +- [Apps] Lazy load categories and marketplaceVersion in admin - apps page ([#16258](https://github.com/RocketChat/Rocket.Chat/pull/16258) by [@lolimay](https://github.com/lolimay)) - [CHORE] Changed remaining SelectInput's to Select ([#16719](https://github.com/RocketChat/Rocket.Chat/pull/16719)) @@ -7550,6 +7605,7 @@ - [@karimelghazouly](https://github.com/karimelghazouly) - [@knrt10](https://github.com/knrt10) - [@localguru](https://github.com/localguru) +- [@lolimay](https://github.com/lolimay) - [@mrsimpson](https://github.com/mrsimpson) - [@ndroo](https://github.com/ndroo) - [@pmayer](https://github.com/pmayer) @@ -7567,7 +7623,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@marceloschmidt](https://github.com/marceloschmidt) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) @@ -7963,9 +8018,9 @@ - Button to download admin server info ([#16059](https://github.com/RocketChat/Rocket.Chat/pull/16059) by [@MarcosSpessatto](https://github.com/MarcosSpessatto)) -- Check the Omnichannel service status per Department ([#16425](https://github.com/RocketChat/Rocket.Chat/pull/16425)) +- Check the Omnichannel service status per Department ([#16425](https://github.com/RocketChat/Rocket.Chat/pull/16425) by [@lolimay](https://github.com/lolimay)) -- Create a user for the Apps during installation ([#15896](https://github.com/RocketChat/Rocket.Chat/pull/15896) by [@Cool-fire](https://github.com/Cool-fire)) +- Create a user for the Apps during installation ([#15896](https://github.com/RocketChat/Rocket.Chat/pull/15896) by [@Cool-fire](https://github.com/Cool-fire) & [@lolimay](https://github.com/lolimay)) - Enforce plain text emails converting from HTML when no text version supplied ([#16063](https://github.com/RocketChat/Rocket.Chat/pull/16063)) @@ -7982,7 +8037,7 @@ ### ๐Ÿš€ Improvements -- Changes App user's status when the app was enabled/disabled ([#16392](https://github.com/RocketChat/Rocket.Chat/pull/16392)) +- Changes App user's status when the app was enabled/disabled ([#16392](https://github.com/RocketChat/Rocket.Chat/pull/16392) by [@lolimay](https://github.com/lolimay)) - Improve function to check if setting has changed ([#16181](https://github.com/RocketChat/Rocket.Chat/pull/16181)) @@ -7990,7 +8045,7 @@ - Major overhaul on data importers ([#16279](https://github.com/RocketChat/Rocket.Chat/pull/16279)) -- Prevent "App user" from being deleted by the admin ([#16373](https://github.com/RocketChat/Rocket.Chat/pull/16373)) +- Prevent "App user" from being deleted by the admin ([#16373](https://github.com/RocketChat/Rocket.Chat/pull/16373) by [@lolimay](https://github.com/lolimay)) - Remove NRR ([#16071](https://github.com/RocketChat/Rocket.Chat/pull/16071)) @@ -8200,6 +8255,7 @@ - [@antkaz](https://github.com/antkaz) - [@ashwaniYDV](https://github.com/ashwaniYDV) - [@aviral243](https://github.com/aviral243) +- [@lolimay](https://github.com/lolimay) - [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@mrsimpson](https://github.com/mrsimpson) - [@ritwizsinha](https://github.com/ritwizsinha) @@ -8213,7 +8269,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -8542,7 +8597,7 @@ ### ๐ŸŽ‰ New features -- Apps-Engine event for when a livechat room is closed ([#15837](https://github.com/RocketChat/Rocket.Chat/pull/15837)) +- Apps-Engine event for when a livechat room is closed ([#15837](https://github.com/RocketChat/Rocket.Chat/pull/15837) by [@lolimay](https://github.com/lolimay)) - Do not print emails in console on production mode ([#15928](https://github.com/RocketChat/Rocket.Chat/pull/15928)) @@ -8722,6 +8777,7 @@ - [@breaking-let](https://github.com/breaking-let) - [@iannuzzelli](https://github.com/iannuzzelli) - [@localguru](https://github.com/localguru) +- [@lolimay](https://github.com/lolimay) - [@mariaeduardacunha](https://github.com/mariaeduardacunha) - [@n-se](https://github.com/n-se) - [@ritwizsinha](https://github.com/ritwizsinha) @@ -8735,7 +8791,6 @@ - [@gabriellsh](https://github.com/gabriellsh) - [@geekgonecrazy](https://github.com/geekgonecrazy) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -10226,7 +10281,7 @@ - Fix not fully extracted pieces ([#14805](https://github.com/RocketChat/Rocket.Chat/pull/14805)) -- Merge master into develop & Set version to 1.2.0-develop ([#14656](https://github.com/RocketChat/Rocket.Chat/pull/14656) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv)) +- Merge master into develop & Set version to 1.2.0-develop ([#14656](https://github.com/RocketChat/Rocket.Chat/pull/14656) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@lolimay](https://github.com/lolimay) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv)) - Regression: Allow debugging of cached collections by name ([#14862](https://github.com/RocketChat/Rocket.Chat/pull/14862)) @@ -10244,6 +10299,7 @@ - [@Hudell](https://github.com/Hudell) - [@MarcosSpessatto](https://github.com/MarcosSpessatto) - [@knrt10](https://github.com/knrt10) +- [@lolimay](https://github.com/lolimay) - [@mohamedar97](https://github.com/mohamedar97) - [@ruKurz](https://github.com/ruKurz) - [@sonbn0](https://github.com/sonbn0) @@ -10258,7 +10314,6 @@ - [@alansikora](https://github.com/alansikora) - [@engelgabriel](https://github.com/engelgabriel) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@marceloschmidt](https://github.com/marceloschmidt) - [@renatobecker](https://github.com/renatobecker) - [@rodrigok](https://github.com/rodrigok) @@ -10761,7 +10816,7 @@ - Duplicate thread message after editing ([#14330](https://github.com/RocketChat/Rocket.Chat/pull/14330)) -- Missing i18n for some new Permissions ([#14011](https://github.com/RocketChat/Rocket.Chat/pull/14011)) +- Missing i18n for some new Permissions ([#14011](https://github.com/RocketChat/Rocket.Chat/pull/14011) by [@lolimay](https://github.com/lolimay)) - New day separator rendered over thread reply ([#14328](https://github.com/RocketChat/Rocket.Chat/pull/14328)) @@ -10787,7 +10842,7 @@ - i18n: Update German strings ([#14182](https://github.com/RocketChat/Rocket.Chat/pull/14182) by [@AnBo83](https://github.com/AnBo83)) -- Release 1.0.2 ([#14339](https://github.com/RocketChat/Rocket.Chat/pull/14339) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv)) +- Release 1.0.2 ([#14339](https://github.com/RocketChat/Rocket.Chat/pull/14339) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@lolimay](https://github.com/lolimay) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv)) @@ -10795,6 +10850,7 @@ - [@AnBo83](https://github.com/AnBo83) - [@knrt10](https://github.com/knrt10) +- [@lolimay](https://github.com/lolimay) - [@mohamedar97](https://github.com/mohamedar97) - [@thaiphv](https://github.com/thaiphv) @@ -10802,7 +10858,6 @@ - [@d-gubert](https://github.com/d-gubert) - [@ggazzo](https://github.com/ggazzo) -- [@lolimay](https://github.com/lolimay) - [@rodrigok](https://github.com/rodrigok) - [@sampaiodiego](https://github.com/sampaiodiego) - [@tassoevan](https://github.com/tassoevan) diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js index 29c4bdeffa1e3..fdaecf873dded 100644 --- a/app/livechat/server/lib/Livechat.js +++ b/app/livechat/server/lib/Livechat.js @@ -675,7 +675,7 @@ export const Livechat = { return; } const secretToken = settings.get('Livechat_secret_token'); - const headers = { headers: { 'X-RocketChat-Livechat-Token': secretToken } }; + const headers = { 'X-RocketChat-Livechat-Token': secretToken }; const options = { data: postData, ...secretToken !== '' && secretToken !== undefined && { headers } }; try { return HTTP.post(settings.get('Livechat_webhookUrl'), options); diff --git a/app/livechat/server/lib/QueueManager.js b/app/livechat/server/lib/QueueManager.js index 29a59130853c2..238e4cdb235f8 100644 --- a/app/livechat/server/lib/QueueManager.js +++ b/app/livechat/server/lib/QueueManager.js @@ -62,7 +62,7 @@ export const QueueManager = { }; let defaultAgent; - if (servedBy && Users.findOneOnlineAgentByUsername(servedBy.username)) { + if (servedBy && Users.findOneOnlineAgentByUserList(servedBy.username)) { defaultAgent = { agentId: servedBy._id, username: servedBy.username }; } diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js index 7de0a4ce0a744..5d8ffda618da6 100644 --- a/app/livechat/server/lib/RoutingManager.js +++ b/app/livechat/server/lib/RoutingManager.js @@ -45,7 +45,7 @@ export const RoutingManager = { async delegateInquiry(inquiry, agent, options = {}) { const { department, rid } = inquiry; - if (!agent || (agent.username && !Users.findOneOnlineAgentByUsername(agent.username) && !allowAgentSkipQueue(agent))) { + if (!agent || (agent.username && !Users.findOneOnlineAgentByUserList(agent.username) && !allowAgentSkipQueue(agent))) { agent = await this.getNextAgent(department); } diff --git a/app/livechat/server/lib/routing/External.js b/app/livechat/server/lib/routing/External.js index d3771871970f8..4b104a9d2df07 100644 --- a/app/livechat/server/lib/routing/External.js +++ b/app/livechat/server/lib/routing/External.js @@ -35,7 +35,7 @@ class ExternalQueue { }); if (result && result.data && result.data.username) { - const agent = Users.findOneOnlineAgentByUsername(result.data.username); + const agent = Users.findOneOnlineAgentByUserList(result.data.username); if (agent) { return { diff --git a/app/models/server/models/LivechatDepartmentAgents.js b/app/models/server/models/LivechatDepartmentAgents.js index 69f17668601bf..05956437b4f24 100644 --- a/app/models/server/models/LivechatDepartmentAgents.js +++ b/app/models/server/models/LivechatDepartmentAgents.js @@ -104,7 +104,7 @@ export class LivechatDepartmentAgents extends Base { return false; } - const onlineUser = Users.findOneOnlineAgentByUsername(_.pluck(agents, 'username')); + const onlineUser = Users.findOneOnlineAgentByUserList(_.pluck(agents, 'username')); return Boolean(onlineUser); } diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js index 043d39bf5e0bc..983b928c54e9c 100644 --- a/app/models/server/models/Users.js +++ b/app/models/server/models/Users.js @@ -135,7 +135,11 @@ export class Users extends Base { return this.findOne(query); } - findOneOnlineAgentByUsername(username, options) { // TODO:: Create class Agent + findOneOnlineAgentByUserList(userList, options) { // TODO:: Create class Agent + const username = { + $in: [].concat(userList), + }; + const query = queryStatusAgentOnline({ username }); return this.findOne(query, options); diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index be20a923c01e2..a987f79bf32be 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.16.1" + "version": "3.16.2" } diff --git a/client/views/blocks/MessageBlock.js b/client/views/blocks/MessageBlock.js index 6522b50877a12..2975a7682b4c6 100644 --- a/client/views/blocks/MessageBlock.js +++ b/client/views/blocks/MessageBlock.js @@ -1,10 +1,21 @@ import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer'; -import { UiKitMessage, UiKitComponent, kitContext } from '@rocket.chat/fuselage-ui-kit'; +import { + UiKitMessage, + UiKitComponent, + kitContext, + messageParser, +} from '@rocket.chat/fuselage-ui-kit'; import React, { useRef, useEffect } from 'react'; import * as ActionManager from '../../../app/ui-message/client/ActionManager'; +import { renderMessageBody } from '../../lib/renderMessageBody'; import './textParsers'; +// TODO: move this to fuselage-ui-kit itself +const mrkdwn = ({ text } = {}) => + text && ; + +messageParser.mrkdwn = mrkdwn; function MessageBlock({ mid: _mid, rid, blocks, appId }) { const context = { action: ({ actionId, value, blockId, mid = _mid }) => { diff --git a/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.js b/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.js index 42f180d270f40..79addc40ad5ae 100644 --- a/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.js +++ b/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.js @@ -15,7 +15,7 @@ const normalizeDefaultAgent = (agent) => { return { agentId, username }; }; -const getDefaultAgent = (username) => username && normalizeDefaultAgent(Users.findOneOnlineAgentByUsername(username, { fields: { _id: 1, username: 1 } })); +const getDefaultAgent = (username) => username && normalizeDefaultAgent(Users.findOneOnlineAgentByUserList(username, { fields: { _id: 1, username: 1 } })); const checkDefaultAgentOnNewRoom = (defaultAgent, defaultGuest) => { if (defaultAgent || !defaultGuest) { @@ -49,7 +49,7 @@ const checkDefaultAgentOnNewRoom = (defaultAgent, defaultGuest) => { } const { servedBy: { username: usernameByRoom } } = room; - const lastRoomAgent = normalizeDefaultAgent(Users.findOneOnlineAgentByUsername(usernameByRoom, { fields: { _id: 1, username: 1 } })); + const lastRoomAgent = normalizeDefaultAgent(Users.findOneOnlineAgentByUserList(usernameByRoom, { fields: { _id: 1, username: 1 } })); return lastRoomAgent || defaultAgent; }; diff --git a/package-lock.json b/package-lock.json index cb34250b06243..5eaa6086caf76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.16.1", + "version": "3.16.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6241,9 +6241,9 @@ } }, "@rocket.chat/apps-engine": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.27.0.tgz", - "integrity": "sha512-RuLxaIsXiPGk3cKVscw7MWUbI2na+0r5Ln2ai0XQTLs1fK8N/FH2bxHwBSMDNwui7xU5zk4YFWHPKVo/oiv+Eg==", + "version": "1.27.1", + "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.27.1.tgz", + "integrity": "sha512-cdOfcd83mRILvT6c7nDoIUadGpqnyPMPpiKZa9ZPsERSZmImkZ/UlHlmNMMf/jZ3GQt34vgcY187CUNN7XMZ/g==", "requires": { "adm-zip": "^0.4.9", "cryptiles": "^4.1.3", diff --git a/package.json b/package.json index e4e57e8d2b53a..d339b2f78a6dc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.16.1", + "version": "3.16.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" @@ -152,7 +152,7 @@ "@nivo/heatmap": "^0.61.0", "@nivo/line": "^0.61.1", "@nivo/pie": "^0.61.1", - "@rocket.chat/apps-engine": "1.27.0", + "@rocket.chat/apps-engine": "1.27.1", "@rocket.chat/css-in-js": "^0.27.0", "@rocket.chat/emitter": "^0.27.0", "@rocket.chat/fuselage": "^0.27.0",