TW-1827: online status is not updated correctly

linagora · Jun 19, 2024 · 8de41a9 · 8de41a9
1 parent 025fa9d
commit 8de41a9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
@@ -1180,6 +1180,7 @@
     "type": "text",
     "placeholders": {}
   },
+  "loading": "Loading status...",
   "loadMore": "Load more…",
   "@loadMore": {
     "type": "text",
@@ -1376,7 +1377,11 @@
     "type": "text",
     "placeholders": {}
   },
-  "aWhileAgo": "A while ago",
+  "aWhileAgo": "a while ago",
+  "@aWhileAgo": {
+    "type": "text",
+    "placeholders": {}
+  },
   "ok": "Ok",
   "@ok": {
     "type": "text",
@@ -2567,6 +2572,12 @@
       "hour": {}
     }
   },
+  "onlineDayAgo": "online {day} day ago",
+  "@onlineDayAgo": {
+    "placeholders": {
+      "day": {}
+    }
+  },
   "noMessageHereYet": "No message here yet...",
   "@noMessageHereYet": {},
   "sendMessageGuide": "Send a message or tap on the greeting bellow.",

diff --git a/lib/utils/date_time_extension.dart b/lib/utils/date_time_extension.dart
@@ -160,9 +160,14 @@ extension DateTimeExtension on DateTime {
     return other.difference(this) < const Duration(hours: 1);
   }
 
-  bool isLessThanTenHoursAgo({DateTime? other}) {
+  bool isLessThanADayAgo({DateTime? other}) {
     other ??= DateTime.now();
-    return other.difference(this) < const Duration(hours: 10);
+    return other.difference(this) < const Duration(hours: 24);
+  }
+
+  bool isLessThan30DaysAgo({DateTime? other}) {
+    other ??= DateTime.now();
+    return other.difference(this) < const Duration(days: 30);
   }
 
   String _formatDateWithLocale(BuildContext context, String pattern) {

diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart
@@ -115,11 +115,15 @@ extension RoomStatusExtension on Room {
           return L10n.of(context)!.onlineMinAgo(
             currentDateTime.difference(lastActiveDateTime).inMinutes,
           );
-        } else if (lastActiveDateTime.isLessThanTenHoursAgo()) {
+        } else if (lastActiveDateTime.isLessThanADayAgo()) {
           final timeOffline = currentDateTime.difference(lastActiveDateTime);
           return L10n.of(context)!.onlineHourAgo(
             (timeOffline.inMinutes / 60).round(),
           );
+        } else if (lastActiveDateTime.isLessThan30DaysAgo()) {
+          return L10n.of(context)!.onlineDayAgo(
+            currentDateTime.difference(lastActiveDateTime).inDays,
+          );
         } else {
           return L10n.of(context)!.aWhileAgo;
         }