From 51b824cfc1c234d3befadf7db670004db43bf370 Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Wed, 19 Apr 2023 09:00:00 +0200 Subject: [PATCH] bug fix --- .../twidda/backend/api/mastodon/impl/MastodonList.java | 2 ++ .../backend/api/mastodon/impl/MastodonNotification.java | 4 +++- .../twidda/backend/api/mastodon/impl/MastodonStatus.java | 4 +++- .../twidda/backend/api/twitter/v1/impl/MessageV1.java | 4 +++- .../twidda/backend/api/twitter/v1/impl/NotificationV1.java | 4 +++- .../twidda/backend/api/twitter/v1/impl/TweetV1.java | 4 +++- .../twidda/backend/api/twitter/v1/impl/UserListV1.java | 2 ++ .../twidda/backend/api/twitter/v2/impl/TweetV2.java | 4 +++- .../org/nuclearfog/twidda/database/impl/DatabaseMessage.java | 4 +++- .../nuclearfog/twidda/database/impl/DatabaseNotification.java | 4 +++- .../org/nuclearfog/twidda/database/impl/DatabaseStatus.java | 4 +++- 11 files changed, 31 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonList.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonList.java index 2b7de85d..e1e1334f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonList.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonList.java @@ -106,6 +106,8 @@ public class MastodonList implements UserList { @Override public int compareTo(UserList userlist) { + if (userlist.getTimestamp() != getTimestamp()) + return Long.compare(userlist.getTimestamp(), getTimestamp()); return Long.compare(userlist.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonNotification.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonNotification.java index e1394b60..63bcea87 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonNotification.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonNotification.java @@ -122,7 +122,9 @@ public class MastodonNotification implements Notification { @Override public int compareTo(Notification notification) { - return Long.compare(notification.getTimestamp(), getTimestamp()); + if (notification.getTimestamp() != getTimestamp()) + return Long.compare(notification.getTimestamp(), getTimestamp()); + return Long.compare(notification.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonStatus.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonStatus.java index 57860864..59ef5214 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonStatus.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonStatus.java @@ -363,7 +363,9 @@ public class MastodonStatus implements Status { @Override public int compareTo(Status status) { - return Long.compare(status.getTimestamp(), getTimestamp()); + if (status.getTimestamp() != getTimestamp()) + return Long.compare(status.getTimestamp(), getTimestamp()); + return Long.compare(status.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/MessageV1.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/MessageV1.java index b9c8c6b9..a7746a41 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/MessageV1.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/MessageV1.java @@ -112,7 +112,9 @@ public class MessageV1 implements Message { @Override public int compareTo(Message message) { - return Long.compare(message.getTimestamp(), getTimestamp()); + if (message.getTimestamp() != getTimestamp()) + return Long.compare(message.getTimestamp(), getTimestamp()); + return Long.compare(message.getId(), getId()); } /** diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/NotificationV1.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/NotificationV1.java index b7f5fe7c..4ab2cc42 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/NotificationV1.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/NotificationV1.java @@ -66,7 +66,9 @@ public class NotificationV1 implements Notification { @Override public int compareTo(Notification notification) { - return Long.compare(notification.getTimestamp(), getTimestamp()); + if (notification.getTimestamp() != getTimestamp()) + return Long.compare(notification.getTimestamp(), getTimestamp()); + return Long.compare(notification.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/TweetV1.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/TweetV1.java index 73f01806..4566e4c7 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/TweetV1.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/TweetV1.java @@ -337,7 +337,9 @@ public class TweetV1 implements Status { @Override public int compareTo(Status status) { - return Long.compare(status.getTimestamp(), getTimestamp()); + if (status.getTimestamp() != getTimestamp()) + return Long.compare(status.getTimestamp(), getTimestamp()); + return Long.compare(status.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/UserListV1.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/UserListV1.java index a6349b3d..e9f38289 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/UserListV1.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v1/impl/UserListV1.java @@ -126,6 +126,8 @@ public class UserListV1 implements UserList { @Override public int compareTo(UserList userlist) { + if (userlist.getTimestamp() != getTimestamp()) + return Long.compare(userlist.getTimestamp(), getTimestamp()); return Long.compare(userlist.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v2/impl/TweetV2.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v2/impl/TweetV2.java index c4ddeeb9..4685cf5d 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v2/impl/TweetV2.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/twitter/v2/impl/TweetV2.java @@ -411,7 +411,9 @@ public class TweetV2 implements Status { @Override public int compareTo(Status status) { - return Long.compare(status.getTimestamp(), getTimestamp()); + if (status.getTimestamp() != getTimestamp()) + return Long.compare(status.getTimestamp(), getTimestamp()); + return Long.compare(status.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseMessage.java b/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseMessage.java index bea68c75..8fc6e928 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseMessage.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseMessage.java @@ -105,7 +105,9 @@ public class DatabaseMessage implements Message, MessageTable { @Override public int compareTo(Message message) { - return Long.compare(message.getTimestamp(), getTimestamp()); + if (message.getTimestamp() != getTimestamp()) + return Long.compare(message.getTimestamp(), getTimestamp()); + return Long.compare(message.getId(), getId()); } /** diff --git a/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseNotification.java b/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseNotification.java index 65cb322a..b4848e42 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseNotification.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseNotification.java @@ -99,7 +99,9 @@ public class DatabaseNotification implements Notification, NotificationTable { @Override public int compareTo(Notification notification) { - return Long.compare(notification.getTimestamp(), getTimestamp()); + if (notification.getTimestamp() != getTimestamp()) + return Long.compare(notification.getTimestamp(), getTimestamp()); + return Long.compare(notification.getId(), getId()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseStatus.java b/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseStatus.java index 95443968..f421f213 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseStatus.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/impl/DatabaseStatus.java @@ -312,7 +312,9 @@ public class DatabaseStatus implements Status, StatusTable, StatusRegisterTable @Override public int compareTo(Status status) { - return Long.compare(status.getTimestamp(), getTimestamp()); + if (status.getTimestamp() != getTimestamp()) + return Long.compare(status.getTimestamp(), getTimestamp()); + return Long.compare(status.getId(), getId()); }