Merge pull request 'claude refactor' (#95) from develop-refactor into develop

Reviewed-on: #95

CLAUDE.md

@@ -0,0 +1,77 @@
+# MarianumMobile Client
+
+Flutter-App für die Schul-Community: Webuntis-Stundenplan, Nextcloud Talk + Files, Custom MHSL-Backend (Breaker, Custom Events, Push).
+
+## Stack
+
+- **Flutter** (Dart >= 3.8)
+- **State:** `flutter_bloc` + `hydrated_bloc` (persistente BLoCs pro Modul)
+- **Navigation:** `persistent_bottom_nav_bar_v2` mit zentraler `AppRoutes`-Klasse als Single Entry Point
+- **HTTP:** `dio`, lokales Caching via `localstore` (Generic `RequestCache<T>`)
+- **Calendar:** `syncfusion_flutter_calendar`
+- **Datum/Zeit:** `jiffy` – wird **nur** über die Extensions in `lib/extensions/date_time.dart` verwendet
+- **Code-Gen:** `freezed`, `json_serializable`
+
+## Ordnerstruktur
+
+```
+lib/
+├── api/                    HTTP-Layer pro Backend (mhsl/, marianumcloud/, webuntis/, holidays/)
+├── state/app/modules/      BLoC pro Feature-Modul (timetable, chat, chat_list, files, ...)
+├── state/app/infrastructure LoadableState<T>, DataLoader, geteilte BLoC-Bausteine
+├── view/                   Screens
+│   ├── login/              Login-Flow
+│   └── pages/              ein Verzeichnis pro Modul (timetable, files, talk, ...)
+├── widget/                 Geteilte UI-Komponenten (Dialoge, Buttons, Sheets)
+├── extensions/             DateTime-, Text-, TimeOfDay-Extensions
+├── routing/                AppRoutes (Single Navigation Entry)
+├── theming/                Light/Dark Theme
+├── storage/                Freezed Settings-Modelle (HydratedBloc-persistent)
+├── notification/           Firebase + flutter_local_notifications
+└── utils/                  Helper (clipboard_helper, debouncer, download_manager, ...)
+```
+
+## Konventionen
+
+**Navigation:** Ausschließlich über `AppRoutes.openX(context, ...)`. Direkte `Navigator.push(...)` für volle Pages sind nicht erlaubt – `Navigator.pop` für Sheets/Dialogs bleibt am Call-Site.
+
+**Dialoge:**
+- Info/Fehler: `InfoDialog.show(context, body, copyable: true, title: '...')` aus `lib/widget/info_dialog.dart`.
+- Bestätigung: `ConfirmDialog(...).asDialog(context)` aus `lib/widget/confirm_dialog.dart`. Async-Bestätigung nutzt `onConfirmAsync` (zeigt Spinner und Inline-Fehler über `AsyncDialogAction`).
+- **Kein** inline `AlertDialog`/`SimpleDialog` mehr.
+
+**Bottom-Sheets:** Detail-Sheets gehen über `showDetailsBottomSheet(context, header: ..., children: (ctx) => [...])` aus `lib/widget/details_bottom_sheet.dart`. Header ist optional.
+
+**Async-Actions:** Statt manuelles Spinner+Try/Catch die `AsyncActionButton`-Familie aus `lib/widget/async_action_button.dart` (`AsyncActionButton`, `AsyncTextButton`, `AsyncIconButton`, `AsyncFab`, `AsyncListTile`, `AsyncDialogAction`, `runWithErrorDialog`). Fehler-Mapping läuft über `errorBuilder` oder zentral über `errorToUserMessage` aus `lib/api/errors/error_mapper.dart`.
+
+**Clipboard:** Über `copyToClipboard(context, text)` aus `lib/utils/clipboard_helper.dart`. Zeigt automatisch SnackBar.
+
+**Datum/Zeit-Formatierung:** Über die Extensions in `lib/extensions/date_time.dart`:
+`dt.formatHm()`, `dt.formatDate()`, `dt.formatDateTime()`, `dt.formatDateShort()`, `dt.formatRelative()`, `start.timeRangeTo(end)`. **Kein** direktes `Jiffy.parseFromDateTime(...).format(pattern: '...')` im View-Code.
+
+**Settings:** Pro Feature ein Freezed-Modell unter `lib/storage/`, persistiert via HydratedBloc.
+
+## Build / Run
+
+```bash
+flutter pub get
+dart run build_runner build --delete-conflicting-outputs   # nach Änderungen an Freezed/JSON-Modellen
+flutter run                                                  # Debug auf angeschlossenem Device
+flutter analyze                                              # statische Analyse, muss 0 Issues melden
+flutter test                                                 # Tests (siehe test/)
+```
+
+## Backend-Integrationen
+
+| Backend                   | Pfad                  | Zweck                                  |
+|---------------------------|-----------------------|----------------------------------------|
+| Webuntis                  | `lib/api/webuntis/`   | Stundenplan, Klassen, Räume, Lehrer    |
+| Nextcloud (Talk + WebDAV) | `lib/api/marianumcloud/` | Chats, Datei-Verwaltung             |
+| Custom MHSL-Server        | `lib/api/mhsl/`       | Breaker, Custom Events, Notify, Noten  |
+| Holiday-Calendar          | `lib/api/holidays/`   | Ferien                                 |
+
+`nextcloud`-Paket ist auf einen Custom-Fork gepinnt (siehe `pubspec.yaml` `dependency_overrides`).
+
+## Tests
+
+`test/` deckt aktuell nur Kern-Funktionen ab (DateTime-Extensions, AsyncActionController, LessonResolver). Beim Hinzufügen neuer pure-function-Helper bitte Test mit dazu.

analysis_options.yaml

@@ -1,44 +1,88 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
+# Static analysis configuration for the Flutter project.
+# https://dart.dev/guides/language/analysis-options
 #
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
+# Base ruleset: flutter_lints (recommended Flutter defaults).
+# Additional lints below catch real bugs and enforce consistent style.
 
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
+  language:
+    strict-casts: true
+    strict-raw-types: true
   errors:
     invalid_annotation_target: ignore
+    todo: ignore
+  exclude:
+    - "**/*.g.dart"
+    - "**/*.freezed.dart"
+    - "lib/firebase_options.dart"
+    - "build/**"
 
 linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-    file_names: false
+    # === Project conventions ===
     prefer_relative_imports: true
-    unnecessary_lambdas: true
     prefer_single_quotes: true
-    prefer_if_elements_to_conditional_expressions: true
-    prefer_expression_function_bodies: true
-    omit_local_variable_types: true
     eol_at_end_of_file: true
-    cast_nullable_to_non_nullable: true
-    avoid_void_async: true
+    omit_local_variable_types: true
     avoid_multiple_declarations_per_line: true
 
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+    # === Bug catchers ===
+    always_declare_return_types: true
+    avoid_empty_else: true
+    avoid_slow_async_io: true
+    avoid_type_to_string: true
+    avoid_void_async: true
+    await_only_futures: true
+    cancel_subscriptions: true
+    cast_nullable_to_non_nullable: true
+    close_sinks: true
+    empty_catches: true
+    hash_and_equals: true
+    no_adjacent_strings_in_list: true
+    no_duplicate_case_values: true
+    test_types_in_equals: true
+    throw_in_finally: true
+    unawaited_futures: true
+    unnecessary_statements: true
+    unrelated_type_equality_checks: true
+    use_build_context_synchronously: true
+    valid_regexps: true
+
+    # === Flutter widget hygiene ===
+    avoid_unnecessary_containers: true
+    sized_box_for_whitespace: true
+    sort_child_properties_last: true
+    use_colored_box: true
+    use_decorated_box: true
+    use_full_hex_values_for_flutter_colors: true
+    use_key_in_widget_constructors: true
+
+    # === Code clarity ===
+    directives_ordering: true
+    library_prefixes: true
+    no_leading_underscores_for_local_identifiers: true
+    prefer_conditional_assignment: true
+    prefer_if_elements_to_conditional_expressions: true
+    prefer_if_null_operators: true
+    prefer_initializing_formals: true
+    prefer_interpolation_to_compose_strings: true
+    prefer_is_empty: true
+    prefer_is_not_empty: true
+    prefer_is_not_operator: true
+    prefer_iterable_whereType: true
+    prefer_null_aware_operators: true
+    prefer_spread_collections: true
+    prefer_void_to_null: true
+    unnecessary_await_in_return: true
+    unnecessary_brace_in_string_interps: true
+    unnecessary_lambdas: true
+    unnecessary_null_aware_assignments: true
+    unnecessary_null_checks: true
+    unnecessary_parenthesis: true
+    unnecessary_string_interpolations: true
+    use_super_parameters: true
+
+    # === File naming ===
+    file_names: true

android/app/build.gradle

@@ -25,7 +25,7 @@ if (flutterVersionName == null) {
 android {
     namespace "eu.mhsl.marianum.mobile.client"
     compileSdk flutter.compileSdkVersion
-    ndkVersion "27.0.12077973"
+    ndkVersion "28.2.13676358"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17

flutter_native_splash.yaml

@@ -54,7 +54,7 @@ flutter_native_splash:
     # 640 pixels in diameter.
     # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle
     # 768 pixels in diameter.
-    image: assets/logo/icon-android12.png
+    image: assets/logo/icon/icon-android12.png
 
     # Splash screen background color.
     color: "#993333"

ios/Runner/Info.plist

@@ -26,6 +26,8 @@
 		<string>$(FLUTTER_BUILD_NUMBER)</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
+		<key>NSCameraUsageDescription</key>
+		<string>Um Fotos direkt aus der App aufnehmen und teilen zu können wird Zugriff auf die Kamera benötigt.</string>
 		<key>NSPhotoLibraryUsageDescription</key>
 		<string>Um Medien mit anderen zu teilen wird Zugriff zu deine Dateien benötigt.</string>
 		<key>UIApplicationSupportsIndirectInputEvents</key>

lib/api/apiParams.dart

@@ -1,3 +0,0 @@
-class ApiParams {
-
-}

lib/api/apiRequest.dart

@@ -1,5 +0,0 @@
-
-
-class ApiRequest {
-
-}

lib/api/api_error.dart

@@ -1,4 +1,4 @@
-class ApiError {
+class ApiError implements Exception {
   String message;
 
   ApiError(this.message);

lib/api/api_params.dart

@@ -0,0 +1 @@
+class ApiParams {}

lib/api/api_request.dart

@@ -0,0 +1 @@
+class ApiRequest {}

lib/api/api_response.dart

@@ -1,5 +1,6 @@
 import 'package:http/http.dart' as http;
 import 'package:json_annotation/json_annotation.dart';
+
 abstract class ApiResponse {
   @JsonKey(includeFromJson: false, includeToJson: false)
   late http.Response rawResponse;

lib/api/errors/app_exception.dart

@@ -0,0 +1,16 @@
+abstract class AppException implements Exception {
+  final String userMessage;
+  final String? technicalDetails;
+  final bool allowRetry;
+
+  const AppException({
+    required this.userMessage,
+    this.technicalDetails,
+    this.allowRetry = true,
+  });
+
+  @override
+  String toString() => technicalDetails == null
+      ? '$runtimeType: $userMessage'
+      : '$runtimeType: $userMessage ($technicalDetails)';
+}

lib/api/errors/auth_exception.dart

@@ -0,0 +1,24 @@
+import 'app_exception.dart';
+
+class AuthException extends AppException {
+  final int statusCode;
+
+  const AuthException({
+    required this.statusCode,
+    required super.userMessage,
+    super.technicalDetails,
+  }) : super(allowRetry: false);
+
+  factory AuthException.unauthorized({String? technicalDetails}) =>
+      AuthException(
+        statusCode: 401,
+        userMessage: 'Bitte melde dich erneut an, um fortzufahren.',
+        technicalDetails: technicalDetails,
+      );
+
+  factory AuthException.forbidden({String? technicalDetails}) => AuthException(
+    statusCode: 403,
+    userMessage: 'Du hast keine Berechtigung für diese Aktion.',
+    technicalDetails: technicalDetails,
+  );
+}

lib/api/errors/error_mapper.dart

@@ -0,0 +1,115 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:http/http.dart' as http;
+
+import '../api_error.dart';
+import '../marianumcloud/talk/talk_error.dart';
+import '../webuntis/webuntis_error.dart';
+import 'app_exception.dart';
+import 'network_exception.dart';
+import 'parse_exception.dart';
+import 'server_exception.dart';
+import 'talk_exception.dart';
+import 'webuntis_exception.dart';
+
+const String _defaultFallback =
+    'Etwas ist schiefgelaufen. Bitte versuche es erneut.';
+const String _tlsErrorMessage =
+    'Die sichere Verbindung zum Server wurde abgelehnt (Zertifikat oder TLS-Fehler). '
+    'Häufige Ursachen: falsche Geräte-Uhrzeit oder ein WLAN mit Anmeldeseite (z.B. Café/Hotel).';
+
+AppException? _dioToAppException(DioException error) {
+  switch (error.type) {
+    case DioExceptionType.connectionTimeout:
+    case DioExceptionType.sendTimeout:
+    case DioExceptionType.receiveTimeout:
+      return NetworkException.timeout(technicalDetails: error.message);
+    case DioExceptionType.connectionError:
+      return NetworkException(technicalDetails: error.message);
+    case DioExceptionType.badCertificate:
+      return const NetworkException(userMessage: _tlsErrorMessage);
+    case DioExceptionType.badResponse:
+      final status = error.response?.statusCode;
+      return ServerException(
+        statusCode: status ?? -1,
+        technicalDetails: 'HTTP $status: ${error.message}',
+      );
+    case DioExceptionType.cancel:
+    case DioExceptionType.unknown:
+      final inner = error.error;
+      if (inner is SocketException) {
+        return NetworkException(technicalDetails: inner.message);
+      }
+      if (inner is HandshakeException) {
+        return const NetworkException(userMessage: _tlsErrorMessage);
+      }
+      if (inner is FormatException) {
+        return ParseException(technicalDetails: inner.message);
+      }
+      return null;
+  }
+}
+
+String errorToUserMessage(Object? error, {String fallback = _defaultFallback}) {
+  if (error == null) return fallback;
+  if (error is AppException) return error.userMessage;
+
+  if (error is TalkError) return TalkException(error).userMessage;
+  if (error is WebuntisError) return WebuntisException(error).userMessage;
+
+  if (error is DioException) {
+    final mapped = _dioToAppException(error);
+    if (mapped != null) return mapped.userMessage;
+  }
+
+  if (error is SocketException) {
+    return const NetworkException().userMessage;
+  }
+  if (error is TimeoutException) {
+    return NetworkException.timeout().userMessage;
+  }
+  if (error is http.ClientException) {
+    return const NetworkException().userMessage;
+  }
+  if (error is HandshakeException) {
+    return _tlsErrorMessage;
+  }
+  if (error is FormatException) {
+    return const ParseException().userMessage;
+  }
+  if (error is ApiError) {
+    return _stripDioPrefix(error.message);
+  }
+
+  return fallback;
+}
+
+String? errorToTechnicalDetails(Object? error) {
+  if (error == null) return null;
+  if (error is AppException) return error.technicalDetails ?? error.toString();
+  if (error is TalkError) return TalkException(error).technicalDetails;
+  if (error is WebuntisError) return WebuntisException(error).technicalDetails;
+  if (error is DioException) {
+    final mapped = _dioToAppException(error);
+    if (mapped != null) return mapped.technicalDetails ?? mapped.toString();
+  }
+  return error.toString();
+}
+
+bool errorAllowsRetry(Object? error) {
+  if (error == null) return true;
+  if (error is AppException) return error.allowRetry;
+  if (error is DioException) {
+    final mapped = _dioToAppException(error);
+    if (mapped != null) return mapped.allowRetry;
+  }
+  return true;
+}
+
+String _stripDioPrefix(String raw) {
+  // ApiError messages embed full request URIs; only surface the first line.
+  final firstLine = raw.split('\n').first.trim();
+  return firstLine.isEmpty ? _defaultFallback : firstLine;
+}

lib/api/errors/network_exception.dart

@@ -0,0 +1,16 @@
+import 'app_exception.dart';
+
+class NetworkException extends AppException {
+  const NetworkException({
+    super.userMessage =
+        'Keine Internetverbindung. Bitte prüfe dein Netzwerk und versuche es erneut.',
+    super.technicalDetails,
+  }) : super(allowRetry: true);
+
+  factory NetworkException.timeout({String? technicalDetails}) =>
+      NetworkException(
+        userMessage:
+            'Der Server hat zu lange gebraucht. Bitte versuche es erneut.',
+        technicalDetails: technicalDetails,
+      );
+}

lib/api/errors/not_found_exception.dart

@@ -0,0 +1,8 @@
+import 'app_exception.dart';
+
+class NotFoundException extends AppException {
+  const NotFoundException({
+    super.userMessage = 'Der angeforderte Eintrag wurde nicht gefunden.',
+    super.technicalDetails,
+  }) : super(allowRetry: false);
+}

lib/api/errors/parse_exception.dart

@@ -0,0 +1,8 @@
+import 'app_exception.dart';
+
+class ParseException extends AppException {
+  const ParseException({
+    super.userMessage = 'Die Antwort des Servers konnte nicht gelesen werden.',
+    super.technicalDetails,
+  }) : super(allowRetry: true);
+}

lib/api/errors/server_exception.dart

@@ -0,0 +1,16 @@
+import 'app_exception.dart';
+
+class ServerException extends AppException {
+  final int statusCode;
+
+  ServerException({
+    required this.statusCode,
+    String? userMessage,
+    super.technicalDetails,
+  }) : super(
+         userMessage:
+             userMessage ??
+             'Der Server hat gerade Probleme (Status $statusCode). Bitte später erneut versuchen.',
+         allowRetry: true,
+       );
+}

lib/api/errors/talk_exception.dart

@@ -0,0 +1,36 @@
+import '../marianumcloud/talk/talk_error.dart';
+import 'app_exception.dart';
+
+class TalkException extends AppException {
+  final TalkError source;
+
+  TalkException(this.source)
+    : super(
+        userMessage: _mapMessage(source),
+        technicalDetails:
+            'Talk ${source.status} (${source.code}): ${source.message}',
+        allowRetry: source.code >= 500,
+      );
+
+  static String _mapMessage(TalkError e) {
+    switch (e.code) {
+      case 401:
+        return 'Bitte melde dich erneut an, um auf Talk zuzugreifen.';
+      case 403:
+        return 'Du hast keine Berechtigung für diese Talk-Aktion.';
+      case 404:
+        return 'Dieser Chat existiert nicht oder wurde entfernt.';
+      case 412:
+        return 'Diese Aktion ist im aktuellen Chat-Zustand nicht erlaubt.';
+      case 429:
+        return 'Zu viele Anfragen. Bitte kurz warten und erneut versuchen.';
+      default:
+        if (e.code >= 500) {
+          return 'Talk-Server hat gerade Probleme (${e.code}).';
+        }
+        return e.message.isNotEmpty
+            ? e.message
+            : 'Talk meldet einen Fehler (${e.code}).';
+    }
+  }
+}

lib/api/errors/webuntis_exception.dart

@@ -0,0 +1,31 @@
+import '../webuntis/webuntis_error.dart';
+import 'app_exception.dart';
+
+class WebuntisException extends AppException {
+  final WebuntisError source;
+
+  WebuntisException(this.source)
+    : super(
+        userMessage: _mapMessage(source),
+        technicalDetails: 'WebUntis (${source.code}): ${source.message}',
+        allowRetry: true,
+      );
+
+  static String _mapMessage(WebuntisError e) {
+    switch (e.code) {
+      case -8504:
+      case -8502:
+        return 'WebUntis-Anmeldung abgelaufen. Bitte erneut anmelden.';
+      case -8520:
+        return 'Bitte melde dich erneut an.';
+      case -7004:
+        return 'Für diesen Zeitraum sind keine Stundenplandaten verfügbar.';
+      case -32601:
+        return 'WebUntis kennt diese Anfrage nicht. Bitte App aktualisieren.';
+      default:
+        return e.message.isNotEmpty
+            ? 'WebUntis: ${e.message}'
+            : 'WebUntis konnte die Anfrage nicht bearbeiten (Code ${e.code}).';
+    }
+  }
+}

lib/api/holidays/getHolidays.dart

@@ -1,16 +0,0 @@
-import 'dart:convert';
-import 'package:http/http.dart' as http;
-
-import 'getHolidaysResponse.dart';
-
-class GetHolidays {
-  Future<GetHolidaysResponse> query() async {
-    var response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
-    var data = jsonDecode(response) as List<dynamic>;
-    return GetHolidaysResponse(
-        List<GetHolidaysResponseObject>.from(
-            data.map<GetHolidaysResponseObject>((e) => GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
-        )
-    );
-  }
-}

lib/api/holidays/getHolidaysCache.dart

@@ -1,26 +0,0 @@
-import 'dart:convert';
-
-import '../requestCache.dart';
-import 'getHolidays.dart';
-import 'getHolidaysResponse.dart';
-
-class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
-  GetHolidaysCache({onUpdate, renew}) : super(RequestCache.cacheDay, onUpdate, renew: renew) {
-    start('state-holidays');
-  }
-
-  @override
-  GetHolidaysResponse onLocalData(String json) {
-    List<dynamic> parsedListJson = jsonDecode(json)['data'];
-    return GetHolidaysResponse(
-      List<GetHolidaysResponseObject>.from(
-        parsedListJson.map<GetHolidaysResponseObject>(
-          (i) => GetHolidaysResponseObject.fromJson(i as Map<String, dynamic>)
-        )
-      )
-    );
-  }
-
-  @override
-  Future<GetHolidaysResponse> onLoad() => GetHolidays().query();
-}

lib/api/holidays/getHolidaysResponse.dart

@@ -1,38 +0,0 @@
-
-import 'package:json_annotation/json_annotation.dart';
-
-import '../apiResponse.dart';
-
-part 'getHolidaysResponse.g.dart';
-
-@JsonSerializable(explicitToJson: true)
-class GetHolidaysResponse extends ApiResponse {
-  List<GetHolidaysResponseObject> data;
-
-  GetHolidaysResponse(this.data);
-
-  factory GetHolidaysResponse.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseFromJson(json);
-  Map<String, dynamic> toJson() => _$GetHolidaysResponseToJson(this);
-}
-
-@JsonSerializable()
-class GetHolidaysResponseObject {
-  String start;
-  String end;
-  int year;
-  String stateCode;
-  String name;
-  String slug;
-
-  GetHolidaysResponseObject({
-    required this.start,
-    required this.end,
-    required this.year,
-    required this.stateCode,
-    required this.name,
-    required this.slug
-  });
-
-  factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
-  Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
-}

lib/api/holidays/getHolidaysResponse.g.dart

@@ -1,49 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getHolidaysResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
-    GetHolidaysResponse(
-        (json['data'] as List<dynamic>)
-            .map(
-              (e) =>
-                  GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toList(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      );
-
-Map<String, dynamic> _$GetHolidaysResponseToJson(
-  GetHolidaysResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'data': instance.data.map((e) => e.toJson()).toList(),
-};
-
-GetHolidaysResponseObject _$GetHolidaysResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetHolidaysResponseObject(
-  start: json['start'] as String,
-  end: json['end'] as String,
-  year: (json['year'] as num).toInt(),
-  stateCode: json['stateCode'] as String,
-  name: json['name'] as String,
-  slug: json['slug'] as String,
-);
-
-Map<String, dynamic> _$GetHolidaysResponseObjectToJson(
-  GetHolidaysResponseObject instance,
-) => <String, dynamic>{
-  'start': instance.start,
-  'end': instance.end,
-  'year': instance.year,
-  'stateCode': instance.stateCode,
-  'name': instance.name,
-  'slug': instance.slug,
-};

lib/api/marianumcloud/autocomplete/autocompleteApi.dart

@@ -1,32 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:http/http.dart' as http;
-
-import '../../../model/accountData.dart';
-import '../../../model/endpointData.dart';
-import 'autocompleteResponse.dart';
-
-class AutocompleteApi {
-  Future<AutocompleteResponse> find(String query) async {
-    var getParameters = <String, dynamic>{
-      'search': query,
-      'itemType': ' ',
-      'itemId': ' ',
-      'shareTypes[]': ['0'],
-      'limit': '10',
-    };
-
-    var headers = <String, String>{};
-    headers.putIfAbsent('Accept', () => 'application/json');
-    headers.putIfAbsent('OCS-APIRequest', () => 'true');
-
-    var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/core/autocomplete/get', getParameters);
-
-    var response = await http.get(endpoint, headers: headers);
-    if(response.statusCode != HttpStatus.ok) throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
-    var result = response.body;
-    return AutocompleteResponse.fromJson(jsonDecode(result)['ocs']);
-  }
-
-}

lib/api/marianumcloud/autocomplete/autocomplete_api.dart

@@ -0,0 +1,32 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:http/http.dart' as http;
+
+import '../nextcloud_ocs.dart';
+import 'autocomplete_response.dart';
+
+class AutocompleteApi {
+  Future<AutocompleteResponse> find(String query) async {
+    final endpoint = NextcloudOcs.uri(
+      'core/autocomplete/get',
+      queryParameters: {
+        'search': query,
+        'itemType': ' ',
+        'itemId': ' ',
+        'shareTypes[]': ['0'],
+        'limit': '10',
+      },
+    );
+    final response = await http.get(endpoint, headers: NextcloudOcs.headers());
+    if (response.statusCode != HttpStatus.ok) {
+      throw Exception(
+        'Api call failed with ${response.statusCode}: ${response.body}',
+      );
+    }
+    final decoded = jsonDecode(response.body) as Map<String, dynamic>;
+    return AutocompleteResponse.fromJson(
+      decoded['ocs'] as Map<String, dynamic>,
+    );
+  }
+}

lib/api/marianumcloud/autocomplete/autocomplete_response.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'autocompleteResponse.g.dart';
+part 'autocomplete_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class AutocompleteResponse {
@@ -8,7 +8,8 @@ class AutocompleteResponse {
 
   AutocompleteResponse(this.data);
 
-  factory AutocompleteResponse.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseFromJson(json);
+  factory AutocompleteResponse.fromJson(Map<String, dynamic> json) =>
+      _$AutocompleteResponseFromJson(json);
   Map<String, dynamic> toJson() => _$AutocompleteResponseToJson(this);
 }
 
@@ -22,9 +23,17 @@ class AutocompleteResponseObject {
   String? subline;
   String? shareWithDisplayNameUniqe;
 
-  AutocompleteResponseObject(this.id, this.label, this.icon, this.source, this.status,
-      this.subline, this.shareWithDisplayNameUniqe);
+  AutocompleteResponseObject(
+    this.id,
+    this.label,
+    this.icon,
+    this.source,
+    this.status,
+    this.subline,
+    this.shareWithDisplayNameUniqe,
+  );
 
-  factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseObjectFromJson(json);
+  factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$AutocompleteResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$AutocompleteResponseObjectToJson(this);
 }

lib/api/marianumcloud/autocomplete/autocomplete_response.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'autocompleteResponse.dart';
+part of 'autocomplete_response.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/files-sharing/fileSharingApi.dart

@@ -1,22 +0,0 @@
-import 'dart:io';
-
-import 'package:http/http.dart' as http;
-
-import '../../../model/accountData.dart';
-import '../../../model/endpointData.dart';
-import 'fileSharingApiParams.dart';
-
-class FileSharingApi {
-  Future<void> share(FileSharingApiParams query) async {
-    var headers = <String, String>{};
-    headers.putIfAbsent('Accept', () => 'application/json');
-    headers.putIfAbsent('OCS-APIRequest', () => 'true');
-
-    var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/files_sharing/api/v1/shares', query.toJson().map((key, value) => MapEntry(key, value.toString())));
-    var response = await http.post(endpoint, headers: headers);
-
-    if(response.statusCode != HttpStatus.ok) {
-      throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
-    }
-  }
-}

lib/api/marianumcloud/files_sharing/file_sharing_api.dart

@@ -0,0 +1,21 @@
+import 'dart:io';
+
+import 'package:http/http.dart' as http;
+
+import '../nextcloud_ocs.dart';
+import 'file_sharing_api_params.dart';
+
+class FileSharingApi {
+  Future<void> share(FileSharingApiParams query) async {
+    final endpoint = NextcloudOcs.uri(
+      'apps/files_sharing/api/v1/shares',
+      queryParameters: query.toJson(),
+    );
+    final response = await http.post(endpoint, headers: NextcloudOcs.headers());
+    if (response.statusCode != HttpStatus.ok) {
+      throw Exception(
+        'Api call failed with ${response.statusCode}: ${response.body}',
+      );
+    }
+  }
+}

lib/api/marianumcloud/files_sharing/file_sharing_api_params.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'fileSharingApiParams.g.dart';
+part 'file_sharing_api_params.g.dart';
 
 @JsonSerializable()
 class FileSharingApiParams {
@@ -15,9 +15,10 @@ class FileSharingApiParams {
     required this.shareWith,
     required this.path,
     this.referenceId,
-    this.talkMetaData
+    this.talkMetaData,
   });
 
-  factory FileSharingApiParams.fromJson(Map<String, dynamic> json) => _$FileSharingApiParamsFromJson(json);
+  factory FileSharingApiParams.fromJson(Map<String, dynamic> json) =>
+      _$FileSharingApiParamsFromJson(json);
   Map<String, dynamic> toJson() => _$FileSharingApiParamsToJson(this);
 }

lib/api/marianumcloud/files_sharing/file_sharing_api_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'fileSharingApiParams.dart';
+part of 'file_sharing_api_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/nextcloud_ocs.dart

@@ -0,0 +1,23 @@
+import '../../model/account_data.dart';
+import '../../model/endpoint_data.dart';
+
+/// Shared headers and URI builder for Nextcloud OCS v2 endpoints. Used by
+/// TalkApi, AutocompleteApi, FileSharingApi.
+class NextcloudOcs {
+  NextcloudOcs._();
+
+  static Map<String, String> headers() => {
+    'Accept': 'application/json',
+    'OCS-APIRequest': 'true',
+    'Authorization': AccountData().getBasicAuthHeader(),
+  };
+
+  static Uri uri(String pathSuffix, {Map<String, dynamic>? queryParameters}) {
+    final endpoint = EndpointData().nextcloud();
+    return Uri.https(
+      endpoint.domain,
+      '${endpoint.path}/ocs/v2.php/$pathSuffix',
+      queryParameters?.map((key, value) => MapEntry(key, value.toString())),
+    );
+  }
+}

lib/api/marianumcloud/talk/actions/talk_actions.dart

@@ -0,0 +1,64 @@
+import 'package:http/http.dart' as http;
+
+import '../../../api_params.dart';
+import '../../../api_response.dart';
+import '../talk_api.dart';
+
+/// Small POST/DELETE-only Talk endpoints that have no response payload.
+/// Each class extends [TalkApi] with `assemble` returning `null`. They share
+/// no state — they're collected here purely to avoid eight near-empty files.
+
+class SetFavorite extends TalkApi {
+  final String chatToken;
+  final bool favoriteState;
+
+  SetFavorite(this.chatToken, this.favoriteState)
+    : super('v4/room/$chatToken/favorite', null);
+
+  @override
+  ApiResponse? assemble(String raw) => null;
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => favoriteState
+      ? http.post(uri, headers: headers)
+      : http.delete(uri, headers: headers);
+}
+
+class LeaveRoom extends TalkApi {
+  final String chatToken;
+
+  LeaveRoom(this.chatToken)
+    : super('v4/room/$chatToken/participants/self', null);
+
+  @override
+  ApiResponse? assemble(String raw) => null;
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => http.delete(uri, headers: headers);
+}
+
+class DeleteMessage extends TalkApi {
+  final String chatToken;
+  final int messageId;
+
+  DeleteMessage(this.chatToken, this.messageId)
+    : super('v1/chat/$chatToken/$messageId', null);
+
+  @override
+  ApiResponse? assemble(String raw) => null;
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => http.delete(uri, headers: headers);
+}

lib/api/marianumcloud/talk/chat/getChat.dart

@@ -1,22 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-import 'getChatParams.dart';
-import 'getChatResponse.dart';
-
-class GetChat extends TalkApi<GetChatResponse> {
-  String chatToken;
-
-  GetChatParams params;
-  GetChat(this.chatToken, this.params) : super('v1/chat/$chatToken', null, getParameters: params.toJson());
-
-  @override
-  assemble(String raw) => GetChatResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-  
-}

lib/api/marianumcloud/talk/chat/getChatCache.dart

@@ -1,28 +0,0 @@
-import 'dart:convert';
-
-import '../../../requestCache.dart';
-import 'getChat.dart';
-import 'getChatParams.dart';
-import 'getChatResponse.dart';
-
-class GetChatCache extends RequestCache<GetChatResponse> {
-  String chatToken;
-
-  GetChatCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
-    start('nc-chat-$chatToken');
-  }
-
-  @override
-  Future<GetChatResponse> onLoad() => GetChat(
-      chatToken,
-      GetChatParams(
-        lookIntoFuture: GetChatParamsSwitch.off,
-        setReadMarker: GetChatParamsSwitch.on,
-        limit: 200,
-      )
-    ).run();
-
-  @override
-  GetChatResponse onLocalData(String json) => GetChatResponse.fromJson(jsonDecode(json));
-
-}

lib/api/marianumcloud/talk/chat/get_chat.dart

@@ -0,0 +1,29 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../talk_api.dart';
+import 'get_chat_params.dart';
+import 'get_chat_response.dart';
+
+class GetChat extends TalkApi<GetChatResponse> {
+  String chatToken;
+
+  GetChatParams params;
+  GetChat(this.chatToken, this.params)
+    : super('v1/chat/$chatToken', null, getParameters: params.toJson());
+
+  @override
+  GetChatResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetChatResponse.fromJson(decoded['ocs'] as Map<String, dynamic>);
+  }
+
+  @override
+  Future<Response> request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

lib/api/marianumcloud/talk/chat/get_chat_cache.dart

@@ -0,0 +1,26 @@
+import '../../../request_cache.dart';
+import 'get_chat.dart';
+import 'get_chat_params.dart';
+import 'get_chat_response.dart';
+
+class GetChatCache extends SimpleCache<GetChatResponse> {
+  GetChatCache({
+    super.onCacheData,
+    super.onNetworkData,
+    super.onError,
+    required String chatToken,
+  }) : super(
+         cacheTime: RequestCache.cacheNothing,
+         loader: () => GetChat(
+           chatToken,
+           GetChatParams(
+             lookIntoFuture: GetChatParamsSwitch.off,
+             setReadMarker: GetChatParamsSwitch.on,
+             limit: 200,
+           ),
+         ).run(),
+         fromJson: GetChatResponse.fromJson,
+       ) {
+    start('nc-chat-$chatToken');
+  }
+}

lib/api/marianumcloud/talk/chat/get_chat_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'getChatParams.g.dart';
+part 'get_chat_params.g.dart';
 
 @JsonSerializable(explicitToJson: true, includeIfNull: false)
 class GetChatParams extends ApiParams {
@@ -15,20 +15,23 @@ class GetChatParams extends ApiParams {
   GetChatParamsSwitch? includeLastKnown;
 
   GetChatParams({
-      required this.lookIntoFuture,
-      this.limit,
-      this.lastKnownMessageId,
-      this.lastCommonReadId,
-      this.timeout,
-      this.setReadMarker,
-      this.includeLastKnown
+    required this.lookIntoFuture,
+    this.limit,
+    this.lastKnownMessageId,
+    this.lastCommonReadId,
+    this.timeout,
+    this.setReadMarker,
+    this.includeLastKnown,
   });
 
-  factory GetChatParams.fromJson(Map<String, dynamic> json) => _$GetChatParamsFromJson(json);
+  factory GetChatParams.fromJson(Map<String, dynamic> json) =>
+      _$GetChatParamsFromJson(json);
   Map<String, dynamic> toJson() => _$GetChatParamsToJson(this);
 }
 
 enum GetChatParamsSwitch {
-  @JsonValue(1) on,
-  @JsonValue(0) off,
+  @JsonValue(1)
+  on,
+  @JsonValue(0)
+  off,
 }

lib/api/marianumcloud/talk/chat/get_chat_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getChatParams.dart';
+part of 'get_chat_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/chat/get_chat_response.dart

@@ -1,10 +1,10 @@
-import 'package:jiffy/jiffy.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiResponse.dart';
-import '../room/getRoomResponse.dart';
+import '../../../../extensions/date_time.dart';
+import '../../../api_response.dart';
+import '../room/get_room_response.dart';
 
-part 'getChatResponse.g.dart';
+part 'get_chat_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetChatResponse extends ApiResponse {
@@ -12,7 +12,8 @@ class GetChatResponse extends ApiResponse {
 
   GetChatResponse(this.data);
 
-  factory GetChatResponse.fromJson(Map<String, dynamic> json) => _$GetChatResponseFromJson(json);
+  factory GetChatResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetChatResponseFromJson(json);
   Map<String, dynamic> toJson() => _$GetChatResponseToJson(this);
 
   List<GetChatResponseObject> sortByTimestamp() {
@@ -37,36 +38,39 @@ class GetChatResponseObject {
   String message;
   Map<String, int>? reactions;
   List<String>? reactionsSelf;
-  @JsonKey(fromJson: _fromJson) Map<String, RichObjectString>? messageParameters;
+  @JsonKey(fromJson: _fromJson)
+  Map<String, RichObjectString>? messageParameters;
   GetChatResponseObject? parent;
 
   GetChatResponseObject(
-      this.id,
-      this.token,
-      this.actorType,
-      this.actorId,
-      this.actorDisplayName,
-      this.timestamp,
-      this.systemMessage,
-      this.messageType,
-      this.isReplyable,
-      this.referenceId,
-      this.message,
-      this.messageParameters,
-      this.reactions,
-      this.reactionsSelf,
-      this.parent,
+    this.id,
+    this.token,
+    this.actorType,
+    this.actorId,
+    this.actorDisplayName,
+    this.timestamp,
+    this.systemMessage,
+    this.messageType,
+    this.isReplyable,
+    this.referenceId,
+    this.message,
+    this.messageParameters,
+    this.reactions,
+    this.reactionsSelf,
+    this.parent,
   );
 
-  factory GetChatResponseObject.fromJson(Map<String, dynamic> json) => _$GetChatResponseObjectFromJson(json);
+  factory GetChatResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetChatResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$GetChatResponseObjectToJson(this);
 
   static GetChatResponseObject getDateDummy(int timestamp) {
     var elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
-    return getTextDummy(Jiffy.parseFromDateTime(elementDate).format(pattern: 'dd.MM.yyyy'));
+    return getTextDummy(elementDate.formatDate());
   }
 
-  static GetChatResponseObject getTextDummy(String text) => GetChatResponseObject(
+  static GetChatResponseObject getTextDummy(String text) =>
+      GetChatResponseObject(
         0,
         '',
         GetRoomResponseObjectMessageActorType.user,
@@ -82,15 +86,17 @@ class GetChatResponseObject {
         null,
         null,
         null,
-    );
-
+      );
 }
 
-Map<String, RichObjectString>? _fromJson(json) {
-  if(json is Map<String, dynamic>) {
-    var data = <String, RichObjectString>{};
-    for (var element in json.keys) {
-      data.putIfAbsent(element, () => RichObjectString.fromJson(json[element]));
+Map<String, RichObjectString>? _fromJson(dynamic json) {
+  if (json is Map<String, dynamic>) {
+    final data = <String, RichObjectString>{};
+    for (final element in json.keys) {
+      data.putIfAbsent(
+        element,
+        () => RichObjectString.fromJson(json[element] as Map<String, dynamic>),
+      );
     }
     return data;
   }
@@ -109,17 +115,26 @@ class RichObjectString {
 
   RichObjectString(this.type, this.id, this.name, this.path, this.link);
 
-  factory RichObjectString.fromJson(Map<String, dynamic> json) => _$RichObjectStringFromJson(json);
+  factory RichObjectString.fromJson(Map<String, dynamic> json) =>
+      _$RichObjectStringFromJson(json);
   Map<String, dynamic> toJson() => _$RichObjectStringToJson(this);
 }
 
 enum RichObjectStringObjectType {
-  @JsonValue('user') user,
-  @JsonValue('group') group,
-  @JsonValue('file') file,
-  @JsonValue('guest') guest,
-  @JsonValue('highlight') highlight,
-  @JsonValue('talk-poll') talkPoll,
-  @JsonValue('geo-location') geoLocation,
-  @JsonValue('call') call,
+  @JsonValue('user')
+  user,
+  @JsonValue('group')
+  group,
+  @JsonValue('file')
+  file,
+  @JsonValue('guest')
+  guest,
+  @JsonValue('highlight')
+  highlight,
+  @JsonValue('talk-poll')
+  talkPoll,
+  @JsonValue('geo-location')
+  geoLocation,
+  @JsonValue('call')
+  call,
 }

lib/api/marianumcloud/talk/chat/get_chat_response.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getChatResponse.dart';
+part of 'get_chat_response.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/chat/rich_object_string_processor.dart

@@ -1,9 +1,11 @@
-
-import 'getChatResponse.dart';
+import 'get_chat_response.dart';
 
 class RichObjectStringProcessor {
-  static String parseToString(String message, Map<String, RichObjectString>? data) {
-    if(data == null) return message;
+  static String parseToString(
+    String message,
+    Map<String, RichObjectString>? data,
+  ) {
+    if (data == null) return message;
 
     data.forEach((key, value) {
       message = message.replaceAll(RegExp('{$key}'), value.name);

lib/api/marianumcloud/talk/createRoom/createRoom.dart

@@ -1,23 +0,0 @@
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-import 'createRoomParams.dart';
-class CreateRoom extends TalkApi {
-  CreateRoomParams params;
-
-  CreateRoom(this.params) : super('v4/room', params);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
-    if(body is CreateRoomParams) {
-      return http.post(uri, headers: headers, body: body.toJson().map((key, value) => MapEntry(key, value.toString())));
-    }
-
-    return null;
-  }
-}

lib/api/marianumcloud/talk/create_room/create_room.dart

@@ -0,0 +1,33 @@
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../talk_api.dart';
+import 'create_room_params.dart';
+
+class CreateRoom extends TalkApi {
+  CreateRoomParams params;
+
+  CreateRoom(this.params) : super('v4/room', params);
+
+  @override
+  Null assemble(String raw) => null;
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) {
+    if (body is CreateRoomParams) {
+      return http.post(
+        uri,
+        headers: headers,
+        body: body.toJson().map(
+          (key, value) => MapEntry(key, value.toString()),
+        ),
+      );
+    }
+
+    return null;
+  }
+}

lib/api/marianumcloud/talk/create_room/create_room_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'createRoomParams.g.dart';
+part 'create_room_params.g.dart';
 
 @JsonSerializable()
 class CreateRoomParams extends ApiParams {
@@ -19,9 +19,10 @@ class CreateRoomParams extends ApiParams {
     this.source,
     this.roomName,
     this.objectType,
-    this.objectId
+    this.objectId,
   });
 
-  factory CreateRoomParams.fromJson(Map<String, dynamic> json) => _$CreateRoomParamsFromJson(json);
+  factory CreateRoomParams.fromJson(Map<String, dynamic> json) =>
+      _$CreateRoomParamsFromJson(json);
   Map<String, dynamic> toJson() => _$CreateRoomParamsToJson(this);
 }

lib/api/marianumcloud/talk/create_room/create_room_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'createRoomParams.dart';
+part of 'create_room_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/deleteMessage/deleteMessage.dart

@@ -1,18 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-
-class DeleteMessage extends TalkApi {
-  String chatToken;
-  int messageId;
-  DeleteMessage(this.chatToken, this.messageId) : super('v1/chat/$chatToken/$messageId', null);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) => http.delete(uri, headers: headers);
-
-}

lib/api/marianumcloud/talk/deleteReactMessage/deleteReactMessage.dart

@@ -1,24 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-import 'deleteReactMessageParams.dart';
-
-class DeleteReactMessage extends TalkApi {
-  String chatToken;
-  int messageId;
-  DeleteReactMessage({required this.chatToken, required this.messageId, required DeleteReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
-    if(body is DeleteReactMessageParams) {
-      return http.delete(uri, headers: headers, body: body.toJson());
-    }
-    return null;
-  }
-
-}

lib/api/marianumcloud/talk/delete_react_message/delete_react_message.dart

@@ -0,0 +1,31 @@
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../../../api_params.dart';
+import '../talk_api.dart';
+import 'delete_react_message_params.dart';
+
+class DeleteReactMessage extends TalkApi {
+  String chatToken;
+  int messageId;
+  DeleteReactMessage({
+    required this.chatToken,
+    required this.messageId,
+    required DeleteReactMessageParams params,
+  }) : super('v1/reaction/$chatToken/$messageId', params);
+
+  @override
+  Null assemble(String raw) => null;
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) {
+    if (body is DeleteReactMessageParams) {
+      return http.delete(uri, headers: headers, body: body.toJson());
+    }
+    return null;
+  }
+}

lib/api/marianumcloud/talk/delete_react_message/delete_react_message_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'deleteReactMessageParams.g.dart';
+part 'delete_react_message_params.g.dart';
 
 @JsonSerializable()
 class DeleteReactMessageParams extends ApiParams {
@@ -10,6 +10,7 @@ class DeleteReactMessageParams extends ApiParams {
 
   DeleteReactMessageParams(this.reaction);
 
-  factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) => _$DeleteReactMessageParamsFromJson(json);
+  factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) =>
+      _$DeleteReactMessageParamsFromJson(json);
   Map<String, dynamic> toJson() => _$DeleteReactMessageParamsToJson(this);
 }

lib/api/marianumcloud/talk/delete_react_message/delete_react_message_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'deleteReactMessageParams.dart';
+part of 'delete_react_message_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/getParticipants/getParticipants.dart

@@ -1,18 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import '../talkApi.dart';
-import 'getParticipantsResponse.dart';
-
-class GetParticipants extends TalkApi<GetParticipantsResponse> {
-  String token;
-  GetParticipants(this.token) : super('v4/room/$token/participants', null);
-
-  @override
-  GetParticipantsResponse assemble(String raw) => GetParticipantsResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-
-}

lib/api/marianumcloud/talk/getParticipants/getParticipantsCache.dart

@@ -1,22 +0,0 @@
-import 'dart:convert';
-
-import '../../../requestCache.dart';
-import 'getParticipants.dart';
-import 'getParticipantsResponse.dart';
-
-class GetParticipantsCache extends RequestCache<GetParticipantsResponse> {
-  String chatToken;
-
-  GetParticipantsCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
-    start('nc-chat-participants-$chatToken');
-  }
-
-  @override
-  Future<GetParticipantsResponse> onLoad() => GetParticipants(
-        chatToken,
-    ).run();
-
-  @override
-  GetParticipantsResponse onLocalData(String json) => GetParticipantsResponse.fromJson(jsonDecode(json));
-
-}

lib/api/marianumcloud/talk/getPoll/getPollState.dart

@@ -1,18 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import '../talkApi.dart';
-import 'getPollStateResponse.dart';
-
-class GetPollState extends TalkApi<GetPollStateResponse> {
-  String token;
-  int pollId;
-  GetPollState({required this.token, required this.pollId}) : super('v1/poll/$token/$pollId', null);
-
-  @override
-  GetPollStateResponse assemble(String raw) => GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-}

lib/api/marianumcloud/talk/getReactions/getReactions.dart

@@ -1,21 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-import 'getReactionsResponse.dart';
-
-class GetReactions extends TalkApi<GetReactionsResponse> {
-  String chatToken;
-  int messageId;
-  GetReactions({required this.chatToken, required this.messageId}) : super('v1/reaction/$chatToken/$messageId', null);
-
-  @override
-  assemble(String raw) => GetReactionsResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-
-}

lib/api/marianumcloud/talk/get_participants/get_participants.dart

@@ -0,0 +1,26 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+
+import '../talk_api.dart';
+import 'get_participants_response.dart';
+
+class GetParticipants extends TalkApi<GetParticipantsResponse> {
+  String token;
+  GetParticipants(this.token) : super('v4/room/$token/participants', null);
+
+  @override
+  GetParticipantsResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetParticipantsResponse.fromJson(
+      decoded['ocs'] as Map<String, dynamic>,
+    );
+  }
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

lib/api/marianumcloud/talk/get_participants/get_participants_cache.dart

@@ -0,0 +1,17 @@
+import '../../../request_cache.dart';
+import 'get_participants.dart';
+import 'get_participants_response.dart';
+
+class GetParticipantsCache extends SimpleCache<GetParticipantsResponse> {
+  GetParticipantsCache({
+    required void Function(GetParticipantsResponse) onUpdate,
+    required String chatToken,
+  }) : super(
+         cacheTime: RequestCache.cacheNothing,
+         loader: () => GetParticipants(chatToken).run(),
+         fromJson: GetParticipantsResponse.fromJson,
+         onUpdate: onUpdate,
+       ) {
+    start('nc-chat-participants-$chatToken');
+  }
+}

lib/api/marianumcloud/talk/get_participants/get_participants_response.dart

@@ -1,9 +1,8 @@
-
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiResponse.dart';
+import '../../../api_response.dart';
 
-part 'getParticipantsResponse.g.dart';
+part 'get_participants_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetParticipantsResponse extends ApiResponse {
@@ -11,7 +10,8 @@ class GetParticipantsResponse extends ApiResponse {
 
   GetParticipantsResponse(this.data);
 
-  factory GetParticipantsResponse.fromJson(Map<String, dynamic> json) => _$GetParticipantsResponseFromJson(json);
+  factory GetParticipantsResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetParticipantsResponseFromJson(json);
   Map<String, dynamic> toJson() => _$GetParticipantsResponseToJson(this);
 }
 
@@ -34,42 +34,55 @@ class GetParticipantsResponseObject {
   String? roomToken;
 
   GetParticipantsResponseObject(
-      this.attendeeId,
-      this.actorType,
-      this.actorId,
-      this.displayName,
-      this.participantType,
-      this.lastPing,
-      this.inCall,
-      this.permissions,
-      this.attendeePermissions,
-      this.sessionId,
-      this.sessionIds,
-      this.status,
-      this.statusIcon,
-      this.statusMessage,
-      this.roomToken);
+    this.attendeeId,
+    this.actorType,
+    this.actorId,
+    this.displayName,
+    this.participantType,
+    this.lastPing,
+    this.inCall,
+    this.permissions,
+    this.attendeePermissions,
+    this.sessionId,
+    this.sessionIds,
+    this.status,
+    this.statusIcon,
+    this.statusMessage,
+    this.roomToken,
+  );
 
-  factory GetParticipantsResponseObject.fromJson(Map<String, dynamic> json) => _$GetParticipantsResponseObjectFromJson(json);
+  factory GetParticipantsResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetParticipantsResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$GetParticipantsResponseObjectToJson(this);
 }
 
 enum GetParticipantsResponseObjectParticipantType {
-  @JsonValue(1) owner('Besitzer'),
-  @JsonValue(2) moderator('Moderator'),
-  @JsonValue(3) user('Teilnehmer'),
-  @JsonValue(4) guest('Gast'),
-  @JsonValue(5) userFollowingPublicLink('Teilnehmer über Link'),
-  @JsonValue(6) guestWithModeratorPermissions('Gast Moderator');
+  @JsonValue(1)
+  owner('Besitzer'),
+  @JsonValue(2)
+  moderator('Moderator'),
+  @JsonValue(3)
+  user('Teilnehmer'),
+  @JsonValue(4)
+  guest('Gast'),
+  @JsonValue(5)
+  userFollowingPublicLink('Teilnehmer über Link'),
+  @JsonValue(6)
+  guestWithModeratorPermissions('Gast Moderator');
 
   const GetParticipantsResponseObjectParticipantType(this.prettyName);
   final String prettyName;
 }
 
 enum GetParticipantsResponseObjectParticipantsInCallFlags {
-  @JsonValue(0) disconnected,
-  @JsonValue(1) inCall,
-  @JsonValue(2) providesAudio,
-  @JsonValue(3) providesVideo,
-  @JsonValue(4) usesSipDialIn
+  @JsonValue(0)
+  disconnected,
+  @JsonValue(1)
+  inCall,
+  @JsonValue(2)
+  providesAudio,
+  @JsonValue(3)
+  providesVideo,
+  @JsonValue(4)
+  usesSipDialIn,
 }

lib/api/marianumcloud/talk/get_participants/get_participants_response.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getParticipantsResponse.dart';
+part of 'get_participants_response.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/get_poll/get_poll_state.dart

@@ -0,0 +1,28 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+
+import '../talk_api.dart';
+import 'get_poll_state_response.dart';
+
+class GetPollState extends TalkApi<GetPollStateResponse> {
+  String token;
+  int pollId;
+  GetPollState({required this.token, required this.pollId})
+    : super('v1/poll/$token/$pollId', null);
+
+  @override
+  GetPollStateResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetPollStateResponse.fromJson(
+      decoded['ocs'] as Map<String, dynamic>,
+    );
+  }
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

lib/api/marianumcloud/talk/get_poll/get_poll_state_response.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiResponse.dart';
+import '../../../api_response.dart';
 
-part 'getPollStateResponse.g.dart';
+part 'get_poll_state_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetPollStateResponse extends ApiResponse {
@@ -10,7 +10,8 @@ class GetPollStateResponse extends ApiResponse {
 
   GetPollStateResponse(this.data);
 
-  factory GetPollStateResponse.fromJson(Map<String, dynamic> json) => _$GetPollStateResponseFromJson(json);
+  factory GetPollStateResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetPollStateResponseFromJson(json);
   Map<String, dynamic> toJson() => _$GetPollStateResponseToJson(this);
 }
 
@@ -31,20 +32,22 @@ class GetPollStateResponseObject {
   List<dynamic>? details;
 
   GetPollStateResponseObject(
-      this.id,
-      this.question,
-      this.options,
-      this.votes,
-      this.actorType,
-      this.actorId,
-      this.actorDisplayName,
-      this.status,
-      this.resultMode,
-      this.maxVotes,
-      this.votedSelf,
-      this.numVoters,
-      this.details);
+    this.id,
+    this.question,
+    this.options,
+    this.votes,
+    this.actorType,
+    this.actorId,
+    this.actorDisplayName,
+    this.status,
+    this.resultMode,
+    this.maxVotes,
+    this.votedSelf,
+    this.numVoters,
+    this.details,
+  );
 
-  factory GetPollStateResponseObject.fromJson(Map<String, dynamic> json) => _$GetPollStateResponseObjectFromJson(json);
+  factory GetPollStateResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetPollStateResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$GetPollStateResponseObjectToJson(this);
 }

lib/api/marianumcloud/talk/get_poll/get_poll_state_response.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getPollStateResponse.dart';
+part of 'get_poll_state_response.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/get_reactions/get_reactions.dart

@@ -0,0 +1,30 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../../../api_params.dart';
+import '../talk_api.dart';
+import 'get_reactions_response.dart';
+
+class GetReactions extends TalkApi<GetReactionsResponse> {
+  String chatToken;
+  int messageId;
+  GetReactions({required this.chatToken, required this.messageId})
+    : super('v1/reaction/$chatToken/$messageId', null);
+
+  @override
+  GetReactionsResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetReactionsResponse.fromJson(
+      decoded['ocs'] as Map<String, dynamic>,
+    );
+  }
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

lib/api/marianumcloud/talk/get_reactions/get_reactions_response.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiResponse.dart';
+import '../../../api_response.dart';
 
-part 'getReactionsResponse.g.dart';
+part 'get_reactions_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetReactionsResponse extends ApiResponse {
@@ -10,7 +10,8 @@ class GetReactionsResponse extends ApiResponse {
 
   GetReactionsResponse(this.data);
 
-  factory GetReactionsResponse.fromJson(Map<String, dynamic> json) => _$GetReactionsResponseFromJson(json);
+  factory GetReactionsResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetReactionsResponseFromJson(json);
   Map<String, dynamic> toJson() => _$GetReactionsResponseToJson(this);
 }
 
@@ -21,13 +22,21 @@ class GetReactionsResponseObject {
   String actorDisplayName;
   int timestamp;
 
-  GetReactionsResponseObject(this.actorType, this.actorId, this.actorDisplayName, this.timestamp);
+  GetReactionsResponseObject(
+    this.actorType,
+    this.actorId,
+    this.actorDisplayName,
+    this.timestamp,
+  );
 
-  factory GetReactionsResponseObject.fromJson(Map<String, dynamic> json) => _$GetReactionsResponseObjectFromJson(json);
+  factory GetReactionsResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetReactionsResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$GetReactionsResponseObjectToJson(this);
 }
 
 enum GetReactionsResponseObjectActorType {
-  @JsonValue('guests') guests,
-  @JsonValue('users') users,
+  @JsonValue('guests')
+  guests,
+  @JsonValue('users')
+  users,
 }

lib/api/marianumcloud/talk/get_reactions/get_reactions_response.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getReactionsResponse.dart';
+part of 'get_reactions_response.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/leaveRoom/leaveRoom.dart

@@ -1,16 +0,0 @@
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-class LeaveRoom extends TalkApi {
-  String chatToken;
-
-  LeaveRoom(this.chatToken) : super('v4/room/$chatToken/participants/self', null);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.delete(uri, headers: headers);
-}

lib/api/marianumcloud/talk/reactMessage/reactMessage.dart

@@ -1,24 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-import 'reactMessageParams.dart';
-
-class ReactMessage extends TalkApi {
-  String chatToken;
-  int messageId;
-  ReactMessage({required this.chatToken, required this.messageId, required ReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
-    if(body is ReactMessageParams) {
-      return http.post(uri, headers: headers, body: body.toJson());
-    }
-    return null;
-  }
-
-}

lib/api/marianumcloud/talk/react_message/react_message.dart

@@ -0,0 +1,31 @@
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../../../api_params.dart';
+import '../talk_api.dart';
+import 'react_message_params.dart';
+
+class ReactMessage extends TalkApi {
+  String chatToken;
+  int messageId;
+  ReactMessage({
+    required this.chatToken,
+    required this.messageId,
+    required ReactMessageParams params,
+  }) : super('v1/reaction/$chatToken/$messageId', params);
+
+  @override
+  Null assemble(String raw) => null;
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) {
+    if (body is ReactMessageParams) {
+      return http.post(uri, headers: headers, body: body.toJson());
+    }
+    return null;
+  }
+}

lib/api/marianumcloud/talk/react_message/react_message_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'reactMessageParams.g.dart';
+part 'react_message_params.g.dart';
 
 @JsonSerializable()
 class ReactMessageParams extends ApiParams {
@@ -10,6 +10,7 @@ class ReactMessageParams extends ApiParams {
 
   ReactMessageParams(this.reaction);
 
-  factory ReactMessageParams.fromJson(Map<String, dynamic> json) => _$ReactMessageParamsFromJson(json);
+  factory ReactMessageParams.fromJson(Map<String, dynamic> json) =>
+      _$ReactMessageParamsFromJson(json);
   Map<String, dynamic> toJson() => _$ReactMessageParamsToJson(this);
 }

lib/api/marianumcloud/talk/react_message/react_message_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'reactMessageParams.dart';
+part of 'react_message_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/room/getRoom.dart

@@ -1,22 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import '../talkApi.dart';
-import 'getRoomParams.dart';
-import 'getRoomResponse.dart';
-
-
-class GetRoom extends TalkApi<GetRoomResponse> {
-  GetRoomParams params;
-  GetRoom(this.params) : super('v4/room', null, getParameters: params.toJson());
-
-
-
-  @override
-  GetRoomResponse assemble(String raw) => GetRoomResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-
-}

lib/api/marianumcloud/talk/room/getRoomCache.dart

@@ -1,23 +0,0 @@
-import 'dart:convert';
-
-
-import '../../../requestCache.dart';
-import 'getRoom.dart';
-import 'getRoomParams.dart';
-import 'getRoomResponse.dart';
-
-class GetRoomCache extends RequestCache<GetRoomResponse> {
-  GetRoomCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
-    start('nc-rooms');
-  }
-
-  @override
-  GetRoomResponse onLocalData(String json) => GetRoomResponse.fromJson(jsonDecode(json));
-
-  @override
-  Future<GetRoomResponse> onLoad() => GetRoom(
-      GetRoomParams(
-        includeStatus: true,
-      )
-    ).run();
-}

lib/api/marianumcloud/talk/room/getRoomResponse.dart

@@ -1,169 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../../apiResponse.dart';
-import '../chat/getChatResponse.dart';
-
-part 'getRoomResponse.g.dart';
-
-@JsonSerializable(explicitToJson: true)
-class GetRoomResponse extends ApiResponse {
-  Set<GetRoomResponseObject> data;
-
-  GetRoomResponse(this.data);
-
-  factory GetRoomResponse.fromJson(Map<String, dynamic> json) => _$GetRoomResponseFromJson(json);
-  Map<String, dynamic> toJson() => _$GetRoomResponseToJson(this);
-
-  List<GetRoomResponseObject> sortBy({bool lastActivity = true, required bool favoritesToTop, required bool unreadToTop}) {
-    for (var chat in data) {
-      final buffer = StringBuffer();
-
-      if(favoritesToTop) {
-        buffer.write(chat.isFavorite ? 'b' : 'a');
-      }
-      if(unreadToTop) {
-        buffer.write(chat.unreadMessages > 0 ? 'b' : 'a');
-      }
-
-      buffer.write(chat.lastActivity);
-
-      chat.sort = buffer.toString();
-    }
-
-    return data.toList()..sort((a, b) => b.sort!.compareTo(a.sort!));
-  }
-}
-
-@JsonSerializable(explicitToJson: true)
-class GetRoomResponseObject {
-  int id;
-  String token;
-  GetRoomResponseObjectConversationType type;
-  String name;
-  String displayName;
-  String description;
-  int participantType;
-  int participantFlags;
-  int readOnly;
-  int listable;
-  int lastPing;
-  String sessionId;
-  bool hasPassword;
-  bool hasCall;
-  int callFlag;
-  bool canStartCall;
-  bool canDeleteConversation;
-  bool canLeaveConversation;
-  int lastActivity;
-  bool isFavorite;
-  GetRoomResponseObjectParticipantNotificationLevel notificationLevel;
-  int unreadMessages;
-  bool unreadMention;
-  bool unreadMentionDirect;
-  int lastReadMessage;
-  int lastCommonReadMessage;
-  GetChatResponseObject lastMessage;
-  String? status;
-  String? statusIcon;
-  String? statusMessage;
-  String? sort;
-
-  GetRoomResponseObject(
-      this.id,
-      this.token,
-      this.type,
-      this.name,
-      this.displayName,
-      this.description,
-      this.participantType,
-      this.participantFlags,
-      this.readOnly,
-      this.listable,
-      this.lastPing,
-      this.sessionId,
-      this.hasPassword,
-      this.hasCall,
-      this.callFlag,
-      this.canStartCall,
-      this.canDeleteConversation,
-      this.canLeaveConversation,
-      this.lastActivity,
-      this.isFavorite,
-      this.notificationLevel,
-      this.unreadMessages,
-      this.unreadMention,
-      this.unreadMentionDirect,
-      this.lastReadMessage,
-      this.lastCommonReadMessage,
-      this.lastMessage,
-      this.status,
-      this.statusIcon,
-      this.statusMessage);
-
-  factory GetRoomResponseObject.fromJson(Map<String, dynamic> json) => _$GetRoomResponseObjectFromJson(json);
-  Map<String, dynamic> toJson() => _$GetRoomResponseObjectToJson(this);
-}
-
-enum GetRoomResponseObjectConversationType {
-  @JsonValue(1) oneToOne,
-  @JsonValue(2) group,
-  @JsonValue(3) public,
-  @JsonValue(4) changelog,
-  @JsonValue(5) deleted,
-  @JsonValue(6) noteToSelf,
-}
-
-enum GetRoomResponseObjectParticipantNotificationLevel {
-  @JsonValue(0) defaultLevel,
-  @JsonValue(1) alwaysNotify,
-  @JsonValue(2) notifyOnMention,
-  @JsonValue(3) neverNotify,
-}
-
-// @JsonSerializable(explicitToJson: true)
-// class GetRoomResponseObjectMessage {
-//   int id;
-//   String token;
-//   GetRoomResponseObjectMessageActorType actorType;
-//   String actorId;
-//   String actorDisplayName;
-//   int timestamp;
-//   String message;
-//   String systemMessage;
-//   GetRoomResponseObjectMessageType messageType;
-//   bool isReplyable;
-//   String referenceId;
-//
-//
-//   GetRoomResponseObjectMessage(
-//       this.id,
-//       this.token,
-//       this.actorType,
-//       this.actorId,
-//       this.actorDisplayName,
-//       this.timestamp,
-//       this.message,
-//       this.systemMessage,
-//       this.messageType,
-//       this.isReplyable,
-//       this.referenceId);
-//
-//   factory GetRoomResponseObjectMessage.fromJson(Map<String, dynamic> json) => _$GetRoomResponseObjectMessageFromJson(json);
-//   Map<String, dynamic> toJson() => _$GetRoomResponseObjectMessageToJson(this);
-// }
-
-enum GetRoomResponseObjectMessageActorType {
-  @JsonValue('deleted_users') deletedUsers,
-  @JsonValue('users') user,
-  @JsonValue('guests') guest,
-  @JsonValue('bots') bot,
-  @JsonValue('bridged') bridge,
-}
-
-enum GetRoomResponseObjectMessageType {
-  @JsonValue('comment') comment,
-  @JsonValue('voice-message') voiceMessage,
-  @JsonValue('comment_deleted') deletedComment,
-  @JsonValue('system') system,
-  @JsonValue('command') command,
-}

lib/api/marianumcloud/talk/room/get_room.dart

@@ -0,0 +1,25 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+
+import '../talk_api.dart';
+import 'get_room_params.dart';
+import 'get_room_response.dart';
+
+class GetRoom extends TalkApi<GetRoomResponse> {
+  GetRoomParams params;
+  GetRoom(this.params) : super('v4/room', null, getParameters: params.toJson());
+
+  @override
+  GetRoomResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetRoomResponse.fromJson(decoded['ocs'] as Map<String, dynamic>);
+  }
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

lib/api/marianumcloud/talk/room/get_room_cache.dart

@@ -0,0 +1,15 @@
+import '../../../request_cache.dart';
+import 'get_room.dart';
+import 'get_room_params.dart';
+import 'get_room_response.dart';
+
+class GetRoomCache extends SimpleCache<GetRoomResponse> {
+  GetRoomCache({super.onUpdate, super.onError, super.renew})
+    : super(
+        cacheTime: RequestCache.cacheMinute,
+        loader: () => GetRoom(GetRoomParams(includeStatus: true)).run(),
+        fromJson: GetRoomResponse.fromJson,
+      ) {
+    start('nc-rooms');
+  }
+}

lib/api/marianumcloud/talk/room/get_room_params.dart

@@ -1,25 +1,28 @@
-
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'getRoomParams.g.dart';
+part 'get_room_params.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetRoomParams extends ApiParams {
   GetRoomParamsStatusUpdate? noStatusUpdate;
-  @JsonKey(toJson: _format) bool? includeStatus;
+  @JsonKey(toJson: _format)
+  bool? includeStatus;
   int? modifiedSince;
 
   GetRoomParams({this.noStatusUpdate, this.includeStatus, this.modifiedSince});
 
-  factory GetRoomParams.fromJson(Map<String, dynamic> json) => _$GetRoomParamsFromJson(json);
+  factory GetRoomParams.fromJson(Map<String, dynamic> json) =>
+      _$GetRoomParamsFromJson(json);
   Map<String, dynamic> toJson() => _$GetRoomParamsToJson(this);
 
   static String _format(bool? v) => v.toString();
 }
 
 enum GetRoomParamsStatusUpdate {
-  @JsonValue(0) defaults,
-  @JsonValue(1) keepAlive,
+  @JsonValue(0)
+  defaults,
+  @JsonValue(1)
+  keepAlive,
 }

lib/api/marianumcloud/talk/room/get_room_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getRoomParams.dart';
+part of 'get_room_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/room/get_room_response.dart

@@ -0,0 +1,164 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../../../api_response.dart';
+import '../chat/get_chat_response.dart';
+
+part 'get_room_response.g.dart';
+
+@JsonSerializable(explicitToJson: true)
+class GetRoomResponse extends ApiResponse {
+  Set<GetRoomResponseObject> data;
+
+  GetRoomResponse(this.data);
+
+  factory GetRoomResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetRoomResponseFromJson(json);
+  Map<String, dynamic> toJson() => _$GetRoomResponseToJson(this);
+
+  List<GetRoomResponseObject> sortBy({
+    bool lastActivity = true,
+    required bool favoritesToTop,
+    required bool unreadToTop,
+  }) {
+    for (var chat in data) {
+      final buffer = StringBuffer();
+
+      if (favoritesToTop) {
+        buffer.write(chat.isFavorite ? 'b' : 'a');
+      }
+      if (unreadToTop) {
+        buffer.write(chat.unreadMessages > 0 ? 'b' : 'a');
+      }
+
+      buffer.write(chat.lastActivity);
+
+      chat.sort = buffer.toString();
+    }
+
+    return data.toList()..sort((a, b) => b.sort!.compareTo(a.sort!));
+  }
+}
+
+@JsonSerializable(explicitToJson: true)
+class GetRoomResponseObject {
+  int id;
+  String token;
+  GetRoomResponseObjectConversationType type;
+  String name;
+  String displayName;
+  String description;
+  int participantType;
+  int participantFlags;
+  int readOnly;
+  int listable;
+  int lastPing;
+  String sessionId;
+  bool hasPassword;
+  bool hasCall;
+  int callFlag;
+  bool canStartCall;
+  bool canDeleteConversation;
+  bool canLeaveConversation;
+  int lastActivity;
+  bool isFavorite;
+  GetRoomResponseObjectParticipantNotificationLevel notificationLevel;
+  int unreadMessages;
+  bool unreadMention;
+  bool unreadMentionDirect;
+  int lastReadMessage;
+  int lastCommonReadMessage;
+  GetChatResponseObject lastMessage;
+  String? status;
+  String? statusIcon;
+  String? statusMessage;
+  String? sort;
+
+  GetRoomResponseObject(
+    this.id,
+    this.token,
+    this.type,
+    this.name,
+    this.displayName,
+    this.description,
+    this.participantType,
+    this.participantFlags,
+    this.readOnly,
+    this.listable,
+    this.lastPing,
+    this.sessionId,
+    this.hasPassword,
+    this.hasCall,
+    this.callFlag,
+    this.canStartCall,
+    this.canDeleteConversation,
+    this.canLeaveConversation,
+    this.lastActivity,
+    this.isFavorite,
+    this.notificationLevel,
+    this.unreadMessages,
+    this.unreadMention,
+    this.unreadMentionDirect,
+    this.lastReadMessage,
+    this.lastCommonReadMessage,
+    this.lastMessage,
+    this.status,
+    this.statusIcon,
+    this.statusMessage,
+  );
+
+  factory GetRoomResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetRoomResponseObjectFromJson(json);
+  Map<String, dynamic> toJson() => _$GetRoomResponseObjectToJson(this);
+}
+
+enum GetRoomResponseObjectConversationType {
+  @JsonValue(1)
+  oneToOne,
+  @JsonValue(2)
+  group,
+  @JsonValue(3)
+  public,
+  @JsonValue(4)
+  changelog,
+  @JsonValue(5)
+  deleted,
+  @JsonValue(6)
+  noteToSelf,
+}
+
+enum GetRoomResponseObjectParticipantNotificationLevel {
+  @JsonValue(0)
+  defaultLevel,
+  @JsonValue(1)
+  alwaysNotify,
+  @JsonValue(2)
+  notifyOnMention,
+  @JsonValue(3)
+  neverNotify,
+}
+
+enum GetRoomResponseObjectMessageActorType {
+  @JsonValue('deleted_users')
+  deletedUsers,
+  @JsonValue('users')
+  user,
+  @JsonValue('guests')
+  guest,
+  @JsonValue('bots')
+  bot,
+  @JsonValue('bridged')
+  bridge,
+}
+
+enum GetRoomResponseObjectMessageType {
+  @JsonValue('comment')
+  comment,
+  @JsonValue('voice-message')
+  voiceMessage,
+  @JsonValue('comment_deleted')
+  deletedComment,
+  @JsonValue('system')
+  system,
+  @JsonValue('command')
+  command,
+}

lib/api/marianumcloud/talk/room/get_room_response.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'getRoomResponse.dart';
+part of 'get_room_response.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/sendMessage/sendMessage.dart

@@ -1,23 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-import 'sendMessageParams.dart';
-
-class SendMessage extends TalkApi {
-  String chatToken;
-  SendMessage(this.chatToken, SendMessageParams params) : super('v1/chat/$chatToken', params);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
-    if(body is SendMessageParams) {
-      return http.post(uri, headers: headers, body: body.toJson());
-    }
-    return null;
-  }
-  
-}

lib/api/marianumcloud/talk/sendMessage/sendMessageResponse.dart

@@ -1,5 +0,0 @@
-import '../../../apiResponse.dart';
-
-class SendMessageResponse extends ApiResponse {
-
-}

lib/api/marianumcloud/talk/send_message/send_message.dart

@@ -0,0 +1,27 @@
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../../../api_params.dart';
+import '../talk_api.dart';
+import 'send_message_params.dart';
+
+class SendMessage extends TalkApi {
+  String chatToken;
+  SendMessage(this.chatToken, SendMessageParams params)
+    : super('v1/chat/$chatToken', params);
+
+  @override
+  Null assemble(String raw) => null;
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) {
+    if (body is SendMessageParams) {
+      return http.post(uri, headers: headers, body: body.toJson());
+    }
+    return null;
+  }
+}

lib/api/marianumcloud/talk/send_message/send_message_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'sendMessageParams.g.dart';
+part 'send_message_params.g.dart';
 
 @JsonSerializable(explicitToJson: true, includeIfNull: false)
 class SendMessageParams extends ApiParams {
@@ -11,6 +11,7 @@ class SendMessageParams extends ApiParams {
 
   SendMessageParams(this.message, {this.replyTo});
 
-  factory SendMessageParams.fromJson(Map<String, dynamic> json) => _$SendMessageParamsFromJson(json);
+  factory SendMessageParams.fromJson(Map<String, dynamic> json) =>
+      _$SendMessageParamsFromJson(json);
   Map<String, dynamic> toJson() => _$SendMessageParamsToJson(this);
 }

lib/api/marianumcloud/talk/send_message/send_message_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'sendMessageParams.dart';
+part of 'send_message_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/api/marianumcloud/talk/setFavorite/setFavorite.dart

@@ -1,25 +0,0 @@
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-
-class SetFavorite extends TalkApi {
-  String chatToken;
-  bool favoriteState;
-
-  SetFavorite(this.chatToken, this.favoriteState) : super('v4/room/$chatToken/favorite', null);
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
-    if(favoriteState) {
-      return http.post(uri, headers: headers);
-    } else {
-      return http.delete(uri, headers: headers);
-    }
-  }
-
-}

lib/api/marianumcloud/talk/setReadMarker/setReadMarker.dart

@@ -1,30 +0,0 @@
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-import 'setReadMarkerParams.dart';
-
-class SetReadMarker extends TalkApi {
-  String chatToken;
-  bool readState;
-  SetReadMarkerParams? setReadMarkerParams;
-
-  SetReadMarker(this.chatToken, this.readState, {this.setReadMarkerParams}) : super('v1/chat/$chatToken/read', null, getParameters: setReadMarkerParams?.toJson()) {
-    if(readState) assert(setReadMarkerParams?.lastReadMessage != null);
-  }
-
-  @override
-  assemble(String raw) => null;
-
-  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
-    if(readState) {
-
-      return http.post(uri, headers: headers);
-    } else {
-      return http.delete(uri, headers: headers);
-    }
-  }
-
-}