incognito mode works as expected

server/hdl_longpoll.go

@@ -91,7 +91,6 @@ func (sess *Session) readOnce(wrt http.ResponseWriter, req *http.Request) (int,
 //   - if payload exists, process it and close
 //  - if sid is not empty but there is no session, report an error
 func serveLongPoll(wrt http.ResponseWriter, req *http.Request) {
-
 	now := time.Now().UTC().Round(time.Millisecond)
 
 	// Use the lowest common denominator - this is a legacy handler after all (otherwise would use application/json)
@@ -138,7 +137,6 @@ func serveLongPoll(wrt http.ResponseWriter, req *http.Request) {
 		enc.Encode(pkt)
 
 		return
-
 	}
 
 	// Existing session

server/pres.go

@@ -198,7 +198,7 @@ func (t *Topic) presProcReq(fromUserID, what string, wantReply bool) string {
 		}
 	}
 
-	// log.Println("in-what:", debugWhat, "out-what", what, "from:", fromUserID, "to:", t.name, "reply:", replyAs)
+	// log.Println("out-what", what, "from:", fromUserID, "to:", t.name, "reply:", replyAs)
 
 	// If requester's online status has not changed, do not reply, otherwise an endless loop will happen.
 	// wantReply is needed to ensure unnecessary {pres} is not sent:
@@ -222,11 +222,25 @@ func (t *Topic) presProcReq(fromUserID, what string, wantReply bool) string {
 // Case C: user agent change, "ua", ua
 // Case D: User updated 'public', "upd"
 func (t *Topic) presUsersOfInterest(what, ua string) {
+	parts := strings.Split(what, "+")
+	wantReply := parts[0] == "on"
+	goOffline := len(parts) > 1 && parts[1] == "dis"
+
 	// Push update to subscriptions
-	for topic := range t.perSubs {
+	for topic, psd := range t.perSubs {
 		globals.hub.route <- &ServerComMessage{
-			Pres:   &MsgServerPres{Topic: "me", What: what, Src: t.name, UserAgent: ua, WantReply: (what == "on")},
+			Pres: &MsgServerPres{
+				Topic:     "me",
+				What:      what,
+				Src:       t.name,
+				UserAgent: ua,
+				WantReply: wantReply},
 			rcptto: topic}
+
+		if psd.online && goOffline {
+			psd.online = false
+			t.perSubs[topic] = psd
+		}
 	}
 }
 

server/topic.go

@@ -2531,12 +2531,12 @@ func (t *Topic) notifySubChange(uid, actor types.Uid, oldWant, oldGiven,
 	} else if (newWant & newGiven).IsPresencer() && !(oldWant & oldGiven).IsPresencer() {
 		// Subscription un-muted.
 
-		if t.cat == types.TopicCatMe {
+		// Notify subscriber of topic's online status.
+		if t.cat == types.TopicCatGrp {
+			t.presSingleUserOffline(uid, "?unkn+en", nilPresParams, "", false)
+		} else if t.cat == types.TopicCatMe {
 			// User is visible online now, notify subscribers.
 			t.presUsersOfInterest("on+en", t.userAgent)
-		} else {
-			// Notify subscriber of topic's online status.
-			t.presSingleUserOffline(uid, "?unkn+en", nilPresParams, "", false)
 		}
 	}