Skip to content

Commit 94f1f20

Browse files
dhulkedhulke
authored
Merge branch 'develop' into test/federation-media-messages
2 parents 377df86 + e1c634a commit 94f1f20

File tree

232 files changed

+742
-729
lines changed

Some content is hidden

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

232 files changed

+742
-729
lines changed

‎.changeset/many-walls-impress.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
"@rocket.chat/rest-typings": patch
4+
---
5+
6+
Adds deprecation warning on `livechat:addMonitor` with new endpoint replacing it; `livechat/monitors.create`

‎.github/actions/docker-image-size-tracker/action.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ inputs:
66
github-token:
77
description: 'GitHub token for commenting on PRs'
88
required: true
9+
ci-pat:
10+
description: 'GitHub token for committing to history branch'
11+
required: true
912
registry:
1013
description: 'Container registry (e.g., ghcr.io)'
1114
required: false
@@ -258,6 +261,9 @@ runs:
258261
cd /tmp/history-worktree
259262
git add "history/${timestamp}.json"
260263
git commit -m "Add measurement for ${timestamp} (${commit_sha:0:7})"
264+
git config --global user.email "[email protected]"
265+
git config --global user.name "rocketchat-ci[bot]"
266+
git config --global url.https://${{ inputs.ci-pat }}@github.com/.insteadOf https://github.com/
261267
git push origin image-size-history
262268
cd -
263269

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ jobs:
454454
uses: ./.github/actions/docker-image-size-tracker
455455
with:
456456
github-token: ${{ secrets.GITHUB_TOKEN }}
457+
ci-pat: ${{ secrets.CI_PAT }}
457458
registry: ghcr.io
458459
repository: ${{ needs.release-versions.outputs.lowercase-repo }}
459460
tag: ${{ needs.release-versions.outputs.gh-docker-tag }}

‎apps/meteor/app/lib/server/functions/createRoom.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export const createRoom = async <T extends RoomType>(
137137
> => {
138138
const { teamId, ...optionalExtraData } = roomExtraData || ({} as IRoom);
139139

140+
// TODO: use a shared helper to check whether a user is federated
140141
const hasFederatedMembers = members.some((member) => {
141142
if (typeof member === 'string') {
142143
return member.includes(':') && member.includes('@');

‎apps/meteor/client/NavBarV2/NavBarSearch/NavBarSearchListbox.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Box, Tile } from '@rocket.chat/fuselage';
22
import { useDebouncedValue, useEffectEvent, useOutsideClick } from '@rocket.chat/fuselage-hooks';
3+
import { CustomScrollbars } from '@rocket.chat/ui-client';
34
import { useRef } from 'react';
45
import type { OverlayTriggerAria } from 'react-aria';
56
import { useFormContext } from 'react-hook-form';
@@ -10,7 +11,6 @@ import NavBarSearchNoResults from './NavBarSearchNoResults';
1011
import NavBarSearchRow from './NavBarSearchRow';
1112
import { useSearchItems } from './hooks/useSearchItems';
1213
import { useListboxNavigation } from './hooks/useSearchNavigation';
13-
import { CustomScrollbars } from '../../components/CustomScrollbars';
1414

1515
type NavBarSearchListBoxProps = {
1616
state: OverlayTriggerState;

‎apps/meteor/client/apps/gameCenter/GameCenter.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type { IExternalComponent } from '@rocket.chat/apps-engine/definition/externalComponent';
22
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
3+
import { useRoomToolbox } from '@rocket.chat/ui-contexts';
34
import { useState } from 'react';
45
import type { MouseEvent, ReactElement } from 'react';
56

67
import GameCenterContainer from './GameCenterContainer';
78
import GameCenterList from './GameCenterList';
89
import { useExternalComponentsQuery } from './hooks/useExternalComponentsQuery';
910
import { preventSyntheticEvent } from '../../lib/utils/preventSyntheticEvent';
10-
import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext';
1111

1212
export type IGame = IExternalComponent;
1313

‎apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
2-
import { useLayoutSizes, useLayoutContextualBarPosition } from '@rocket.chat/ui-contexts';
2+
import { useLayoutSizes, useLayoutContextualBarPosition, useRoomToolbox } from '@rocket.chat/ui-contexts';
33
import type { ComponentProps } from 'react';
44
import { useCallback, useRef } from 'react';
55
import type { AriaDialogProps } from 'react-aria';
66
import { FocusScope, useDialog } from 'react-aria';
77

88
import Contextualbar from './Contextualbar';
99
import ContextualbarResizable from './ContextualbarResizable';
10-
import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext';
1110

1211
type ContextualbarDialogProps = AriaDialogProps & ComponentProps<typeof Contextualbar> & { onClose?: () => void };
1312

‎apps/meteor/client/components/GenericTable/GenericTable.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Box, Table } from '@rocket.chat/fuselage';
2+
import { CustomScrollbars } from '@rocket.chat/ui-client';
23
import type { ComponentProps, ForwardedRef, ReactNode } from 'react';
34
import { forwardRef } from 'react';
45

5-
import { CustomScrollbars } from '../CustomScrollbars';
6-
76
type GenericTableProps = {
87
fixed?: boolean;
98
children: ReactNode;

‎apps/meteor/client/components/Page/PageScrollableContent.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { Box } from '@rocket.chat/fuselage';
2+
import type { OverlayScrollbars } from '@rocket.chat/ui-client';
3+
import { CustomScrollbars } from '@rocket.chat/ui-client';
24
import type { ComponentProps } from 'react';
35
import { forwardRef } from 'react';
46

5-
import type { OverlayScrollbars } from '../CustomScrollbars';
6-
import { CustomScrollbars } from '../CustomScrollbars';
7-
87
type PageScrollableContentProps = {
98
onScroll?: (args: OverlayScrollbars) => void;
109
} & Omit<ComponentProps<typeof Box>, 'onScroll'>;

‎apps/meteor/client/components/Sidebar/Content.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Box } from '@rocket.chat/fuselage';
2+
import { CustomScrollbars } from '@rocket.chat/ui-client';
23
import type { ComponentPropsWithoutRef } from 'react';
34

4-
import { CustomScrollbars } from '../CustomScrollbars';
5-
65
type ContentProps = ComponentPropsWithoutRef<typeof CustomScrollbars>;
76

87
const Content = ({ children, ...props }: ContentProps) => (

0 commit comments

Comments
 (0)