feat: replace Tenor GIF service with Klipy GIF service

lib/src/features/composer/domain/klipy_gif.dart

···
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'klipy_gif.freezed.dart';
+part 'klipy_gif.g.dart';
+
+/// Represents a media format from Klipy API (url, dimensions, size).
+@freezed
+abstract class KlipyMediaFormat with _$KlipyMediaFormat {
+  const factory KlipyMediaFormat({
+    @Default('') String url,
+    @Default(0) int width,
+    @Default(0) int height,
+    int? size,
+  }) = _KlipyMediaFormat;
+
+  factory KlipyMediaFormat.fromJson(Map<String, dynamic> json) => _$KlipyMediaFormatFromJson(json);
+}
+
+/// Represents all format variants for a single size (gif, webp, jpg, mp4, webm).
+@freezed
+abstract class KlipyFormatVariants with _$KlipyFormatVariants {
+  const factory KlipyFormatVariants({
+    KlipyMediaFormat? gif,
+    KlipyMediaFormat? webp,
+    KlipyMediaFormat? jpg,
+    KlipyMediaFormat? mp4,
+    KlipyMediaFormat? webm,
+  }) = _KlipyFormatVariants;
+
+  factory KlipyFormatVariants.fromJson(Map<String, dynamic> json) =>
+      _$KlipyFormatVariantsFromJson(json);
+}
+
+/// Represents all size variants for a GIF (hd, md, sm, xs).
+@freezed
+abstract class KlipyFile with _$KlipyFile {
+  const factory KlipyFile({
+    KlipyFormatVariants? hd,
+    KlipyFormatVariants? md,
+    KlipyFormatVariants? sm,
+    KlipyFormatVariants? xs,
+  }) = _KlipyFile;
+
+  factory KlipyFile.fromJson(Map<String, dynamic> json) => _$KlipyFileFromJson(json);
+}
+
+/// Represents a GIF result from Klipy API.
+@freezed
+abstract class KlipyGif with _$KlipyGif {
+  const factory KlipyGif({
+    @Default(0) int id,
+    @Default('') String slug,
+    @Default('') String title,
+    @Default(KlipyFile()) KlipyFile file,
+    List<String>? tags,
+    String? type,
+    @JsonKey(name: 'blur_preview') String? blurPreview,
+  }) = _KlipyGif;
+
+  const KlipyGif._();
+
+  factory KlipyGif.fromJson(Map<String, dynamic> json) => _$KlipyGifFromJson(json);
+
+  /// URL for the thumbnail (small webp preferred, falls back to gif).
+  String? get thumbnailUrl {
+    return file.sm?.webp?.url ?? file.sm?.gif?.url ?? file.xs?.webp?.url ?? file.xs?.gif?.url;
+  }
+
+  /// URL for the full GIF (medium size preferred).
+  String? get gifUrl {
+    return file.md?.gif?.url ?? file.hd?.gif?.url ?? file.sm?.gif?.url;
+  }
+
+  /// URL to attribute/link back to Klipy.
+  String get itemUrl => 'https://klipy.com/gif/$slug';
+}
+
+/// Represents search results from Klipy API.
+@freezed
+abstract class KlipySearchResponse with _$KlipySearchResponse {
+  const factory KlipySearchResponse({
+    @Default([]) List<KlipyGif> results,
+    @JsonKey(name: 'current_page') @Default(1) int currentPage,
+    @JsonKey(name: 'per_page') @Default(24) int perPage,
+    @JsonKey(name: 'has_next') @Default(false) bool hasNext,
+  }) = _KlipySearchResponse;
+
+  const KlipySearchResponse._();
+
+  factory KlipySearchResponse.fromJson(Map<String, dynamic> json) =>
+      _$KlipySearchResponseFromJson(json);
+
+  /// Creates a [KlipySearchResponse] from the raw Klipy API response which
+  /// wraps the pagination data in a 'data' field.
+  factory KlipySearchResponse.fromApiResponse(Map<String, dynamic> json) {
+    final data = json['data'] as Map<String, dynamic>?;
+    if (data != null) {
+      return KlipySearchResponse.fromJson({...data, 'results': data['data']});
+    }
+
+    return KlipySearchResponse.fromJson(json);
+  }
+
+  /// Next page number if there are more results.
+  int? get nextPage => hasNext ? currentPage + 1 : null;
+}

