chore: cutie fixes

namidaco · Jul 9, 2024 · 1f7b860 · 1f7b860
1 parent b2d7884
commit 1f7b860
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/youtube/controller/info_controllers/yt_video_info_controller.dart b/lib/youtube/controller/info_controllers/yt_video_info_controller.dart
@@ -37,10 +37,10 @@ class _VideoInfoController {
     final res = YoutiPie.cacheBuilder.forVideoStreams(videoId: videoId);
     final cached = res.read();
     if (cached == null || cached.client != _usedClient) return null;
-    if (_requiresJSPlayer) {
+    if (_requiresJSPlayer && bypassJSCheck == false) {
       if (!YoutiPie.cipher.isPrepared) {
         YoutubeInfoController.ensureJSPlayerInitialized();
-        if (bypassJSCheck == false) return null; // the player is not prepared, hence the urls are just useless
+        return null; // the player is not prepared, hence the urls are just useless
       }
     }
     return cached;

diff --git a/lib/youtube/controller/youtube_account_controller.dart b/lib/youtube/controller/youtube_account_controller.dart
@@ -282,7 +282,7 @@ class _CurrentMembership {
       return;
     }
     userPatreonTier.value = tier;
-    final ms = NamicoSubscriptionManager.usdToMembershipType(tier.ammountUSD);
+    final ms = tier.toMembershipType();
     userMembershipTypePatreon.value = ms;
     _updateGlobal(ms);
   }
@@ -294,7 +294,7 @@ class _CurrentMembership {
       return;
     }
     userPatreonTier.value = tier;
-    final ms = NamicoSubscriptionManager.usdToMembershipType(tier.ammountUSD);
+    final ms = tier.toMembershipType();
     userMembershipTypePatreon.value = ms;
     _updateGlobal(ms);
   }
@@ -307,7 +307,7 @@ class _CurrentMembership {
       deviceId: deviceId,
     );
     userSupabaseSub.value = sub;
-    final ms = NamicoSubscriptionManager.usdToMembershipType(sub.usd);
+    final ms = sub.toMembershipType();
     userMembershipTypeSupabase.value = ms;
     _updateGlobal(ms);
   }
@@ -320,7 +320,7 @@ class _CurrentMembership {
       deviceId: deviceId,
     );
     userSupabaseSub.value = sub;
-    final ms = NamicoSubscriptionManager.usdToMembershipType(sub.usd);
+    final ms = sub.toMembershipType();
     userMembershipTypeSupabase.value = ms;
     _updateGlobal(ms);
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 3.1.0-beta+240708236
+version: 3.1.1-beta+240709136
 
 environment:
   sdk: ">=3.4.0 <4.0.0"