Skip to content

Commit 5c7266d

Browse files
d-gubertd-gubert
committed
Merge remote-tracking branch 'origin' into chore/apps-engine-tests-conversion-start
2 parents 15cab5c + f0e401b commit 5c7266d

File tree

319 files changed

+7897
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+7897
-921
lines changed

‎.changeset/eight-colts-kiss.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/federation-matrix": patch
3+
"@rocket.chat/meteor": patch
4+
---
5+
6+
Fixes an issue on Federation where all domains ending with the pattern where being allowed to communicate, the feature is meant to work with a list, url by url

‎.changeset/five-chicken-invite.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/federation-matrix': minor
3+
'@rocket.chat/meteor': minor
4+
---
5+
6+
Adds support to name changes on federated rooms

‎.changeset/little-eyes-kneel.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
'@rocket.chat/mock-providers': patch
2323
'@rocket.chat/release-action': patch
2424
'@rocket.chat/pdf-worker': patch
25-
'@rocket.chat/ui-theming': patch
2625
'@rocket.chat/account-utils': patch
2726
'@rocket.chat/core-services': patch
2827
'@rocket.chat/message-types': patch

‎.changeset/many-glasses-care.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@rocket.chat/meteor": minor
3+
"@rocket.chat/i18n": minor
4+
"@rocket.chat/media-signaling": minor
5+
"@rocket.chat/ui-voip": minor
6+
"@rocket.chat/media-calls": minor
7+
---
8+
9+
Introduces native screen sharing for internal voice calls. This feature is currently in beta and can be disabled through admin settings.

‎.changeset/rare-planes-tan.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/core-typings': patch
3+
'@rocket.chat/meteor': patch
4+
---
5+
6+
Fixes an issue where emails were not saved for users logging in via the GitHub OAuth provider.

‎.changeset/stale-elephants-type.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
---
4+
5+
Fixes main team channels being able to be converted into public or private with only the `create-team-channel` or `create-team-group` (the correct permission for main teams are `create-c` and `create-p`)

‎.changeset/thick-nails-exist.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
---
4+
5+
Adds support for ban management in federated rooms, enabling authorized users to ban and unban members via UI and slash commands.

‎.github/workflows/release-candidate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Release candidate cut
22
on:
33
schedule:
4-
- cron: '28 17 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
4+
- cron: '28 21 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
55
jobs:
66
new-release:
77
runs-on: ubuntu-24.04

‎apps/meteor/CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,53 @@
11
# @rocket.chat/meteor
22

3+
## 8.2.1
4+
5+
### Patch Changes
6+
7+
- ([#39508](https://github.com/RocketChat/Rocket.Chat/pull/39508) by [@dionisio-bot](https://github.com/dionisio-bot)) Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
8+
9+
- Bump @rocket.chat/meteor version.
10+
11+
- Bump @rocket.chat/meteor version.
12+
13+
- ([#39517](https://github.com/RocketChat/Rocket.Chat/pull/39517) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixes `ssrf` validation for oauth endpoints, which allows internal endpoints to be used during the auth flow.
14+
15+
- <details><summary>Updated dependencies []:</summary>
16+
17+
- @rocket.chat/[email protected]
18+
- @rocket.chat/[email protected]
19+
- @rocket.chat/[email protected]
20+
- @rocket.chat/[email protected]
21+
- @rocket.chat/[email protected]
22+
- @rocket.chat/[email protected]
23+
- @rocket.chat/[email protected]
24+
- @rocket.chat/[email protected]
25+
- @rocket.chat/[email protected]
26+
- @rocket.chat/[email protected]
27+
- @rocket.chat/[email protected]
28+
- @rocket.chat/[email protected]
29+
- @rocket.chat/[email protected]
30+
- @rocket.chat/[email protected]
31+
- @rocket.chat/[email protected]
32+
- @rocket.chat/[email protected]
33+
- @rocket.chat/[email protected]
34+
- @rocket.chat/[email protected]
35+
- @rocket.chat/[email protected]
36+
- @rocket.chat/[email protected]
37+
- @rocket.chat/[email protected]
38+
- @rocket.chat/[email protected]
39+
- @rocket.chat/[email protected]
40+
- @rocket.chat/[email protected]
41+
- @rocket.chat/[email protected]
42+
- @rocket.chat/[email protected]
43+
- @rocket.chat/[email protected]
44+
- @rocket.chat/[email protected]
45+
- @rocket.chat/[email protected]
46+
- @rocket.chat/[email protected]
47+
- @rocket.chat/[email protected]
48+
- @rocket.chat/[email protected]
49+
</details>
50+
351
## 8.2.0
452

553
### Minor Changes

‎apps/meteor/app/api/server/helpers/getUserFromParams.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ import type { IUser } from '@rocket.chat/core-typings';
33
import { Users } from '@rocket.chat/models';
44
import { Meteor } from 'meteor/meteor';
55

6-
export async function getUserFromParams(params: {
7-
userId?: string;
8-
username?: string;
9-
user?: string;
10-
}): Promise<Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'statusText' | 'roles'>> {
6+
export async function getUserFromParams<T extends boolean = false>(
7+
params: {
8+
userId?: string;
9+
username?: string;
10+
user?: string;
11+
},
12+
full?: T,
13+
): Promise<T extends true ? IUser : Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'statusText' | 'roles'>> {
1114
let user;
1215

13-
const projection = { username: 1, name: 1, status: 1, statusText: 1, roles: 1 };
16+
const projection = full ? {} : { username: 1, name: 1, status: 1, statusText: 1, roles: 1 };
1417
if (params.userId?.trim()) {
1518
user = await Users.findOneById(params.userId, { projection });
1619
} else if (params.username?.trim()) {

0 commit comments

Comments
 (0)
⚡