mattermost-redux 10.10.0 → 10.12.0

package/lib/actions/posts.js

@@ -997,7 +997,7 @@ function getNeededAtMentionedUsernamesAndGroups(state, posts) {
         if (!groupsByName) {
             groupsByName = (0, groups_2.getAllGroupsByName)(state);
         }
-        const pattern = /\B@(([a-z0-9_.-]*[a-z0-9_])[.-]*)/gi;
+        const pattern = /\B@(([a-z0-9.\-_:]*[a-z0-9_])[.\-:]*)/gi;
         let match;
         while ((match = pattern.exec(text)) !== null) {
             // match[1] is the matched mention including trailing punctuation

package/lib/actions/users.d.ts

@@ -41,6 +41,9 @@ export declare function createTermsOfService(text: string): ActionFuncAsync<impo
 export declare function getUser(id: string): ActionFuncAsync<UserProfile, import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function getUserByUsername(username: string): ActionFuncAsync<UserProfile, import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function getUserByEmail(email: string): ActionFuncAsync<UserProfile, import("@mattermost/types/store").GlobalState, AnyAction>;
+export declare function canUserDirectMessage(userId: string, otherUserId: string): ActionFuncAsync<{
+    can_dm: boolean;
+}>;
 export declare function getStatusesByIds(userIds: Array<UserProfile['id']>): ActionFuncAsync<UserStatus[]>;
 export declare function setStatus(status: UserStatus): ActionFuncAsync<UserStatus>;
 export declare function setCustomStatus(customStatus: UserCustomStatus): ActionFuncAsync<unknown, import("@mattermost/types/store").GlobalState, AnyAction>;

package/lib/actions/users.js

@@ -33,6 +33,7 @@ exports.createTermsOfService = createTermsOfService;
 exports.getUser = getUser;
 exports.getUserByUsername = getUserByUsername;
 exports.getUserByEmail = getUserByEmail;
+exports.canUserDirectMessage = canUserDirectMessage;
 exports.getStatusesByIds = getStatusesByIds;
 exports.setStatus = setStatus;
 exports.setCustomStatus = setCustomStatus;
@@ -133,9 +134,6 @@ function loadMe() {
                 dispatch((0, teams_1.getMyTeams)()),
                 dispatch((0, teams_1.getMyTeamMembers)()),
             ]);
-            if ((0, general_2.getFeatureFlagValue)(getState(), 'CustomProfileAttributes') === 'true') {
-                dispatch((0, general_1.getCustomProfileAttributeFields)());
-            }
             const isCollapsedThreads = (0, preferences_2.isCollapsedThreadsEnabled)(getState());
             await dispatch((0, teams_1.getMyTeamUnreads)(isCollapsedThreads));
             await dispatch((0, limits_1.getServerLimits)());
@@ -622,6 +620,19 @@ function getUserByEmail(email) {
         ],
     });
 }
