PLT-3366 Holding down the ALT key and clicking on a message adds a new messages indicator (squashed) (#3374)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
6abc9601be
Коммит
9b9facd3d2
@@ -5,6 +5,8 @@ import {browserHistory} from 'react-router/es6';
|
||||
import * as Utils from 'utils/utils.jsx';
|
||||
import TeamStore from 'stores/team_store.jsx';
|
||||
import UserStore from 'stores/user_store.jsx';
|
||||
import ChannelStore from 'stores/channel_store.jsx';
|
||||
import * as AsyncClient from 'utils/async_client.jsx';
|
||||
import Client from 'utils/web_client.jsx';
|
||||
|
||||
export function goToChannel(channel) {
|
||||
@@ -24,3 +26,13 @@ export function goToChannel(channel) {
|
||||
export function executeCommand(channelId, message, suggest, success, error) {
|
||||
Client.executeCommand(channelId, message, suggest, success, error);
|
||||
}
|
||||
|
||||
export function setChannelAsRead(channelIdParam) {
|
||||
const channelId = channelIdParam || ChannelStore.getCurrentId();
|
||||
AsyncClient.updateLastViewedAt();
|
||||
ChannelStore.resetCounts(channelId);
|
||||
ChannelStore.emitChange();
|
||||
if (channelId === ChannelStore.getCurrentId()) {
|
||||
ChannelStore.emitLastViewed(Number.MAX_VALUE, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,9 @@ import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
|
||||
import ChannelStore from 'stores/channel_store.jsx';
|
||||
import PostStore from 'stores/post_store.jsx';
|
||||
import TeamStore from 'stores/team_store.jsx';
|
||||
import UserStore from 'stores/user_store.jsx';
|
||||
|
||||
import * as PostUtils from 'utils/post_utils.jsx';
|
||||
import Constants from 'utils/constants.jsx';
|
||||
const ActionTypes = Constants.ActionTypes;
|
||||
|
||||
@@ -62,3 +64,53 @@ export function handleNewPost(post, msg) {
|
||||
websocketMessageProps
|
||||
});
|
||||
}
|
||||
|
||||
export function setUnreadPost(channelId, postId) {
|
||||
let lastViewed = 0;
|
||||
let ownNewMessage = false;
|
||||
const post = PostStore.getPost(channelId, postId);
|
||||
const posts = PostStore.getVisiblePosts(channelId).posts;
|
||||
var currentUsedId = UserStore.getCurrentId();
|
||||
if (currentUsedId === post.user_id || PostUtils.isSystemMessage(post)) {
|
||||
for (const otherPostId in posts) {
|
||||
if (lastViewed < posts[otherPostId].create_at && currentUsedId !== posts[otherPostId].user_id && !PostUtils.isSystemMessage(posts[otherPostId])) {
|
||||
lastViewed = posts[otherPostId].create_at;
|
||||
}
|
||||
}
|
||||
if (lastViewed === 0) {
|
||||
lastViewed = Number.MAX_VALUE;
|
||||
} else if (lastViewed > post.create_at) {
|
||||
lastViewed = post.create_at - 1;
|
||||
ownNewMessage = true;
|
||||
} else {
|
||||
lastViewed -= 1;
|
||||
}
|
||||
} else {
|
||||
lastViewed = post.create_at - 1;
|
||||
}
|
||||
|
||||
if (lastViewed === Number.MAX_VALUE) {
|
||||
AsyncClient.updateLastViewedAt();
|
||||
ChannelStore.resetCounts(ChannelStore.getCurrentId());
|
||||
ChannelStore.emitChange();
|
||||
} else {
|
||||
let unreadPosts = 0;
|
||||
for (const otherPostId in posts) {
|
||||
if (posts[otherPostId].create_at > lastViewed) {
|
||||
unreadPosts += 1;
|
||||
}
|
||||
}
|
||||
const member = ChannelStore.getMember(channelId);
|
||||
const channel = ChannelStore.get(channelId);
|
||||
member.last_viewed_at = lastViewed;
|
||||
member.msg_count = channel.total_msg_count - unreadPosts;
|
||||
member.mention_count = 0;
|
||||
ChannelStore.setChannelMember(member);
|
||||
ChannelStore.setUnreadCount(channelId);
|
||||
AsyncClient.setLastViewedAt(lastViewed, channelId);
|
||||
}
|
||||
|
||||
if (channelId === ChannelStore.getCurrentId()) {
|
||||
ChannelStore.emitLastViewed(lastViewed, ownNewMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user