Skip to content

Github issue#585, Ignore 'user-joined' type posts in Topic comments #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 1 commit into from
Dec 15, 2016
+10 −4
Merged

Github issue#585, Ignore 'user-joined' type posts in Topic comments #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/projects/detail/containers/FeedContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,18 @@ class FeedView extends React.Component {
author: isSystemUser(p.userId) ? SYSTEM_USER : allMembers[p.userId]
}
}
const validPost = (post) => {
return post.type === 'post' && (post.body && post.body.trim().length || !isSystemUser(post.userId))
}
if (showAll) {
// if we are showing all comments, just iterate through the entire array
_.forEach(_.slice(feed.posts, 1), p => {
p.type === 'post' ? item.comments.push(_toComment(p)) : item.totalComments--
validPost(p) ? item.comments.push(_toComment(p)) : item.totalComments--
})
} else {
// otherwise iterate from right and add to the beginning of the array
_.forEachRight(_.slice(feed.posts, 1), (p) => {
p.type === 'post' ? item.comments.unshift(_toComment(p)) : item.totalComments--
validPost(p) ? item.comments.unshift(_toComment(p)) : item.totalComments--
if (!feed.showAll && item.comments.length === THREAD_MESSAGES_PAGE_SIZE)
return false
})
Expand Down
7 changes: 5 additions & 2 deletions src/projects/detail/containers/MessagesContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,18 @@ class MessagesView extends React.Component {
author: isSystemUser(p.userId) ? SYSTEM_USER : allMembers[p.userId]
}
}
const validPost = (post) => {
return post.type === 'post' && (post.body && post.body.trim().length || !isSystemUser(post.userId))
}
if (showAll) {
// if we are showing all comments, just iterate through the entire array
_.forEach(feed.posts, p => {
p.type === 'post' ? item.messages.push(_toComment(p)) : item.totalComments--
validPost(p) ? item.messages.push(_toComment(p)) : item.totalComments--
})
} else {
// otherwise iterate from right and add to the beginning of the array
_.forEachRight(feed.posts, (p) => {
p.type === 'post' ? item.messages.unshift(_toComment(p)) : item.totalComments--
validPost(p) ? item.messages.unshift(_toComment(p)) : item.totalComments--
if (!feed.showAll && item.messages.length === THREAD_MESSAGES_PAGE_SIZE)
return false
})
Expand Down