Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/config/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ export const PROJECT_REF_CODE_MAX_LENGTH = 7
export const PROJECT_FEED_TYPE_PRIMARY = 'PRIMARY'
export const PROJECT_FEED_TYPE_MESSAGES = 'MESSAGES'

export const DISCOURSE_BOT_USERID = 'system'
export const CODER_BOT_USERID = 'system'
export const DISCOURSE_BOT_USERID = 'CoderBot'
export const CODER_BOT_USERID = 'CoderBot'
export const CODER_BOT_USER_FNAME = 'Coder'
export const CODER_BOT_USER_LNAME = 'Bot'

Expand Down
6 changes: 4 additions & 2 deletions src/projects/actions/projectTopics.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import {
CREATE_PROJECT_FEED,
LOAD_PROJECT_FEED_COMMENTS,
CREATE_PROJECT_FEED_COMMENT,
LOAD_PROJECT_FEEDS_MEMBERS
LOAD_PROJECT_FEEDS_MEMBERS,
DISCOURSE_BOT_USERID,
CODER_BOT_USERID
} from '../../config/constants'
import { loadMembers } from '../../actions/members'
import { EventTypes } from 'redux-segment'
Expand Down Expand Up @@ -85,7 +87,7 @@ const getProjectTopicsWithMember = (dispatch, projectId, tag) => {
userIds = _.union(userIds, _.map(topic.posts, 'userId'))
})
// this is to remove any nulls from the list (dev had some bad data)
_.remove(userIds, i => !i || i === 'system')
_.remove(userIds, i => !i || [DISCOURSE_BOT_USERID, CODER_BOT_USERID].indexOf(i) > -1)
// return if there are no userIds to retrieve, empty result set
if (!userIds.length)
resolve(value)
Expand Down