Merge remote-tracking branch 'rocket.chat/develop' into HEAD

Author: SeRoNet Concourse

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   no-response:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v3.0.18
+    - uses: actions/stale@v3.0.19
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 10
@@ -26,7 +26,7 @@ jobs:
 #   stale:
 #     runs-on: ubuntu-latest
 #     steps:
-#     - uses: actions/stale@v3.0.18
+#     - uses: actions/stale@v3.0.19
 #       with:
 #         repo-token: ${{ secrets.GITHUB_TOKEN }}
 #         days-before-stale: 60

app/chatpal-search/server/provider/provider.js

@@ -4,7 +4,6 @@ import { searchProviderService, SearchProvider } from '../../../search/server';
 import ChatpalLogger from '../utils/logger';
 import { Subscriptions, Rooms } from '../../../models';
 import { baseUrl } from '../utils/settings';
-
 import Index from './index';
 
 /**

app/lib/server/functions/insertMessage.js

@@ -119,7 +119,7 @@ export const insertMessage = function(user, message, rid, upsert = false) {
 
 		const urls = message.html.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\(\)\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g);
 		if (urls) {
-			message.urls = urls.map((url) => ({ url }));
+			message.urls = [...new Set(urls)].map((url) => ({ url }));
 		}
 
 		message = Markdown.mountTokensBack(message, false);

app/lib/server/functions/parseUrlsInMessage.js

@@ -10,7 +10,7 @@ export const parseUrlsInMessage = (message) => {
 
 	const urls = message.html.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g) || [];
 	if (urls) {
-		message.urls = urls.map((url) => ({ url }));
+		message.urls = [...new Set(urls)].map((url) => ({ url }));
 	}
 
 	message = Markdown.mountTokensBack(message, false);

app/lib/server/functions/saveCustomFields.js

@@ -1,7 +1,6 @@
 import s from 'underscore.string';
 
 import { settings } from '../../../settings';
-
 import { validateCustomFields, saveCustomFieldsWithoutValidation } from '.';
 
 export const saveCustomFields = function(userId, formData) {

app/lib/server/functions/saveUser.js

@@ -12,7 +12,6 @@ import { validateEmailDomain } from '../lib';
 import { validateUserRoles } from '../../../../ee/app/authorization/server/validateUserRoles';
 import { getNewUserRoles } from '../../../../server/services/user/lib/getNewUserRoles';
 import { saveUserIdentity } from './saveUserIdentity';
-
 import { checkEmailAvailability, checkUsernameAvailability, setUserAvatar, setEmail, setStatusText } from '.';
 
 let html = '';

app/lib/server/functions/setEmail.js

@@ -7,7 +7,6 @@ import { hasPermission } from '../../../authorization';
 import { RateLimiter, validateEmailDomain } from '../lib';
 import * as Mailer from '../../../mailer';
 import { settings } from '../../../settings';
-
 import { checkEmailAvailability } from '.';
 
 let html = '';

app/lib/server/functions/setUsername.js

@@ -8,7 +8,6 @@ import { hasPermission } from '../../../authorization';
 import { RateLimiter } from '../lib';
 import { addUserToRoom } from './addUserToRoom';
 import { api } from '../../../../server/sdk/api';
-
 import { checkUsernameAvailability, setUserAvatar, getAvatarSuggestionForUser } from '.';
 
 export const _setUsername = function(userId, u, fullUser) {

app/lib/server/lib/interceptDirectReplyEmails.js

@@ -4,7 +4,6 @@ import { simpleParser } from 'mailparser';
 
 import { settings } from '../../../settings';
 import { IMAPInterceptor } from '../../../../server/email/IMAPInterceptor';
-
 import { processDirectEmail } from '.';
 
 export class IMAPIntercepter extends IMAPInterceptor {

app/theme/client/imports/general/base.css

@@ -239,7 +239,7 @@ button {
 	.rc-old .main-content-flex {
 		flex: 1 0 auto !important; /* 1 */
 
-		height: auto !important; /* 1 */ 
+		height: auto !important; /* 1 */
 	}
 
 	.rc-alerts {
@@ -269,4 +269,4 @@ button {
 
 /*
  1. The `!important` directive is necessary to override components' autogenerated styles.
- */
+ */