feat(nextcloud)!: Support server 29 and spreed 19

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Apr 25, 2024 · 1f39624 · 1f39624
1 parent 98b6a96
commit 1f39624
Show file tree

Hide file tree

Showing 71 changed files with 69,211 additions and 56,368 deletions.
diff --git a/.cspell/nextcloud.txt b/.cspell/nextcloud.txt
@@ -3,6 +3,7 @@ apppassword
 bigfilechunking
 boardname
 bools
+bruteforce
 bulkupload
 clearsky
 configapi
@@ -34,12 +35,14 @@ nextcloud
 nextcloud's
 organisation
 partlycloudy
+pollinterval
 productname
 rainshowers
 replyable
 requesttoken
 resharing
 rgdnvw
+roomid
 setsip
 shareapi
 sharebymail

diff --git a/external/nextcloud-notifications b/external/nextcloud-notifications
diff --git a/external/nextcloud-openapi-extractor b/external/nextcloud-openapi-extractor
diff --git a/external/nextcloud-server b/external/nextcloud-server
diff --git a/external/nextcloud-spreed b/external/nextcloud-spreed
diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart b/packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart
@@ -30,8 +30,8 @@ class TalkRichObjectFile extends StatelessWidget {
     if (parameter.previewAvailable == spreed.RichObjectParameter_PreviewAvailable.yes) {
       final maxHeight = MediaQuery.sizeOf(context).height / 2;
 
-      var width = parameter.width;
-      var height = parameter.height;
+      var width = _parseDimension(parameter.width);
+      var height = _parseDimension(parameter.height);
       if (width != null && height != null) {
         final devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
 
@@ -95,4 +95,22 @@ class TalkRichObjectFile extends StatelessWidget {
       child: child,
     );
   }
+
+  int? _parseDimension(({int? $int, String? string})? dimension) {
+    if (dimension == null) {
+      return null;
+    }
+
+    final $int = dimension.$int;
+    if ($int != null) {
+      return $int;
+    }
+
+    final string = dimension.string;
+    if (string != null) {
+      return int.parse(string);
+    }
+
+    throw ArgumentError(r'One of $int or string has to be not-null');
+  }
 }
diff --git a/packages/neon/neon_talk/test/main_page_test.dart b/packages/neon/neon_talk/test/main_page_test.dart
@@ -70,7 +70,7 @@ void main() {
   });
 
   testWidgets('Without message preview', (tester) async {
-    when(() => room.lastMessage).thenReturn((builtListNever: null, chatMessage: null));
+    when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: null));
     when(() => room.unreadMessages).thenReturn(0);
 
     await tester.pumpWidget(
@@ -94,7 +94,7 @@ void main() {
       when(() => chatMessage.message).thenReturn('test');
       when(() => chatMessage.messageParameters).thenReturn(BuiltMap());
 
-      when(() => room.lastMessage).thenReturn((builtListNever: null, chatMessage: chatMessage));
+      when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: chatMessage));
       when(() => room.unreadMessages).thenReturn(1);
 
       await tester.pumpWidget(
@@ -125,7 +125,7 @@ void main() {
       when(() => chatMessage.messageParameters).thenReturn(BuiltMap());
       when(() => chatMessage.id).thenReturn(0);
 
-      when(() => room.lastMessage).thenReturn((builtListNever: null, chatMessage: chatMessage));
+      when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: chatMessage));
       when(() => room.unreadMessages).thenReturn(0);
       when(() => room.lastCommonReadMessage).thenReturn(0);
 
@@ -151,7 +151,7 @@ void main() {
   });
 
   testWidgets('Create room', (tester) async {
-    when(() => room.lastMessage).thenReturn((builtListNever: null, chatMessage: null));
+    when(() => room.lastMessage).thenReturn((baseMessage: null, builtListNever: null, chatMessage: null));
     when(() => room.unreadMessages).thenReturn(0);
 
     await tester.pumpWidget(

diff --git a/packages/neon_framework/test/dialog_test.dart b/packages/neon_framework/test/dialog_test.dart
@@ -387,6 +387,8 @@ void main() {
             ..capabilities = (
               // We need to provide at least one capability because anyOf expects at least one schema to match
               commentsCapabilities: core.CommentsCapabilities((b) => b..files.update((b) => b..comments = true)),
+              coreCapabilities: null,
+              corePublicCapabilities: null,
               davCapabilities: null,
               dropAccountCapabilities: capabilities,
               filesCapabilities: null,
@@ -397,6 +399,7 @@ void main() {
               notificationsCapabilities: null,
               provisioningApiCapabilities: null,
               sharebymailCapabilities: null,
+              spreedCapabilities: null,
               spreedPublicCapabilities: null,
               systemtagsCapabilities: null,
               themingPublicCapabilities: null,

diff --git a/packages/neon_framework/test/weather_status_bloc_test.dart b/packages/neon_framework/test/weather_status_bloc_test.dart
@@ -107,6 +107,8 @@ core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data buildCapabilities({requi
         )
         ..capabilities = (
           commentsCapabilities: null,
+          coreCapabilities: null,
+          corePublicCapabilities: null,
           davCapabilities: null,
           dropAccountCapabilities: null,
           filesCapabilities: null,
@@ -117,6 +119,7 @@ core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data buildCapabilities({requi
           notificationsCapabilities: null,
           provisioningApiCapabilities: null,
           sharebymailCapabilities: null,
+          spreedCapabilities: null,
           spreedPublicCapabilities: null,
           systemtagsCapabilities: null,
           themingPublicCapabilities: null,

diff --git a/packages/nextcloud/README.md b/packages/nextcloud/README.md
@@ -49,11 +49,11 @@ These OpenAPI specifications are [generated](https://github.com/nextcloud/openap
 
 | Component                                                                          | Supported versions (1) |
 |------------------------------------------------------------------------------------|------------------------|
-| [Server](https://github.com/nextcloud/server) (2)                                  | 27 - 28                |
+| [Server](https://github.com/nextcloud/server) (2)                                  | 27 - 29                |
 | [News app](https://github.com/nextcloud/news)                                      | 22 - 25                |
 | [Notes app](https://github.com/nextcloud/notes)                                    | 4.7 - 4.10             |
-| [Notifications app](https://github.com/nextcloud/notifications)                    | 27 - 28                |
-| [Talk app](https://github.com/nextcloud/spreed)                                    | 17 - 18                |
+| [Notifications app](https://github.com/nextcloud/notifications)                    | 27 - 29                |
+| [Talk app](https://github.com/nextcloud/spreed)                                    | 17 - 19                |
 | [NextPush app](https://codeberg.org/NextPush/uppush)                               | 1.4                    |
 | [User account deletion app](https://framagit.org/framasoft/nextcloud/drop_account) | 2.3 - 2.5              |