Skip to content

Commit

Permalink
Merge branch 'develop' into fix-bridge-startup-inconsistency
Browse files Browse the repository at this point in the history
  • Loading branch information
debdutdeb authored Dec 9, 2024
2 parents 3f7bf0f + d569f26 commit a2223d1
Show file tree
Hide file tree
Showing 269 changed files with 4,308 additions and 2,605 deletions.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1732728542480.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/chilly-pants-hunt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Removes a validation that allowed only the room creator to propagate E2EE room keys. This was causing issues when the rooms were created via apps or some other integration, as the creator may not be online or able to create E2EE keys
5 changes: 5 additions & 0 deletions .changeset/cold-mangos-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed an issue that caused clients to not properly receive certain server notifications right after login
5 changes: 5 additions & 0 deletions .changeset/green-shirts-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes condition causing Omnichannel queue to start more than once.
5 changes: 5 additions & 0 deletions .changeset/lucky-mirrors-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where premium settings were using the wrong `Tag` variant in Omnichannel Appearance configuration
5 changes: 5 additions & 0 deletions .changeset/metal-wolves-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/ui-voip": patch
---

Fixes an issue preventing VoIP permission updates from being properly reflected in the UI.
111 changes: 111 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"mode": "pre",
"tag": "rc",
"initialVersions": {
"@rocket.chat/meteor": "7.1.0-develop",
"rocketchat-services": "2.0.0",
"@rocket.chat/uikit-playground": "0.6.0",
"@rocket.chat/account-service": "0.4.9",
"@rocket.chat/authorization-service": "0.4.9",
"@rocket.chat/ddp-streamer": "0.3.9",
"@rocket.chat/omnichannel-transcript": "0.4.9",
"@rocket.chat/presence-service": "0.4.9",
"@rocket.chat/queue-worker": "0.4.9",
"@rocket.chat/stream-hub-service": "0.4.9",
"@rocket.chat/license": "1.0.0",
"@rocket.chat/network-broker": "0.1.1",
"@rocket.chat/omnichannel-services": "0.3.6",
"@rocket.chat/pdf-worker": "0.2.6",
"@rocket.chat/presence": "0.2.9",
"@rocket.chat/ui-theming": "0.4.0",
"@rocket.chat/account-utils": "0.0.2",
"@rocket.chat/agenda": "0.1.0",
"@rocket.chat/api-client": "0.2.9",
"@rocket.chat/apps": "0.2.0",
"@rocket.chat/apps-engine": "1.47.0",
"@rocket.chat/base64": "1.0.13",
"@rocket.chat/cas-validate": "0.0.2",
"@rocket.chat/core-services": "0.7.1",
"@rocket.chat/core-typings": "7.1.0-develop",
"@rocket.chat/cron": "0.1.9",
"@rocket.chat/ddp-client": "0.3.9",
"@rocket.chat/eslint-config": "0.7.0",
"@rocket.chat/favicon": "0.0.2",
"@rocket.chat/freeswitch": "1.0.0",
"@rocket.chat/fuselage-ui-kit": "12.0.0",
"@rocket.chat/gazzodown": "12.0.0",
"@rocket.chat/i18n": "1.0.0",
"@rocket.chat/instance-status": "0.1.9",
"@rocket.chat/jest-presets": "0.0.1",
"@rocket.chat/jwt": "0.1.1",
"@rocket.chat/livechat": "1.20.1",
"@rocket.chat/log-format": "0.0.2",
"@rocket.chat/logger": "0.0.2",
"@rocket.chat/message-parser": "0.31.31",
"@rocket.chat/mock-providers": "0.1.4",
"@rocket.chat/model-typings": "1.0.0",
"@rocket.chat/models": "1.0.0",
"@rocket.chat/poplib": "0.0.2",
"@rocket.chat/password-policies": "0.0.2",
"@rocket.chat/patch-injection": "0.0.1",
"@rocket.chat/peggy-loader": "0.31.27",
"@rocket.chat/random": "1.2.2",
"@rocket.chat/release-action": "2.2.3",
"@rocket.chat/release-changelog": "0.1.0",
"@rocket.chat/rest-typings": "7.1.0-develop",
"@rocket.chat/server-cloud-communication": "0.0.2",
"@rocket.chat/server-fetch": "0.0.3",
"@rocket.chat/sha256": "1.0.10",
"@rocket.chat/tools": "0.2.2",
"@rocket.chat/tracing": "0.0.1",
"@rocket.chat/ui-avatar": "8.0.0",
"@rocket.chat/ui-client": "12.0.0",
"@rocket.chat/ui-composer": "0.4.0",
"@rocket.chat/ui-contexts": "12.0.0",
"@rocket.chat/ui-kit": "0.37.0",
"@rocket.chat/ui-video-conf": "12.0.0",
"@rocket.chat/ui-voip": "2.0.0",
"@rocket.chat/web-ui-registration": "12.0.0"
},
"changesets": [
"bump-patch-1732728542480",
"clean-flies-collect",
"curvy-flies-greet",
"fair-colts-remain",
"forty-gorillas-kneel",
"friendly-ravens-teach",
"green-papayas-thank",
"happy-stingrays-provide",
"honest-pumpkins-joke",
"lazy-avocados-whisper",
"lemon-foxes-carry",
"light-terms-ring",
"mean-cobras-sneeze",
"metal-avocados-serve",
"neat-flies-drive",
"nervous-rivers-fry",
"old-coins-bow",
"pink-dodos-greet",
"plenty-snakes-dream",
"popular-queens-brake",
"real-jeans-worry",
"serious-mice-film",
"seven-berries-check",
"seven-otters-fold",
"silent-steaks-happen",
"smart-radios-reflect",
"spicy-spiders-search",
"spotty-ads-knock",
"stale-actors-enjoy",
"sweet-needles-melt",
"swift-suns-perform",
"three-dragons-brush",
"tricky-trees-destroy",
"twelve-horses-suffer",
"twenty-news-own",
"two-guests-tan",
"unlucky-kangaroos-yawn",
"unlucky-wasps-check",
"weak-trees-exercise"
]
}
5 changes: 5 additions & 0 deletions .changeset/proud-cups-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes `im.counters` endpoint returning `null` on `unread` messages property for users that have never opened the queried DM
5 changes: 5 additions & 0 deletions .changeset/real-crabs-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Organizes App Settings interface by introducing section-based accordion groups to improve navigation and readability for administrators.
5 changes: 5 additions & 0 deletions .changeset/selfish-fishes-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixes mail export form "To additional emails" field validation
5 changes: 5 additions & 0 deletions .changeset/sour-guests-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue which caused action menu to be clipped in moderation page on smaller screens for better usability.
5 changes: 5 additions & 0 deletions .changeset/strange-bulldogs-roll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Sorts the list of language options by name correctly
5 changes: 5 additions & 0 deletions .changeset/strange-countries-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fixed an issue that caused the conference call ringer to fail to accept calls if the user logged out and in again
2 changes: 1 addition & 1 deletion .github/workflows/pr-title-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: thehanimo/[email protected].2
- uses: thehanimo/[email protected].3
with:
GITHUB_TOKEN: ${{ secrets.RC_TITLE_CHECKER }}
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.5.0.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"

