mattermost-redux 10.11.0 → 10.12.0

package/lib/actions/users.js

@@ -134,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)());

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/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.11.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.11.0",
-    "@mattermost/types": "10.11.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",