Merge pull request #461 from kooWZ/dev

fix announcements

Author: w568w

lib/model/announcement.dart

@@ -40,12 +40,12 @@ class Announcement {
 
   Announcement(this.content);
 
-  // FIXME: Use maxVersion as objectId requires maxVersion to be unique
+  // FIXME: Use updatedAt as objectId requires updatedAt to be unique
   Announcement.fromToml(Map<String, dynamic> notice){
     updatedAt = notice['updatedAt'];
     content = notice['content'];
     maxVersion = notice['build'];
     createdAt = updatedAt;
-    objectId = maxVersion.toString();
+    objectId = updatedAt;
   }
 }

lib/repository/app/announcement_repository.dart

@@ -72,7 +72,7 @@ class AnnouncementRepository {
   }
 
   List<Announcement>? getAnnouncements() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
@@ -81,26 +81,33 @@ class AnnouncementRepository {
       return [];
     }
     final list = (_tomlCache!['dev_notice'] as List<Map<String, dynamic>>)
-        .where((element) => (element['maxVersion'] as int) >= version)
+        .where((element) => (element['build'] as int) >= version)
         .toList();
-    return list.map<Announcement>((e) => Announcement.fromToml(e)).toList();
+    final announcements =
+        list.map<Announcement>((e) => Announcement.fromToml(e)).toList();
+    announcements.sort((a, b) =>
+        (DateTime.parse(b.updatedAt!)).compareTo(DateTime.parse(a.updatedAt!)));
+    return announcements;
   }
 
   List<Announcement>? getAllAnnouncements() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
     if (_tomlCache!['dev_notice'] == null) {
       return [];
     }
-    return _tomlCache!['dev_notice']
+    final announcements = _tomlCache!['dev_notice']
         .map<Announcement>((e) => Announcement.fromToml(e))
         .toList();
+    announcements?.sort((a, b) =>
+        (DateTime.parse(b.updatedAt!)).compareTo(DateTime.parse(a.updatedAt!)));
+    return announcements;
   }
 
   TimeTableExtra? getStartDates() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
@@ -113,23 +120,23 @@ class AnnouncementRepository {
   }
 
   String? getUserAgent() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
     return _tomlCache!['user_agent'];
   }
 
   List<String?>? getStopWords() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
     return _tomlCache!['stop_words'].cast<String>();
   }
 
   List<BannerExtra?>? getBannerExtras() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
@@ -140,15 +147,15 @@ class AnnouncementRepository {
   }
 
   List<String?>? getCareWords() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
     return _tomlCache!['care_words'].cast<String>();
   }
 
   UpdateInfo? checkVersion() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }
 
@@ -163,7 +170,7 @@ class AnnouncementRepository {
   }
 
   List<Celebration>? getCelebrations() {
-    if (_tomlCache == null){
+    if (_tomlCache == null) {
       return null;
     }