fix issues with latest version of invidious

lamarios · lamarios · commit 79ccc084e9e7 · 2025-01-30T12:24:01.000+08:00
diff --git a/lib/videos/models/video.dart b/lib/videos/models/video.dart
@@ -3,16 +3,38 @@ import 'package:clipious/settings/models/db/video_filter.dart';
 import 'package:clipious/utils/models/sharelink.dart';
 import 'package:clipious/videos/models/ided_video.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:json_annotation/json_annotation.dart';
 
 import '../../utils/models/image_object.dart';
 import 'adaptive_format.dart';
 import 'caption.dart';
 import 'format_stream.dart';
 
+part 'video.freezed.dart';
 part 'video.g.dart';
 
-part 'video.freezed.dart';
+/// Depending on versions, the published field can be a full formatted date or a timestamp
+/// sometimes the published field is like this
+///
+///   "published": 1738022400,
+///
+/// sometimes it is:
+///
+///       "published": "2025-01-28T19:00:26Z",
+int? _parsePublished(dynamic published) {
+  if (published == null) return null;
+
+  if (published is int) {
+    return published;
+  } else if (published is String) {
+    try {
+      return DateTime.parse(published).millisecondsSinceEpoch ~/ 1000;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  return null;
+}
 
 @freezed
 class Video with _$Video implements ShareLinks, IdedVideo {
@@ -21,7 +43,7 @@ class Video with _$Video implements ShareLinks, IdedVideo {
   const factory Video(
       {required String videoId,
       int? viewCount,
-      int? published,
+      @JsonKey(fromJson: _parsePublished) int? published,
       int? index,
       String? indexId,
       String? publishedText,
diff --git a/lib/videos/models/video.freezed.dart b/lib/videos/models/video.freezed.dart
@@ -22,6 +22,7 @@ Video _$VideoFromJson(Map<String, dynamic> json) {
 mixin _$Video {
   String get videoId => throw _privateConstructorUsedError;
   int? get viewCount => throw _privateConstructorUsedError;
+  @JsonKey(fromJson: _parsePublished)
   int? get published => throw _privateConstructorUsedError;
   int? get index => throw _privateConstructorUsedError;
   String? get indexId => throw _privateConstructorUsedError;
@@ -87,7 +88,7 @@ abstract class $VideoCopyWith<$Res> {
   $Res call(
       {String videoId,
       int? viewCount,
-      int? published,
+      @JsonKey(fromJson: _parsePublished) int? published,
       int? index,
       String? indexId,
       String? publishedText,
@@ -378,7 +379,7 @@ abstract class _$$VideoImplCopyWith<$Res> implements $VideoCopyWith<$Res> {
   $Res call(
       {String videoId,
       int? viewCount,
-      int? published,
+      @JsonKey(fromJson: _parsePublished) int? published,
       int? index,
       String? indexId,
       String? publishedText,
@@ -663,7 +664,7 @@ class _$VideoImpl extends _Video {
   const _$VideoImpl(
       {required this.videoId,
       this.viewCount,
-      this.published,
+      @JsonKey(fromJson: _parsePublished) this.published,
       this.index,
       this.indexId,
       this.publishedText,
@@ -728,6 +729,7 @@ class _$VideoImpl extends _Video {
   @override
   final int? viewCount;
   @override
+  @JsonKey(fromJson: _parsePublished)
   final int? published;
   @override
   final int? index;
@@ -1035,7 +1037,7 @@ abstract class _Video extends Video implements ShareLinks, IdedVideo {
   const factory _Video(
       {required final String videoId,
       final int? viewCount,
-      final int? published,
+      @JsonKey(fromJson: _parsePublished) final int? published,
       final int? index,
       final String? indexId,
       final String? publishedText,
@@ -1090,6 +1092,7 @@ abstract class _Video extends Video implements ShareLinks, IdedVideo {
   @override
   int? get viewCount;
   @override
+  @JsonKey(fromJson: _parsePublished)
   int? get published;
   @override
   int? get index;
diff --git a/lib/videos/models/video.g.dart b/lib/videos/models/video.g.dart
diff --git a/shell.nix b/shell.nix
@@ -48,6 +48,8 @@ pkgs.mkShell {
 
   echo "creating useful aliases..."
 
+  flutter config --jdk-dir ${pkgs.corretto17}/lib/corretto
+
   ''+
   pkgs.lib.concatStrings (map (x: ''alias ${x.name}="${x.command}";'') aliases)
   +''
