Merge branch 'rewrite' into feature/web-server-v2

# Conflicts:
#	pubspec.yaml

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.9.2
+- Fix jellyfin model deserialization
+
 ## 4.9.1
 - Upgrade migent
 - Fix kavita exception message

docker-compose.prod.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   running_on_dart:
-    image: ghcr.io/nyxx-discord/running_on_dart:4.9.1
+    image: ghcr.io/nyxx-discord/running_on_dart:4.9.2
     container_name: running_on_dart
     env_file:
      - .env

lib/src/modules/jellyfin.dart

@@ -164,7 +164,7 @@ class AuthenticatedJellyfinClient {
 
   AuthenticatedJellyfinClient(this.jellyfinClient, this.configUser);
 
-  Future<Iterable<SessionInfo>> getCurrentSessions() async {
+  Future<Iterable<SessionInfoDto>> getCurrentSessions() async {
     final response = await jellyfinClient.getSessionApi().getSessions(activeWithinSeconds: 15);
     return response.data ?? [];
   }

lib/src/settings.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.9.1';
+String get version => '4.9.2';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///

lib/src/util/jellyfin.dart

@@ -60,7 +60,7 @@ EmbedFieldBuilder getExternalUrlsEmbedField(Iterable<ExternalUrl> externalUrls)
   return EmbedFieldBuilder(name: "External Urls", value: fieldValue.toString(), isInline: false);
 }
 
-Iterable<EmbedFieldBuilder> getMediaPlaybackInfoFields(SessionInfo sessionInfo) {
+Iterable<EmbedFieldBuilder> getMediaPlaybackInfoFields(SessionInfoDto sessionInfo) {
   if (sessionInfo.transcodingInfo == null) {
     final mediaStreams = (sessionInfo.nowPlayingItem!.mediaStreams as Iterable<MediaStream>? ?? []);
 
@@ -84,7 +84,7 @@ Iterable<EmbedFieldBuilder> getMediaPlaybackInfoFields(SessionInfo sessionInfo)
   return [EmbedFieldBuilder(name: "Transcoding", value: transCodingInfoString, isInline: false)];
 }
 
-EmbedBuilder? buildSessionEmbed(SessionInfo sessionInfo, AuthenticatedJellyfinClient client) {
+EmbedBuilder? buildSessionEmbed(SessionInfoDto sessionInfo, AuthenticatedJellyfinClient client) {
   final nowPlayingItem = sessionInfo.nowPlayingItem;
   if (nowPlayingItem == null) {
     return null;

pubspec.lock

@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
@@ -599,10 +599,10 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "410f54de1327e7bf55ceace9943f104c5ab84af0"
-      url: "https://github.com/TentacleOrg/Tentacle.git"
+      resolved-ref: "8d9e67ec01196f8ac515606a4dfd8d2a7de4f9ec"
+      url: "https://github.com/l7ssha/Tentacle.git"
     source: git
-    version: "3.0.1"
+    version: "3.1.0"
   term_glyph:
     dependency: transitive
     description:

pubspec.yaml

@@ -24,7 +24,7 @@ dependencies:
   fuzzy: ^0.5.1
   collection: ^1.19.0
   tentacle:
-    git: https://github.com/TentacleOrg/Tentacle.git
+    git: https://github.com/l7ssha/Tentacle.git
   injector: ^4.0.0
 
   # directly used transitive dependencies