fix(chat): removed self from online user list

polonel · Mar 3, 2019 · de3a596 · de3a596
1 parent c14d24d
commit de3a596
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/client/containers/Topbar/TopbarContainer.jsx b/src/client/containers/Topbar/TopbarContainer.jsx
@@ -108,6 +108,7 @@ class TopbarContainer extends React.Component {
   }
 
   onSocketUpdateUsers (data) {
+    delete data[this.props.sessionUser.username]
     const count = size(data)
     if (count !== this.activeUserCount) this.activeUserCount = count
   }
@@ -229,7 +230,11 @@ class TopbarContainer extends React.Component {
             </div>
           </div>
 
-          <OnlineUserListPartial timezone={viewdata.timezone} users={viewdata.users} />
+          <OnlineUserListPartial
+            timezone={viewdata.timezone}
+            users={viewdata.users}
+            sessionUser={this.props.sessionUser}
+          />
         </div>
       </div>
     )

diff --git a/src/client/containers/Topbar/onlineUserList.jsx b/src/client/containers/Topbar/onlineUserList.jsx
@@ -94,6 +94,7 @@ class OnlineUserListPartial extends React.Component {
             <div className='online-list-wrapper'>
               <ul className='online-list'>
                 {entries(this.activeUsers).map(([key, value]) => {
+                  if (this.props.sessionUser && value.user._id === this.props.sessionUser._id) return
                   const image = value.user.image || 'defaultProfile.jpg'
                   return (
                     <li key={key}>
@@ -123,6 +124,7 @@ class OnlineUserListPartial extends React.Component {
             </div>
             <ul className='user-list'>
               {users.map(user => {
+                if (this.props.sessionUser && user._id === this.props.sessionUser._id) return
                 const image = user.image || 'defaultProfile.jpg'
                 return (
                   <li key={user._id} data-search-term={user.fullname.toLowerCase()}>
@@ -154,6 +156,7 @@ class OnlineUserListPartial extends React.Component {
 }
 
 OnlineUserListPartial.propTypes = {
+  sessionUser: PropTypes.object,
   timezone: PropTypes.string.isRequired,
   users: PropTypes.array.isRequired
 }