Merge pull request #206 from provokateurin/fix/update-news

Update news to fix test failures

external/nextcloud-news

@@ -1 +1 @@
-Subproject commit c60d9b1f15d566e48a148adcb3fd1e4493a1c1c0
+Subproject commit adc143e2a561289665d16089770b2a8cecbb1099

packages/neon/lib/src/apps/news/widgets/feed_icon.dart

@@ -18,9 +18,9 @@ class NewsFeedIcon extends StatelessWidget {
         width: size,
         height: size,
         borderRadius: borderRadius,
-        child: feed.faviconLink != ''
+        child: feed.faviconLink != null
             ? CachedURLImage(
-                url: feed.faviconLink,
+                url: feed.faviconLink!,
                 height: size,
                 width: size,
                 iconColor: Theme.of(context).colorScheme.primary,

packages/nextcloud/lib/src/nextcloud.openapi.dart

@@ -3604,7 +3604,7 @@ class NextcloudNewsFeed {
     required this.id,
     required this.url,
     required this.title,
-    required this.faviconLink,
+    this.faviconLink,
     required this.added,
     this.folderId,
     this.unreadCount,
@@ -3631,7 +3631,7 @@ class NextcloudNewsFeed {
 
   final String title;
 
-  final String faviconLink;
+  final String? faviconLink;
 
   final int added;
 

packages/nextcloud/lib/src/nextcloud.openapi.g.dart

@@ -1336,7 +1336,7 @@ NextcloudNewsFeed _$NextcloudNewsFeedFromJson(Map<String, dynamic> json) {
     id: json['id'] as int,
     url: json['url'] as String,
     title: json['title'] as String,
-    faviconLink: json['faviconLink'] as String,
+    faviconLink: json['faviconLink'] as String?,
     added: json['added'] as int,
     folderId: json['folderId'] as int?,
     unreadCount: json['unreadCount'] as int?,

packages/nextcloud/lib/src/nextcloud.openapi.json

@@ -987,7 +987,6 @@
           "id",
           "url",
           "title",
-          "faviconLink",
           "added",
           "ordering",
           "pinned",

specs/news.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "News",
-    "version": "20.0.0",
+    "version": "21.0.0",
     "description": "An RSS/Atom feed reader",
     "license": {
       "name": "agpl",
@@ -103,7 +103,6 @@
           "id",
           "url",
           "title",
-          "faviconLink",
           "added",
           "ordering",
           "pinned",

specs/templates/news.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "News",
-    "version": "20.0.0",
+    "version": "21.0.0",
     "description": "An RSS/Atom feed reader",
     "license": {
       "name": "agpl",

tool/Dockerfile.dev

@@ -11,8 +11,8 @@ RUN ./occ app:disable password_policy
 RUN OC_PASS="user1" ./occ user:add --password-from-env --display-name "User One" user1
 RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" user2
 
-RUN ./occ app:install news
+RUN ./occ app:install news # 21.0.0
-RUN ./occ app:install notes
+RUN ./occ app:install notes # 4.6.0
 
 RUN ./occ app:enable password_policy
 # TODO: This stopped working randomly with apache not being able to bind to the port during build. Must be some docker changes?

tool/update.sh

@@ -24,10 +24,12 @@ elif [ -d "external/nextcloud-$1" ]; then
       git reset --hard "$latest_tag"
       git submodule update
 
+      # shellcheck disable=SC2001
+      latest_version=$(echo "$latest_tag" | sed "s/^v//")
       if [[ "$1" == "server" ]]; then
-        # shellcheck disable=SC2001
+        sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version/" ../../tool/Dockerfile.dev
-        image_version=$(echo "$latest_tag" | sed "s/^v//")
+      else
-        sed -i "s/FROM nextcloud:.*/FROM nextcloud:$image_version/" ../../tool/Dockerfile.dev
+        sed -i "s/RUN \.\/occ app:install $1 .*/RUN .\/occ app:install $1 # $latest_version/" ../../tool/Dockerfile.dev
       fi
     )
 else