+
diff --git a/app/user-status/client/index.js b/app/user-status/client/index.js
new file mode 100644
index 000000000000..cd0736a72021
--- /dev/null
+++ b/app/user-status/client/index.js
@@ -0,0 +1,17 @@
+import './admin/adminUserStatus.html';
+import './admin/adminUserStatus';
+import './admin/adminUserStatusEdit.html';
+import './admin/adminUserStatusInfo.html';
+import './admin/userStatusEdit.html';
+import './admin/userStatusEdit';
+import './admin/userStatusInfo.html';
+import './admin/userStatusInfo';
+import './admin/userStatusPreview.html';
+import './admin/route';
+import './admin/startup';
+
+import './notifications/deleteCustomUserStatus';
+import './notifications/updateCustomUserStatus';
+
+export { userStatus } from './lib/userStatus';
+export { deleteCustomUserStatus, updateCustomUserStatus } from './lib/customUserStatus';
diff --git a/app/user-status/client/lib/customUserStatus.js b/app/user-status/client/lib/customUserStatus.js
new file mode 100644
index 000000000000..2168febe96dd
--- /dev/null
+++ b/app/user-status/client/lib/customUserStatus.js
@@ -0,0 +1,54 @@
+import { Meteor } from 'meteor/meteor';
+
+import { userStatus } from './userStatus';
+
+userStatus.packages.customUserStatus = {
+ list: [],
+};
+
+export const deleteCustomUserStatus = function(customUserStatusData) {
+ delete userStatus.list[customUserStatusData._id];
+
+ const arrayIndex = userStatus.packages.customUserStatus.list.indexOf(customUserStatusData._id);
+ if (arrayIndex !== -1) {
+ userStatus.packages.customUserStatusData.list.splice(arrayIndex, 1);
+ }
+};
+
+export const updateCustomUserStatus = function(customUserStatusData) {
+ const newUserStatus = {
+ name: customUserStatusData.name,
+ id: customUserStatusData._id,
+ statusType: customUserStatusData.statusType,
+ localizeName: false,
+ };
+
+ const arrayIndex = userStatus.packages.customUserStatus.list.indexOf(newUserStatus.id);
+ if (arrayIndex === -1) {
+ userStatus.packages.customUserStatus.list.push(newUserStatus);
+ } else {
+ userStatus.packages.customUserStatus.list[arrayIndex] = newUserStatus;
+ }
+
+ userStatus.list[newUserStatus.id] = newUserStatus;
+};
+
+Meteor.startup(() =>
+ Meteor.call('listCustomUserStatus', (error, result) => {
+ if (!result) {
+ return;
+ }
+
+ for (const customStatus of result) {
+ const newUserStatus = {
+ name: customStatus.name,
+ id: customStatus._id,
+ statusType: customStatus.statusType,
+ localizeName: false,
+ };
+
+ userStatus.packages.customUserStatus.list.push(newUserStatus);
+ userStatus.list[newUserStatus.id] = newUserStatus;
+ }
+ })
+);
diff --git a/app/user-status/client/lib/userStatus.js b/app/user-status/client/lib/userStatus.js
new file mode 100644
index 000000000000..71fded4e86d5
--- /dev/null
+++ b/app/user-status/client/lib/userStatus.js
@@ -0,0 +1,36 @@
+export const userStatus = {
+ packages: {
+ base: {
+ render(html) {
+ return html;
+ },
+ },
+ },
+
+ list: {
+ online: {
+ name: 'online',
+ localizeName: true,
+ id: 'online',
+ statusType: 'online',
+ },
+ away: {
+ name: 'away',
+ localizeName: true,
+ id: 'away',
+ statusType: 'away',
+ },
+ busy: {
+ name: 'busy',
+ localizeName: true,
+ id: 'busy',
+ statusType: 'busy',
+ },
+ invisible: {
+ name: 'invisible',
+ localizeName: true,
+ id: 'offline',
+ statusType: 'offline',
+ },
+ },
+};
diff --git a/app/user-status/client/notifications/deleteCustomUserStatus.js b/app/user-status/client/notifications/deleteCustomUserStatus.js
new file mode 100644
index 000000000000..8bc89decab30
--- /dev/null
+++ b/app/user-status/client/notifications/deleteCustomUserStatus.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+import { deleteCustomUserStatus } from '../lib/customUserStatus';
+import { Notifications } from '../../../notifications';
+
+Meteor.startup(() =>
+ Notifications.onLogged('deleteCustomUserStatus', (data) => deleteCustomUserStatus(data.userStatusData))
+);
diff --git a/app/user-status/client/notifications/updateCustomUserStatus.js b/app/user-status/client/notifications/updateCustomUserStatus.js
new file mode 100644
index 000000000000..28f4ed07e706
--- /dev/null
+++ b/app/user-status/client/notifications/updateCustomUserStatus.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+import { updateCustomUserStatus } from '../lib/customUserStatus';
+import { Notifications } from '../../../notifications';
+
+Meteor.startup(() =>
+ Notifications.onLogged('updateCustomUserStatus', (data) => updateCustomUserStatus(data.userStatusData))
+);
diff --git a/app/user-status/index.js b/app/user-status/index.js
new file mode 100644
index 000000000000..a67eca871efb
--- /dev/null
+++ b/app/user-status/index.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+ module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+ module.exports = require('./server/index.js');
+}
diff --git a/app/user-status/server/index.js b/app/user-status/server/index.js
new file mode 100644
index 000000000000..1875567ed31f
--- /dev/null
+++ b/app/user-status/server/index.js
@@ -0,0 +1,6 @@
+import './methods/deleteCustomUserStatus';
+import './methods/insertOrUpdateUserStatus';
+import './methods/listCustomUserStatus';
+import './methods/setUserStatus';
+
+import './publications/fullUserStatusData';
diff --git a/app/user-status/server/methods/deleteCustomUserStatus.js b/app/user-status/server/methods/deleteCustomUserStatus.js
new file mode 100644
index 000000000000..4d947ff5732c
--- /dev/null
+++ b/app/user-status/server/methods/deleteCustomUserStatus.js
@@ -0,0 +1,26 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../authorization';
+import { Notifications } from '../../../notifications';
+import { CustomUserStatus } from '../../../models';
+
+Meteor.methods({
+ deleteCustomUserStatus(userStatusID) {
+ let userStatus = null;
+
+ if (hasPermission(this.userId, 'manage-user-status')) {
+ userStatus = CustomUserStatus.findOneById(userStatusID);
+ } else {
+ throw new Meteor.Error('not_authorized');
+ }
+
+ if (userStatus == null) {
+ throw new Meteor.Error('Custom_User_Status_Error_Invalid_User_Status', 'Invalid user status', { method: 'deleteCustomUserStatus' });
+ }
+
+ CustomUserStatus.removeById(userStatusID);
+ Notifications.notifyLogged('deleteCustomUserStatus', { userStatusData: userStatus });
+
+ return true;
+ },
+});
diff --git a/app/user-status/server/methods/insertOrUpdateUserStatus.js b/app/user-status/server/methods/insertOrUpdateUserStatus.js
new file mode 100644
index 000000000000..07b4631173be
--- /dev/null
+++ b/app/user-status/server/methods/insertOrUpdateUserStatus.js
@@ -0,0 +1,70 @@
+import { Meteor } from 'meteor/meteor';
+import s from 'underscore.string';
+
+import { hasPermission } from '../../../authorization';
+import { Notifications } from '../../../notifications';
+import { CustomUserStatus } from '../../../models';
+
+Meteor.methods({
+ insertOrUpdateUserStatus(userStatusData) {
+ if (!hasPermission(this.userId, 'manage-user-status')) {
+ throw new Meteor.Error('not_authorized');
+ }
+
+ if (!s.trim(userStatusData.name)) {
+ throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', { method: 'insertOrUpdateUserStatus', field: 'Name' });
+ }
+
+ // allow all characters except >, <, &, ", '
+ // more practical than allowing specific sets of characters; also allows foreign languages
+ const nameValidation = /[><&"']/;
+
+ if (nameValidation.test(userStatusData.name)) {
+ throw new Meteor.Error('error-input-is-not-a-valid-field', `${ userStatusData.name } is not a valid name`, { method: 'insertOrUpdateUserStatus', input: userStatusData.name, field: 'Name' });
+ }
+
+ let matchingResults = [];
+
+ if (userStatusData._id) {
+ matchingResults = CustomUserStatus.findByNameExceptId(userStatusData.name, userStatusData._id).fetch();
+ } else {
+ matchingResults = CustomUserStatus.findByName(userStatusData.name).fetch();
+ }
+
+ if (matchingResults.length > 0) {
+ throw new Meteor.Error('Custom_User_Status_Error_Name_Already_In_Use', 'The custom user status name is already in use', { method: 'insertOrUpdateUserStatus' });
+ }
+
+ const validStatusTypes = ['online', 'away', 'busy', 'offline'];
+ if (userStatusData.statusType && validStatusTypes.indexOf(userStatusData.statusType) < 0) {
+ throw new Meteor.Error('error-input-is-not-a-valid-field', `${ userStatusData.statusType } is not a valid status type`, { method: 'insertOrUpdateUserStatus', input: userStatusData.statusType, field: 'StatusType' });
+ }
+
+ if (!userStatusData._id) {
+ // insert user status
+ const createUserStatus = {
+ name: userStatusData.name,
+ statusType: userStatusData.statusType || null,
+ };
+
+ const _id = CustomUserStatus.create(createUserStatus);
+
+ Notifications.notifyLogged('updateCustomUserStatus', { userStatusData: createUserStatus });
+
+ return _id;
+ }
+
+ // update User status
+ if (userStatusData.name !== userStatusData.previousName) {
+ CustomUserStatus.setName(userStatusData._id, userStatusData.name);
+ }
+
+ if (userStatusData.statusType !== userStatusData.previousStatusType) {
+ CustomUserStatus.setStatusType(userStatusData._id, userStatusData.statusType);
+ }
+
+ Notifications.notifyLogged('updateCustomUserStatus', { userStatusData });
+
+ return true;
+ },
+});
diff --git a/app/user-status/server/methods/listCustomUserStatus.js b/app/user-status/server/methods/listCustomUserStatus.js
new file mode 100644
index 000000000000..912f8531a405
--- /dev/null
+++ b/app/user-status/server/methods/listCustomUserStatus.js
@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+
+import { CustomUserStatus } from '../../../models';
+
+Meteor.methods({
+ listCustomUserStatus() {
+ return CustomUserStatus.find({}).fetch();
+ },
+});
diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js
new file mode 100644
index 000000000000..3ea7d4e07ff9
--- /dev/null
+++ b/app/user-status/server/methods/setUserStatus.js
@@ -0,0 +1,30 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+
+import { settings } from '../../../settings';
+import { RateLimiter, setStatusMessage } from '../../../lib';
+
+Meteor.methods({
+ setUserStatus(statusType, statusText) {
+ if (statusType) {
+ Meteor.call('UserPresence:setDefaultStatus', statusType);
+ }
+
+ if (statusText || statusText === '') {
+ check(statusText, String);
+
+ if (!settings.get('Accounts_AllowUserStatusMessageChange')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+ method: 'setUserStatus',
+ });
+ }
+
+ const userId = Meteor.userId();
+ setStatusMessage(userId, statusText);
+ }
+ },
+});
+
+RateLimiter.limitMethod('setUserStatus', 1, 1000, {
+ userId: () => true,
+});
diff --git a/app/user-status/server/publications/fullUserStatusData.js b/app/user-status/server/publications/fullUserStatusData.js
new file mode 100644
index 000000000000..f877cb942824
--- /dev/null
+++ b/app/user-status/server/publications/fullUserStatusData.js
@@ -0,0 +1,30 @@
+import s from 'underscore.string';
+import { Meteor } from 'meteor/meteor';
+
+import { CustomUserStatus } from '../../../models';
+
+Meteor.publish('fullUserStatusData', function(filter, limit) {
+ if (!this.userId) {
+ return this.ready();
+ }
+
+ const fields = {
+ name: 1,
+ statusType: 1,
+ };
+
+ filter = s.trim(filter);
+
+ const options = {
+ fields,
+ limit,
+ sort: { name: 1 },
+ };
+
+ if (filter) {
+ const filterReg = new RegExp(s.escapeRegExp(filter), 'i');
+ return CustomUserStatus.findByName(filterReg, options);
+ }
+
+ return CustomUserStatus.find({}, options);
+});
diff --git a/app/utils/client/lib/roomTypes.js b/app/utils/client/lib/roomTypes.js
index 887d82c791b6..709d8ee63950 100644
--- a/app/utils/client/lib/roomTypes.js
+++ b/app/utils/client/lib/roomTypes.js
@@ -51,6 +51,10 @@ export const roomTypes = new class RocketChatRoomTypes extends RoomTypesCommon {
return room && room.t;
}
+ getUserStatusText(roomType, rid) {
+ return this.roomTypes[roomType] && typeof this.roomTypes[roomType].getUserStatusText === 'function' && this.roomTypes[roomType].getUserStatusText(rid);
+ }
+
findRoom(roomType, identifier, user) {
return this.roomTypes[roomType] && this.roomTypes[roomType].findRoom(identifier, user);
}
diff --git a/app/utils/server/functions/getDefaultUserFields.js b/app/utils/server/functions/getDefaultUserFields.js
index f3332ca76177..e7aaddf1b816 100644
--- a/app/utils/server/functions/getDefaultUserFields.js
+++ b/app/utils/server/functions/getDefaultUserFields.js
@@ -4,6 +4,7 @@ export const getDefaultUserFields = () => ({
emails: 1,
status: 1,
statusDefault: 1,
+ statusText: 1,
statusConnection: 1,
avatarOrigin: 1,
utcOffset: 1,
diff --git a/client/importPackages.js b/client/importPackages.js
index 32e492e5d21d..e26dde77f6f7 100644
--- a/client/importPackages.js
+++ b/client/importPackages.js
@@ -97,6 +97,7 @@ import '../app/lazy-load';
import '../app/discussion/client';
import '../app/threads/client';
import '../app/mail-messages/client';
+import '../app/user-status';
import '../app/utils';
import '../app/settings';
import '../app/models';
diff --git a/client/startup/usersObserve.js b/client/startup/usersObserve.js
index ef705bc2e3d5..d9456fd2eb62 100644
--- a/client/startup/usersObserve.js
+++ b/client/startup/usersObserve.js
@@ -4,13 +4,15 @@ import { Session } from 'meteor/session';
import { RoomManager } from '../../app/ui-utils';
Meteor.startup(function() {
- Meteor.users.find({}, { fields: { name: 1, username: 1, status: 1, utcOffset: 1 } }).observe({
+ Meteor.users.find({}, { fields: { name: 1, username: 1, status: 1, utcOffset: 1, statusText: 1 } }).observe({
added(user) {
Session.set(`user_${ user.username }_status`, user.status);
+ Session.set(`user_${ user.username }_status_text`, user.statusText);
RoomManager.updateUserStatus(user, user.status, user.utcOffset);
},
changed(user) {
Session.set(`user_${ user.username }_status`, user.status);
+ Session.set(`user_${ user.username }_status_text`, user.statusText);
RoomManager.updateUserStatus(user, user.status, user.utcOffset);
},
removed(user) {
diff --git a/imports/startup/client/listenActiveUsers.js b/imports/startup/client/listenActiveUsers.js
index bddc19c97133..19a33ff66632 100644
--- a/imports/startup/client/listenActiveUsers.js
+++ b/imports/startup/client/listenActiveUsers.js
@@ -25,6 +25,7 @@ const saveUser = (user, force = false) => {
// name: user.name,
// utcOffset: user.utcOffset,
status: user.status,
+ statusText: user.statusText,
},
});
}
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 64bf88bd3887..75994691a232 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -38,6 +38,7 @@
"Accounts_AllowUserAvatarChange": "Allow User Avatar Change",
"Accounts_AllowUsernameChange": "Allow Username Change",
"Accounts_AllowUserProfileChange": "Allow User Profile Change",
+ "Accounts_AllowUserStatusMessageChange": "Allow Custom Status Message",
"Accounts_AvatarBlockUnauthenticatedAccess": "Block Unauthenticated Access to Avatars",
"Accounts_AvatarCacheTime": "Avatar cache time",
"Accounts_AvatarCacheTime_description": "Number of seconds the http protocol is told to cache the avatar images.",
@@ -973,6 +974,15 @@
"Custom_Sounds": "Custom Sounds",
"Custom_Translations": "Custom Translations",
"Custom_Translations_Description": "Should be a valid JSON where keys are languages containing a dictionary of key and translations. Example: {\n \"en\": {\n \"Channels\": \"Rooms\"\n },\n \"pt\": {\n \"Channels\": \"Salas\"\n }\n} ",
+ "Custom_User_Status": "Custom User Status",
+ "Custom_User_Status_Add": "Add Custom User Status",
+ "Custom_User_Status_Added_Successfully" : "Custom User Status Added Successfully",
+ "Custom_User_Status_Delete_Warning": "Deleting a Custom User Status cannot be undone.",
+ "Custom_User_Status_Error_Invalid_User_Status": "Invalid User Status",
+ "Custom_User_Status_Error_Name_Already_In_Use": "The Custom User Status Name is already in use.",
+ "Custom_User_Status_Has_Been_Deleted": "Custom User Status Has Been Deleted",
+ "Custom_User_Status_Info": "Custom User Status Info",
+ "Custom_User_Status_Updated_Successfully": "Custom User Status Updated Successfully",
"Customize": "Customize",
"CustomSoundsFilesystem": "Custom Sounds Filesystem",
"Dashboard": "Dashboard",
@@ -1112,6 +1122,7 @@
"E2E_password_reveal_text": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.
This is end to end encryption so the key to encode/decode your messages will not be saved on the server. For that reason you need to store this password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on. Learn more here!
Your password is: %s
This is an auto generated password, you can setup a new password for your encryption key any time from any browser you have entered the existing password. This password is only stored on this browser until you store the password and dismiss this message.",
"E2E_password_request_text": "To access your encrypted private groups and direct messages, enter your encryption password. You need to enter this password to encode/decode your messages on every client you use, since the key is not stored on the server.",
"Edit": "Edit",
+ "Edit_Status": "Edit Status",
"edit-message": "Edit Message",
"edit-message_description": "Permission to edit a message within a room",
"edit-other-user-active-status": "Edit Other User Active Status",
@@ -1941,6 +1952,8 @@
"manage-own-integrations_description": "Permition to allow users to create and edit their own integration or webhooks",
"manage-sounds": "Manage Sounds",
"manage-sounds_description": "Permission to manage the server sounds",
+ "manage-user-status": "Manage User Status",
+ "manage-user-status_description": "Permission to manage the server custom user statuses",
"Manage_Apps": "Manage Apps",
"Manage_the_App": "Manage the App",
"Manager_added": "Manager added",
@@ -2320,6 +2333,7 @@
"Preparing_list_of_channels": "Preparing list of channels",
"Preparing_list_of_messages": "Preparing list of messages",
"Preparing_list_of_users": "Preparing list of users",
+ "Presence": "Presence",
"preview-c-room": "Preview Public Channel",
"preview-c-room_description": "Permission to view the contents of a public channel before joining",
"Previous_month": "Previous Month",
@@ -2698,6 +2712,8 @@
"Slash_Shrug_Description": "Displays ¯\\_(ツ)_/¯ after your message",
"Slash_Tableflip_Description": "Displays (╯°□°）╯︵ ┻━┻",
"Slash_TableUnflip_Description": "Displays ┬─┬ ノ( ゜-゜ノ)",
+ "Slash_Status_Description": "Set your status message",
+ "Slash_Status_Params": "Status message",
"Slash_Topic_Description": "Set topic",
"Slash_Topic_Params": "Topic message",
"Smarsh_Email": "Smarsh Email",
@@ -2772,6 +2788,11 @@
"Stats_Total_Uploads": "Total Uploads",
"Stats_Total_Uploads_Size": "Total Uploads Size",
"Status": "Status",
+ "StatusMessage": "Status Message",
+ "StatusMessage_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of status messages",
+ "StatusMessage_Changed_Successfully": "Status message changed successfully.",
+ "StatusMessage_Placeholder": "What are you doing right now?",
+ "StatusMessage_Too_Long": "Status message must be shorter than 120 characters.",
"Step": "Step",
"Stop_Recording": "Stop Recording",
"Store_Last_Message": "Store Last Message",
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index af4322965026..454970fdead0 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -38,6 +38,7 @@
"Accounts_AllowUserAvatarChange": "Permitir al Usuario modificar su Avatar",
"Accounts_AllowUsernameChange": "Permitir el Cambio de Nombre de Usuario",
"Accounts_AllowUserProfileChange": "Permitir al Usuario modificar su Perfil",
+ "Accounts_AllowUserStatusMessageChange": "Permitir cambio de mensaje de estado",
"Accounts_AvatarCacheTime": "Tiempo de caché de Avatar",
"Accounts_AvatarCacheTime_description": "Número de segundos que se le dice al protocolo http para almacenar en caché las imágenes de avatar.",
"Accounts_AvatarResize": "Cambiar el Tamaño de los Avatars",
@@ -2377,6 +2378,8 @@
"Slash_Shrug_Description": "Muestra ¯ \\ _ (ツ) _ / ¯ después de su mensaje",
"Slash_Tableflip_Description": "Muestra ° (╯ ° □ °) ╯( ┻━┻",
"Slash_TableUnflip_Description": "Muestra ┬─┬ ノ (゜ - ゜ ノ)",
+ "Slash_Status_Description": "Configura tu mensaje de estado",
+ "Slash_Status_Params": "Mensaje de estado",
"Slash_Topic_Description": "Establecer tema",
"Slash_Topic_Params": "Mensaje del tema",
"Smarsh_Email": "Smarsh Email",
@@ -2444,6 +2447,11 @@
"Stats_Total_Rooms": "Total de Salas",
"Stats_Total_Users": "Total de Usuarios",
"Status": "Estado",
+ "StatusMessage": "Mensaje de estado",
+ "StatusMessage_Change_Disabled": "Tu administrador de Rocket.Chat ha desactivado el cambio de mensajes de estado",
+ "StatusMessage_Changed_Successfully": "Mensaje de estado cambiado correctamente.",
+ "StatusMessage_Placeholder": "¿Qué estás haciendo ahora?",
+ "StatusMessage_Too_Long": "El mensaje de estado debe tener menos de 120 caracteres.",
"Step": "Paso",
"Stop_Recording": "Detener Grabacion",
"Store_Last_Message": "Almacenar el último mensaje",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 6b293a90110d..ea5ec5fb0564 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -2280,6 +2280,7 @@
"Preparing_list_of_channels": "Preparando lista de canais",
"Preparing_list_of_messages": "Preparando lista de mensagens",
"Preparing_list_of_users": "Preparando lista de usuários",
+ "Presence": "Presença",
"preview-c-room": "Pré-visualizar Canal público",
"preview-c-room_description": "Permissão para visualizar o conteúdo de um canal público antes de se juntar",
"Previous_month": "Mês anterior",
diff --git a/server/importPackages.js b/server/importPackages.js
index 40daed01b3de..35d4dbac90ea 100644
--- a/server/importPackages.js
+++ b/server/importPackages.js
@@ -81,6 +81,7 @@ import '../app/slashcommands-leave';
import '../app/slashcommands-me';
import '../app/slashcommands-msg';
import '../app/slashcommands-mute';
+import '../app/slashcommands-status';
import '../app/slashcommands-topic/server';
import '../app/slashcommands-unarchiveroom/server';
import '../app/smarsh-connector';
@@ -105,6 +106,7 @@ import '../app/chatpal-search/server';
import '../app/discussion/server';
import '../app/bigbluebutton';
import '../app/mail-messages/server';
+import '../app/user-status';
import '../app/utils';
import '../app/settings';
import '../app/models';
diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js
index 788ee9281d04..2fdf5e5fafdb 100644
--- a/server/methods/saveUserProfile.js
+++ b/server/methods/saveUserProfile.js
@@ -49,6 +49,10 @@ Meteor.methods({
Meteor.call('setUsername', settings.username);
}
+ if (settings.statusText || settings.statusText === '') {
+ Meteor.call('setUserStatus', null, settings.statusText);
+ }
+
if (settings.email) {
if (!checkPassword(user, settings.typedPassword)) {
throw new Meteor.Error('error-invalid-password', 'Invalid password', {
diff --git a/server/publications/activeUsers.js b/server/publications/activeUsers.js
index c6e33e283517..0256c5a37215 100644
--- a/server/publications/activeUsers.js
+++ b/server/publications/activeUsers.js
@@ -13,6 +13,7 @@ Meteor.publish('activeUsers', function() {
name: 1,
status: 1,
utcOffset: 1,
+ statusText: 1,
},
});
});
diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
index c34069ff33cb..5b11589e7748 100644
--- a/tests/end-to-end/api/01-users.js
+++ b/tests/end-to-end/api/01-users.js
@@ -495,6 +495,7 @@ describe('[Users]', function() {
updateSetting('Accounts_AllowUserProfileChange', true)
.then(() => updateSetting('Accounts_AllowUsernameChange', true))
.then(() => updateSetting('Accounts_AllowRealNameChange', true))
+ .then(() => updateSetting('Accounts_AllowUserStatusMessageChange', true))
.then(() => updateSetting('Accounts_AllowEmailChange', true))
.then(() => updateSetting('Accounts_AllowPasswordChange', true))
.then(done);
@@ -503,6 +504,7 @@ describe('[Users]', function() {
updateSetting('Accounts_AllowUserProfileChange', true)
.then(() => updateSetting('Accounts_AllowUsernameChange', true))
.then(() => updateSetting('Accounts_AllowRealNameChange', true))
+ .then(() => updateSetting('Accounts_AllowUserStatusMessageChange', true))
.then(() => updateSetting('Accounts_AllowEmailChange', true))
.then(() => updateSetting('Accounts_AllowPasswordChange', true))
.then(done);
@@ -662,6 +664,50 @@ describe('[Users]', function() {
});
});
+ it('should return an error when trying update user status message and it is not allowed', (done) => {
+ updatePermission('edit-other-user-info', ['user']).then(() => {
+ updateSetting('Accounts_AllowUserStatusMessageChange', false)
+ .then(() => {
+ request.post(api('users.update'))
+ .set(credentials)
+ .send({
+ userId: targetUser._id,
+ data: {
+ statusMessage: 'a new status',
+ },
+ })
+ .expect('Content-Type', 'application/json')
+ .expect(400)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', false);
+ })
+ .end(done);
+ });
+ });
+ });
+
+ it('should update user status message when the required permission is applied', (done) => {
+ updatePermission('edit-other-user-info', ['admin']).then(() => {
+ updateSetting('Accounts_AllowUserStatusMessageChange', false)
+ .then(() => {
+ request.post(api('users.update'))
+ .set(credentials)
+ .send({
+ userId: targetUser._id,
+ data: {
+ name: 'a new status',
+ },
+ })
+ .expect('Content-Type', 'application/json')
+ .expect(200)
+ .expect((res) => {
+ expect(res.body).to.have.property('success', true);
+ })
+ .end(done);
+ });
+ });
+ });
+
it('should return an error when trying update user email and it is not allowed', (done) => {
updatePermission('edit-other-user-info', ['user']).then(() => {
updateSetting('Accounts_AllowEmailChange', false)
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index 15a3a6746010..1629e980a9bd 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -364,6 +364,10 @@ class Administration extends Page {
get accountsRealNameChangeFalse() { return browser.element('label:nth-of-type(2) [name="Accounts_AllowRealNameChange"]'); }
+ get accountsUserStatusMessageChangeTrue() { return browser.element('label:nth-of-type(1) [name="Accounts_AllowUserStatusMessageChange"]'); }
+
+ get accountsUserStatusMessageChangeFalse() { return browser.element('label:nth-of-type(2) [name="Accounts_AllowUserStatusMessageChange"]'); }
+
get accountsUsernameChangeTrue() { return browser.element('label:nth-of-type(1) [name="Accounts_AllowUsernameChange"]'); }
get accountsUsernameChangeFalse() { return browser.element('label:nth-of-type(2) [name="Accounts_AllowUsernameChange"]'); }