lib/src/features/composer/domain/klipy_gif.freezed.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'klipy_gif.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$KlipyMediaFormat {
+
+ String get url; int get width; int get height; int? get size;
+/// Create a copy of KlipyMediaFormat
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<KlipyMediaFormat> get copyWith => _$KlipyMediaFormatCopyWithImpl<KlipyMediaFormat>(this as KlipyMediaFormat, _$identity);
+
+  /// Serializes this KlipyMediaFormat to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is KlipyMediaFormat&&(identical(other.url, url) || other.url == url)&&(identical(other.width, width) || other.width == width)&&(identical(other.height, height) || other.height == height)&&(identical(other.size, size) || other.size == size));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,url,width,height,size);
+
+@override
+String toString() {
+  return 'KlipyMediaFormat(url: $url, width: $width, height: $height, size: $size)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $KlipyMediaFormatCopyWith<$Res>  {
+  factory $KlipyMediaFormatCopyWith(KlipyMediaFormat value, $Res Function(KlipyMediaFormat) _then) = _$KlipyMediaFormatCopyWithImpl;
+@useResult
+$Res call({
+ String url, int width, int height, int? size
+});
+
+
+
+
+}
+/// @nodoc
+class _$KlipyMediaFormatCopyWithImpl<$Res>
+    implements $KlipyMediaFormatCopyWith<$Res> {
+  _$KlipyMediaFormatCopyWithImpl(this._self, this._then);
+
+  final KlipyMediaFormat _self;
+  final $Res Function(KlipyMediaFormat) _then;
+
+/// Create a copy of KlipyMediaFormat
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? url = null,Object? width = null,Object? height = null,Object? size = freezed,}) {
+  return _then(_self.copyWith(
+url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,width: null == width ? _self.width : width // ignore: cast_nullable_to_non_nullable
+as int,height: null == height ? _self.height : height // ignore: cast_nullable_to_non_nullable
+as int,size: freezed == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
+as int?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [KlipyMediaFormat].
+extension KlipyMediaFormatPatterns on KlipyMediaFormat {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _KlipyMediaFormat value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _KlipyMediaFormat() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _KlipyMediaFormat value)  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyMediaFormat():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _KlipyMediaFormat value)?  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyMediaFormat() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String url,  int width,  int height,  int? size)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _KlipyMediaFormat() when $default != null:
+return $default(_that.url,_that.width,_that.height,_that.size);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String url,  int width,  int height,  int? size)  $default,) {final _that = this;
+switch (_that) {
+case _KlipyMediaFormat():
+return $default(_that.url,_that.width,_that.height,_that.size);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String url,  int width,  int height,  int? size)?  $default,) {final _that = this;
+switch (_that) {
+case _KlipyMediaFormat() when $default != null:
+return $default(_that.url,_that.width,_that.height,_that.size);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _KlipyMediaFormat implements KlipyMediaFormat {
+  const _KlipyMediaFormat({this.url = '', this.width = 0, this.height = 0, this.size});
+  factory _KlipyMediaFormat.fromJson(Map<String, dynamic> json) => _$KlipyMediaFormatFromJson(json);
+
+@override@JsonKey() final  String url;
+@override@JsonKey() final  int width;
+@override@JsonKey() final  int height;
+@override final  int? size;
+
+/// Create a copy of KlipyMediaFormat
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$KlipyMediaFormatCopyWith<_KlipyMediaFormat> get copyWith => __$KlipyMediaFormatCopyWithImpl<_KlipyMediaFormat>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$KlipyMediaFormatToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _KlipyMediaFormat&&(identical(other.url, url) || other.url == url)&&(identical(other.width, width) || other.width == width)&&(identical(other.height, height) || other.height == height)&&(identical(other.size, size) || other.size == size));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,url,width,height,size);
+
+@override
+String toString() {
+  return 'KlipyMediaFormat(url: $url, width: $width, height: $height, size: $size)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$KlipyMediaFormatCopyWith<$Res> implements $KlipyMediaFormatCopyWith<$Res> {
+  factory _$KlipyMediaFormatCopyWith(_KlipyMediaFormat value, $Res Function(_KlipyMediaFormat) _then) = __$KlipyMediaFormatCopyWithImpl;
+@override @useResult
+$Res call({
+ String url, int width, int height, int? size
+});
+
+
+
+
+}
+/// @nodoc
+class __$KlipyMediaFormatCopyWithImpl<$Res>
+    implements _$KlipyMediaFormatCopyWith<$Res> {
+  __$KlipyMediaFormatCopyWithImpl(this._self, this._then);
+
+  final _KlipyMediaFormat _self;
+  final $Res Function(_KlipyMediaFormat) _then;
+
+/// Create a copy of KlipyMediaFormat
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? url = null,Object? width = null,Object? height = null,Object? size = freezed,}) {
+  return _then(_KlipyMediaFormat(
+url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,width: null == width ? _self.width : width // ignore: cast_nullable_to_non_nullable
+as int,height: null == height ? _self.height : height // ignore: cast_nullable_to_non_nullable
+as int,size: freezed == size ? _self.size : size // ignore: cast_nullable_to_non_nullable
+as int?,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$KlipyFormatVariants {
+
+ KlipyMediaFormat? get gif; KlipyMediaFormat? get webp; KlipyMediaFormat? get jpg; KlipyMediaFormat? get mp4; KlipyMediaFormat? get webm;
+/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<KlipyFormatVariants> get copyWith => _$KlipyFormatVariantsCopyWithImpl<KlipyFormatVariants>(this as KlipyFormatVariants, _$identity);
+
+  /// Serializes this KlipyFormatVariants to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is KlipyFormatVariants&&(identical(other.gif, gif) || other.gif == gif)&&(identical(other.webp, webp) || other.webp == webp)&&(identical(other.jpg, jpg) || other.jpg == jpg)&&(identical(other.mp4, mp4) || other.mp4 == mp4)&&(identical(other.webm, webm) || other.webm == webm));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,gif,webp,jpg,mp4,webm);
+
+@override
+String toString() {
+  return 'KlipyFormatVariants(gif: $gif, webp: $webp, jpg: $jpg, mp4: $mp4, webm: $webm)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $KlipyFormatVariantsCopyWith<$Res>  {
+  factory $KlipyFormatVariantsCopyWith(KlipyFormatVariants value, $Res Function(KlipyFormatVariants) _then) = _$KlipyFormatVariantsCopyWithImpl;
+@useResult
+$Res call({
+ KlipyMediaFormat? gif, KlipyMediaFormat? webp, KlipyMediaFormat? jpg, KlipyMediaFormat? mp4, KlipyMediaFormat? webm
+});
+
+
+$KlipyMediaFormatCopyWith<$Res>? get gif;$KlipyMediaFormatCopyWith<$Res>? get webp;$KlipyMediaFormatCopyWith<$Res>? get jpg;$KlipyMediaFormatCopyWith<$Res>? get mp4;$KlipyMediaFormatCopyWith<$Res>? get webm;
+
+}
+/// @nodoc
+class _$KlipyFormatVariantsCopyWithImpl<$Res>
+    implements $KlipyFormatVariantsCopyWith<$Res> {
+  _$KlipyFormatVariantsCopyWithImpl(this._self, this._then);
+
+  final KlipyFormatVariants _self;
+  final $Res Function(KlipyFormatVariants) _then;
+
+/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? gif = freezed,Object? webp = freezed,Object? jpg = freezed,Object? mp4 = freezed,Object? webm = freezed,}) {
+  return _then(_self.copyWith(
+gif: freezed == gif ? _self.gif : gif // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,webp: freezed == webp ? _self.webp : webp // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,jpg: freezed == jpg ? _self.jpg : jpg // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,mp4: freezed == mp4 ? _self.mp4 : mp4 // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,webm: freezed == webm ? _self.webm : webm // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,
+  ));
+}
+/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get gif {
+    if (_self.gif == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.gif!, (value) {
+    return _then(_self.copyWith(gif: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get webp {
+    if (_self.webp == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.webp!, (value) {
+    return _then(_self.copyWith(webp: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get jpg {
+    if (_self.jpg == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.jpg!, (value) {
+    return _then(_self.copyWith(jpg: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get mp4 {
+    if (_self.mp4 == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.mp4!, (value) {
+    return _then(_self.copyWith(mp4: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get webm {
+    if (_self.webm == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.webm!, (value) {
+    return _then(_self.copyWith(webm: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [KlipyFormatVariants].
+extension KlipyFormatVariantsPatterns on KlipyFormatVariants {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _KlipyFormatVariants value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _KlipyFormatVariants() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _KlipyFormatVariants value)  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyFormatVariants():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _KlipyFormatVariants value)?  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyFormatVariants() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( KlipyMediaFormat? gif,  KlipyMediaFormat? webp,  KlipyMediaFormat? jpg,  KlipyMediaFormat? mp4,  KlipyMediaFormat? webm)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _KlipyFormatVariants() when $default != null:
+return $default(_that.gif,_that.webp,_that.jpg,_that.mp4,_that.webm);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( KlipyMediaFormat? gif,  KlipyMediaFormat? webp,  KlipyMediaFormat? jpg,  KlipyMediaFormat? mp4,  KlipyMediaFormat? webm)  $default,) {final _that = this;
+switch (_that) {
+case _KlipyFormatVariants():
+return $default(_that.gif,_that.webp,_that.jpg,_that.mp4,_that.webm);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( KlipyMediaFormat? gif,  KlipyMediaFormat? webp,  KlipyMediaFormat? jpg,  KlipyMediaFormat? mp4,  KlipyMediaFormat? webm)?  $default,) {final _that = this;
+switch (_that) {
+case _KlipyFormatVariants() when $default != null:
+return $default(_that.gif,_that.webp,_that.jpg,_that.mp4,_that.webm);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _KlipyFormatVariants implements KlipyFormatVariants {
+  const _KlipyFormatVariants({this.gif, this.webp, this.jpg, this.mp4, this.webm});
+  factory _KlipyFormatVariants.fromJson(Map<String, dynamic> json) => _$KlipyFormatVariantsFromJson(json);
+
+@override final  KlipyMediaFormat? gif;
+@override final  KlipyMediaFormat? webp;
+@override final  KlipyMediaFormat? jpg;
+@override final  KlipyMediaFormat? mp4;
+@override final  KlipyMediaFormat? webm;
+
+/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$KlipyFormatVariantsCopyWith<_KlipyFormatVariants> get copyWith => __$KlipyFormatVariantsCopyWithImpl<_KlipyFormatVariants>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$KlipyFormatVariantsToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _KlipyFormatVariants&&(identical(other.gif, gif) || other.gif == gif)&&(identical(other.webp, webp) || other.webp == webp)&&(identical(other.jpg, jpg) || other.jpg == jpg)&&(identical(other.mp4, mp4) || other.mp4 == mp4)&&(identical(other.webm, webm) || other.webm == webm));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,gif,webp,jpg,mp4,webm);
+
+@override
+String toString() {
+  return 'KlipyFormatVariants(gif: $gif, webp: $webp, jpg: $jpg, mp4: $mp4, webm: $webm)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$KlipyFormatVariantsCopyWith<$Res> implements $KlipyFormatVariantsCopyWith<$Res> {
+  factory _$KlipyFormatVariantsCopyWith(_KlipyFormatVariants value, $Res Function(_KlipyFormatVariants) _then) = __$KlipyFormatVariantsCopyWithImpl;
+@override @useResult
+$Res call({
+ KlipyMediaFormat? gif, KlipyMediaFormat? webp, KlipyMediaFormat? jpg, KlipyMediaFormat? mp4, KlipyMediaFormat? webm
+});
+
+
+@override $KlipyMediaFormatCopyWith<$Res>? get gif;@override $KlipyMediaFormatCopyWith<$Res>? get webp;@override $KlipyMediaFormatCopyWith<$Res>? get jpg;@override $KlipyMediaFormatCopyWith<$Res>? get mp4;@override $KlipyMediaFormatCopyWith<$Res>? get webm;
+
+}
+/// @nodoc
+class __$KlipyFormatVariantsCopyWithImpl<$Res>
+    implements _$KlipyFormatVariantsCopyWith<$Res> {
+  __$KlipyFormatVariantsCopyWithImpl(this._self, this._then);
+
+  final _KlipyFormatVariants _self;
+  final $Res Function(_KlipyFormatVariants) _then;
+
+/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? gif = freezed,Object? webp = freezed,Object? jpg = freezed,Object? mp4 = freezed,Object? webm = freezed,}) {
+  return _then(_KlipyFormatVariants(
+gif: freezed == gif ? _self.gif : gif // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,webp: freezed == webp ? _self.webp : webp // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,jpg: freezed == jpg ? _self.jpg : jpg // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,mp4: freezed == mp4 ? _self.mp4 : mp4 // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,webm: freezed == webm ? _self.webm : webm // ignore: cast_nullable_to_non_nullable
+as KlipyMediaFormat?,
+  ));
+}
+
+/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get gif {
+    if (_self.gif == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.gif!, (value) {
+    return _then(_self.copyWith(gif: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get webp {
+    if (_self.webp == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.webp!, (value) {
+    return _then(_self.copyWith(webp: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get jpg {
+    if (_self.jpg == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.jpg!, (value) {
+    return _then(_self.copyWith(jpg: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get mp4 {
+    if (_self.mp4 == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.mp4!, (value) {
+    return _then(_self.copyWith(mp4: value));
+  });
+}/// Create a copy of KlipyFormatVariants
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyMediaFormatCopyWith<$Res>? get webm {
+    if (_self.webm == null) {
+    return null;
+  }
+
+  return $KlipyMediaFormatCopyWith<$Res>(_self.webm!, (value) {
+    return _then(_self.copyWith(webm: value));
+  });
+}
+}
+
+
+/// @nodoc
+mixin _$KlipyFile {
+
+ KlipyFormatVariants? get hd; KlipyFormatVariants? get md; KlipyFormatVariants? get sm; KlipyFormatVariants? get xs;
+/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$KlipyFileCopyWith<KlipyFile> get copyWith => _$KlipyFileCopyWithImpl<KlipyFile>(this as KlipyFile, _$identity);
+
+  /// Serializes this KlipyFile to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is KlipyFile&&(identical(other.hd, hd) || other.hd == hd)&&(identical(other.md, md) || other.md == md)&&(identical(other.sm, sm) || other.sm == sm)&&(identical(other.xs, xs) || other.xs == xs));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,hd,md,sm,xs);
+
+@override
+String toString() {
+  return 'KlipyFile(hd: $hd, md: $md, sm: $sm, xs: $xs)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $KlipyFileCopyWith<$Res>  {
+  factory $KlipyFileCopyWith(KlipyFile value, $Res Function(KlipyFile) _then) = _$KlipyFileCopyWithImpl;
+@useResult
+$Res call({
+ KlipyFormatVariants? hd, KlipyFormatVariants? md, KlipyFormatVariants? sm, KlipyFormatVariants? xs
+});
+
+
+$KlipyFormatVariantsCopyWith<$Res>? get hd;$KlipyFormatVariantsCopyWith<$Res>? get md;$KlipyFormatVariantsCopyWith<$Res>? get sm;$KlipyFormatVariantsCopyWith<$Res>? get xs;
+
+}
+/// @nodoc
+class _$KlipyFileCopyWithImpl<$Res>
+    implements $KlipyFileCopyWith<$Res> {
+  _$KlipyFileCopyWithImpl(this._self, this._then);
+
+  final KlipyFile _self;
+  final $Res Function(KlipyFile) _then;
+
+/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? hd = freezed,Object? md = freezed,Object? sm = freezed,Object? xs = freezed,}) {
+  return _then(_self.copyWith(
+hd: freezed == hd ? _self.hd : hd // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,md: freezed == md ? _self.md : md // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,sm: freezed == sm ? _self.sm : sm // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,xs: freezed == xs ? _self.xs : xs // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,
+  ));
+}
+/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get hd {
+    if (_self.hd == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.hd!, (value) {
+    return _then(_self.copyWith(hd: value));
+  });
+}/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get md {
+    if (_self.md == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.md!, (value) {
+    return _then(_self.copyWith(md: value));
+  });
+}/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get sm {
+    if (_self.sm == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.sm!, (value) {
+    return _then(_self.copyWith(sm: value));
+  });
+}/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get xs {
+    if (_self.xs == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.xs!, (value) {
+    return _then(_self.copyWith(xs: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [KlipyFile].
+extension KlipyFilePatterns on KlipyFile {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _KlipyFile value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _KlipyFile() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _KlipyFile value)  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyFile():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _KlipyFile value)?  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyFile() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( KlipyFormatVariants? hd,  KlipyFormatVariants? md,  KlipyFormatVariants? sm,  KlipyFormatVariants? xs)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _KlipyFile() when $default != null:
+return $default(_that.hd,_that.md,_that.sm,_that.xs);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( KlipyFormatVariants? hd,  KlipyFormatVariants? md,  KlipyFormatVariants? sm,  KlipyFormatVariants? xs)  $default,) {final _that = this;
+switch (_that) {
+case _KlipyFile():
+return $default(_that.hd,_that.md,_that.sm,_that.xs);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( KlipyFormatVariants? hd,  KlipyFormatVariants? md,  KlipyFormatVariants? sm,  KlipyFormatVariants? xs)?  $default,) {final _that = this;
+switch (_that) {
+case _KlipyFile() when $default != null:
+return $default(_that.hd,_that.md,_that.sm,_that.xs);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _KlipyFile implements KlipyFile {
+  const _KlipyFile({this.hd, this.md, this.sm, this.xs});
+  factory _KlipyFile.fromJson(Map<String, dynamic> json) => _$KlipyFileFromJson(json);
+
+@override final  KlipyFormatVariants? hd;
+@override final  KlipyFormatVariants? md;
+@override final  KlipyFormatVariants? sm;
+@override final  KlipyFormatVariants? xs;
+
+/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$KlipyFileCopyWith<_KlipyFile> get copyWith => __$KlipyFileCopyWithImpl<_KlipyFile>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$KlipyFileToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _KlipyFile&&(identical(other.hd, hd) || other.hd == hd)&&(identical(other.md, md) || other.md == md)&&(identical(other.sm, sm) || other.sm == sm)&&(identical(other.xs, xs) || other.xs == xs));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,hd,md,sm,xs);
+
+@override
+String toString() {
+  return 'KlipyFile(hd: $hd, md: $md, sm: $sm, xs: $xs)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$KlipyFileCopyWith<$Res> implements $KlipyFileCopyWith<$Res> {
+  factory _$KlipyFileCopyWith(_KlipyFile value, $Res Function(_KlipyFile) _then) = __$KlipyFileCopyWithImpl;
+@override @useResult
+$Res call({
+ KlipyFormatVariants? hd, KlipyFormatVariants? md, KlipyFormatVariants? sm, KlipyFormatVariants? xs
+});
+
+
+@override $KlipyFormatVariantsCopyWith<$Res>? get hd;@override $KlipyFormatVariantsCopyWith<$Res>? get md;@override $KlipyFormatVariantsCopyWith<$Res>? get sm;@override $KlipyFormatVariantsCopyWith<$Res>? get xs;
+
+}
+/// @nodoc
+class __$KlipyFileCopyWithImpl<$Res>
+    implements _$KlipyFileCopyWith<$Res> {
+  __$KlipyFileCopyWithImpl(this._self, this._then);
+
+  final _KlipyFile _self;
+  final $Res Function(_KlipyFile) _then;
+
+/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? hd = freezed,Object? md = freezed,Object? sm = freezed,Object? xs = freezed,}) {
+  return _then(_KlipyFile(
+hd: freezed == hd ? _self.hd : hd // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,md: freezed == md ? _self.md : md // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,sm: freezed == sm ? _self.sm : sm // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,xs: freezed == xs ? _self.xs : xs // ignore: cast_nullable_to_non_nullable
+as KlipyFormatVariants?,
+  ));
+}
+
+/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get hd {
+    if (_self.hd == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.hd!, (value) {
+    return _then(_self.copyWith(hd: value));
+  });
+}/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get md {
+    if (_self.md == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.md!, (value) {
+    return _then(_self.copyWith(md: value));
+  });
+}/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get sm {
+    if (_self.sm == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.sm!, (value) {
+    return _then(_self.copyWith(sm: value));
+  });
+}/// Create a copy of KlipyFile
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFormatVariantsCopyWith<$Res>? get xs {
+    if (_self.xs == null) {
+    return null;
+  }
+
+  return $KlipyFormatVariantsCopyWith<$Res>(_self.xs!, (value) {
+    return _then(_self.copyWith(xs: value));
+  });
+}
+}
+
+
+/// @nodoc
+mixin _$KlipyGif {
+
+ int get id; String get slug; String get title; KlipyFile get file; List<String>? get tags; String? get type;@JsonKey(name: 'blur_preview') String? get blurPreview;
+/// Create a copy of KlipyGif
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$KlipyGifCopyWith<KlipyGif> get copyWith => _$KlipyGifCopyWithImpl<KlipyGif>(this as KlipyGif, _$identity);
+
+  /// Serializes this KlipyGif to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is KlipyGif&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.title, title) || other.title == title)&&(identical(other.file, file) || other.file == file)&&const DeepCollectionEquality().equals(other.tags, tags)&&(identical(other.type, type) || other.type == type)&&(identical(other.blurPreview, blurPreview) || other.blurPreview == blurPreview));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,title,file,const DeepCollectionEquality().hash(tags),type,blurPreview);
+
+@override
+String toString() {
+  return 'KlipyGif(id: $id, slug: $slug, title: $title, file: $file, tags: $tags, type: $type, blurPreview: $blurPreview)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $KlipyGifCopyWith<$Res>  {
+  factory $KlipyGifCopyWith(KlipyGif value, $Res Function(KlipyGif) _then) = _$KlipyGifCopyWithImpl;
+@useResult
+$Res call({
+ int id, String slug, String title, KlipyFile file, List<String>? tags, String? type,@JsonKey(name: 'blur_preview') String? blurPreview
+});
+
+
+$KlipyFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class _$KlipyGifCopyWithImpl<$Res>
+    implements $KlipyGifCopyWith<$Res> {
+  _$KlipyGifCopyWithImpl(this._self, this._then);
+
+  final KlipyGif _self;
+  final $Res Function(KlipyGif) _then;
+
+/// Create a copy of KlipyGif
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? title = null,Object? file = null,Object? tags = freezed,Object? type = freezed,Object? blurPreview = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as int,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,file: null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as KlipyFile,tags: freezed == tags ? _self.tags : tags // ignore: cast_nullable_to_non_nullable
+as List<String>?,type: freezed == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String?,blurPreview: freezed == blurPreview ? _self.blurPreview : blurPreview // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+/// Create a copy of KlipyGif
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFileCopyWith<$Res> get file {
+  
+  return $KlipyFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
+
+/// Adds pattern-matching-related methods to [KlipyGif].
+extension KlipyGifPatterns on KlipyGif {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _KlipyGif value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _KlipyGif() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _KlipyGif value)  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyGif():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _KlipyGif value)?  $default,){
+final _that = this;
+switch (_that) {
+case _KlipyGif() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int id,  String slug,  String title,  KlipyFile file,  List<String>? tags,  String? type, @JsonKey(name: 'blur_preview')  String? blurPreview)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _KlipyGif() when $default != null:
+return $default(_that.id,_that.slug,_that.title,_that.file,_that.tags,_that.type,_that.blurPreview);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int id,  String slug,  String title,  KlipyFile file,  List<String>? tags,  String? type, @JsonKey(name: 'blur_preview')  String? blurPreview)  $default,) {final _that = this;
+switch (_that) {
+case _KlipyGif():
+return $default(_that.id,_that.slug,_that.title,_that.file,_that.tags,_that.type,_that.blurPreview);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int id,  String slug,  String title,  KlipyFile file,  List<String>? tags,  String? type, @JsonKey(name: 'blur_preview')  String? blurPreview)?  $default,) {final _that = this;
+switch (_that) {
+case _KlipyGif() when $default != null:
+return $default(_that.id,_that.slug,_that.title,_that.file,_that.tags,_that.type,_that.blurPreview);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _KlipyGif extends KlipyGif {
+  const _KlipyGif({this.id = 0, this.slug = '', this.title = '', this.file = const KlipyFile(), final  List<String>? tags, this.type, @JsonKey(name: 'blur_preview') this.blurPreview}): _tags = tags,super._();
+  factory _KlipyGif.fromJson(Map<String, dynamic> json) => _$KlipyGifFromJson(json);
+
+@override@JsonKey() final  int id;
+@override@JsonKey() final  String slug;
+@override@JsonKey() final  String title;
+@override@JsonKey() final  KlipyFile file;
+ final  List<String>? _tags;
+@override List<String>? get tags {
+  final value = _tags;
+  if (value == null) return null;
+  if (_tags is EqualUnmodifiableListView) return _tags;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(value);
+}
+
+@override final  String? type;
+@override@JsonKey(name: 'blur_preview') final  String? blurPreview;
+
+/// Create a copy of KlipyGif
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$KlipyGifCopyWith<_KlipyGif> get copyWith => __$KlipyGifCopyWithImpl<_KlipyGif>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$KlipyGifToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _KlipyGif&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.title, title) || other.title == title)&&(identical(other.file, file) || other.file == file)&&const DeepCollectionEquality().equals(other._tags, _tags)&&(identical(other.type, type) || other.type == type)&&(identical(other.blurPreview, blurPreview) || other.blurPreview == blurPreview));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,title,file,const DeepCollectionEquality().hash(_tags),type,blurPreview);
+
+@override
+String toString() {
+  return 'KlipyGif(id: $id, slug: $slug, title: $title, file: $file, tags: $tags, type: $type, blurPreview: $blurPreview)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$KlipyGifCopyWith<$Res> implements $KlipyGifCopyWith<$Res> {
+  factory _$KlipyGifCopyWith(_KlipyGif value, $Res Function(_KlipyGif) _then) = __$KlipyGifCopyWithImpl;
+@override @useResult
+$Res call({
+ int id, String slug, String title, KlipyFile file, List<String>? tags, String? type,@JsonKey(name: 'blur_preview') String? blurPreview
+});
+
+
+@override $KlipyFileCopyWith<$Res> get file;
+
+}
+/// @nodoc
+class __$KlipyGifCopyWithImpl<$Res>
+    implements _$KlipyGifCopyWith<$Res> {
+  __$KlipyGifCopyWithImpl(this._self, this._then);
+
+  final _KlipyGif _self;
+  final $Res Function(_KlipyGif) _then;
+
+/// Create a copy of KlipyGif
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? title = null,Object? file = null,Object? tags = freezed,Object? type = freezed,Object? blurPreview = freezed,}) {
+  return _then(_KlipyGif(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as int,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,file: null == file ? _self.file : file // ignore: cast_nullable_to_non_nullable
+as KlipyFile,tags: freezed == tags ? _self._tags : tags // ignore: cast_nullable_to_non_nullable
+as List<String>?,type: freezed == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String?,blurPreview: freezed == blurPreview ? _self.blurPreview : blurPreview // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+/// Create a copy of KlipyGif
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$KlipyFileCopyWith<$Res> get file {
+  
+  return $KlipyFileCopyWith<$Res>(_self.file, (value) {
+    return _then(_self.copyWith(file: value));
+  });
+}
+}
+
+
+/// @nodoc
+mixin _$KlipySearchResponse {
+
+ List<KlipyGif> get results;@JsonKey(name: 'current_page') int get currentPage;@JsonKey(name: 'per_page') int get perPage;@JsonKey(name: 'has_next') bool get hasNext;
+/// Create a copy of KlipySearchResponse
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$KlipySearchResponseCopyWith<KlipySearchResponse> get copyWith => _$KlipySearchResponseCopyWithImpl<KlipySearchResponse>(this as KlipySearchResponse, _$identity);
+
+  /// Serializes this KlipySearchResponse to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is KlipySearchResponse&&const DeepCollectionEquality().equals(other.results, results)&&(identical(other.currentPage, currentPage) || other.currentPage == currentPage)&&(identical(other.perPage, perPage) || other.perPage == perPage)&&(identical(other.hasNext, hasNext) || other.hasNext == hasNext));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(results),currentPage,perPage,hasNext);
+
+@override
+String toString() {
+  return 'KlipySearchResponse(results: $results, currentPage: $currentPage, perPage: $perPage, hasNext: $hasNext)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $KlipySearchResponseCopyWith<$Res>  {
+  factory $KlipySearchResponseCopyWith(KlipySearchResponse value, $Res Function(KlipySearchResponse) _then) = _$KlipySearchResponseCopyWithImpl;
+@useResult
+$Res call({
+ List<KlipyGif> results,@JsonKey(name: 'current_page') int currentPage,@JsonKey(name: 'per_page') int perPage,@JsonKey(name: 'has_next') bool hasNext
+});
+
+
+
+
+}
+/// @nodoc
+class _$KlipySearchResponseCopyWithImpl<$Res>
+    implements $KlipySearchResponseCopyWith<$Res> {
+  _$KlipySearchResponseCopyWithImpl(this._self, this._then);
+
+  final KlipySearchResponse _self;
+  final $Res Function(KlipySearchResponse) _then;
+
+/// Create a copy of KlipySearchResponse
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? results = null,Object? currentPage = null,Object? perPage = null,Object? hasNext = null,}) {
+  return _then(_self.copyWith(
+results: null == results ? _self.results : results // ignore: cast_nullable_to_non_nullable
+as List<KlipyGif>,currentPage: null == currentPage ? _self.currentPage : currentPage // ignore: cast_nullable_to_non_nullable
+as int,perPage: null == perPage ? _self.perPage : perPage // ignore: cast_nullable_to_non_nullable
+as int,hasNext: null == hasNext ? _self.hasNext : hasNext // ignore: cast_nullable_to_non_nullable
+as bool,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [KlipySearchResponse].
+extension KlipySearchResponsePatterns on KlipySearchResponse {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _KlipySearchResponse value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _KlipySearchResponse() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _KlipySearchResponse value)  $default,){
+final _that = this;
+switch (_that) {
+case _KlipySearchResponse():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _KlipySearchResponse value)?  $default,){
+final _that = this;
+switch (_that) {
+case _KlipySearchResponse() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<KlipyGif> results, @JsonKey(name: 'current_page')  int currentPage, @JsonKey(name: 'per_page')  int perPage, @JsonKey(name: 'has_next')  bool hasNext)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _KlipySearchResponse() when $default != null:
+return $default(_that.results,_that.currentPage,_that.perPage,_that.hasNext);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<KlipyGif> results, @JsonKey(name: 'current_page')  int currentPage, @JsonKey(name: 'per_page')  int perPage, @JsonKey(name: 'has_next')  bool hasNext)  $default,) {final _that = this;
+switch (_that) {
+case _KlipySearchResponse():
+return $default(_that.results,_that.currentPage,_that.perPage,_that.hasNext);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<KlipyGif> results, @JsonKey(name: 'current_page')  int currentPage, @JsonKey(name: 'per_page')  int perPage, @JsonKey(name: 'has_next')  bool hasNext)?  $default,) {final _that = this;
+switch (_that) {
+case _KlipySearchResponse() when $default != null:
+return $default(_that.results,_that.currentPage,_that.perPage,_that.hasNext);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _KlipySearchResponse extends KlipySearchResponse {
+  const _KlipySearchResponse({final  List<KlipyGif> results = const [], @JsonKey(name: 'current_page') this.currentPage = 1, @JsonKey(name: 'per_page') this.perPage = 24, @JsonKey(name: 'has_next') this.hasNext = false}): _results = results,super._();
+  factory _KlipySearchResponse.fromJson(Map<String, dynamic> json) => _$KlipySearchResponseFromJson(json);
+
+ final  List<KlipyGif> _results;
+@override@JsonKey() List<KlipyGif> get results {
+  if (_results is EqualUnmodifiableListView) return _results;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_results);
+}
+
+@override@JsonKey(name: 'current_page') final  int currentPage;
+@override@JsonKey(name: 'per_page') final  int perPage;
+@override@JsonKey(name: 'has_next') final  bool hasNext;
+
+/// Create a copy of KlipySearchResponse
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$KlipySearchResponseCopyWith<_KlipySearchResponse> get copyWith => __$KlipySearchResponseCopyWithImpl<_KlipySearchResponse>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$KlipySearchResponseToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _KlipySearchResponse&&const DeepCollectionEquality().equals(other._results, _results)&&(identical(other.currentPage, currentPage) || other.currentPage == currentPage)&&(identical(other.perPage, perPage) || other.perPage == perPage)&&(identical(other.hasNext, hasNext) || other.hasNext == hasNext));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_results),currentPage,perPage,hasNext);
+
+@override
+String toString() {
+  return 'KlipySearchResponse(results: $results, currentPage: $currentPage, perPage: $perPage, hasNext: $hasNext)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$KlipySearchResponseCopyWith<$Res> implements $KlipySearchResponseCopyWith<$Res> {
+  factory _$KlipySearchResponseCopyWith(_KlipySearchResponse value, $Res Function(_KlipySearchResponse) _then) = __$KlipySearchResponseCopyWithImpl;
+@override @useResult
+$Res call({
+ List<KlipyGif> results,@JsonKey(name: 'current_page') int currentPage,@JsonKey(name: 'per_page') int perPage,@JsonKey(name: 'has_next') bool hasNext
+});
+
+
+
+
+}
+/// @nodoc
+class __$KlipySearchResponseCopyWithImpl<$Res>
+    implements _$KlipySearchResponseCopyWith<$Res> {
+  __$KlipySearchResponseCopyWithImpl(this._self, this._then);
+
+  final _KlipySearchResponse _self;
+  final $Res Function(_KlipySearchResponse) _then;
+
+/// Create a copy of KlipySearchResponse
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? results = null,Object? currentPage = null,Object? perPage = null,Object? hasNext = null,}) {
+  return _then(_KlipySearchResponse(
+results: null == results ? _self._results : results // ignore: cast_nullable_to_non_nullable
+as List<KlipyGif>,currentPage: null == currentPage ? _self.currentPage : currentPage // ignore: cast_nullable_to_non_nullable
+as int,perPage: null == perPage ? _self.perPage : perPage // ignore: cast_nullable_to_non_nullable
+as int,hasNext: null == hasNext ? _self.hasNext : hasNext // ignore: cast_nullable_to_non_nullable
+as bool,
+  ));
+}
+
+
+}
+
+// dart format on

lib/src/features/composer/domain/klipy_gif.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'klipy_gif.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_KlipyMediaFormat _$KlipyMediaFormatFromJson(Map<String, dynamic> json) => _KlipyMediaFormat(
+  url: json['url'] as String? ?? '',
+  width: (json['width'] as num?)?.toInt() ?? 0,
+  height: (json['height'] as num?)?.toInt() ?? 0,
+  size: (json['size'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$KlipyMediaFormatToJson(_KlipyMediaFormat instance) => <String, dynamic>{
+  'url': instance.url,
+  'width': instance.width,
+  'height': instance.height,
+  'size': instance.size,
+};
+
+_KlipyFormatVariants _$KlipyFormatVariantsFromJson(
+  Map<String, dynamic> json,
+) => _KlipyFormatVariants(
+  gif: json['gif'] == null ? null : KlipyMediaFormat.fromJson(json['gif'] as Map<String, dynamic>),
+  webp: json['webp'] == null
+      ? null
+      : KlipyMediaFormat.fromJson(json['webp'] as Map<String, dynamic>),
+  jpg: json['jpg'] == null ? null : KlipyMediaFormat.fromJson(json['jpg'] as Map<String, dynamic>),
+  mp4: json['mp4'] == null ? null : KlipyMediaFormat.fromJson(json['mp4'] as Map<String, dynamic>),
+  webm: json['webm'] == null
+      ? null
+      : KlipyMediaFormat.fromJson(json['webm'] as Map<String, dynamic>),
+);
+
+Map<String, dynamic> _$KlipyFormatVariantsToJson(_KlipyFormatVariants instance) =>
+    <String, dynamic>{
+      'gif': instance.gif,
+      'webp': instance.webp,
+      'jpg': instance.jpg,
+      'mp4': instance.mp4,
+      'webm': instance.webm,
+    };
+
+_KlipyFile _$KlipyFileFromJson(Map<String, dynamic> json) => _KlipyFile(
+  hd: json['hd'] == null ? null : KlipyFormatVariants.fromJson(json['hd'] as Map<String, dynamic>),
+  md: json['md'] == null ? null : KlipyFormatVariants.fromJson(json['md'] as Map<String, dynamic>),
+  sm: json['sm'] == null ? null : KlipyFormatVariants.fromJson(json['sm'] as Map<String, dynamic>),
+  xs: json['xs'] == null ? null : KlipyFormatVariants.fromJson(json['xs'] as Map<String, dynamic>),
+);
+
+Map<String, dynamic> _$KlipyFileToJson(_KlipyFile instance) => <String, dynamic>{
+  'hd': instance.hd,
+  'md': instance.md,
+  'sm': instance.sm,
+  'xs': instance.xs,
+};
+
+_KlipyGif _$KlipyGifFromJson(Map<String, dynamic> json) => _KlipyGif(
+  id: (json['id'] as num?)?.toInt() ?? 0,
+  slug: json['slug'] as String? ?? '',
+  title: json['title'] as String? ?? '',
+  file: json['file'] == null
+      ? const KlipyFile()
+      : KlipyFile.fromJson(json['file'] as Map<String, dynamic>),
+  tags: (json['tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
+  type: json['type'] as String?,
+  blurPreview: json['blur_preview'] as String?,
+);
+
+Map<String, dynamic> _$KlipyGifToJson(_KlipyGif instance) => <String, dynamic>{
+  'id': instance.id,
+  'slug': instance.slug,
+  'title': instance.title,
+  'file': instance.file,
+  'tags': instance.tags,
+  'type': instance.type,
+  'blur_preview': instance.blurPreview,
+};
+
+_KlipySearchResponse _$KlipySearchResponseFromJson(Map<String, dynamic> json) =>
+    _KlipySearchResponse(
+      results:
+          (json['results'] as List<dynamic>?)
+              ?.map((e) => KlipyGif.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+      currentPage: (json['current_page'] as num?)?.toInt() ?? 1,
+      perPage: (json['per_page'] as num?)?.toInt() ?? 24,
+      hasNext: json['has_next'] as bool? ?? false,
+    );
+
+Map<String, dynamic> _$KlipySearchResponseToJson(_KlipySearchResponse instance) =>
+    <String, dynamic>{
+      'results': instance.results,
+      'current_page': instance.currentPage,
+      'per_page': instance.perPage,
+      'has_next': instance.hasNext,
+    };

lib/src/features/composer/domain/tenor_gif.dart

···
-import 'package:equatable/equatable.dart';
-
-/// Represents a GIF media object from Tenor API.
-class TenorMedia with EquatableMixin {
-  factory TenorMedia.fromJson(Map<String, dynamic> json) {
-    return TenorMedia(
-      previewUrl: json['preview'] as String? ?? '',
-      url: json['url'] as String? ?? '',
-      dims: TenorDimensions.fromJson(json['dims'] as Map<String, dynamic>? ?? {}),
-      previewSize: json['preview_size'] as int?,
-      size: json['size'] as int?,
-    );
-  }
-  const TenorMedia({
-    required this.previewUrl,
-    required this.url,
-    required this.dims,
-    this.previewSize,
-    this.size,
-  });
-
-  final String previewUrl;
-  final String url;
-  final TenorDimensions dims;
-  final int? previewSize;
-  final int? size;
-
-  Map<String, dynamic> toJson() {
-    return {
-      'preview': previewUrl,
-      'url': url,
-      'dims': dims.toJson(),
-      if (previewSize != null) 'preview_size': previewSize,
-      if (size != null) 'size': size,
-    };
-  }
-
-  @override
-  List<Object?> get props => [previewUrl, url, dims, previewSize, size];
-}
-
-/// Represents dimensions of a Tenor GIF.
-class TenorDimensions with EquatableMixin {
-  factory TenorDimensions.fromJson(Map<String, dynamic> json) {
-    return TenorDimensions(width: json['width'] as int? ?? 0, height: json['height'] as int? ?? 0);
-  }
-  const TenorDimensions({required this.width, required this.height});
-
-  final int width;
-  final int height;
-
-  Map<String, dynamic> toJson() {
-    return {'width': width, 'height': height};
-  }
-
-  @override
-  List<Object?> get props => [width, height];
-}
-
-/// Represents a GIF result from Tenor API.
-class TenorGif with EquatableMixin {
-  factory TenorGif.fromJson(Map<String, dynamic> json) {
-    final mediaFormats = <String, TenorMedia>{};
-    final mediaFormatsJson = json['media_formats'];
-    if (mediaFormatsJson != null && mediaFormatsJson is Map) {
-      for (final entry in mediaFormatsJson.entries) {
-        if (entry.key is String && entry.value is Map<String, dynamic>) {
-          mediaFormats[entry.key as String] = TenorMedia.fromJson(
-            entry.value as Map<String, dynamic>,
-          );
-        }
-      }
-    }
-
-    return TenorGif(
-      id: json['id'] as String? ?? '',
-      title: json['title'] as String? ?? '',
-      mediaFormats: mediaFormats,
-      created: json['created'] != null
-          ? DateTime.fromMillisecondsSinceEpoch((json['created'] as num).toInt() * 1000)
-          : DateTime.now(),
-      contentDescription: json['content_description'] as String?,
-      url: json['url'] as String?,
-      itemurl: json['itemurl'] as String?,
-      tags: (json['tags'] as List<dynamic>?)?.cast<String>(),
-      flags: (json['flags'] as List<dynamic>?)?.cast<String>(),
-      hasaudio: json['hasaudio'] as bool?,
-    );
-  }
-  const TenorGif({
-    required this.id,
-    required this.title,
-    required this.mediaFormats,
-    required this.created,
-    this.contentDescription,
-    this.url,
-    this.itemurl,
-    this.tags,
-    this.flags,
-    this.hasaudio,
-  });
-
-  final String id;
-  final String title;
-  final Map<String, TenorMedia> mediaFormats;
-  final DateTime created;
-  final String? contentDescription;
-  final String? url;
-  final String? itemurl;
-  final List<String>? tags;
-  final List<String>? flags;
-  final bool? hasaudio;
-
-  Map<String, dynamic> toJson() {
-    return {
-      'id': id,
-      'title': title,
-      'media_formats': mediaFormats.map((key, value) => MapEntry(key, value.toJson())),
-      'created': created.millisecondsSinceEpoch ~/ 1000,
-      if (contentDescription != null) 'content_description': contentDescription,
-      if (url != null) 'url': url,
-      if (itemurl != null) 'itemurl': itemurl,
-      if (tags != null) 'tags': tags,
-      if (flags != null) 'flags': flags,
-      if (hasaudio != null) 'hasaudio': hasaudio,
-    };
-  }
-
-  TenorMedia? get mediumGif => mediaFormats['mediumgif'];
-  TenorMedia? get tinyGif => mediaFormats['tinygif'];
-  TenorMedia? get gif => mediaFormats['gif'];
-
-  String? get thumbnailUrl => tinyGif?.previewUrl ?? mediumGif?.previewUrl;
-
-  String? get gifUrl => mediumGif?.url ?? gif?.url;
-
-  @override
-  List<Object?> get props => [
-    id,
-    title,
-    mediaFormats,
-    created,
-    contentDescription,
-    url,
-    itemurl,
-    tags,
-    flags,
-    hasaudio,
-  ];
-}
-
-/// Represents search results from Tenor API.
-class TenorSearchResponse with EquatableMixin {
-  factory TenorSearchResponse.fromJson(Map<String, dynamic> json) {
-    final results = <TenorGif>[];
-    final resultsJson = json['results'] as List<dynamic>?;
-    if (resultsJson != null) {
-      for (final result in resultsJson) {
-        if (result is Map<String, dynamic>) {
-          results.add(TenorGif.fromJson(result));
-        }
-      }
-    }
-
-    return TenorSearchResponse(results: results, next: json['next'] as String?);
-  }
-  const TenorSearchResponse({required this.results, this.next});
-
-  final List<TenorGif> results;
-  final String? next;
-
-  Map<String, dynamic> toJson() {
-    return {
-      'results': results.map((gif) => gif.toJson()).toList(),
-      if (next != null) 'next': next,
-    };
-  }
-
-  @override
-  List<Object?> get props => [results, next];
-}

lib/src/features/composer/infrastructure/klipy_service.g.dart

···
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'klipy_service.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint, type=warning
+/// Service for interacting with Klipy API.
+///
+/// Provides methods for searching GIFs and getting trending GIFs.
+/// The API key should be configured securely via environment variables.
+/// Obtain your API key from https://partner.klipy.com
+
+@ProviderFor(klipyService)
+final klipyServiceProvider = KlipyServiceProvider._();
+
+/// Service for interacting with Klipy API.
+///
+/// Provides methods for searching GIFs and getting trending GIFs.
+/// The API key should be configured securely via environment variables.
+/// Obtain your API key from https://partner.klipy.com
+
+final class KlipyServiceProvider
+    extends $FunctionalProvider<KlipyService, KlipyService, KlipyService>
+    with $Provider<KlipyService> {
+  /// Service for interacting with Klipy API.
+  ///
+  /// Provides methods for searching GIFs and getting trending GIFs.
+  /// The API key should be configured securely via environment variables.
+  /// Obtain your API key from https://partner.klipy.com
+  KlipyServiceProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'klipyServiceProvider',
+        isAutoDispose: true,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$klipyServiceHash();
+
+  @$internal
+  @override
+  $ProviderElement<KlipyService> $createElement($ProviderPointer pointer) =>
+      $ProviderElement(pointer);
+
+  @override
+  KlipyService create(Ref ref) {
+    return klipyService(ref);
+  }
+
+  /// {@macro riverpod.override_with_value}
+  Override overrideWithValue(KlipyService value) {
+    return $ProviderOverride(
+      origin: this,
+      providerOverride: $SyncValueProvider<KlipyService>(value),
+    );
+  }
+}
+
+String _$klipyServiceHash() => r'b1b2821189fcb6c0381d1bad49150cb20bb6d049';

lib/src/features/composer/infrastructure/tenor_service.dart lib/src/features/composer/infrastructure/klipy_service.dart

···
 import 'package:dio/dio.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-import '../domain/tenor_gif.dart';
+import '../domain/klipy_gif.dart';
 
-part 'tenor_service.g.dart';
+part 'klipy_service.g.dart';
 
-// FIXME: Replace with Klipy (Tenor is deprecated)
-const String _defaultApiKey = 'AIzaSyD4HJZw9KqfVqXbQeJZxk7w7xX0Xy0X0';
+// TODO: Replace with your Klipy API key from https://partner.klipy.com
+const String _defaultApiKey = 'YOUR_KLIPY_API_KEY';
 
-/// Service for interacting with Tenor API.
+/// Service for interacting with Klipy API.
 ///
-/// Provides methods for searching GIFs and getting featured/trending GIFs.
+/// Provides methods for searching GIFs and getting trending GIFs.
 /// The API key should be configured securely via environment variables.
+/// Obtain your API key from https://partner.klipy.com
 @riverpod
-TenorService tenorService(Ref ref) {
-  return TenorService(apiKey: _defaultApiKey, clientKey: 'lazurite_flutter');
+KlipyService klipyService(Ref ref) {
+  return KlipyService(apiKey: _defaultApiKey);
 }
 
-class TenorService {
-  TenorService({required String apiKey, required String clientKey, Dio? dio})
+class KlipyService {
+  KlipyService({required String apiKey, String? customerId, Dio? dio})
     : _apiKey = apiKey,
-      _clientKey = clientKey,
+      _customerId = customerId ?? 'lazurite_user',
       _dio =
           dio ??
           Dio(
             BaseOptions(
-              baseUrl: 'https://tenor.googleapis.com/v2',
+              baseUrl: 'https://api.klipy.com',
               connectTimeout: const Duration(seconds: 30),
               receiveTimeout: const Duration(seconds: 30),
               sendTimeout: const Duration(seconds: 30),
···
           );
 
   final String _apiKey;
-  final String _clientKey;
+  final String _customerId;
   final Dio _dio;
 
   /// Searches for GIFs matching the query string.
   ///
   /// [query] is the search query string.
-  /// [limit] is the number of results to return (max 50, default 20).
-  /// [pos] is the pagination token for fetching next page.
-  Future<TenorSearchResponse> searchGifs({
+  /// [perPage] is the number of results to return (max 50, default 24).
+  /// [page] is the page number for pagination (starts at 1).
+  Future<KlipySearchResponse> searchGifs({
     required String query,
-    int limit = 20,
-    String? pos,
+    int perPage = 24,
+    int page = 1,
   }) async {
     if (query.trim().isEmpty) {
-      return getFeaturedGifs(limit: limit);
+      return getTrendingGifs(perPage: perPage, page: page);
     }
 
     try {
       final response = await _dio.get<Map<String, dynamic>>(
-        '/search',
+        '/api/v1/$_apiKey/gifs/search',
         queryParameters: {
+          'customer_id': _customerId,
           'q': query,
-          'key': _apiKey,
-          'client_key': _clientKey,
-          'limit': limit.clamp(1, 50),
-          if (pos != null) 'pos': pos,
+          'per_page': perPage.clamp(1, 50),
+          'page': page,
         },
       );
 
-      return TenorSearchResponse.fromJson(response.data ?? {});
+      return KlipySearchResponse.fromApiResponse(response.data ?? {});
     } on DioException catch (e) {
       throw _convertDioError(e);
     }
   }
 
-  /// Gets featured/trending GIFs.
+  /// Gets trending GIFs.
   ///
-  /// [limit] is the number of results to return (max 50, default 20).
-  /// [pos] is the pagination token for fetching next page.
-  Future<TenorSearchResponse> getFeaturedGifs({int limit = 20, String? pos}) async {
+  /// [perPage] is the number of results to return (max 50, default 24).
+  /// [page] is the page number for pagination (starts at 1).
+  Future<KlipySearchResponse> getTrendingGifs({int perPage = 24, int page = 1}) async {
     try {
       final response = await _dio.get<Map<String, dynamic>>(
-        '/featured',
+        '/api/v1/$_apiKey/gifs/trending',
         queryParameters: {
-          'key': _apiKey,
-          'client_key': _clientKey,
-          'limit': limit.clamp(1, 50),
-          if (pos != null) 'pos': pos,
+          'customer_id': _customerId,
+          'per_page': perPage.clamp(1, 50),
+          'page': page,
         },
       );
 
-      return TenorSearchResponse.fromJson(response.data ?? {});
+      return KlipySearchResponse.fromApiResponse(response.data ?? {});
     } on DioException catch (e) {
       throw _convertDioError(e);
     }
···
         throw Exception('Failed to download thumbnail: empty response');
       }
 
+      final extension = url.contains('.webp') ? 'webp' : 'jpg';
       final directory = Directory.systemTemp;
       final file = File(
-        '${directory.path}/tenor_thumb_${DateTime.now().millisecondsSinceEpoch}.jpg',
+        '${directory.path}/klipy_thumb_${DateTime.now().millisecondsSinceEpoch}.$extension',
       );
       await file.writeAsBytes(bytes);
 

lib/src/features/composer/infrastructure/tenor_service.g.dart

···
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'tenor_service.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint, type=warning
-/// Service for interacting with Tenor API.
-///
-/// Provides methods for searching GIFs and getting featured/trending GIFs.
-/// The API key should be configured securely via environment variables.
-
-@ProviderFor(tenorService)
-final tenorServiceProvider = TenorServiceProvider._();
-
-/// Service for interacting with Tenor API.
-///
-/// Provides methods for searching GIFs and getting featured/trending GIFs.
-/// The API key should be configured securely via environment variables.
-
-final class TenorServiceProvider
-    extends $FunctionalProvider<TenorService, TenorService, TenorService>
-    with $Provider<TenorService> {
-  /// Service for interacting with Tenor API.
-  ///
-  /// Provides methods for searching GIFs and getting featured/trending GIFs.
-  /// The API key should be configured securely via environment variables.
-  TenorServiceProvider._()
-    : super(
-        from: null,
-        argument: null,
-        retry: null,
-        name: r'tenorServiceProvider',
-        isAutoDispose: true,
-        dependencies: null,
-        $allTransitiveDependencies: null,
-      );
-
-  @override
-  String debugGetCreateSourceHash() => _$tenorServiceHash();
-
-  @$internal
-  @override
-  $ProviderElement<TenorService> $createElement($ProviderPointer pointer) =>
-      $ProviderElement(pointer);
-
-  @override
-  TenorService create(Ref ref) {
-    return tenorService(ref);
-  }
-
-  /// {@macro riverpod.override_with_value}
-  Override overrideWithValue(TenorService value) {
-    return $ProviderOverride(
-      origin: this,
-      providerOverride: $SyncValueProvider<TenorService>(value),
-    );
-  }
-}
-
-String _$tenorServiceHash() => r'4296b779d4b198c7cc9b1555f00a91309d4ac8af';

lib/src/features/composer/presentation/screens/gif_picker_screen.dart

···
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:lazurite/src/infrastructure/network/network.dart';
 
-import '../../../composer/domain/tenor_gif.dart';
-import '../../../composer/infrastructure/tenor_service.dart';
+import '../../../composer/domain/klipy_gif.dart';
+import '../../../composer/infrastructure/klipy_service.dart';
 
 /// Result data returned when user selects a GIF.
 class GifSelectionResult {
···
   final String thumbBlobJson;
 }
 
-/// Screen for searching and selecting GIFs from Tenor.
+/// Screen for searching and selecting GIFs from Klipy.
 class GifPickerScreen extends ConsumerStatefulWidget {
   const GifPickerScreen({super.key});
 
···
 class _GifPickerScreenState extends ConsumerState<GifPickerScreen> {
   final TextEditingController _searchController = TextEditingController();
   final ScrollController _scrollController = ScrollController();
-  final List<TenorGif> _gifs = [];
-  String? _nextPos;
+  final List<KlipyGif> _gifs = [];
+  int? _nextPage;
   bool _isLoading = false;
   bool _isSearching = false;
 
···
     });
 
     try {
-      final service = ref.read(tenorServiceProvider);
-      final response = await service.getFeaturedGifs();
+      final service = ref.read(klipyServiceProvider);
+      final response = await service.getTrendingGifs();
 
       if (mounted) {
         setState(() {
           _gifs.clear();
           _gifs.addAll(response.results);
-          _nextPos = response.next;
+          _nextPage = response.nextPage;
           _isLoading = false;
         });
       }
···
     setState(() {
       _isLoading = true;
       _isSearching = true;
-      _nextPos = null;
+      _nextPage = null;
     });
 
     try {
-      final service = ref.read(tenorServiceProvider);
+      final service = ref.read(klipyServiceProvider);
       final response = await service.searchGifs(query: query);
 
       if (mounted) {
         setState(() {
           _gifs.clear();
           _gifs.addAll(response.results);
-          _nextPos = response.next;
+          _nextPage = response.nextPage;
           _isLoading = false;
         });
       }
···
   }
 
   Future<void> _loadMoreGifs() async {
-    if (_isLoading || _nextPos == null) return;
+    if (_isLoading || _nextPage == null) return;
 
     setState(() {
       _isLoading = true;
     });
 
     try {
-      final service = ref.read(tenorServiceProvider);
+      final service = ref.read(klipyServiceProvider);
 
-      final TenorSearchResponse response;
+      final KlipySearchResponse response;
       if (_isSearching) {
-        response = await service.searchGifs(query: _searchController.text, pos: _nextPos);
+        response = await service.searchGifs(query: _searchController.text, page: _nextPage!);
       } else {
-        response = await service.getFeaturedGifs(pos: _nextPos);
+        response = await service.getTrendingGifs(page: _nextPage!);
       }
 
       if (mounted) {
         setState(() {
           _gifs.addAll(response.results);
-          _nextPos = response.next;
+          _nextPage = response.nextPage;
           _isLoading = false;
         });
       }
···
     }
   }
 
-  Future<void> _selectGif(TenorGif gif) async {
+  Future<void> _selectGif(KlipyGif gif) async {
     try {
-      final service = ref.read(tenorServiceProvider);
+      final service = ref.read(klipyServiceProvider);
 
       final thumbnailUrl = gif.thumbnailUrl;
       if (thumbnailUrl == null) {
···
       if (!mounted) return;
 
       final result = GifSelectionResult(
-        uri: gif.itemurl ?? gif.url ?? '',
+        uri: gif.itemUrl,
         title: gif.title,
-        description: gif.contentDescription,
+        description: gif.tags?.join(', '),
         thumbBlobJson: blobRefJson,
       );
 
···
       bottomSheet: const Padding(
         padding: EdgeInsets.symmetric(vertical: 8),
         child: Text(
-          'Powered by Tenor',
+          'Powered by Klipy',
           style: TextStyle(fontSize: 12, color: Colors.grey),
           textAlign: TextAlign.center,
         ),
···
 class GifGridItem extends StatelessWidget {
   const GifGridItem({required this.gif, required this.onTap, super.key});
 
-  final TenorGif gif;
+  final KlipyGif gif;
   final VoidCallback onTap;
 
   @override

lib/src/features/feeds/presentation/screens/feed_discovery_screen.dart

···
                   );
                 }
 
-                // FIXME: These bools don't seem to be right
-                if (searchState.results.isEmpty && searchState.isLoading) {
-                  return const LoadingView();
+                if (searchState.isLoading && searchState.results.isEmpty) {
+                  return const LoadingView(message: 'Searching feeds...');
                 }
 
                 final feeds = searchState.filteredResults;
                 if (feeds.isEmpty) {
                   if (searchState.isLoading) {
-                    return const Center(child: Text('No matching feeds found.'));
+                    return const LoadingView(message: 'Searching feeds...');
                   }
-                  return const Center(child: Text('No feeds found.'));
+
+                  return EmptyState(
+                    icon: Icons.search_off,
+                    title: 'No feeds found',
+                    subtitle: searchState.localFilter.isNotEmpty
+                        ? 'No results match your local filter.'
+                        : (searchState.query.isNotEmpty
+                              ? 'No results found for "${searchState.query}".'
+                              : 'No popular feeds found at the moment.'),
+                  );
                 }
 
                 return ListView.separated(

lib/src/features/scheduling/infrastructure/background_infrastructure.dart

···
     );
 
     final videoDio = createVideoServiceDio();
-    final tenorDio = createTenorDio();
+    final klipyDio = createKlipyDio();
 
     Dio? pdsDio;
     final session = await sessionStorage.getSession();
···
       publicDio: publicDio,
       pdsDio: pdsDio,
       videoServiceDio: videoDio,
-      tenorDio: tenorDio,
+      klipyDio: klipyDio,
       logger: const Logger('XrpcClient'),
     );
 

lib/src/infrastructure/network/dio_clients.dart

···
   return dio;
 }
 
-/// Creates a Dio client configured for Tenor API access.
+/// Creates a Dio client configured for Klipy API access.
 ///
 /// This client is used for GIF search and selection.
-Dio createTenorDio({
-  String baseUrl = 'https://tenor.googleapis.com/v2',
+Dio createKlipyDio({
+  String baseUrl = 'https://api.klipy.com',
   bool enableLogging = true,
   List<Interceptor> interceptors = const [],
 }) {

lib/src/infrastructure/network/host_kind.dart

···
   /// Base URL: `https://video.bsky.app`
   video,
 
-  /// Tenor API endpoint for GIF search and selection.
+  /// Klipy API endpoint for GIF search and selection.
   ///
-  /// Base URL: `https://tenor.googleapis.com/v2`
-  tenor,
+  /// Base URL: `https://api.klipy.com`
+  klipy,
 }
 
 /// Extension to get host-related properties.
···
       HostKind.publicApi => 'https://public.api.bsky.app',
       HostKind.pds => null,
       HostKind.video => 'https://video.bsky.app',
-      HostKind.tenor => 'https://tenor.googleapis.com/v2',
+      HostKind.klipy => 'https://api.klipy.com',
     };
   }
 
···
       HostKind.publicApi => false,
       HostKind.pds => true,
       HostKind.video => true,
-      HostKind.tenor => false,
+      HostKind.klipy => false,
     };
   }
 }

lib/src/infrastructure/network/providers.dart

···
   );
 }
 
-/// Provides Tenor API Dio client for GIF search.
+/// Provides Klipy API Dio client for GIF search.
 ///
-/// This client is used for GIF search and selection from Tenor.
+/// This client is used for GIF search and selection from Klipy.
 @Riverpod(keepAlive: true)
-Dio dioTenor(Ref ref) {
-  return createTenorDio(
+Dio dioKlipy(Ref ref) {
+  return createKlipyDio(
     interceptors: [
       if (kDebugMode) DebugNetworkInterceptor(ref.watch(appDatabaseProvider).devToolsDao),
     ],
···
     publicDio: ref.watch(dioPublicProvider),
     pdsDio: ref.watch(dioPdsProvider),
     videoServiceDio: ref.watch(dioVideoServiceProvider),
-    tenorDio: ref.watch(dioTenorProvider),
+    klipyDio: ref.watch(dioKlipyProvider),
     logger: ref.watch(loggerProvider('XrpcClient')),
   );
 }

lib/src/infrastructure/network/providers.g.dart

···
 
 String _$dioVideoServiceHash() => r'35fad9f27769840636716b14bdb28c3b43634b52';
 
-/// Provides Tenor API Dio client for GIF search.
+/// Provides Klipy API Dio client for GIF search.
 ///
-/// This client is used for GIF search and selection from Tenor.
+/// This client is used for GIF search and selection from Klipy.
 
-@ProviderFor(dioTenor)
-final dioTenorProvider = DioTenorProvider._();
+@ProviderFor(dioKlipy)
+final dioKlipyProvider = DioKlipyProvider._();
 
-/// Provides Tenor API Dio client for GIF search.
+/// Provides Klipy API Dio client for GIF search.
 ///
-/// This client is used for GIF search and selection from Tenor.
+/// This client is used for GIF search and selection from Klipy.
 
-final class DioTenorProvider extends $FunctionalProvider<Dio, Dio, Dio> with $Provider<Dio> {
-  /// Provides Tenor API Dio client for GIF search.
+final class DioKlipyProvider extends $FunctionalProvider<Dio, Dio, Dio> with $Provider<Dio> {
+  /// Provides Klipy API Dio client for GIF search.
   ///
-  /// This client is used for GIF search and selection from Tenor.
-  DioTenorProvider._()
+  /// This client is used for GIF search and selection from Klipy.
+  DioKlipyProvider._()
     : super(
         from: null,
         argument: null,
         retry: null,
-        name: r'dioTenorProvider',
+        name: r'dioKlipyProvider',
         isAutoDispose: false,
         dependencies: null,
         $allTransitiveDependencies: null,
       );
 
   @override
-  String debugGetCreateSourceHash() => _$dioTenorHash();
+  String debugGetCreateSourceHash() => _$dioKlipyHash();
 
   @$internal
   @override
···
 
   @override
   Dio create(Ref ref) {
-    return dioTenor(ref);
+    return dioKlipy(ref);
   }
 
   /// {@macro riverpod.override_with_value}
···
   }
 }
 
-String _$dioTenorHash() => r'a2e99a8a8c47829fb3aefdc8d7cdc098ead2c517';
+String _$dioKlipyHash() => r'86d9a53bc4189f1293878796146efa563dfab8e1';
 
 /// Provides XRPC client for making API requests.
 ///
···
   }
 }
 
-String _$xrpcClientHash() => r'79a74523bf3f31a57602964b3989d6690bdd4903';
+String _$xrpcClientHash() => r'34d0a57c4054cdc40b4671c1036ef2911436dfbf';

lib/src/infrastructure/network/xrpc_client.dart

···
 ///
 /// This is the main entry point for making XRPC requests. It:
 /// - Looks up endpoint metadata from the registry
-/// - Routes requests to the correct Dio client (public vs PDS vs video vs tenor)
+/// - Routes requests to the correct Dio client (public vs PDS vs video vs klipy)
 /// - Handles response parsing and error conversion
 class XrpcClient {
   XrpcClient({
     required Dio publicDio,
     required Dio? pdsDio,
     required Dio videoServiceDio,
-    required Dio tenorDio,
+    required Dio klipyDio,
     required Logger logger,
     EndpointRegistry? registry,
   }) : _publicDio = publicDio,
        _pdsDio = pdsDio,
        _videoServiceDio = videoServiceDio,
-       _tenorDio = tenorDio,
+       _klipyDio = klipyDio,
        _logger = logger,
        _registry = registry ?? EndpointRegistry.instance;
 
   final Dio _publicDio;
   final Dio? _pdsDio;
   final Dio _videoServiceDio;
-  final Dio _tenorDio;
+  final Dio _klipyDio;
   final Logger _logger;
   final EndpointRegistry _registry;
 
···
         );
       case HostKind.video:
         return _videoServiceDio;
-      case HostKind.tenor:
-        return _tenorDio;
+      case HostKind.klipy:
+        return _klipyDio;
     }
   }
 

test/helpers/mocks.dart

···
 import 'package:lazurite/src/core/utils/logger.dart';
 import 'package:lazurite/src/features/auth/domain/auth_state.dart';
 import 'package:lazurite/src/features/composer/domain/facet_parser.dart';
-import 'package:lazurite/src/features/composer/infrastructure/tenor_service.dart';
+import 'package:lazurite/src/features/composer/infrastructure/klipy_service.dart';
 import 'package:lazurite/src/features/dms/infrastructure/dms_repository.dart';
 import 'package:lazurite/src/features/dms/infrastructure/outbox_repository.dart';
 import 'package:lazurite/src/features/feeds/application/feed_providers.dart';
···
 /// Fake ServerMetadata for testing
 class FakeServerMetadata extends Fake implements ServerMetadata {}
 
-class MockTenorService extends Mock implements TenorService {}
+class MockKlipyService extends Mock implements KlipyService {}
 
 class MockFlutterLocalNotificationsPlugin extends Mock
     implements FlutterLocalNotificationsPlugin {}

test/src/features/composer/infrastructure/klipy_service_test.dart

···
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lazurite/src/features/composer/domain/klipy_gif.dart';
+import 'package:lazurite/src/features/composer/infrastructure/klipy_service.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockDio extends Mock implements Dio {}
+
+void main() {
+  test('KlipyService can be created', () {
+    final service = KlipyService(apiKey: 'test-api-key');
+
+    expect(service, isA<KlipyService>());
+  });
+
+  test('KlipyGif parses complete object', () {
+    final Map<String, dynamic> json = {
+      'id': 123,
+      'slug': 'funny-cat-abc123',
+      'title': 'Funny Cat',
+      'file': {
+        'hd': {
+          'gif': {'url': 'https://media.klipy.com/hd.gif', 'width': 1920, 'height': 1080},
+          'webp': {'url': 'https://media.klipy.com/hd.webp', 'width': 1920, 'height': 1080},
+        },
+        'md': {
+          'gif': {'url': 'https://media.klipy.com/md.gif', 'width': 640, 'height': 360},
+        },
+        'sm': {
+          'gif': {'url': 'https://media.klipy.com/sm.gif', 'width': 320, 'height': 180},
+          'webp': {'url': 'https://media.klipy.com/sm.webp', 'width': 320, 'height': 180},
+        },
+      },
+      'tags': ['cat', 'funny'],
+      'type': 'gif',
+      'blur_preview': 'base64encodeddata',
+    };
+
+    final gif = KlipyGif.fromJson(json);
+
+    expect(gif.id, 123);
+    expect(gif.slug, 'funny-cat-abc123');
+    expect(gif.title, 'Funny Cat');
+    expect(gif.tags, ['cat', 'funny']);
+    expect(gif.type, 'gif');
+    expect(gif.blurPreview, 'base64encodeddata');
+  });
+
+  test('KlipyMediaFormat parses complete object', () {
+    final json = {
+      'url': 'https://example.com/full.gif',
+      'width': 500,
+      'height': 400,
+      'size': 1000000,
+    };
+
+    final format = KlipyMediaFormat.fromJson(json);
+
+    expect(format.url, 'https://example.com/full.gif');
+    expect(format.width, 500);
+    expect(format.height, 400);
+    expect(format.size, 1000000);
+  });
+
+  test('KlipySearchResponse parses complete object', () {
+    final json = {
+      'result': true,
+      'data': {
+        'data': [
+          {
+            'id': 1,
+            'slug': 'gif-1',
+            'title': 'GIF 1',
+            'file': {
+              'md': {
+                'gif': {'url': 'https://example.com/1.gif', 'width': 400, 'height': 400},
+              },
+            },
+          },
+        ],
+        'current_page': 1,
+        'per_page': 24,
+        'has_next': true,
+      },
+    };
+
+    final response = KlipySearchResponse.fromApiResponse(json);
+
+    expect(response.results, hasLength(1));
+    expect(response.results.first.slug, 'gif-1');
+    expect(response.currentPage, 1);
+    expect(response.perPage, 24);
+    expect(response.hasNext, isTrue);
+    expect(response.nextPage, 2);
+  });
+
+  group('KlipyGif thumbnailUrl helpers', () {
+    test('gets from sm webp', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'sm': {
+            'webp': {'url': 'https://example.com/sm.webp', 'width': 320, 'height': 180},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+      expect(gif.thumbnailUrl, 'https://example.com/sm.webp');
+    });
+
+    test('gets from sm gif when webp not available', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'sm': {
+            'gif': {'url': 'https://example.com/sm.gif', 'width': 320, 'height': 180},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+      expect(gif.thumbnailUrl, 'https://example.com/sm.gif');
+    });
+
+    test('falls back to xs when sm not available', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'xs': {
+            'webp': {'url': 'https://example.com/xs.webp', 'width': 160, 'height': 90},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+      expect(gif.thumbnailUrl, 'https://example.com/xs.webp');
+    });
+
+    test('returns null when no thumbnails', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'hd': {
+            'gif': {'url': 'https://example.com/hd.gif', 'width': 1920, 'height': 1080},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+      expect(gif.thumbnailUrl, isNull);
+    });
+  });
+
+  group('KlipyGif gifUrl helpers', () {
+    test('gets from md gif', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'md': {
+            'gif': {'url': 'https://example.com/md.gif', 'width': 640, 'height': 360},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+
+      expect(gif.gifUrl, 'https://example.com/md.gif');
+    });
+
+    test('gets from hd when md not available', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'hd': {
+            'gif': {'url': 'https://example.com/hd.gif', 'width': 1920, 'height': 1080},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+
+      expect(gif.gifUrl, 'https://example.com/hd.gif');
+    });
+
+    test('returns null when no gif format available', () {
+      final json = {
+        'id': 789,
+        'slug': 'test-gif',
+        'title': 'Test',
+        'file': {
+          'md': {
+            'webp': {'url': 'https://example.com/md.webp', 'width': 640, 'height': 360},
+          },
+        },
+      };
+
+      final gif = KlipyGif.fromJson(json);
+
+      expect(gif.gifUrl, isNull);
+    });
+  });
+
+  group('KlipyGif itemUrl', () {
+    test('generates correct Klipy URL', () {
+      final Map<String, dynamic> json = {
+        'id': 789,
+        'slug': 'funny-cat-abc123',
+        'title': 'Funny Cat',
+        'file': <String, dynamic>{},
+      };
+
+      final gif = KlipyGif.fromJson(json);
+
+      expect(gif.itemUrl, 'https://klipy.com/gif/funny-cat-abc123');
+    });
+  });
+
+  group('KlipyService', () {
+    late MockDio mockDio;
+    late KlipyService service;
+
+    setUp(() {
+      mockDio = MockDio();
+      service = KlipyService(apiKey: 'test-api-key', customerId: 'test-user', dio: mockDio);
+    });
+
+    test('searchGifs returns correct results', () async {
+      final responseJson = {
+        'result': true,
+        'data': {
+          'data': [
+            {'id': 1, 'slug': 'gif-1', 'title': 'Test GIF', 'file': <String, dynamic>{}},
+          ],
+          'current_page': 1,
+          'per_page': 24,
+          'has_next': false,
+        },
+      };
+
+      when(
+        () => mockDio.get<Map<String, dynamic>>(
+          '/api/v1/test-api-key/gifs/search',
+          queryParameters: any(named: 'queryParameters'),
+        ),
+      ).thenAnswer(
+        (_) async => Response<Map<String, dynamic>>(
+          data: responseJson,
+          statusCode: 200,
+          requestOptions: RequestOptions(path: '/api/v1/test-api-key/gifs/search'),
+        ),
+      );
+
+      final response = await service.searchGifs(query: 'funny cats');
+
+      expect(response.results, hasLength(1));
+      expect(response.results.first.slug, 'gif-1');
+    });
+
+    test('searchGifs respects pagination', () async {
+      final responseJson = {
+        'result': true,
+        'data': {'data': [], 'current_page': 2, 'per_page': 24, 'has_next': true},
+      };
+
+      when(
+        () => mockDio.get<Map<String, dynamic>>(
+          '/api/v1/test-api-key/gifs/search',
+          queryParameters: any(named: 'queryParameters'),
+        ),
+      ).thenAnswer(
+        (_) async => Response<Map<String, dynamic>>(
+          data: responseJson,
+          statusCode: 200,
+          requestOptions: RequestOptions(path: '/api/v1/test-api-key/gifs/search'),
+        ),
+      );
+
+      final response = await service.searchGifs(query: 'test', page: 2);
+
+      expect(response.currentPage, 2);
+      expect(response.nextPage, 3);
+    });
+
+    test('getTrendingGifs returns correct results', () async {
+      final responseJson = {
+        'result': true,
+        'data': {
+          'data': [
+            {'id': 1, 'slug': 'trending-1', 'title': 'Trending GIF', 'file': <String, dynamic>{}},
+          ],
+          'current_page': 1,
+          'per_page': 24,
+          'has_next': false,
+        },
+      };
+
+      when(
+        () => mockDio.get<Map<String, dynamic>>(
+          '/api/v1/test-api-key/gifs/trending',
+          queryParameters: any(named: 'queryParameters'),
+        ),
+      ).thenAnswer(
+        (_) async => Response<Map<String, dynamic>>(
+          data: responseJson,
+          statusCode: 200,
+          requestOptions: RequestOptions(path: '/api/v1/test-api-key/gifs/trending'),
+        ),
+      );
+
+      final response = await service.getTrendingGifs();
+
+      expect(response.results, hasLength(1));
+      expect(response.results.first.slug, 'trending-1');
+    });
+
+    test('downloadThumbnail downloads and saves file', () async {
+      final bytes = [1, 2, 3, 4, 5];
+
+      when(
+        () => mockDio.get<List<int>>(
+          'https://example.com/thumb.jpg',
+          options: any(named: 'options'),
+        ),
+      ).thenAnswer(
+        (_) async => Response<List<int>>(
+          data: bytes,
+          statusCode: 200,
+          requestOptions: RequestOptions(path: 'https://example.com/thumb.jpg'),
+        ),
+      );
+
+      final file = await service.downloadThumbnail('https://example.com/thumb.jpg');
+
+      expect(file.existsSync(), isTrue);
+      final readBytes = await file.readAsBytes();
+      expect(readBytes, bytes);
+
+      await file.delete();
+    });
+
+    test('downloadThumbnail throws exception on empty response', () async {
+      when(
+        () => mockDio.get<List<int>>(
+          'https://example.com/thumb.jpg',
+          options: any(named: 'options'),
+        ),
+      ).thenAnswer(
+        (_) async => Response<List<int>>(
+          data: [],
+          statusCode: 200,
+          requestOptions: RequestOptions(path: 'https://example.com/thumb.jpg'),
+        ),
+      );
+
+      expect(
+        () => service.downloadThumbnail('https://example.com/thumb.jpg'),
+        throwsA(isA<Exception>()),
+      );
+    });
+  });
+}

test/src/features/composer/infrastructure/tenor_service_test.dart

···
-import 'package:dio/dio.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:lazurite/src/features/composer/domain/tenor_gif.dart';
-import 'package:lazurite/src/features/composer/infrastructure/tenor_service.dart';
-import 'package:mocktail/mocktail.dart';
-
-class MockDio extends Mock implements Dio {}
-
-void main() {
-  test('TenorService can be created', () {
-    final service = TenorService(apiKey: 'test-api-key', clientKey: 'test-client');
-
-    expect(service, isA<TenorService>());
-  });
-
-  test('TenorGif parses complete object', () {
-    final json = {
-      'id': 'gif-123',
-      'title': 'Funny Cat',
-      'media_formats': {
-        'gif': {
-          'url': 'https://media.tenor.com/full.gif',
-          'preview': 'https://media.tenor.com/preview.gif',
-          'dims': {'width': 500, 'height': 500},
-          'size': 1000000,
-          'preview_size': 50000,
-        },
-      },
-      'created': 1640000000,
-      'tags': ['cat', 'funny'],
-      'flags': ['trending'],
-      'hasaudio': false,
-    };
-
-    final gif = TenorGif.fromJson(json);
-
-    expect(gif.id, 'gif-123');
-    expect(gif.title, 'Funny Cat');
-    expect(gif.created, DateTime.fromMillisecondsSinceEpoch(1640000000000));
-    expect(gif.tags, ['cat', 'funny']);
-    expect(gif.flags, ['trending']);
-    expect(gif.hasaudio, isFalse);
-    expect(gif.mediaFormats, hasLength(1));
-  });
-
-  test('TenorMedia parses complete object', () {
-    final json = {
-      'url': 'https://example.com/full.gif',
-      'preview': 'https://example.com/preview.gif',
-      'dims': {'width': 500, 'height': 500},
-      'size': 1000000,
-      'preview_size': 50000,
-    };
-
-    final media = TenorMedia.fromJson(json);
-
-    expect(media.url, 'https://example.com/full.gif');
-    expect(media.previewUrl, 'https://example.com/preview.gif');
-    expect(media.dims.width, 500);
-    expect(media.dims.height, 500);
-    expect(media.size, 1000000);
-    expect(media.previewSize, 50000);
-  });
-
-  test('TenorSearchResponse parses complete object', () {
-    final json = {
-      'results': [
-        {
-          'id': 'gif-1',
-          'title': 'GIF 1',
-          'media_formats': {
-            'mediumgif': {
-              'url': 'https://example.com/1.gif',
-              'dims': {'width': 400, 'height': 400},
-            },
-          },
-        },
-      ],
-      'next': 'next-token-123',
-    };
-
-    final response = TenorSearchResponse.fromJson(json);
-
-    expect(response.results, hasLength(1));
-    expect(response.results.first.id, 'gif-1');
-    expect(response.next, 'next-token-123');
-  });
-
-  group('TenorGif thumbnailUrl helpers', () {
-    test('gets from tinygif', () {
-      final json = {
-        'id': 'gif-789',
-        'title': 'Test',
-        'media_formats': {
-          'tinygif': {'preview': 'https://example.com/preview.gif'},
-        },
-      };
-
-      final gif = TenorGif.fromJson(json);
-      expect(gif.thumbnailUrl, 'https://example.com/preview.gif');
-    });
-
-    test('gets from mediumgif when tiny not available', () {
-      final json = {
-        'id': 'gif-789',
-        'title': 'Test',
-        'media_formats': {
-          'mediumgif': {'preview': 'https://example.com/medium-preview.gif'},
-        },
-      };
-
-      final gif = TenorGif.fromJson(json);
-      expect(gif.thumbnailUrl, 'https://example.com/medium-preview.gif');
-    });
-
-    test('returns null when no previews', () {
-      final json = {
-        'id': 'gif-789',
-        'title': 'Test',
-        'media_formats': {
-          'gif': {'url': 'https://example.com/gif.gif'},
-        },
-      };
-
-      final gif = TenorGif.fromJson(json);
-      expect(gif.thumbnailUrl, equals(null));
-    });
-  });
-
-  group('TenorGif gifUrl helpers', () {
-    test('gets from mediumgif', () {
-      final json = {
-        'id': 'gif-789',
-        'title': 'Test',
-        'media_formats': {
-          'mediumgif': {'url': 'https://example.com/medium.gif'},
-        },
-      };
-
-      final gif = TenorGif.fromJson(json);
-
-      expect(gif.gifUrl, 'https://example.com/medium.gif');
-    });
-
-    test('gets from gif when medium not available', () {
-      final json = {
-        'id': 'gif-789',
-        'title': 'Test',
-        'media_formats': {
-          'gif': {'url': 'https://example.com/gif.gif'},
-        },
-      };
-
-      final gif = TenorGif.fromJson(json);
-
-      expect(gif.gifUrl, 'https://example.com/gif.gif');
-    });
-
-    test('returns null when neither format available', () {
-      final json = {'id': 'gif-789', 'title': 'Test', 'media_formats': {}};
-
-      final gif = TenorGif.fromJson(json);
-
-      expect(gif.gifUrl, equals(null));
-    });
-  });
-
-  group('TenorService', () {
-    late MockDio mockDio;
-    late TenorService service;
-
-    setUp(() {
-      mockDio = MockDio();
-      service = TenorService(apiKey: 'test-api-key', clientKey: 'test-client', dio: mockDio);
-    });
-
-    test('searchGifs returns correct results', () async {
-      final responseJson = {
-        'results': [
-          {'id': 'gif-1', 'title': 'Test GIF', 'media_formats': {}},
-        ],
-      };
-
-      when(
-        () => mockDio.get<Map<String, dynamic>>(
-          '/search',
-          queryParameters: any(named: 'queryParameters'),
-        ),
-      ).thenAnswer(
-        (_) async => Response<Map<String, dynamic>>(
-          data: responseJson,
-          statusCode: 200,
-          requestOptions: RequestOptions(path: '/search'),
-        ),
-      );
-
-      final response = await service.searchGifs(query: 'funny cats');
-
-      expect(response.results, hasLength(1));
-      expect(response.results.first.id, 'gif-1');
-    });
-
-    test('searchGifs respects pagination', () async {
-      final responseJson = {'results': [], 'next': 'token-123'};
-
-      when(
-        () => mockDio.get<Map<String, dynamic>>(
-          '/search',
-          queryParameters: any(named: 'queryParameters'),
-        ),
-      ).thenAnswer(
-        (_) async => Response<Map<String, dynamic>>(
-          data: responseJson,
-          statusCode: 200,
-          requestOptions: RequestOptions(path: '/search'),
-        ),
-      );
-
-      final response = await service.searchGifs(query: 'test', pos: 'token-123');
-
-      expect(response.next, 'token-123');
-    });
-
-    test('getFeaturedGifs returns correct results', () async {
-      final responseJson = {
-        'results': [
-          {'id': 'featured-1', 'title': 'Featured GIF', 'media_formats': {}},
-        ],
-      };
-
-      when(
-        () => mockDio.get<Map<String, dynamic>>(
-          '/featured',
-          queryParameters: any(named: 'queryParameters'),
-        ),
-      ).thenAnswer(
-        (_) async => Response<Map<String, dynamic>>(
-          data: responseJson,
-          statusCode: 200,
-          requestOptions: RequestOptions(path: '/featured'),
-        ),
-      );
-
-      final response = await service.getFeaturedGifs();
-
-      expect(response.results, hasLength(1));
-      expect(response.results.first.id, 'featured-1');
-    });
-
-    test('downloadThumbnail downloads and saves file', () async {
-      final bytes = [1, 2, 3, 4, 5];
-
-      when(
-        () => mockDio.get<List<int>>(
-          'https://example.com/thumb.jpg',
-          options: any(named: 'options'),
-        ),
-      ).thenAnswer(
-        (_) async => Response<List<int>>(
-          data: bytes,
-          statusCode: 200,
-          requestOptions: RequestOptions(path: 'https://example.com/thumb.jpg'),
-        ),
-      );
-
-      final file = await service.downloadThumbnail('https://example.com/thumb.jpg');
-
-      expect(file.existsSync(), isTrue);
-      final readBytes = await file.readAsBytes();
-      expect(readBytes, bytes);
-
-      await file.delete();
-    });
-
-    test('downloadThumbnail throws exception on empty response', () async {
-      when(
-        () => mockDio.get<List<int>>(
-          'https://example.com/thumb.jpg',
-          options: any(named: 'options'),
-        ),
-      ).thenAnswer(
-        (_) async => Response<List<int>>(
-          data: [],
-          statusCode: 200,
-          requestOptions: RequestOptions(path: 'https://example.com/thumb.jpg'),
-        ),
-      );
-
-      expect(
-        () => service.downloadThumbnail('https://example.com/thumb.jpg'),
-        throwsA(isA<Exception>()),
-      );
-    });
-  });
-}

test/src/features/composer/infrastructure/video_upload_service_test.dart

···
   group('VideoUploadService - cancelUpload', () {
     test('cancels active upload', () async {
       var getJobStatusCallCount = 0;
-      final shouldCancel = Completer<bool>();
+      final pollingStarted = Completer<void>();
+      final shouldCancel = Completer<void>();
 
       when(
         () => mockApi.callRaw<Map<String, dynamic>>(
···
         getJobStatusCallCount++;
 
         if (getJobStatusCallCount == 1) {
+          pollingStarted.complete();
           await shouldCancel.future;
         }
 
···
         mimeType: 'video/mp4',
       );
 
-      await Future.delayed(const Duration(milliseconds: 10));
-
-      shouldCancel.complete(true);
+      await pollingStarted.future;
 
       videoUploadService.cancelUpload('test-job-cancel');
+      shouldCancel.complete();
 
       await expectLater(
         uploadFuture,

test/src/infrastructure/network/xrpc_client_test.dart

···
   late Dio publicDio;
   late Dio pdsDio;
   late Dio videoServiceDio;
-  late Dio tenorDio;
+  late Dio klipyDio;
   late DioAdapter publicAdapter;
   late DioAdapter pdsAdapter;
   late XrpcClient client;
···
     publicDio = Dio(BaseOptions(baseUrl: 'https://public.api.bsky.app'));
     pdsDio = Dio(BaseOptions(baseUrl: 'https://user.pds.example'));
     videoServiceDio = Dio(BaseOptions(baseUrl: 'https://video.bsky.app'));
-    tenorDio = Dio(BaseOptions(baseUrl: 'https://tenor.googleapis.com/v2'));
+    klipyDio = Dio(BaseOptions(baseUrl: 'https://api.klipy.com'));
     publicAdapter = DioAdapter(dio: publicDio);
     pdsAdapter = DioAdapter(dio: pdsDio);
     DioAdapter(dio: videoServiceDio);
···
       publicDio: publicDio,
       pdsDio: pdsDio,
       videoServiceDio: videoServiceDio,
-      tenorDio: tenorDio,
+      klipyDio: klipyDio,
       logger: MockLogger(),
     );
   });
···
         publicDio: publicDio,
         pdsDio: null,
         videoServiceDio: videoServiceDio,
-        tenorDio: tenorDio,
+        klipyDio: klipyDio,
         logger: MockLogger(),
       );
     });
···
         publicDio: publicDio,
         pdsDio: null,
         videoServiceDio: videoServiceDio,
-        tenorDio: tenorDio,
+        klipyDio: klipyDio,
         logger: MockLogger(),
       );
 
···
         publicDio: mockDio,
         pdsDio: mockDio,
         videoServiceDio: videoServiceDio,
-        tenorDio: tenorDio,
+        klipyDio: klipyDio,
         logger: MockLogger(),
       );