yarnPath: .yarn/releases/yarn-4.5.0.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
144 changes: 144 additions & 0 deletions apps/meteor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,149 @@
# @rocket.chat/meteor

## 7.1.0-rc.1

### Patch Changes

- Bump @rocket.chat/meteor version.

- <details><summary>Updated dependencies []:</summary>

- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
</details>

## 7.1.0-rc.0

### Minor Changes

- ([#33897](https://github.com/RocketChat/Rocket.Chat/pull/33897)) adds unread badge to sidebar collapser

- ([#32906](https://github.com/RocketChat/Rocket.Chat/pull/32906)) Improves thread metrics featuring user avatars, better titles and repositioned elements.

- ([#33810](https://github.com/RocketChat/Rocket.Chat/pull/33810)) Adds cursor pagination on chat.syncMessages endpoint

- ([#33214](https://github.com/RocketChat/Rocket.Chat/pull/33214)) Adds a new route to allow fetching avatars by the user's id `/avatar/uid/<UserID>`

- ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
- A brand-new omnichannel contact profile
- The ability to communicate with known contacts only
- Communicate with verified contacts only
- Merge verified contacts across different channels
- Block contact channels
- Resolve conflicting contact information when registered via different channels
- An advanced contact center filters
- ([#33920](https://github.com/RocketChat/Rocket.Chat/pull/33920)) Improves the customizability of the naming of automatic Persistent video calls discussions, allowing the date of the call to be in different parts of the name, using the `[date]` keyword.

- ([#33997](https://github.com/RocketChat/Rocket.Chat/pull/33997)) Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions

- ([#33814](https://github.com/RocketChat/Rocket.Chat/pull/33814)) Adds a confirmation modal to the cancel subscription action

- ([#33949](https://github.com/RocketChat/Rocket.Chat/pull/33949)) Disables the possiblity to upload exempted apps

### Patch Changes

- ([#33776](https://github.com/RocketChat/Rocket.Chat/pull/33776)) Fix user highlights not matching only whole words

- ([#33818](https://github.com/RocketChat/Rocket.Chat/pull/33818)) Remove unused client side `setUserActiveStatus` meteor method.

- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0

- ([#33713](https://github.com/RocketChat/Rocket.Chat/pull/33713)) Deprecated the `from` field in the apps email bridge and made it optional, using the server's settings when the field is omitted

- ([#32991](https://github.com/RocketChat/Rocket.Chat/pull/32991)) Fixes an issue where updating custom emojis didn’t work as expected, ensuring that uploaded emojis now update correctly and display without any caching problems.

- ([#33985](https://github.com/RocketChat/Rocket.Chat/pull/33985)) Fixes issue that could cause multiple discussions to be created when creating it from a message action

- ([#33904](https://github.com/RocketChat/Rocket.Chat/pull/33904)) adds missing html attributes in sidebar item templates

- ([#33218](https://github.com/RocketChat/Rocket.Chat/pull/33218)) Fixes message character limit not being applied to file upload descriptions

- ([#33908](https://github.com/RocketChat/Rocket.Chat/pull/33908)) Fixes the issue where newly created teams are incorrectly displayed as channels on the sidebar when the DISABLE_DB_WATCHERS environment variable is enabled

- ([#33953](https://github.com/RocketChat/Rocket.Chat/pull/33953)) Adds a divider on Create team modal - advanced settings

- ([#33786](https://github.com/RocketChat/Rocket.Chat/pull/33786)) Fixed an issue that would grant network permission to app's processes in wrong cases

- ([#33986](https://github.com/RocketChat/Rocket.Chat/pull/33986)) Fixes sidepanel not replicating sidebar sort preference

- ([#33689](https://github.com/RocketChat/Rocket.Chat/pull/33689)) Fixes banner breaking the UI with specific payloads

- ([#33808](https://github.com/RocketChat/Rocket.Chat/pull/33808)) Fixes client-side updates for recent emoji list when custom emojis are modified.

- ([#33902](https://github.com/RocketChat/Rocket.Chat/pull/33902)) Adds "Master volume" and "Call ringer volume" to the user preferences sound section.

- ([#33311](https://github.com/RocketChat/Rocket.Chat/pull/33311)) Sends server statistics only once a day despite multiple instance being started at different times.

- ([#33719](https://github.com/RocketChat/Rocket.Chat/pull/33719)) stops calling an object through proxy calling getQueueWorker

- ([#33785](https://github.com/RocketChat/Rocket.Chat/pull/33785)) Fixed an issue where the installed apps list would go stale without a refresh in some cases

- ([#33278](https://github.com/RocketChat/Rocket.Chat/pull/33278)) Fixes display of emoji aliases in custom emoji list by adding commas between aliases

- ([#33772](https://github.com/RocketChat/Rocket.Chat/pull/33772)) Fixes `waiting queue` feature. When `Livechat_waiting_queue` setting is enabled, incoming conversations should be sent to the queue instead of being assigned directly.

- ([#33963](https://github.com/RocketChat/Rocket.Chat/pull/33963)) Fixes edge case of thread unread not being added to unread group

- ([#33994](https://github.com/RocketChat/Rocket.Chat/pull/33994)) Adds login and permission validation for resetIrcConnection method

- ([#33880](https://github.com/RocketChat/Rocket.Chat/pull/33880)) Updates VoIP field labels from 'Free Extension Numbers' to 'Available Extensions' to better describe the field's purpose and improve clarity.

- ([#33958](https://github.com/RocketChat/Rocket.Chat/pull/33958)) Fixes an issue where resizable handler renders over the expanded thread view while using contextualbarResizable feature preview

- <details><summary>Updated dependencies [82767d8fd8a52ac348e8aded1d238e688d36129b, 80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 66ecc64fc1d4464ad2818ad04e23a09cdf221194, 6c83bf0657004ee9cf43d5c832f51826a6591165, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 3569b0a9c48f8b94ebaef2f8b607c52fdb8e570a, b4841cb7206d855d7a1bc7604683a5b4a48b7176, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, d1e6a73796269824fb1aa7afcc7b8aa242e34e90, 661cc01237629ce83699d6c25df25d12985e88bf, 63ccadc012499e004445ad6bc6cd2ff777aecbd1, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, 616655585cb1c5c60d7cee97e25b17af3dfda794, e5fe727f6a2f0e60cdf7ba225e1f6caa6db2045c, d398866dba725918017e3609807f9d0ab9b89b72, 322bafd4bd1fe91ed34610501b269e4d8951944c, d398866dba725918017e3609807f9d0ab9b89b72]:</summary>

- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
</details>

## 7.0.0

### Major Changes
Expand Down
15 changes: 3 additions & 12 deletions apps/meteor/app/api/server/definition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,7 @@ export type PartialThis = {
readonly logger: Logger;
};

export type UserInfo = IUser & {
email?: string;
settings: {
profile: object;
preferences: unknown;
};
avatarUrl: string;
};

export type ActionThis<TMethod extends Method, TPathPattern extends PathPattern, TOptions> = {
type ActionThis<TMethod extends Method, TPathPattern extends PathPattern, TOptions> = {
readonly requestIp: string;
urlParams: UrlParams<TPathPattern>;
readonly response: Response;
Expand Down Expand Up @@ -186,11 +177,11 @@ export type ResultFor<TMethod extends Method, TPathPattern extends PathPattern>
body: unknown;
};

export type Action<TMethod extends Method, TPathPattern extends PathPattern, TOptions> =
type Action<TMethod extends Method, TPathPattern extends PathPattern, TOptions> =
| ((this: ActionThis<TMethod, TPathPattern, TOptions>) => Promise<ResultFor<TMethod, TPathPattern>>)
| ((this: ActionThis<TMethod, TPathPattern, TOptions>) => ResultFor<TMethod, TPathPattern>);

export type Operation<TMethod extends Method, TPathPattern extends PathPattern, TEndpointOptions> =
type Operation<TMethod extends Method, TPathPattern extends PathPattern, TEndpointOptions> =
| Action<TMethod, TPathPattern, TEndpointOptions>
| ({
action: Action<TMethod, TPathPattern, TEndpointOptions>;
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/api/server/v1/im.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ API.v1.addRoute(

lm = room?.lm ? new Date(room.lm).toISOString() : new Date(room._updatedAt).toISOString(); // lm is the last message timestamp

if (subscription?.open) {
if (subscription) {
unreads = subscription.unread ?? null;
if (subscription.ls && room.msgs) {
unreads = subscription.unread;
unreadsFrom = new Date(subscription.ls).toISOString(); // last read timestamp
}
userMentions = subscription.userMentions;
Expand Down
Loading

0 comments on commit a2223d1

Please sign in to comment.