package.json

@@ -7,7 +7,7 @@
  "start": "ng serve",
  "prebuild": "gulp build.sass",
  "build": "ng build --prod",
- "prebuild-dev": "gulp build.sass --deploy-url=http://localhost/en",
+ "prebuild-dev": "gulp build.sass",
  "build-dev": "ng build --output-path dist/en --deploy-url=/en/ --watch=true",
  "test": "ng test",
  "lint": "ng lint",

src/app/common/services/update-markers.service.ts

@@ -129,15 +129,16 @@ export class UpdateMarkersService {
  (marker) => {
  marker = JSON.parse(marker);
  let entity_guid = marker.entity_guid;
- 
- if (this.muted.indexOf(entity_guid) > -1)
- return; //muted, so take no action
- //this.entityGuids$[entity_guid].next(marker);
-
- let found:boolean = false;
- for(let i in this.data) {
- if (this.data[i].entity_guid === entity_guid
- && this.data[i].marker === marker.marker) {
+
+ if (this.muted.indexOf(entity_guid) > -1) {
+ return;
+ }
+
+ let found = false;
+ for (let i in this.data) {
+ if (this.data[i].entity_guid === entity_guid &&
+ this.data[i].marker === marker.marker &&
+ this.data[i].user_guid === marker.user_guid) {
  this.data[i].updated_timestamp = marker.updated_timestamp;
  found = true;
  }

src/app/modules/groups/profile/member-previews/member-previews.component.ts

@@ -65,12 +65,6 @@ export class GroupMemberPreviews {
  if (marker.entity_guid === this.group.guid &&
  marker.marker === 'gathering-heartbeat' &&
  marker.updated_timestamp > this.currentTimestamp() - 30) {
- this.updateMarkers.markAsRead({
- entity_guid: this.group.guid,
- entity_type: 'group',
- marker: 'gathering-heartbeat',
- noReply: true
- });
  this.userIsInGathering(marker.user_guid);
  }
  }).bind(this));