Merge pull request tinode#710 from tinode/next

Fixing {get sub ims=...} for subscriptions with new messages

Author: or-else

INSTALL.md

@@ -173,7 +173,7 @@ A bash script [run-cluster.sh](./server/run-cluster.sh) may be found useful.
 
 ### Enabling Push Notifications
 
-Follow [instructions](./docs/faq.md#q-how-to-setup-fcm-push-notifications).
+Follow [instructions](./docs/faq.md#q-how-to-setup-push-notifications-with-google-fcm).
 
 ### Note on Running the Server in Background
 

README.md

@@ -144,16 +144,15 @@ More translations are [welcome](docs/translations.md). Particularly interested i
 * Demo avatars and some other graphics are from https://www.pexels.com/ under [CC0 license](https://www.pexels.com/photo-license/) and https://pixabay.com/ under their [license](https://pixabay.com/service/license/).
 * Web and Android background patterns are from http://subtlepatterns.com/ under [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) license.
 * Android icons are from https://material.io/tools/icons/ under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) license.
-* Some iOS icons are from https://icons8.com/ under [CC BY-ND 3.0](https://icons8.com/license) license.
 
 ## Screenshots
 
 ### [Android](https://github.com/tinode/tindroid/)
 
 <p align="center">
-<img src="docs/android-contacts.png" alt="Android screenshot: list of chats" width=270 />
-<img src="docs/android-chat.png" alt="Android screenshot: one conversation" width=270 />
-<img src="docs/android-account.png" alt="Android screenshot: account settings" width=270 />
+<img src="docs/android-contacts.png" alt="Android screenshot: list of chats" width=250 />
+<img src="docs/android-chat.png" alt="Android screenshot: one conversation" width=250 />
+<img src="docs/android-account.png" alt="Android screenshot: account settings" width=250 />
 </p>
 
 ### [iOS](https://github.com/tinode/ios)

docs/android-account.png

@@ -23,41 +23,38 @@ func SelectEarliestUpdatedSubs(subs []t.Subscription, opts *t.QueryOpt, maxResul
 		}
 	}
 
-	if !ims.IsZero() || len(subs) > limit {
-		// Now that we fetched potentially more subscriptions than needed, we got to take those with the oldest modifications.
-		// Sorting in ascending order by modification time.
-		sort.Slice(subs, func(i, j int) bool {
-			return subs[i].UpdatedAt.Before(subs[j].UpdatedAt)
+	// No cache management and the number of results is below the limit: return all.
+	if ims.IsZero() && len(subs) <= limit {
+		return subs
+	}
+
+	// Now that we fetched potentially more subscriptions than needed, we got to take those with the oldest modifications.
+	// Sorting in ascending order by modification time.
+	sort.Slice(subs, func(i, j int) bool {
+		return subs[i].LastModified().Before(subs[j].LastModified())
+	})
+
+	if !ims.IsZero() {
+		// Keep only those subscriptions which are newer than ims.
+		at := sort.Search(len(subs), func(i int) bool {
+			return subs[i].LastModified().After(ims)
 		})
-		if !ims.IsZero() {
-			// Keep only those subscriptions which are newer than ims.
-			at := sort.Search(len(subs), func(i int) bool { return subs[i].UpdatedAt.After(ims) })
-			subs = subs[at:]
-		}
-		// Trim slice at the limit.
-		if len(subs) > limit {
-			subs = subs[:limit]
-		}
+		subs = subs[at:]
+	}
+	// Trim slice at the limit.
+	if len(subs) > limit {
+		subs = subs[:limit]
 	}
 
 	return subs
 }
 
-// SelectEarliestUpdatedAt picks the oldest timestamp which is still newer than the threshold ims.
-// The 'old' can be less than 'ims', the 'curr' must be greater than 'ims'.
-func SelectEarliestUpdatedAt(old, curr, ims time.Time) time.Time {
-	if old.Before(ims) {
+// SelectLatestTime picks the latest update timestamp out of the two.
+func SelectLatestTime(t1, t2 time.Time) time.Time {
+	if t1.Before(t2) {
 		// Subscription has not changed recently, use user's update timestamp.
-		return curr
-	} else if old.After(curr) {
-		if !ims.IsZero() {
-			// Subscription changed after the user and cache management: using earlier timestamp.
-			return curr
-		}
-	} else if ims.IsZero() {
-		// Subscription changed before the user and NO cache management: using later timestamp.
-		return curr
+		return t2
 	}
 
-	return old
+	return t1
 }