+function canUserDirectMessage(userId, otherUserId) {
+    return async (dispatch, getState) => {
+        try {
+            const result = await client_1.Client4.canUserDirectMessage(userId, otherUserId);
+            return { data: result };
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            dispatch((0, errors_1.logError)(error));
+            return { error };
+        }
+    };
+}
 function getStatusesByIds(userIds) {
     return async (dispatch, getState) => {
         if (!userIds || userIds.length === 0) {

package/lib/selectors/entities/access_control.d.ts

@@ -1,5 +1,7 @@
 import type { Channel, ChannelWithTeamData, ChannelSearchOpts } from '@mattermost/types/channels';
+import type { AccessControlSettings } from '@mattermost/types/config';
 import type { GlobalState } from '@mattermost/types/store';
+export declare function getAccessControlSettings(state: GlobalState): AccessControlSettings;
 export declare function getAccessControlPolicy(state: GlobalState, id: string): import("@mattermost/types/access_control").AccessControlPolicy;
 export declare const getChannelIdsForAccessControlPolicy: (state: GlobalState, parentId: string) => string[];
 export declare function makeGetChannelsInAccessControlPolicy(): (b: GlobalState, a: {

package/lib/selectors/entities/access_control.js

@@ -3,12 +3,16 @@
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChannelIdsForAccessControlPolicy = void 0;
+exports.getAccessControlSettings = getAccessControlSettings;
 exports.getAccessControlPolicy = getAccessControlPolicy;
 exports.makeGetChannelsInAccessControlPolicy = makeGetChannelsInAccessControlPolicy;
 exports.searchChannelsInheritsPolicy = searchChannelsInheritsPolicy;
 const channel_utils_1 = require("mattermost-redux/utils/channel_utils");
 const channels_1 = require("./channels");
 const create_selector_1 = require("../create_selector");
+function getAccessControlSettings(state) {
+    return state.entities.admin.config.AccessControlSettings;
+}
 function getAccessControlPolicy(state, id) {
     return state.entities.admin.accessControlPolicies[id];
 }

package/lib/selectors/entities/channels.js

@@ -355,8 +355,11 @@ exports.getUnreadStatus = (0, create_selector_1.createSelector)('getUnreadStatus
         if (!channelExists) {
             return counts;
         }
+        if ((0, channel_utils_1.isChannelMuted)(membership)) {
+            return counts;
+        }
         const mentions = collapsedThreads ? membership.mention_count_root : membership.mention_count;
-        if (mentions && !(0, channel_utils_1.isChannelMuted)(membership)) {
+        if (mentions) {
             counts.mentions += mentions;
         }
         const unreadCount = (0, channel_utils_1.calculateUnreadCount)(messageCounts[channelId], myMembers[channelId], collapsedThreads);

package/lib/selectors/entities/users.d.ts

@@ -30,6 +30,7 @@ export declare function getUserStatuses(state: GlobalState): RelationOneToOne<Us
 export declare function getUserSessions(state: GlobalState): any[];
 export declare function getUserAudits(state: GlobalState): any[];
 export declare function getUser(state: GlobalState, id: UserProfile['id']): UserProfile;
+export declare function getUsersByIDs(state: GlobalState, ids: Array<UserProfile['id']>): UserProfile[];
 export declare const getUsersByUsername: (a: GlobalState) => Record<string, UserProfile>;
 export declare function getUserByUsername(state: GlobalState, username: UserProfile['username']): UserProfile;
 export declare const getUsersByEmail: (a: GlobalState) => Record<string, UserProfile>;

package/lib/selectors/entities/users.js

@@ -14,6 +14,7 @@ exports.getUserStatuses = getUserStatuses;
 exports.getUserSessions = getUserSessions;
 exports.getUserAudits = getUserAudits;
 exports.getUser = getUser;
+exports.getUsersByIDs = getUsersByIDs;
 exports.getUserByUsername = getUserByUsername;
 exports.getUserByEmail = getUserByEmail;
 exports.filterProfiles = filterProfiles;
@@ -87,6 +88,9 @@ function getUserAudits(state) {
 function getUser(state, id) {
     return state.entities.users.profiles[id];
 }
+function getUsersByIDs(state, ids) {
+    return ids.map((userId) => getUser(state, userId));
+}
 exports.getUsersByUsername = (0, create_selector_1.createSelector)('getUsersByUsername', exports.getUsers, (users) => {
     const usersByUsername = {};
     for (const id in users) {

package/lib/utils/user_utils.d.ts

@@ -18,7 +18,7 @@ export declare function profileListToMap(profileList: UserProfile[]): IDMappedOb
 export declare function removeUserFromList(userId: UserProfile['id'], list: UserProfile[]): UserProfile[];
 export declare function getSuggestionsSplitBy(term: string, splitStr: string): string[];
 export declare function getSuggestionsSplitByMultiple(term: string, splitStrs: string[]): string[];
-export declare function nameSuggestionsForUser(user: UserProfile): string[];
+export declare function nameSuggestionsForUser(user: UserProfile, includeFullEmail?: boolean): string[];
 export declare function filterProfilesStartingWithTerm(users: UserProfile[], term: string): UserProfile[];
 export declare function filterProfilesMatchingWithTerm(users: UserProfile[], term: string): UserProfile[];
 export declare function sortByUsername(a: UserProfile, b: UserProfile): number;

package/lib/utils/user_utils.js

@@ -144,7 +144,7 @@ function getSuggestionsSplitByMultiple(term, splitStrs) {
     }, new Set());
     return [...suggestions];
 }
-function nameSuggestionsForUser(user) {
+function nameSuggestionsForUser(user, includeFullEmail = false) {
     const profileSuggestions = [];
     const usernameSuggestions = getSuggestionsSplitByMultiple((user.username || '').toLowerCase(), constants_1.General.AUTOCOMPLETE_SPLIT_CHARACTERS);
     profileSuggestions.push(...usernameSuggestions);
@@ -155,8 +155,13 @@ function nameSuggestionsForUser(user) {
     profileSuggestions.push((user.nickname || '').toLowerCase());
     const positionSuggestions = getSuggestionsSplitBy((user.position || '').toLowerCase(), ' ');
     profileSuggestions.push(...positionSuggestions);
-    const email = (user.email || '').toLowerCase().split('@')[0];
-    profileSuggestions.push(email);
+    const email = (user.email || '').toLowerCase();
+    const emailPrefix = email.split('@')[0];
+    profileSuggestions.push(emailPrefix);
+    // Only include full email if explicitly requested (when search contains @)
+    if (includeFullEmail && email.includes('@')) {
+        profileSuggestions.push(email);
+    }
     return profileSuggestions;
 }
 function filterProfilesStartingWithTerm(users, term) {
@@ -165,11 +170,13 @@ function filterProfilesStartingWithTerm(users, term) {
     if (trimmedTerm.startsWith('@')) {
         trimmedTerm = trimmedTerm.substr(1);
     }
+    // Include full email in suggestions if the search term contains @
+    const includeFullEmail = lowercasedTerm.includes('@');
     return users.filter((user) => {
         if (!user) {
             return false;
         }
-        const profileSuggestions = nameSuggestionsForUser(user);
+        const profileSuggestions = nameSuggestionsForUser(user, includeFullEmail);
         return profileSuggestions.filter((suggestion) => suggestion !== '').some((suggestion) => suggestion.startsWith(trimmedTerm));
     });
 }
@@ -179,11 +186,13 @@ function filterProfilesMatchingWithTerm(users, term) {
     if (trimmedTerm.startsWith('@')) {
         trimmedTerm = trimmedTerm.substr(1);
     }
+    // Include full email in suggestions if the search term contains @
+    const includeFullEmail = lowercasedTerm.includes('@');
     return users.filter((user) => {
         if (!user) {
             return false;
         }
-        const profileSuggestions = nameSuggestionsForUser(user);
+        const profileSuggestions = nameSuggestionsForUser(user, includeFullEmail);
         return profileSuggestions.filter((suggestion) => suggestion !== '').some((suggestion) => suggestion.includes(trimmedTerm));
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mattermost-redux",
-  "version": "10.10.0",
+  "version": "10.12.0",
   "description": "Common code (API client, Redux stores, logic, utility functions) for building a Mattermost client",
   "keywords": [
     "mattermost"
@@ -39,8 +39,8 @@
     "directory": "webapp/platform/mattermost-redux"
   },
   "dependencies": {
-    "@mattermost/client": "10.10.0",
-    "@mattermost/types": "10.10.0",
+    "@mattermost/client": "10.12.0",
+    "@mattermost/types": "10.12.0",
     "@redux-devtools/extension": "^3.2.3",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.38",