fix errors in search

Hash-Studios · Feb 3, 2022 · 1025c89 · 1025c89
1 parent 69dc3d1
commit 1025c89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/models/notice.dart b/lib/models/notice.dart
@@ -53,8 +53,10 @@ class TimestampConverter implements JsonConverter<DateTime, Timestamp> {
   DateTime fromJson(Object timestamp) {
     if (timestamp is Timestamp) {
       return timestamp.toDate();
-    } else {
+    } else if (timestamp is String) {
       return DateTime.parse(timestamp.toString());
+    } else {
+      return DateTime.fromMillisecondsSinceEpoch(timestamp as int);
     }
   }
 

diff --git a/lib/models/notice.g.dart b/lib/models/notice.g.dart
diff --git a/lib/widgets/notice_tile.dart b/lib/widgets/notice_tile.dart
@@ -326,7 +326,10 @@ class _NoticeTileState extends State<NoticeTile> {
                               .format(DateTime.parse(
                                   widget.document?.createdAt.toString() ?? '0'))
                               .contains('year'))
-                      ? "${widget.document?.date.split('-')[0]} ${DateFormat('MMM').format(DateTime(0, int.parse(widget.document?.date.split('-')[1] ?? '0')))}"
+                      ? widget.document?.date.isNotEmpty == true
+                          ? "${widget.document?.date.split('-')[0]} ${DateFormat('MMM').format(DateTime(0, int.parse(widget.document?.date.split('-')[1] ?? '0')))}"
+                          : DateFormat('dd MMM').format(
+                              widget.document?.createdAt ?? DateTime.now())
                       : timeago
                           .format(DateTime.parse(
                               widget.document?.createdAt.toString() ?? '0'))