Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new/…
Browse files Browse the repository at this point in the history
…modalRegions

* 'develop' of github.com:RocketChat/Rocket.Chat: (77 commits)
  fix: CRM integration mismatch on callback type (#31880)
  test: make outgoing integrations fully independent (#31656)
  fix: setDepartment not persisting on chat closed (#31792)
  fix: Trigger app event after inquiry is created (#31909)
  regression: Favorite action announcement (#31940)
  regression: Prevents `ImageGallery` to restore focus on message (#31869)
  i18n: Add missing swedish translation for "Create direct message" key (#31945)
  feat(message-parser): add timestamps pattern (#31810)
  fix: convert network broker stopped lifecycle method to async (#31927)
  regression: undefined guest causing issues (#31932)
  refactor: use uiContexts on livechat (#31919)
  fix: Validate rooms are not taken before processing by queue (#31896)
  fix: livechat sdk reconnect not resubscribing (#31941)
  fix: Quote attachments are not deleted on message update (#31660)
  Revert "regression: Favorite action announcement" (#31935)
  chore: improve room `LeaderBar` behavior with date bubble (#31933)
  regression: Favorite action announcement (#31934)
  chore: Migrate notifyUsersOnMessage to TypeScript (#31877)
  fix: Mentions stop working when mentioned user changes username (#31860)
  regression: `RoomBody` unread and new messages behavior (#31929)
  ...
  • Loading branch information
gabriellsh committed Mar 12, 2024
2 parents 4478688 + 871efa5 commit 196256f
Show file tree
Hide file tree
Showing 601 changed files with 14,705 additions and 6,674 deletions.
5 changes: 5 additions & 0 deletions .changeset/bright-cycles-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Trigger `IPostLivechatRoomStarted` app event after inquiry is created. Previously, this event was fired after a room was created. This allowed to do some actions on rooms, but more elevated actions like transfering a room were not possible as at this point, an inquiry didn't exist.
5 changes: 5 additions & 0 deletions .changeset/calm-penguins-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Now we are considering channels with auto-join inside teams on user creation
5 changes: 5 additions & 0 deletions .changeset/cuddly-rocks-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Deprecate `insertOrUpdateUser` Meteor method
6 changes: 6 additions & 0 deletions .changeset/curly-impalas-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/meteor': patch
---

fix: Fixes SAML Role mapping of custom roles
fixed: here https://github.com/RocketChat/Rocket.Chat/pull/31830
5 changes: 5 additions & 0 deletions .changeset/eight-rice-tease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed issue with quote attachments still being displayed within the message even after removing link
5 changes: 5 additions & 0 deletions .changeset/empty-hounds-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/ddp-client": patch
---

fix: livechat sdk reconnect not resubscribing
5 changes: 5 additions & 0 deletions .changeset/flat-fishes-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fix notifications specially for DMs when preference is set to mentions.
5 changes: 5 additions & 0 deletions .changeset/funny-cooks-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed room owner specified on room import not being inserted as a room member or owner.
5 changes: 5 additions & 0 deletions .changeset/gold-tigers-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fix: Jump to message only works once
6 changes: 6 additions & 0 deletions .changeset/khaki-oranges-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Added a new formatter shortcut to add hyperlinks to a message
5 changes: 5 additions & 0 deletions .changeset/large-files-agree.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed mentions not working when mentioned user changes username.
5 changes: 5 additions & 0 deletions .changeset/nice-ducks-shout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed auto-availability of reactivated livechat agents; they now stay 'Not Available' until manually set to 'Available'
5 changes: 5 additions & 0 deletions .changeset/nine-ads-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

feat: show date on message's scroll
6 changes: 6 additions & 0 deletions .changeset/orange-dragons-fly.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/livechat": minor
---

chore: Refactor & Improve Livechat Widget API
Refactors and adds better error handling to the widget's API calls
5 changes: 5 additions & 0 deletions .changeset/quick-cheetahs-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/web-ui-registration": patch
---

fixed the login page crashing when receiving unexpected errors
5 changes: 5 additions & 0 deletions .changeset/rude-avocados-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed discussion names displaying as IDs in sidebar search results
5 changes: 5 additions & 0 deletions .changeset/shy-bananas-repeat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed Federation not working with Microservice deployments
5 changes: 5 additions & 0 deletions .changeset/silly-socks-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/eslint-config": patch
---

Fixed react eslint config
6 changes: 6 additions & 0 deletions .changeset/slimy-clocks-argue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/core-services": patch
---

`stopped` lifecycle method was unexpectedly synchronous when using microservices, causing our code to create race conditions.
5 changes: 5 additions & 0 deletions .changeset/slow-jobs-think.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: CRM integration mismatch on callback type vs code validation. Previously, callback was attempting to register a `LivechatStarted` event, however, our internal code was expecting a `LivechatStart` event, causing the hook to receive incomplete data
5 changes: 5 additions & 0 deletions .changeset/strange-jars-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Validate rooms are not taken before processing by queue. This will prevent an issue that caused a room, that's on an invalid state, to be re-processed by the queue worker, assigning it again to another user despite being already assigned to one. This happens when a room's inquiry gets to an state where it desyncs from the room object. Room is taken & served while inquiry is still queued. This fix will also reconciliate both when something like this happens: whenever the queue picks a chat that's already taken, it will update it's inquiry object to reflect that and avoid processing again.
6 changes: 6 additions & 0 deletions .changeset/strange-lamps-taste.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/ddp-client': patch
'@rocket.chat/meteor': patch
---

Revert unintentional changes real time presence data payload
24 changes: 24 additions & 0 deletions .changeset/stupid-trains-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
"@rocket.chat/message-parser": patch
---

feat(message-parser): add timestamps pattern

### Usage

Pattern: <t:{timestamp}:?{format}>

- {timestamp} is a Unix timestamp
- {format} is an optional parameter that can be used to customize the date and time format.

#### Formats

| Format | Description | Example |
| ------ | ------------------------- | --------------------------------------- |
| `t` | Short time | 12:00 AM |
| `T` | Long time | 12:00:00 AM |
| `d` | Short date | 12/31/2020 |
| `D` | Long date | Thursday, December 31, 2020 |
| `f` | Full date and time | Thursday, December 31, 2020 12:00 AM |
| `F` | Full date and time (long) | Thursday, December 31, 2020 12:00:00 AM |
| `R` | Relative time | 1 year ago |
5 changes: 5 additions & 0 deletions .changeset/thin-keys-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/livechat": patch
---

Fixes issue of the `setDepartment` Livechat API method not setting the store value properly (is was only setting on the guest object)
5 changes: 5 additions & 0 deletions .changeset/wicked-months-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fix users presence stuck as online after connecting using mobile apps
6 changes: 6 additions & 0 deletions .changeset/young-doors-bathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/meteor': patch
'@rocket.chat/ddp-streamer': patch
---

Fix web UI not showing users presence updating to offline
6 changes: 3 additions & 3 deletions apps/meteor/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rocketchat:streamer
rocketchat:version
rocketchat:user-presence

[email protected].9
[email protected].10
[email protected]
[email protected]
[email protected]
Expand All @@ -37,12 +37,12 @@ [email protected]

[email protected]
[email protected]
[email protected].6
[email protected].8

[email protected]

[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.14
METEOR@2.15
6 changes: 2 additions & 4 deletions apps/meteor/app/apps/server/bridges/activation.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
import type { IAppServerOrchestrator, AppStatus } from '@rocket.chat/apps';
import type { ProxiedApp } from '@rocket.chat/apps-engine/server/ProxiedApp';
import { AppActivationBridge as ActivationBridge } from '@rocket.chat/apps-engine/server/bridges/AppActivationBridge';
import { Users } from '@rocket.chat/models';

import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';

export class AppActivationBridge extends ActivationBridge {
// eslint-disable-next-line no-empty-function
constructor(private readonly orch: AppServerOrchestrator) {
constructor(private readonly orch: IAppServerOrchestrator) {
super();
}

Expand Down
5 changes: 2 additions & 3 deletions apps/meteor/app/apps/server/bridges/api.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { RequestMethod } from '@rocket.chat/apps-engine/definition/accessors';
import type { IApiRequest, IApiEndpoint, IApi } from '@rocket.chat/apps-engine/definition/api';
import { ApiBridge } from '@rocket.chat/apps-engine/server/bridges/ApiBridge';
Expand All @@ -7,7 +8,6 @@ import express from 'express';
import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';

import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
import { authenticationMiddleware } from '../../../api/server/middlewares/authentication';

const apiServer = express();
Expand All @@ -24,8 +24,7 @@ interface IRequestWithPrivateHash extends Request {
export class AppApisBridge extends ApiBridge {
appRouters: Map<string, IRouter>;

// eslint-disable-next-line no-empty-function
constructor(private readonly orch: AppServerOrchestrator) {
constructor(private readonly orch: IAppServerOrchestrator) {
super();
this.appRouters = new Map();

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/cloud.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { IAppServerOrchestrator } from '@rocket.chat/apps';
import type { IWorkspaceToken } from '@rocket.chat/apps-engine/definition/cloud/IWorkspaceToken';
import { CloudWorkspaceBridge } from '@rocket.chat/apps-engine/server/bridges/CloudWorkspaceBridge';

import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
import { getWorkspaceAccessTokenWithScope } from '../../../cloud/server';

export class AppCloudBridge extends CloudWorkspaceBridge {
constructor(private readonly orch: AppServerOrchestrator) {
constructor(private readonly orch: IAppServerOrchestrator) {
super();
}

Expand Down
Loading

0 comments on commit 196256f

Please sign in to comment.