Update notification_actions.jsx (#26639)
Update notification_actions.jsx Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e532807454
Коммит
9ecb3e20c8
@@ -2,7 +2,6 @@
|
|||||||
// See LICENSE.txt for license information.
|
// See LICENSE.txt for license information.
|
||||||
|
|
||||||
import {logError} from 'mattermost-redux/actions/errors';
|
import {logError} from 'mattermost-redux/actions/errors';
|
||||||
import {getProfilesByIds} from 'mattermost-redux/actions/users';
|
|
||||||
import {getCurrentChannel, getMyChannelMember, makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
|
import {getCurrentChannel, getMyChannelMember, makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
|
||||||
import {getConfig} from 'mattermost-redux/selectors/entities/general';
|
import {getConfig} from 'mattermost-redux/selectors/entities/general';
|
||||||
import {
|
import {
|
||||||
@@ -64,14 +63,6 @@ export function sendDesktopNotification(post, msgProps) {
|
|||||||
return {status: 'not_sent', reason: 'system_message'};
|
return {status: 'not_sent', reason: 'system_message'};
|
||||||
}
|
}
|
||||||
|
|
||||||
let userFromPost = getUser(state, post.user_id);
|
|
||||||
if (!userFromPost) {
|
|
||||||
const missingProfileResponse = await dispatch(getProfilesByIds([post.user_id]));
|
|
||||||
if (missingProfileResponse.data && missingProfileResponse.data.length) {
|
|
||||||
userFromPost = missingProfileResponse.data[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mentions = [];
|
let mentions = [];
|
||||||
if (msgProps.mentions) {
|
if (msgProps.mentions) {
|
||||||
mentions = JSON.parse(msgProps.mentions);
|
mentions = JSON.parse(msgProps.mentions);
|
||||||
@@ -199,11 +190,15 @@ export function sendDesktopNotification(post, msgProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const config = getConfig(state);
|
const config = getConfig(state);
|
||||||
|
const userFromPost = getUser(state, post.user_id);
|
||||||
|
|
||||||
let username = '';
|
let username = '';
|
||||||
if (post.props.override_username && config.EnablePostUsernameOverride === 'true') {
|
if (post.props.override_username && config.EnablePostUsernameOverride === 'true') {
|
||||||
username = post.props.override_username;
|
username = post.props.override_username;
|
||||||
} else if (userFromPost) {
|
} else if (userFromPost) {
|
||||||
username = displayUsername(userFromPost, getTeammateNameDisplaySetting(state), false);
|
username = displayUsername(userFromPost, getTeammateNameDisplaySetting(state), false);
|
||||||
|
} else if (msgProps.sender_name) {
|
||||||
|
username = msgProps.sender_name;
|
||||||
} else {
|
} else {
|
||||||
username = Utils.localizeMessage('channel_loader.someone', 'Someone');
|
username = Utils.localizeMessage('channel_loader.someone', 'Someone');
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user