Patreon refs

.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
 stages:
 - buildAndDeployApkUnstable
 - buildAndDeployApkStable
+- buildAndDeployPlaystore
 
 buildAndDeployApkUnstable:
   stage: buildAndDeployApkUnstable
@@ -25,8 +26,8 @@ buildAndDeployApkStable:
     - branches
   when: manual
 
-buildAndDeployApkStable:
-  stage: buildAndDeployApkStable
+buildAndDeployPlaystore:
+  stage: buildAndDeployPlaystore
   script:
     - sh deploy-playstore.sh
   only:

app/build.gradle

@@ -95,7 +95,7 @@ android {
     }
 
     defaultConfig {
-        minSdk 29
+        minSdk 28
         targetSdk 33
         versionCode gitVersionCode
         versionName gitVersionName

app/src/main/AndroidManifest.xml

@@ -127,6 +127,10 @@
             android:name=".activities.ExceptionActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.CaptchaActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.LoginActivity"
             android:screenOrientation="portrait"

app/src/main/assets/devportal/dev_bridge.js

@@ -217,6 +217,9 @@ function pluginUpdateTestPlugin(config) {
 }
 function pluginLoginTestPlugin() {
     return syncGET("/plugin/loginTestPlugin", {});
+}//captchaLoginTestPlugin
+function pluginCaptchaTestPlugin(url, html) {
+    return syncPOST("/plugin/captchaTestPlugin?url=" + url, {}, html);
 }
 function pluginLogoutTestPlugin() {
     return syncGET("/plugin/logoutTestPlugin", {});

app/src/main/assets/devportal/index.html

@@ -681,6 +681,9 @@
 					});
 				}, 1000);
 			},
+			captchaTestPlugin() {
+				captchaLoginTestPlugin();
+			},
 			logoutTestPlugin() {
 				pluginLogoutTestPlugin();
 			},
@@ -838,6 +841,12 @@
 					this.Testing.lastResultError = "";
 				}
 				catch(ex) {
+					if(ex.plugin_type == "CaptchaRequiredException") {
+						let shouldCaptcha = confirm("Do you want to request captcha?");
+						if(shouldCaptcha) {
+							pluginCaptchaTestPlugin(ex.url, ex.body);
+						}
+					}
 					console.error("Failed to run test for " + req.title, ex);
 					this.Testing.lastResult = ""
 					if(ex.message)

app/src/main/assets/scripts/source.js

@@ -64,6 +64,19 @@ class ScriptException extends Error {
         }
     }
 }
+class CaptchaRequiredException extends Error {
+    constructor(url, body) {
+        super(JSON.stringify({ 'plugin_type': 'CaptchaRequiredException', url, body }));
+        this.plugin_type = "CaptchaRequiredException";
+        this.url = url;
+        this.body = body;
+    }
+}
+class CriticalException extends ScriptException {
+    constructor(msg) {
+        super("CriticalException", msg);
+    }
+}
 class UnavailableException extends ScriptException {
     constructor(msg) {
         super("UnavailableException", msg);

app/src/main/java/com/futo/platformplayer/Extensions_Content.kt

@@ -0,0 +1,15 @@
+package com.futo.platformplayer
+
+import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.helpers.VideoHelper
+
+fun IPlatformVideoDetails.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+fun IVideoSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+fun IAudioSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+
+
+fun IVideoSourceDescriptor.hasAnySource(): Boolean = this.videoSources.any() || (this is VideoUnMuxedSourceDescriptor && this.audioSources.any());

app/src/main/java/com/futo/platformplayer/Extensions_Polycentric.kt

@@ -35,4 +35,8 @@ fun Protocol.ImageBundle?.selectHighestResolutionImage(): Protocol.ImageManifest
 
 fun Protocol.Claim.resolveChannelUrl(): String? {
     return StatePlatform.instance.resolveChannelUrlByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
+}
+
+fun Protocol.Claim.resolveChannelUrls(): List<String> {
+    return StatePlatform.instance.resolveChannelUrlsByClaimTemplates(this.claimType.toInt(), this.claimFieldsList.associate { Pair(it.key.toInt(), it.value) })
 }

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -4,7 +4,9 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.webkit.CookieManager
+import androidx.core.content.ContextCompat.startActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.activities.*
 import com.futo.platformplayer.api.http.ManagedHttpClient
@@ -20,6 +22,7 @@ import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.fields.DropdownFieldOptionsId
 import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FieldForm
+import com.futo.platformplayer.views.fields.FormFieldButton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -43,8 +46,9 @@ class Settings : FragmentedStorageFileJson() {
 
     @FormField(
         "Manage Polycentric identity", FieldForm.BUTTON,
-        "Manage your Polycentric identity", -2
+        "Manage your Polycentric identity", -4
     )
+    @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
         SettingsActivity.getActivity()?.let {
             if (StatePolycentric.instance.processHandle != null) {
@@ -55,15 +59,44 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
+    @FormField(
+        "Show FAQ", FieldForm.BUTTON,
+        "Get answers to common questions", -3
+    )
+    @FormFieldButton(R.drawable.ic_quiz)
+    fun openFAQ() {
+        try {
+            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Settings.URL_FAQ))
+            SettingsActivity.getActivity()?.startActivity(browserIntent);
+        } catch (e: Throwable) {
+            //Ignored
+        }
+    }
+    @FormField(
+        "Show Issues", FieldForm.BUTTON,
+        "A list of user-reported and self-reported issues", -2
+    )
+    @FormFieldButton(R.drawable.ic_data_alert)
+    fun openIssues() {
+        try {
+            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/futo-org/grayjay-android/issues"))
+            SettingsActivity.getActivity()?.startActivity(browserIntent);
+        } catch (e: Throwable) {
+            //Ignored
+        }
+    }
+
     @FormField(
         "Submit feedback", FieldForm.BUTTON,
         "Give feedback on the application", -1
     )
+    @FormFieldButton(R.drawable.ic_bug)
     fun submitFeedback() {
         try {
             val i = Intent(Intent.ACTION_VIEW);
             val subject = "Feedback Grayjay";
-            val body = "Hey,\n\nI have some feedback on the Grayjay app.\nVersion information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE}})\n\n";
+            val body = "Hey,\n\nI have some feedback on the Grayjay app.\nVersion information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE}})\n" +
+                    "Device information (brand= ${Build.BRAND}, manufacturer = ${Build.MANUFACTURER}, device = ${Build.DEVICE}, version-sdk = ${Build.VERSION.SDK_INT}, version-os = ${Build.VERSION.BASE_OS})\n\n";
             val data = Uri.parse("mailto:grayjay@futo.org?subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body));
             i.data = data;
 
@@ -77,6 +110,7 @@ class Settings : FragmentedStorageFileJson() {
         "Manage Tabs", FieldForm.BUTTON,
         "Change tabs visible on the home screen", -1
     )
+    @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
         try {
             SettingsActivity.getActivity()?.let {
@@ -140,7 +174,11 @@ class Settings : FragmentedStorageFileJson() {
                 return FeedStyle.THUMBNAIL;
         }
 
-        @FormField("Background Update", FieldForm.DROPDOWN, "Experimental background update for subscriptions cache (requires restart)", 6)
+        @FormField("Fetch on app boot", FieldForm.TOGGLE, "Shortly after opening the app, start fetching subscriptions.", 6)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var fetchOnAppBoot: Boolean = true;
+
+        @FormField("Background Update", FieldForm.DROPDOWN, "Experimental background update for subscriptions cache (requires restart)", 7)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
 
@@ -156,7 +194,7 @@ class Settings : FragmentedStorageFileJson() {
         };
 
 
-        @FormField("Subscription Concurrency", FieldForm.DROPDOWN, "Specify how many threads are used to fetch channels (requires restart)", 7)
+        @FormField("Subscription Concurrency", FieldForm.DROPDOWN, "Specify how many threads are used to fetch channels (requires restart)", 8)
         @DropdownFieldOptionsId(R.array.thread_count)
         var subscriptionConcurrency: Int = 3;
 
@@ -213,7 +251,7 @@ class Settings : FragmentedStorageFileJson() {
 
         fun isAutoRotate() = autoRotate == 1 || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate());
 
-        @FormField("Auto-Rotate Dead Zone", FieldForm.DROPDOWN, "Auto-rotate deadzone in degrees", 5)
+        @FormField("Auto-Rotate Dead Zone", FieldForm.DROPDOWN, "This prevents the device from rotating within the given amount of degrees.", 5)
         @DropdownFieldOptionsId(R.array.auto_rotate_dead_zone)
         var autoRotateDeadZone: Int = 0;
 
@@ -595,6 +633,7 @@ class Settings : FragmentedStorageFileJson() {
 
     companion object {
         private const val TAG = "Settings";
+        const val URL_FAQ = "https://grayjay.app/faq.html";
 
         private var _isFirst = true;
 

app/src/main/java/com/futo/platformplayer/SettingsDev.kt

@@ -17,6 +17,7 @@ import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.states.StateDownloads
+import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
 import com.futo.platformplayer.views.fields.FieldForm
@@ -272,6 +273,15 @@ class SettingsDev : FragmentedStorageFileJson() {
     @FormField("Other", FieldForm.GROUP, "Others...", 5)
     val otherTests: OtherTests = OtherTests();
     class OtherTests {
+        @FormField("Unsubscribe all", FieldForm.BUTTON, "Removes all subscriptions", -1)
+        fun unsubscribeAll() {
+            val toUnsub = StateSubscriptions.instance.getSubscriptions();
+            UIDialogs.toast("Started unsubbing.. (${toUnsub.size})")
+            toUnsub.forEach {
+                StateSubscriptions.instance.removeSubscription(it.channel.url);
+            };
+            UIDialogs.toast("Finished unsubbing.. (${toUnsub.size})")
+        }
         @FormField("Clear Downloads", FieldForm.BUTTON, "Deletes all ongoing downloads", 1)
         fun clearDownloads() {
             StateDownloads.instance.getDownloading().forEach {

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt

@@ -4,7 +4,6 @@ import android.content.ContentResolver
 import android.view.View
 import android.view.ViewGroup
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.http.server.handlers.HttpConstantHandler
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
@@ -18,6 +17,7 @@ import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.states.*
+import com.futo.platformplayer.views.Loader
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
@@ -29,7 +29,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
+import java.lang.IllegalStateException
 
 class UISlideOverlays {
     companion object {
@@ -45,7 +45,7 @@ class UISlideOverlays {
             menu.show();
         }
 
-        fun showDownloadVideoOverlay(contentResolver: ContentResolver, video: IPlatformVideoDetails, container: ViewGroup): SlideUpMenuOverlay? {
+        fun showDownloadVideoOverlay(video: IPlatformVideoDetails, container: ViewGroup, contentResolver: ContentResolver? = null): SlideUpMenuOverlay? {
             val items = arrayListOf<View>();
             var menu: SlideUpMenuOverlay? = null;
 
@@ -68,6 +68,12 @@ class UISlideOverlays {
                 return null;
             }
 
+            if(!VideoHelper.isDownloadable(video)) {
+                Logger.i(TAG, "Attempted to open downloads without valid sources for [${video.name}]: ${video.url}");
+                UIDialogs.toast( "No downloadable sources (yet)");
+                return null;
+            }
+
             items.add(SlideUpMenuGroup(container.context, "Video", videoSources,
                 listOf(listOf(SlideUpMenuItem(container.context, R.drawable.ic_movie, "None", "Audio Only", "none", {
                     selectedVideo = null;
@@ -76,7 +82,7 @@ class UISlideOverlays {
                         menu?.setOk("Download");
                 }, false)) +
                 videoSources
-                .filter { it is IVideoUrlSource }
+                .filter { it.isDownloadable() }
                 .map {
                     SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
                         selectedVideo = it as IVideoUrlSource;
@@ -88,14 +94,14 @@ class UISlideOverlays {
             ));
 
             if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.size > 0)
-                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it is IVideoUrlSource }.asIterable(),
+                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it.isDownloadable() }.asIterable(),
                     Settings.instance.downloads.getDefaultVideoQualityPixels(),
                     FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) as IVideoUrlSource;
 
 
             audioSources?.let { audioSources ->
                 items.add(SlideUpMenuGroup(container.context, "Audio", audioSources, audioSources
-                    .filter { it is IAudioUrlSource }
+                    .filter { VideoHelper.isDownloadable(it) }
                     .map {
                         SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
                             selectedAudio = it as IAudioUrlSource;
@@ -111,24 +117,27 @@ class UISlideOverlays {
                 menu?.selectOption(asources, preferredAudioSource);
 
 
-                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioUrlSource }.asIterable(),
+                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it.isDownloadable() }.asIterable(),
                     FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
                     Settings.instance.playback.getPrimaryLanguage(container.context),
                     if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioUrlSource?;
             }
 
-            items.add(SlideUpMenuGroup(container.context, "Subtitles", subtitleSources, subtitleSources
-                .map {
-                    SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
-                        if (selectedSubtitle == it) {
-                            selectedSubtitle = null;
-                            menu?.selectOption(subtitleSources, null);
-                        } else {
-                            selectedSubtitle = it;
-                            menu?.selectOption(subtitleSources, it);
-                        }
-                    }, false);
-                }));
+            //ContentResolver is required for subtitles..
+            if(contentResolver != null) {
+                items.add(SlideUpMenuGroup(container.context, "Subtitles", subtitleSources, subtitleSources
+                    .map {
+                        SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
+                            if (selectedSubtitle == it) {
+                                selectedSubtitle = null;
+                                menu?.selectOption(subtitleSources, null);
+                            } else {
+                                selectedSubtitle = it;
+                                menu?.selectOption(subtitleSources, it);
+                            }
+                        }, false);
+                    }));
+            }
 
             menu = SlideUpMenuOverlay(container.context, container, "Download Video", null, true, items);
 
@@ -153,29 +162,12 @@ class UISlideOverlays {
                         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                             try {
                                 val subtitleUri = subtitleToDownload.getSubtitlesURI();
-                                if (subtitleUri != null) {
-                                    var subtitles: String? = null;
-                                    if ("file" == subtitleUri.scheme) {
-                                        val inputStream = contentResolver.openInputStream(subtitleUri);
-                                        inputStream?.use { stream ->
-                                            val reader = stream.bufferedReader();
-                                            subtitles = reader.use { it.readText() };
-                                        }
-                                    } else if ("http" == subtitleUri.scheme || "https" == subtitleUri.scheme) {
-                                        val client = ManagedHttpClient();
-                                        val subtitleResponse = client.get(subtitleUri.toString());
-                                        if (!subtitleResponse.isOk) {
-                                            throw Exception("Cannot fetch subtitles from source '${subtitleUri}': ${subtitleResponse.code}");
-                                        }
-
-                                        subtitles = subtitleResponse.body?.toString()
-                                            ?: throw Exception("Subtitles are invalid '${subtitleUri}': ${subtitleResponse.code}");
-                                    } else {
-                                        throw Exception("Unsuported scheme");
-                                    }
+                                //TODO: Remove uri dependency, should be able to work with raw aswell?
+                                if (subtitleUri != null && contentResolver != null) {
+                                    val subtitlesRaw = StateDownloads.instance.downloadSubtitles(subtitleToDownload, contentResolver);
 
                                     withContext(Dispatchers.Main) {
-                                        StateDownloads.instance.download(video, selectedVideo, selectedAudio, if (subtitles != null) SubtitleRawSource(subtitleToDownload.name, subtitleToDownload.format, subtitles!!) else null);
+                                        StateDownloads.instance.download(video, selectedVideo, selectedAudio, subtitlesRaw);
                                     }
                                 } else {
                                     withContext(Dispatchers.Main) {
@@ -191,10 +183,41 @@ class UISlideOverlays {
             };
             return menu.apply { show() };
         }
-        fun showDownloadVideoOverlay(video: IPlatformVideo, container: ViewGroup) {
-            showUnknownVideoDownload("Video", container) { px, bitrate ->
-                StateDownloads.instance.download(video, px, bitrate)
+        fun showDownloadVideoOverlay(video: IPlatformVideo, container: ViewGroup, useDetails: Boolean = false) {
+            val handleUnknownDownload: ()->Unit = {
+                showUnknownVideoDownload("Video", container) { px, bitrate ->
+                    StateDownloads.instance.download(video, px, bitrate)
+                };
             };
+            if(!useDetails)
+                handleUnknownDownload();
+            else {
+                val scope = StateApp.instance.scopeOrNull;
+
+                if(scope != null) {
+                    val loader = showLoaderOverlay("Fetching video details", container);
+                    scope.launch(Dispatchers.IO) {
+                        try {
+                            val videoDetails = StatePlatform.instance.getContentDetails(video.url, false).await();
+                            if(videoDetails !is IPlatformVideoDetails)
+                                throw IllegalStateException("Not a video details");
+
+                            withContext(Dispatchers.Main) {
+                                if(showDownloadVideoOverlay(videoDetails, container, StateApp.instance.contextOrNull?.contentResolver) == null)
+                                    loader.hide(true);
+                            }
+                        }
+                        catch(ex: Throwable) {
+                            withContext(Dispatchers.Main) {
+                                UIDialogs.toast("Failed to fetch details for download");
+                                handleUnknownDownload();
+                                loader.hide(true);
+                            }
+                        }
+                    }
+                }
+                else handleUnknownDownload();
+            }
         }
         fun showDownloadPlaylistOverlay(playlist: Playlist, container: ViewGroup) {
             showUnknownVideoDownload("Video", container) { px, bitrate ->
@@ -269,7 +292,19 @@ class UISlideOverlays {
             menu.show();
         }
 
-        fun showVideoOptionsOverlay(video: IPlatformVideo, container: ViewGroup, onVideoHidden: (()->Unit)? = null): SlideUpMenuOverlay {
+        fun showLoaderOverlay(text: String, container: ViewGroup): SlideUpMenuOverlay {
+            val dp70 = 70.dp(container.context.resources);
+            val dp15 = 15.dp(container.context.resources);
+            val overlay = SlideUpMenuOverlay(container.context, container, text, null, true, listOf(
+                Loader(container.context, true, dp70).apply {
+                    this.setPadding(0, dp15, 0, dp15);
+                }
+            ), true);
+            overlay.show();
+            return overlay;
+        }
+
+        fun showVideoOptionsOverlay(video: IPlatformVideo, container: ViewGroup, vararg actions: SlideUpMenuItem): SlideUpMenuOverlay {
             val items = arrayListOf<View>();
             val lastUpdated = StatePlaylists.instance.getLastUpdatedPlaylist();
 
@@ -288,11 +323,11 @@ class UISlideOverlays {
             val queue = StatePlayer.instance.getQueue();
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(SlideUpMenuGroup(container.context, "Actions", "actions",
-                SlideUpMenuItem(container.context, R.drawable.ic_visibility_off, "Hide", "Hide from Home", "hide",
-                    { StateMeta.instance.addHiddenVideo(video.url); onVideoHidden?.invoke() }),
-                SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
-                    { showDownloadVideoOverlay(video, container); }, false)
-            ))
+                (listOf(
+                    SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
+                        { showDownloadVideoOverlay(video, container, true); }, false))
+                        + actions)
+            ));
             items.add(
                 SlideUpMenuGroup(container.context, "Add To", "addto",
                     SlideUpMenuItem(container.context, R.drawable.ic_queue_add, "Add to Queue", "${queue.size} videos", "queue",
@@ -344,7 +379,7 @@ class UISlideOverlays {
                     SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, StatePlayer.TYPE_WATCHLATER, "${watchLater.size} videos", "watch later",
                         { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
                     SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
-                        { showDownloadVideoOverlay(video, container); }, false))
+                        { showDownloadVideoOverlay(video, container, true); }, false))
             );
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();

app/src/main/java/com/futo/platformplayer/Utility.kt

@@ -58,7 +58,7 @@ fun findNonRuntimeException(ex: Throwable?): Throwable? {
 
 fun warnIfMainThread(context: String) {
     if(BuildConfig.DEBUG && Looper.myLooper() == Looper.getMainLooper())
-        Logger.w(V8Plugin.TAG, "JAVASCRIPT ON MAIN THREAD\nAt: ${context}\n" + Thread.currentThread().stackTrace);
+        Logger.w(V8Plugin.TAG, "JAVASCRIPT ON MAIN THREAD\nAt: ${context}\n" + Thread.currentThread().stackTrace.joinToString { it.toString() });
 }
 
 fun ensureNotMainThread() {

app/src/main/java/com/futo/platformplayer/activities/AddSourceActivity.kt

@@ -75,10 +75,10 @@ class AddSourceActivity : AppCompatActivity() {
         _buttonInstall = findViewById(R.id.button_install);
 
         _buttonBack.setOnClickListener {
-            onBackPressed();
+            finish();
         };
         _buttonCancel.setOnClickListener {
-            onBackPressed();
+            finish();
         }
         _buttonInstall.setOnClickListener {
             _config?.let {

app/src/main/java/com/futo/platformplayer/activities/AddSourceOptionsActivity.kt

@@ -1,7 +1,10 @@
 package com.futo.platformplayer.activities
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.widget.*
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.*
 import com.futo.platformplayer.views.buttons.BigButton
@@ -14,6 +17,31 @@ class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonQR: BigButton;
     lateinit var _buttonURL: BigButton;
 
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            val content = it.contents
+            if (content == null) {
+                UIDialogs.toast(this, "Failed to scan QR code")
+                return@let
+            }
+
+            val url = if (content.startsWith("https://")) {
+                content
+            } else if (content.startsWith("grayjay://plugin/")) {
+                content.substring("grayjay://plugin/".length)
+            } else {
+                UIDialogs.toast(this, "Not a plugin URL")
+                return@let;
+            }
+
+            val intent = Intent(this, AddSourceActivity::class.java).apply {
+                data = Uri.parse(url);
+            };
+            startActivity(intent);
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_source_options);
@@ -37,8 +65,9 @@ class AddSourceOptionsActivity : AppCompatActivity() {
             integrator.setBeepEnabled(false)
             integrator.setBarcodeImageEnabled(true)
             integrator.setCaptureActivity(QRCaptureActivity::class.java);
-            integrator.initiateScan()
+            _qrCodeResultLauncher.launch(integrator.createScanIntent())
         }
+
         _buttonURL.onClick.subscribe {
             UIDialogs.toast(this, "Not implemented yet..");
         }

app/src/main/java/com/futo/platformplayer/activities/CaptchaActivity.kt

@@ -0,0 +1,120 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.webkit.CookieManager
+import android.webkit.WebView
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.*
+import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginCaptchaConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.others.CaptchaWebViewClient
+import com.futo.platformplayer.others.LoginWebViewClient
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.io.File
+import java.lang.Exception
+import java.util.UUID
+
+class CaptchaActivity : AppCompatActivity() {
+    private lateinit var _webView: WebView;
+    private lateinit var _buttonClose: Button;
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_captcha);
+        setNavigationBarColorAndIcons();
+
+        _buttonClose = findViewById(R.id.button_close);
+        _buttonClose.setOnClickListener { finish(); };
+
+        _webView = findViewById(R.id.web_view);
+        _webView.settings.javaScriptEnabled = true;
+        CookieManager.getInstance().setAcceptCookie(true);
+
+
+        val config = if(intent.hasExtra("plugin"))
+            Json.decodeFromString<SourcePluginConfig>(intent.getStringExtra("plugin")!!);
+        else null;
+
+        val captchaConfig = if(config != null)
+            config.captcha ?: throw IllegalStateException("Plugin has no captcha support");
+        else if(intent.hasExtra("captcha"))
+            Json.decodeFromString<SourcePluginCaptchaConfig>(intent.getStringExtra("captcha")!!);
+        else throw IllegalStateException("No valid configuration?");
+        //TODO: Backwards compat removal?
+
+        val extraUrl = if (intent.hasExtra("url"))
+            intent.getStringExtra("url");
+        else null;
+
+        val extraBody = if (intent.hasExtra("body"))
+            intent.getStringExtra("body");
+        else null;
+
+        _webView.settings.userAgentString = captchaConfig.userAgent ?: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36";
+        _webView.settings.useWideViewPort = true;
+        _webView.settings.loadWithOverviewMode = true;
+
+        val webViewClient = if(config != null) CaptchaWebViewClient(config) else CaptchaWebViewClient(captchaConfig);
+        webViewClient.onCaptchaFinished.subscribe { captcha ->
+            _callback?.let {
+                _callback = null;
+                it.invoke(captcha);
+            }
+            finish();
+        };
+        _webView.settings.domStorageEnabled = true;
+        _webView.webViewClient = webViewClient;
+
+        if(captchaConfig.captchaUrl != null)
+            _webView.loadUrl(captchaConfig.captchaUrl);
+        else if(extraUrl != null && extraBody != null)
+            _webView.loadDataWithBaseURL(extraUrl, extraBody, "text/html", "utf-8", null);
+        else if(extraUrl != null)
+            _webView.loadUrl(extraUrl);
+        else throw IllegalStateException("No valid captcha info provided");
+    }
+
+    override fun finish() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            _webView.loadUrl("about:blank");
+        }
+        _callback?.let {
+            _callback = null;
+            it.invoke(null);
+        }
+        super.finish();
+    }
+
+    companion object {
+        private val TAG = "CaptchaActivity";
+        private var _callback: ((SourceCaptchaData?) -> Unit)? = null;
+
+        private fun getCaptchaIntent(context: Context, config: SourcePluginConfig, url: String? = null, body: String? = null): Intent {
+            val intent = Intent(context, CaptchaActivity::class.java);
+            if(url != null)
+                intent.putExtra("url", url);
+            if(body != null)
+                intent.putExtra("body", body);
+            intent.putExtra("plugin", Json.encodeToString(config));
+            return intent;
+        }
+
+        fun showCaptcha(context: Context, config: SourcePluginConfig, url: String? = null, body: String? = null, callback: ((SourceCaptchaData?) -> Unit)? = null) {
+            _callback = callback;
+            context.startActivity(getCaptchaIntent(context, config, url, body));
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/activities/ExceptionActivity.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.activities
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -40,7 +41,8 @@ class ExceptionActivity : AppCompatActivity() {
         val context = intent.getStringExtra(EXTRA_CONTEXT) ?: "Unknown Context";
         val stack = intent.getStringExtra(EXTRA_STACK) ?: "Something went wrong... missing stack trace?";
 
-        val exceptionString = "Version information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE})\n\n" +
+        val exceptionString = "Version information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE})\n" +
+                "Device information (brand= ${Build.BRAND}, manufacturer = ${Build.MANUFACTURER}, device = ${Build.DEVICE}, version-sdk = ${Build.VERSION.SDK_INT}, version-os = ${Build.VERSION.BASE_OS})\n\n" +
                 Logging.buildLogString(LogLevel.ERROR, TAG, "Uncaught exception (\"$context\"): $stack");
         try {
             val file = File(filesDir, "log.txt");

app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt

@@ -3,7 +3,9 @@ package com.futo.platformplayer.activities
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.webkit.ConsoleMessage
 import android.webkit.CookieManager
+import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
@@ -68,9 +70,15 @@ class LoginActivity : AppCompatActivity() {
                 view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
             }
         }
-        //TODO: Required for some...TBD what to do with it. Clear on finish?
         _webView.settings.domStorageEnabled = true;
 
+        /*
+        _webView.webChromeClient = object: WebChromeClient() {
+            override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
+                Logger.w(TAG, "Login Console: " + consoleMessage?.message());
+                return super.onConsoleMessage(consoleMessage);
+            }
+        }*/
         _webView.webViewClient = webViewClient;
         _webView.loadUrl(authConfig.loginUrl);
     }

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -607,6 +607,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 return;
             };
         };
+
         val name = when(type) {
             "Playlist" -> recon.split("\n").filter { !it.startsWith(ManagedStore.RECONSTRUCTION_HEADER_OPERATOR) }.firstOrNull() ?: type;
             else -> type
@@ -894,7 +895,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
 
 
-
+    //TODO: Only calls last handler due to missing request codes on ActivityResultLaunchers.
     private var resultLauncherMap =  mutableMapOf<Int, (ActivityResult)->Unit>();
     private var requestCode: Int? = -1;
     private val resultLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(

app/src/main/java/com/futo/platformplayer/activities/PolycentricImportProfileActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
@@ -14,6 +15,7 @@ import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.*
 import com.google.zxing.integration.android.IntentIntegrator
+import com.journeyapps.barcodescanner.CaptureActivity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -27,6 +29,16 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
     private lateinit var _buttonImportProfile: LinearLayout;
     private lateinit var _editProfile: EditText;
 
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            if (it.contents != null) {
+                val scannedUrl = it.contents
+                import(scannedUrl)
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_import_profile);
@@ -45,10 +57,15 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
         };
 
         _buttonScanProfile.setOnClickListener {
-            val integrator = IntentIntegrator(this);
-            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE);
-            integrator.setPrompt("Scan a QR code");
-            integrator.initiateScan();
+            val integrator = IntentIntegrator(this)
+            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
+            integrator.setPrompt("Scan a QR code")
+            integrator.setOrientationLocked(true);
+            integrator.setCameraId(0)
+            integrator.setBeepEnabled(false)
+            integrator.setBarcodeImageEnabled(true)
+            integrator.setCaptureActivity(QRCaptureActivity::class.java);
+            _qrCodeResultLauncher.launch(integrator.createScanIntent())
         };
 
         _buttonImportProfile.setOnClickListener {
@@ -66,18 +83,6 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        val result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
-        if (result != null) {
-            if (result.contents != null) {
-                val scannedUrl = result.contents;
-                import(scannedUrl);
-            }
-        } else {
-            super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
     private fun import(url: String) {
         if (!url.startsWith("polycentric://")) {
             UIDialogs.toast(this, "Not a valid URL");
@@ -126,4 +131,8 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
     companion object {
         private const val TAG = "PolycentricImportProfileActivity";
     }
+
+    class QRCaptureActivity: CaptureActivity() {
+
+    }
 }

app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt

@@ -52,17 +52,6 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
             startActivity(Intent(this, DeveloperActivity::class.java));
         }
 
-        var devCounter = 0;
-        _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
-            devCounter++;
-            if(devCounter > 5) {
-                devCounter = 0;
-                SettingsDev.instance.developerMode = true;
-                SettingsDev.instance.save();
-                updateDevMode();
-                UIDialogs.toast(this, "You are now in developer mode");
-            }
-        };
         _lastActivity = this;
 
         reloadSettings();
@@ -72,6 +61,18 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
         _loader.start();
         _form.fromObject(lifecycleScope, Settings.instance) {
             _loader.stop();
+
+            var devCounter = 0;
+            _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
+                devCounter++;
+                if(devCounter > 5) {
+                    devCounter = 0;
+                    SettingsDev.instance.developerMode = true;
+                    SettingsDev.instance.save();
+                    updateDevMode();
+                    UIDialogs.toast(this, "You are now in developer mode");
+                }
+            };
         };
     }
 

app/src/main/java/com/futo/platformplayer/api/http/ManagedHttpClient.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.logging.Logger
 import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
+import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -28,7 +29,11 @@ open class ManagedHttpClient {
 
     constructor(builder: OkHttpClient.Builder = OkHttpClient.Builder()) {
         _builderTemplate = builder;
-        client = builder.build();
+        client = builder.addNetworkInterceptor { chain ->
+            val request = beforeRequest(chain.request());
+            val response = afterRequest(chain.proceed(request));
+            return@addNetworkInterceptor response;
+        }.build();
     }
 
     open fun clone(): ManagedHttpClient {
@@ -116,7 +121,7 @@ open class ManagedHttpClient {
     fun execute(request : Request) : Response {
         ensureNotMainThread();
 
-        beforeRequest(request);
+        //beforeRequest(request);
 
         Logger.v(TAG, "HTTP Request [${request.method}] ${request.url} - [${if(request.body != null) request.body.size else 0}]");
 
@@ -156,23 +161,16 @@ open class ManagedHttpClient {
         if(true)
             Logger.v(TAG, "HTTP Response [${request.method}] ${request.url} - [${time}ms]");
 
-        afterRequest(request, resp);
+        //afterRequest(request, resp);
         return resp;
     }
 
     //Set Listeners
-    fun setOnBeforeRequest(listener : (Request)->Unit) {
-        this.onBeforeRequest = listener;
+    open fun beforeRequest(request: okhttp3.Request): okhttp3.Request {
+        return request;
     }
-    fun setOnAfterRequest(listener : (Request, Response)->Unit) {
-        this.onAfterRequest = listener;
-    }
-
-    open fun beforeRequest(request: Request) {
-        onBeforeRequest?.invoke(request);
-    }
-    open fun afterRequest(request: Request, resp: Response) {
-        onAfterRequest?.invoke(request, resp);
+    open fun afterRequest(resp: okhttp3.Response): okhttp3.Response {
+        return resp;
     }
 
 

app/src/main/java/com/futo/platformplayer/api/media/PlatformClientPool.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 
 class PlatformClientPool {
     private val _parent: JSClient;
@@ -51,6 +52,11 @@ class PlatformClientPool {
             if(reserved == null && _pool.size < capacity) {
                 Logger.i(TAG, "Started additional [${_parent.name}] client in pool [${_poolName}] (${_pool.size + 1}/${capacity})");
                 reserved = _parent.getCopy();
+
+                reserved?.onCaptchaException?.subscribe { client, ex ->
+                    StateApp.instance.handleCaptchaException(client, ex);
+                };
+
                 reserved?.initialize();
                 _pool[reserved!!] = _poolCounter;
             }

app/src/main/java/com/futo/platformplayer/api/media/models/ResultCapabilities.kt

@@ -27,6 +27,7 @@ class ResultCapabilities(
         const val TYPE_VIDEOS = "VIDEOS";
         const val TYPE_STREAMS = "STREAMS";
         const val TYPE_LIVE = "LIVE";
+        const val TYPE_POSTS = "POSTS";
         const val TYPE_MIXED = "MIXED";
 
         const val ORDER_CHONOLOGICAL = "CHRONOLOGICAL";

app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt

@@ -39,4 +39,8 @@ class PolycentricPlatformComment : IPlatformComment {
     fun cloneWithUpdatedReplyCount(replyCount: Int?): PolycentricPlatformComment {
         return PolycentricPlatformComment(contextUrl, author, message, rating, date, reference, replyCount);
     }
+
+    companion object {
+        val MAX_COMMENT_SIZE = 2000
+    }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/contents/PlatformContentPlaceholder.kt

@@ -4,7 +4,7 @@ import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import java.time.OffsetDateTime
 
-class PlatformContentPlaceholder(pluginId: String): IPlatformContent {
+class PlatformContentPlaceholder(pluginId: String, exception: Throwable? = null): IPlatformContent {
     override val contentType: ContentType = ContentType.PLACEHOLDER;
     override val id: PlatformID = PlatformID("", null, pluginId);
     override val name: String = "";
@@ -12,4 +12,5 @@ class PlatformContentPlaceholder(pluginId: String): IPlatformContent {
     override val shareUrl: String = "";
     override val datetime: OffsetDateTime? = null;
     override val author: PlatformAuthorLink = PlatformAuthorLink(PlatformID("", pluginId), "", "", null, null);
+    val error: Throwable? = exception
 }

app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt

@@ -30,7 +30,7 @@ open class SerializedPlatformNestedContent(
     override val contentProvider: String?,
     override val contentThumbnails: Thumbnails
 ) : IPlatformNestedContent, SerializedPlatformContent {
-    final override val contentType: ContentType get() = ContentType.MEDIA;
+    final override val contentType: ContentType get() = ContentType.NESTED_VIDEO;
 
     override val contentPlugin: String? = StatePlatform.instance.getContentClientOrNull(contentUrl)?.id;
     override val contentSupported: Boolean get() = contentPlugin != null;

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/DevJSClient.kt

@@ -7,6 +7,7 @@ import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.states.StateApp
 import java.util.*
 
 class DevJSClient : JSClient {
@@ -15,29 +16,44 @@ class DevJSClient : JSClient {
 
     private val _devScript: String;
     private var _auth: SourceAuth? = null;
+    private var _captcha: SourceCaptchaData? = null;
 
     val devID: String;
 
-    constructor(context: Context, config: SourcePluginConfig, script: String, auth: SourceAuth? = null, devID: String? = null): super(context, SourcePluginDescriptor(config, auth?.toEncrypted(), listOf("DEV")), null, script) {
+    constructor(context: Context, config: SourcePluginConfig, script: String, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, devID: String? = null): super(context, SourcePluginDescriptor(config, auth?.toEncrypted(), captcha?.toEncrypted(), listOf("DEV")), null, script) {
         _devScript = script;
         _auth = auth;
+        _captcha = captcha;
         this.devID = devID ?: UUID.randomUUID().toString().substring(0, 5);
+
+        onCaptchaException.subscribe { client, captcha ->
+            StateApp.instance.handleCaptchaException(client, captcha);
+        }
     }
-    constructor(context: Context, descriptor: SourcePluginDescriptor, script: String, auth: SourceAuth? = null, savedState: String? = null, devID: String? = null): super(context, descriptor, savedState, script) {
+    //TODO: Misisng auth/captcha pass on purpose?
+    constructor(context: Context, descriptor: SourcePluginDescriptor, script: String, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, savedState: String? = null, devID: String? = null): super(context, descriptor, savedState, script) {
         _devScript = script;
         _auth = auth;
+        _captcha = captcha;
         this.devID = devID ?: UUID.randomUUID().toString().substring(0, 5);
+
+        onCaptchaException.subscribe { client, captcha ->
+            StateApp.instance.handleCaptchaException(client, captcha);
+        }
     }
 
+    fun setCaptcha(captcha: SourceCaptchaData? = null) {
+        _captcha = captcha;
+    }
     fun setAuth(auth: SourceAuth? = null) {
         _auth = auth;
     }
     fun recreate(context: Context): DevJSClient {
-        return DevJSClient(context, config, _devScript, _auth, devID);
+        return DevJSClient(context, config, _devScript, _auth, _captcha, devID);
     }
 
     override fun getCopy(): JSClient {
-        return DevJSClient(_context, descriptor, _script, _auth, saveState(), devID);
+        return DevJSClient(_context, descriptor, _script, _auth, _captcha, saveState(), devID);
     }
 
     override fun initialize() {

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/JSClient.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueBoolean
 import com.caoccao.javet.values.primitive.V8ValueInteger
+import com.caoccao.javet.values.primitive.V8ValueNull
 import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
@@ -23,9 +24,14 @@ import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.platforms.js.internal.*
 import com.futo.platformplayer.api.media.platforms.js.models.*
+import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.engine.V8Plugin
+import com.futo.platformplayer.engine.exceptions.PluginEngineException
+import com.futo.platformplayer.engine.exceptions.PluginEngineStoppedException
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
 import com.futo.platformplayer.logging.Logger
@@ -59,6 +65,7 @@ open class JSClient : IPlatformClient {
     private var _enabled: Boolean = false;
 
     private val _auth: SourceAuth?;
+    private val _captcha: SourceCaptchaData?;
 
     private val _injectedSaveState: String?;
 
@@ -85,6 +92,7 @@ open class JSClient : IPlatformClient {
     val enableInHome get() = descriptor.appSettings.tabEnabled.enableHome ?: true
 
     val onDisabled = Event1<JSClient>();
+    val onCaptchaException = Event2<JSClient, ScriptCaptchaRequiredException>();
 
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String? = null) {
         this._context = context;
@@ -93,10 +101,11 @@ open class JSClient : IPlatformClient {
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         _auth = descriptor.getAuth();
+        _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _client = JSHttpClient(this);
-        _clientAuth = JSHttpClient(this, _auth);
+        _client = JSHttpClient(this, null, _captcha);
+        _clientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, null, _client, _clientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
@@ -108,6 +117,11 @@ open class JSClient : IPlatformClient {
         }
         else
             throw IllegalStateException("Script for plugin [${descriptor.config.name}] was not available");
+
+        _plugin.onScriptException.subscribe {
+            if(it is ScriptCaptchaRequiredException)
+                onCaptchaException.emit(this, it);
+        };
     }
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String) {
         this._context = context;
@@ -116,15 +130,21 @@ open class JSClient : IPlatformClient {
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         _auth = descriptor.getAuth();
+        _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _client = JSHttpClient(this);
-        _clientAuth = JSHttpClient(this, _auth);
+        _client = JSHttpClient(this, null, _captcha);
+        _clientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, script, _client, _clientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
         _plugin.withScript(script);
         _script = script;
+
+        _plugin.onScriptException.subscribe {
+            if(it is ScriptCaptchaRequiredException)
+                onCaptchaException.emit(this, it);
+        };
     }
 
     open fun getCopy(): JSClient {
@@ -413,8 +433,11 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("url", "A content url (this platform)")
     override fun getComments(url: String): IPager<IPlatformComment> = isBusyWith {
         ensureEnabled();
-        return@isBusyWith JSCommentPager(config, plugin,
-            plugin.executeTyped("source.getComments(${Json.encodeToString(url)})"));
+        val pager = plugin.executeTyped<V8Value>("source.getComments(${Json.encodeToString(url)})");
+        if (pager !is V8ValueObject) { //TODO: Maybe solve this better
+            return@isBusyWith EmptyPager<IPlatformComment>();
+        }
+        return@isBusyWith JSCommentPager(config, plugin, pager);
     }
     @JSDocs(17, "source.getSubComments(comment)", "Gets replies for a given comment")
     @JSDocsParameter("comment", "Comment object that was returned by getComments")
@@ -545,6 +568,23 @@ open class JSClient : IPlatformClient {
         };
     }
 
+    fun resolveChannelUrlsByClaimTemplates(claimType: Int, values: Map<Int, String>): List<String> {
+        val urls = arrayListOf<String>();
+        channelClaimTemplates?.let {
+            if(it.containsKey(claimType)) {
+                val templates = it[claimType];
+                if(templates != null)
+                    for(value in values.keys.sortedBy { it }) {
+                        if(templates.containsKey(value)) {
+                            urls.add(templates[value]!!.replace("{{CLAIMVALUE}}", values[value]!!));
+                        }
+                    }
+            }
+        };
+
+        return urls;
+    }
+
 
     private fun <T> isBusyWith(handle: ()->T): T {
         try {
@@ -561,11 +601,13 @@ open class JSClient : IPlatformClient {
     }
 
     private fun announcePluginUnhandledException(method: String, ex: Throwable) {
+        if(ex is PluginEngineException)
+            return;
         try {
             StateAnnouncement.instance.registerAnnouncement("PluginUnhandled_${config.id}_${method}",
                 "Plugin ${config.name} encountered an error in [${method}]",
                 "${ex.message}\nPlease contact the plugin developer",
-                AnnouncementType.RECURRING,
+                AnnouncementType.SESSION_RECURRING,
                 OffsetDateTime.now());
         }
         catch(_: Throwable) {}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourceCaptchaData.kt

@@ -0,0 +1,49 @@
+package com.futo.platformplayer.api.media.platforms.js
+
+import com.futo.platformplayer.encryption.EncryptionProvider
+import com.futo.platformplayer.logging.Logger
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf()) {
+    override fun toString(): String {
+        return "(headers: '$headers', cookieString: '$cookieMap')";
+    }
+
+    fun toEncrypted(): String{
+        return EncryptionProvider.instance.encrypt(serialize());
+    }
+
+    private fun serialize(): String {
+        return Json.encodeToString(SerializedCaptchaData(cookieMap, headers));
+    }
+
+    companion object {
+        val TAG = "SourceAuth";
+
+        fun fromEncrypted(encrypted: String?): SourceCaptchaData? {
+            if(encrypted == null)
+                return null;
+
+            val decrypted = EncryptionProvider.instance.decrypt(encrypted);
+            try {
+                return deserialize(decrypted);
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed to deserialize authentication", ex);
+                return null;
+            }
+        }
+
+        fun deserialize(str: String): SourceCaptchaData {
+            val data = Json.decodeFromString<SerializedCaptchaData>(str);
+            return SourceCaptchaData(data.cookieMap, data.headers);
+        }
+    }
+
+    @Serializable
+    data class SerializedCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>?,
+                              val headers: Map<String, Map<String, String>> = mapOf())
+}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginCaptchaConfig.kt

@@ -0,0 +1,12 @@
+package com.futo.platformplayer.api.media.platforms.js
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class SourcePluginCaptchaConfig(
+    val captchaUrl: String? = null,
+    val completionUrl: String? = null,
+    val cookiesToFind: List<String>? = null,
+    val userAgent: String? = null,
+    val cookiesExclOthers: Boolean = true
+)

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginConfig.kt

@@ -35,11 +35,13 @@ class SourcePluginConfig(
 
     val settings: List<Setting> = listOf(),
 
+    var captcha: SourcePluginCaptchaConfig? = null,
     val authentication: SourcePluginAuthConfig? = null,
     var sourceUrl: String? = null,
     val constants: HashMap<String, String> = hashMapOf(),
 
     //TODO: These should be vals...but prob for serialization reasons cannot be changed.
+    var subscriptionRateLimit: Int? = null,
     var enableInSearch: Boolean = true,
     var enableInHome: Boolean = true,
     var supportedClaimTypes: List<Int> = listOf()

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt

@@ -13,22 +13,28 @@ class SourcePluginDescriptor {
 
     var appSettings: AppPluginSettings = AppPluginSettings();
 
-    var authEncrypted: String?
+    var authEncrypted: String? = null
+        private set;
+    var captchaEncrypted: String? = null
         private set;
 
     val flags: List<String>;
 
     @kotlinx.serialization.Transient
     val onAuthChanged = Event0();
+    @kotlinx.serialization.Transient
+    val onCaptchaChanged = Event0();
 
-    constructor(config :SourcePluginConfig, authEncrypted: String? = null) {
+    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null) {
         this.config = config;
         this.authEncrypted = authEncrypted;
+        this.captchaEncrypted = captchaEncrypted;
         this.flags = listOf();
     }
-    constructor(config :SourcePluginConfig, authEncrypted: String? = null, flags: List<String>) {
+    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null, flags: List<String>) {
         this.config = config;
         this.authEncrypted = authEncrypted;
+        this.captchaEncrypted = captchaEncrypted;
         this.flags = flags;
     }
 
@@ -41,6 +47,13 @@ class SourcePluginDescriptor {
         return map;
     }
 
+    fun updateCaptcha(captcha: SourceCaptchaData?) {
+        captchaEncrypted = captcha?.toEncrypted();
+        onCaptchaChanged.emit();
+    }
+    fun getCaptchaData(): SourceCaptchaData? {
+        return SourceCaptchaData.fromEncrypted(captchaEncrypted);
+    }
 
     fun updateAuth(str: SourceAuth?) {
         authEncrypted = str?.toEncrypted();

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt

@@ -5,90 +5,108 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
 import com.futo.platformplayer.matchesDomain
 
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
     private val _auth: SourceAuth?;
+    private val _captcha: SourceCaptchaData?;
 
     var doUpdateCookies: Boolean = true;
     var doApplyCookies: Boolean = true;
     var doAllowNewCookies: Boolean = true;
     val isLoggedIn: Boolean get() = _auth != null;
 
-    private var _currentCookieMap: HashMap<String, HashMap<String, String>>?;
+    private var _currentCookieMap: HashMap<String, HashMap<String, String>>;
 
-    constructor(jsClient: JSClient?, auth: SourceAuth? = null) : super() {
+    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null) : super() {
         _jsClient = jsClient;
         _auth = auth;
+        _captcha = captcha;
 
+        _currentCookieMap = hashMapOf();
         if(!auth?.cookieMap.isNullOrEmpty()) {
-            _currentCookieMap = hashMapOf();
             for(domainCookies in auth!!.cookieMap!!)
-                _currentCookieMap!!.put(domainCookies.key, HashMap(domainCookies.value));
+                _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
         }
-        else _currentCookieMap = null;
+        if(!captcha?.cookieMap.isNullOrEmpty()) {
+            for(domainCookies in captcha!!.cookieMap!!) {
+                if(_currentCookieMap.containsKey(domainCookies.key))
+                    _currentCookieMap[domainCookies.key]?.putAll(domainCookies.value);
+                else
+                    _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
+            }
+        }
+
     }
 
     override fun clone(): ManagedHttpClient {
         val newClient = JSHttpClient(_jsClient, _auth);
         newClient._currentCookieMap = if(_currentCookieMap != null)
-            HashMap(_currentCookieMap!!.toList().associate { Pair(it.first, HashMap(it.second)) })
+            HashMap(_currentCookieMap.toList().associate { Pair(it.first, HashMap(it.second)) })
         else
-            null;
+            hashMapOf();
         return newClient;
     }
 
-    override fun beforeRequest(request: Request) {
+    override fun beforeRequest(request: okhttp3.Request): okhttp3.Request {
+        val domain = request.url.host.lowercase();
         val auth = _auth;
-        if (auth != null) {
-            val domain = Uri.parse(request.url).host!!.lowercase();
 
+        val newBuilder = if(auth != null || doApplyCookies)
+            request.newBuilder();
+        else
+            null;
+        if (auth != null) {
             //TODO: Possibly add doApplyHeaders
             for (header in auth.headers.filter { domain.matchesDomain(it.key) }.flatMap { it.value.entries })
-                request.headers[header.key] = header.value;
+                newBuilder?.header(header.key, header.value);
+        }
 
-            if(doApplyCookies) {
-                if (!_currentCookieMap.isNullOrEmpty()) {
-                    val cookiesToApply = hashMapOf<String, String>();
-                    synchronized(_currentCookieMap!!) {
-                        for(cookie in _currentCookieMap!!
-                                .filter { domain.matchesDomain(it.key) }
-                                .flatMap { it.value.toList() })
-                            cookiesToApply[cookie.first] = cookie.second;
-                    };
+        if(doApplyCookies) {
+            if (!_currentCookieMap.isNullOrEmpty()) {
+                val cookiesToApply = hashMapOf<String, String>();
+                synchronized(_currentCookieMap!!) {
+                    for(cookie in _currentCookieMap!!
+                        .filter { domain.matchesDomain(it.key) }
+                        .flatMap { it.value.toList() })
+                        cookiesToApply[cookie.first] = cookie.second;
+                };
 
-                    if(cookiesToApply.size > 0) {
-                        val cookieString = cookiesToApply.map { it.key + "=" + it.value }.joinToString("; ");
-                        request.headers["Cookie"] = cookieString;
-                    }
-                    //printTestCode(request.url, request.body, auth.headers, cookieString, request.headers.filter { !auth.headers.containsKey(it.key) });
+                if(cookiesToApply.size > 0) {
+                    val cookieString = cookiesToApply.map { it.key + "=" + it.value }.joinToString("; ");
+
+                    val existingCookies = request.headers["Cookie"];
+                    if(!existingCookies.isNullOrEmpty())
+                        newBuilder?.header("Cookie", existingCookies.trim(';') + "; " + cookieString);
+                    else
+                        newBuilder?.header("Cookie", cookieString);
                 }
+                //printTestCode(request.url, request.body, auth.headers, cookieString, request.headers.filter { !auth.headers.containsKey(it.key) });
             }
         }
 
-        _jsClient?.validateUrlOrThrow(request.url);
-        super.beforeRequest(request)
+        _jsClient?.validateUrlOrThrow(request.url.toString());
+        return newBuilder?.let { it.build() } ?: request;
     }
 
-    override fun afterRequest(request: Request, resp: Response) {
-        super.afterRequest(request, resp)
-
+    override fun afterRequest(resp: okhttp3.Response): okhttp3.Response {
         if(doUpdateCookies) {
-            val domain = Uri.parse(request.url).host!!.lowercase();
-            val domainParts = domain!!.split(".");
+            val domain = resp.request.url.host.lowercase();
+            val domainParts = domain.split(".");
             val defaultCookieDomain =
                 "." + domainParts.drop(domainParts.size - 2).joinToString(".");
             for (header in resp.headers) {
-                if (_currentCookieMap != null && header.key.lowercase() == "set-cookie") {
-                    val newCookies = cookieStringToMap(header.value);
-                    for (cookie in newCookies) {
-                        val endIndex = cookie.value.indexOf(";");
-                        var cookieValue = cookie.value;
+                if ((_auth != null || _currentCookieMap.isNotEmpty()) && header.first.lowercase() == "set-cookie") {
+                    //val newCookies = cookieStringToMap(header.second.split("; "));
+                    val cookie = cookieStringToPair(header.second);
+                    //for (cookie in newCookies) {
+                        var cookieValue = cookie.second;
                         var domainToUse = domain;
 
-                        if (endIndex > 0) {
-                            val cookieParts = cookie.value.split(";");
+                        if (!cookie.first.isNullOrEmpty() && !cookie.second.isNullOrEmpty()) {
+                            val cookieParts = cookie.second.split(";");
                             if (cookieParts.size == 0)
                                 continue;
                             cookieValue = cookieParts[0].trim();
@@ -114,24 +132,29 @@ class JSHttpClient : ManagedHttpClient {
                             _currentCookieMap!!.put(domainToUse, newMap)
                             newMap;
                         }
-                        if(cookieMap.containsKey(cookie.key) || doAllowNewCookies)
-                            cookieMap.put(cookie.key, cookieValue);
-                    }
+                        if(cookieMap.containsKey(cookie.first) || doAllowNewCookies)
+                            cookieMap.put(cookie.first, cookieValue);
+                    //}
                 }
             }
         }
+        return resp;
     }
 
 
     private fun cookieStringToMap(parts: List<String>): Map<String, String> {
         val map = hashMapOf<String, String>();
         for(cookie in parts) {
-            val cookieKey = cookie.substring(0, cookie.indexOf("="));
-            val cookieVal = cookie.substring(cookie.indexOf("=") + 1);
-            map.put(cookieKey.trim(), cookieVal.trim());
+            val pair = cookieStringToPair(cookie)
+            map.put(pair.first, pair.second);
         }
         return map;
     }
+    private fun cookieStringToPair(cookie: String): Pair<String, String> {
+        val cookieKey = cookie.substring(0, cookie.indexOf("="));
+        val cookieVal = cookie.substring(cookie.indexOf("=") + 1);
+        return Pair(cookieKey.trim(), cookieVal.trim());
+    }
 
     //Prints out code for test reproduction..
     fun printTestCode(url: String, body: ByteArray?, headers: Map<String, String>, cookieString: String, allHeaders: Map<String, String>? = null) {
@@ -155,4 +178,5 @@ class JSHttpClient : ManagedHttpClient {
 
         Logger.i("Testing", code);
     }
+
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt

@@ -7,6 +7,7 @@ import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
+import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.warnIfMainThread
 
@@ -27,7 +28,7 @@ abstract class JSPager<T> : IPager<T> {
         this.pager = pager;
         this.config = config;
 
-        _hasMorePages = pager.getOrThrow(config, "hasMore", "Pager");
+        _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
         getResults();
     }
 
@@ -45,7 +46,7 @@ abstract class JSPager<T> : IPager<T> {
         pager = plugin.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
             pager.invoke("nextPage", arrayOf<Any>());
         };
-        _hasMorePages = pager.getOrThrow(config, "hasMore", "Pager");
+        _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
         _resultChanged = true;
         /*
         try {

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSVideoDetails.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.api.media.platforms.js.models
 
 import com.caoccao.javet.values.V8Value
+import com.caoccao.javet.values.primitive.V8ValueNull
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.IPlatformClient
@@ -99,8 +100,11 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
             return getCommentsJS(client);
     }
 
-    private fun getCommentsJS(client: JSClient): JSCommentPager {
-        val commentPager = _content.invoke<V8ValueObject>("getComments", arrayOf<Any>());
+    private fun getCommentsJS(client: JSClient): IPager<IPlatformComment>? {
+        val commentPager = _content.invoke<V8Value>("getComments", arrayOf<Any>());
+        if (commentPager !is V8ValueObject) //TODO: Maybe handle this better?
+            return null;
+
         return JSCommentPager(_pluginConfig, client.getUnderlyingPlugin(), commentPager);
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSHLSManifestAudioSource.kt

@@ -9,7 +9,7 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.orNull
 
-class JSHLSManifestAudioSource : IAudioUrlSource, IHLSManifestAudioSource, JSSource {
+class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
     override val container : String get() = "application/vnd.apple.mpegurl";
     override val codec: String = "HLS";
     override val name : String;
@@ -31,9 +31,6 @@ class JSHLSManifestAudioSource : IAudioUrlSource, IHLSManifestAudioSource, JSSou
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
     }
 
-    override fun getAudioUrl(): String {
-        return url;
-    }
 
     companion object {
         fun fromV8HLSNullable(config: IV8PluginConfig, obj: V8Value?) : JSHLSManifestAudioSource? = obj.orNull { fromV8HLS(config, it as V8ValueObject) };

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSHLSManifestSource.kt

@@ -7,7 +7,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 
-class JSHLSManifestSource : IVideoUrlSource, IHLSManifestSource, JSSource {
+class JSHLSManifestSource : IHLSManifestSource, JSSource {
     override val width : Int = 0;
     override val height : Int = 0;
     override val container : String get() = "application/vnd.apple.mpegurl";
@@ -28,8 +28,4 @@ class JSHLSManifestSource : IVideoUrlSource, IHLSManifestSource, JSSource {
 
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
     }
-
-    override fun getVideoUrl(): String {
-        return url;
-    }
 }

app/src/main/java/com/futo/platformplayer/api/media/structures/DedupContentPager.kt

@@ -25,7 +25,8 @@ class DedupContentPager : IPager<IPlatformContent>, IAsyncPager<IPlatformContent
         _currentResults = dedupResults(_basePager.getResults());
     }
 
-    override fun hasMorePages(): Boolean = _basePager.hasMorePages();
+    override fun hasMorePages(): Boolean =
+        _basePager.hasMorePages();
     override fun nextPage() {
         _basePager.nextPage()
         _currentResults = dedupResults(_basePager.getResults());
@@ -74,7 +75,12 @@ class DedupContentPager : IPager<IPlatformContent>, IAsyncPager<IPlatformContent
         return toReturn;
     }
     private fun isSameItem(item: IPlatformContent, item2: IPlatformContent): Boolean {
-        return item.name == item2.name && (item.datetime == null || item2.datetime == null || abs(item.datetime!!.getDiffDays(item2.datetime!!)) < 2);
+        //return item == item2;
+        val daysAgo = Math.abs(item.datetime?.getNowDiffDays() ?: return false);
+        val maxDelta = Math.max(2, (daysAgo / 1.5).toInt()); //TODO: Better scaling delta
+        val isSame = item.name.equals(item2.name, true) && (item.datetime == null || item2.datetime == null || abs(item.datetime!!.getDiffDays(item2.datetime!!)) < maxDelta);
+
+        return isSame;
     }
     private fun calculateHash(item: IPlatformContent): Int {
         return combineHashCodes(listOf(item.name.hashCode(), item.datetime?.hashCode()));

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiChronoContentPager.kt

@@ -7,7 +7,8 @@ import java.util.stream.IntStream
  * A PlatformContent MultiPager that orders the results of a page based on the datetime of a content item
  */
 class MultiChronoContentPager : MultiPager<IPlatformContent> {
-    constructor(pagers : Array<IPager<IPlatformContent>>, allowFailure: Boolean = false) : super(pagers.map { it }.toList(), allowFailure) {}
+    constructor(pagers : Array<IPager<IPlatformContent>>, allowFailure: Boolean = false, pageSize: Int = 9) : super(pagers.map { it }.toList(), allowFailure, pageSize) {}
+    constructor(pagers : List<IPager<IPlatformContent>>, allowFailure: Boolean = false, pageSize: Int = 9) : super(pagers, allowFailure, pageSize) {}
 
     @Synchronized
     override fun selectItemIndex(options: Array<SelectionOption<IPlatformContent>>): Int {

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiChronoContentParallelPager.kt

@@ -0,0 +1,33 @@
+package com.futo.platformplayer.api.media.structures
+
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import kotlinx.coroutines.runBlocking
+import java.util.stream.IntStream
+
+
+/**
+ * A Content AsyncMultiPager that returns results based on a specified distribution
+ * Unlike its non-async counterpart, this one uses parallel nextPage requests
+ */
+class MultiChronoContentParallelPager : MultiParallelPager<IPlatformContent> {
+
+    constructor(pagers: List<IPager<IPlatformContent>>) : super(pagers)
+
+    @Synchronized
+    override fun selectItemIndex(options: Array<SelectionOption<IPlatformContent>>): Int {
+        if(options.size == 0)
+            return -1;
+        var bestIndex = 0;
+
+        val allResults = runBlocking { options.map { Pair(it, it.item?.await()) } };
+        for(i in IntStream.range(1, options.size)) {
+            val best = allResults[bestIndex].second;
+            val cur = allResults[i].second ?: continue;
+            if(best?.datetime == null || (cur.datetime != null && cur.datetime!! > best.datetime!!))
+                bestIndex = i;
+        }
+        return bestIndex;
+    }
+
+
+}

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiPager.kt

@@ -16,7 +16,7 @@ abstract class MultiPager<T> : IPager<T> {
     protected val _subSinglePagers : MutableList<SingleItemPager<T>>;
     protected val _failedPagers: ArrayList<IPager<T>> = arrayListOf();
 
-    private val _pageSize : Int = 9;
+    private var _pageSize : Int = 9;
 
     private var _didInitialize = false;
 
@@ -27,7 +27,8 @@ abstract class MultiPager<T> : IPager<T> {
 
     val totalPagers: Int get() = _pagers.size;
 
-    constructor(pagers : List<IPager<T>>, allowFailure: Boolean = false) {
+    constructor(pagers : List<IPager<T>>, allowFailure: Boolean = false, pageSize: Int = 9) {
+        this._pageSize = pageSize;
         this.allowFailure = allowFailure;
         _pagers = pagers.toMutableList();
         _subSinglePagers = _pagers.map { SingleItemPager(it) }.toMutableList();

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiRefreshPager.kt

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.api.media.structures
 
+import com.futo.platformplayer.api.media.models.contents.PlatformContentPlaceholder
 import com.futo.platformplayer.api.media.structures.ReusablePager.Companion.asReusable
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
@@ -37,8 +38,12 @@ abstract class MultiRefreshPager<T>: IRefreshPager<T>, IPager<T> {
                 synchronized(_pending) {
                     _pending.remove(pendingPager);
                 }
-                if(error != null)
+                if(error != null) {
                     onPagerError.emit(error);
+                    val replacing = _placeHolderPagersPaired[pendingPager];
+                    if(replacing != null)
+                        updatePager(null, replacing, error);
+                }
                 else
                     updatePager(pendingPager.getCompleted());
             }
@@ -60,10 +65,26 @@ abstract class MultiRefreshPager<T>: IRefreshPager<T>, IPager<T> {
     override fun nextPage() = synchronized(_pagersReusable){ _currentPager.nextPage() };
     override fun getResults(): List<T> = synchronized(_pagersReusable){ _currentPager.getResults() };
 
-    private fun updatePager(pagerToAdd: IPager<T>?) {
-        if(pagerToAdd == null)
-            return;
+    private fun updatePager(pagerToAdd: IPager<T>?, toReplacePager: IPager<T>? = null, error: Throwable? = null) {
         synchronized(_pagersReusable) {
+            if(pagerToAdd == null) {
+                if(toReplacePager != null && toReplacePager is PlaceholderPager && error != null) {
+                    val pluginId = toReplacePager.placeholderFactory.invoke().id?.pluginId ?: "";
+
+                    _pagersReusable.add((PlaceholderPager(5) {
+                        return@PlaceholderPager PlatformContentPlaceholder(pluginId, error)
+                    } as IPager<T>).asReusable());
+                    _currentPager = recreatePager(getCurrentSubPagers());
+
+                    if(_currentPager is MultiParallelPager<*>)
+                        runBlocking { (_currentPager as MultiParallelPager).initialize(); };
+                    else if(_currentPager is MultiPager<*>)
+                        (_currentPager as MultiPager).initialize()
+
+                    onPagerChanged.emit(_currentPager);
+                }
+                return;
+            }
             Logger.i("RefreshMultiDistributionContentPager", "Received new pager for RefreshPager")
             _pagersReusable.add(pagerToAdd.asReusable());
 

app/src/main/java/com/futo/platformplayer/api/media/structures/PlaceholderPager.kt

@@ -6,11 +6,11 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContent
  * A placeholder pager simply generates PlatformContent by some creator function.
  */
 class PlaceholderPager : IPager<IPlatformContent> {
-    private val _creator: ()->IPlatformContent;
+    val placeholderFactory: ()->IPlatformContent;
     private val _pageSize: Int;
 
     constructor(pageSize: Int, placeholderCreator: ()->IPlatformContent) {
-        _creator = placeholderCreator;
+        placeholderFactory = placeholderCreator;
         _pageSize = pageSize;
     }
 
@@ -18,7 +18,7 @@ class PlaceholderPager : IPager<IPlatformContent> {
     override fun getResults(): List<IPlatformContent> {
         val pages = ArrayList<IPlatformContent>();
         for(item in 1.._pageSize)
-            pages.add(_creator());
+            pages.add(placeholderFactory());
         return pages;
     }
     override fun hasMorePages(): Boolean = true;

app/src/main/java/com/futo/platformplayer/api/media/structures/RefreshChronoContentPager.kt

@@ -0,0 +1,19 @@
+package com.futo.platformplayer.api.media.structures
+
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import kotlinx.coroutines.Deferred
+
+/**
+ * A RefreshMultiPager that simply returns all respective pagers in equal distribution, optionally inserting PlaceholderPager results as provided for their respective promised pagers
+ * (Eg. Pager A is completed, Pager [B,C,D] are promised/deferred. placeholderPagers [1,2,3] will map B=>1, C=>2, D=>3 until promised pagers are completed)
+ * Uses wrapped MultiDistributionContentAsyncPager for inidivual pagers.
+ */
+class RefreshChronoContentPager(pagers: List<IPager<IPlatformContent>>, pendingPagers: List<Deferred<IPager<IPlatformContent>?>>, placeholderPagers: List<IPager<IPlatformContent>>? = null)
+    : MultiRefreshPager<IPlatformContent>(pagers, pendingPagers, placeholderPagers) {
+
+    override fun recreatePager(pagers: List<IPager<IPlatformContent>>): IPager<IPlatformContent> {
+        return MultiChronoContentPager(pagers);
+        //return MultiChronoContentParallelPager(pagers);
+        //return MultiDistributionContentPager(pagers.associateWith { 1f });
+    }
+}

app/src/main/java/com/futo/platformplayer/api/media/structures/SingleAsyncItemPager.kt

@@ -43,6 +43,7 @@ class SingleAsyncItemPager<T> {
             if (_currentResultPos >= _requestedPageItems.size) {
                 val startPos = fillDeferredUntil(_currentResultPos);
                 if(!_pager.hasMorePages()) {
+                    Logger.i("SingleAsyncItemPager", "end of async page reached");
                     completeRemainder { it?.complete(null) };
                 }
                 if(_isRequesting)

app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt

@@ -12,6 +12,7 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.builders.DashBuilder
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.states.StateApp
@@ -352,16 +353,25 @@ class StateCasting {
                 }
             }
         } else {
-            if (videoSource is IVideoUrlSource) {
+            if (videoSource is IVideoUrlSource)
                 ad.loadVideo("BUFFERED", videoSource.container, videoSource.getVideoUrl(), resumePosition, video.duration.toDouble());
-            } else if (audioSource is IAudioUrlSource) {
+            else if(videoSource is IHLSManifestSource)
+                ad.loadVideo("BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble());
+            else if (audioSource is IAudioUrlSource)
                 ad.loadVideo("BUFFERED", audioSource.container, audioSource.getAudioUrl(), resumePosition, video.duration.toDouble());
-            } else if (videoSource is LocalVideoSource) {
+            else if(audioSource is IHLSManifestAudioSource)
+                ad.loadVideo("BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble());
+            else if (videoSource is LocalVideoSource)
                 castLocalVideo(video, videoSource, resumePosition);
-            } else if (audioSource is LocalAudioSource) {
+            else if (audioSource is LocalAudioSource)
                 castLocalAudio(video, audioSource, resumePosition);
-            } else {
-                throw Exception("Unhandled source type videoSource=$videoSource audioSource=$audioSource subtitleSource=$subtitleSource");
+            else {
+                var str = listOf(
+                    if(videoSource != null) "Video: ${videoSource::class.java.simpleName}" else null,
+                    if(audioSource != null) "Audio: ${audioSource::class.java.simpleName}" else null,
+                    if(subtitleSource != null) "Subtitles: ${subtitleSource::class.java.simpleName}" else null
+                ).filterNotNull().joinToString(", ");
+                throw UnsupportedCastException(str);
             }
         }
 

app/src/main/java/com/futo/platformplayer/constructs/Event.kt

@@ -8,6 +8,10 @@ abstract class EventBase<Handler, ConditionalHandler>: IEvent {
     protected val _conditionalListeners = mutableListOf<TaggedHandler<ConditionalHandler>>();
     protected val _listeners = mutableListOf<TaggedHandler<Handler>>();
 
+    fun hasListeners(): Boolean =
+        synchronized(_listeners){_listeners.isNotEmpty()} ||
+        synchronized(_conditionalListeners){_conditionalListeners.isNotEmpty()};
+
     fun subscribeConditional(listener: ConditionalHandler) {
         synchronized(_conditionalListeners) {
             _conditionalListeners.add(TaggedHandler(listener));
@@ -65,10 +69,7 @@ abstract class EventBase<Handler, ConditionalHandler>: IEvent {
 
 class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
     fun emit() : Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
+        var handled = false;
 
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
@@ -76,6 +77,7 @@ class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke();
         }
@@ -85,17 +87,14 @@ class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
 }
 class Event1<T1>() : EventBase<((T1)->Unit), ((T1)->Boolean)>() {
     fun emit(value : T1): Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
-
+        var handled = false;
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
                 handled = handled || conditional.handler.invoke(value);
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke(value);
         }
@@ -105,10 +104,7 @@ class Event1<T1>() : EventBase<((T1)->Unit), ((T1)->Boolean)>() {
 }
 class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
     fun emit(value1 : T1, value2 : T2): Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
+        var handled = false;
 
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
@@ -116,6 +112,7 @@ class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke(value1, value2);
         }
@@ -126,10 +123,7 @@ class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
 
 class Event3<T1, T2, T3>() : EventBase<((T1, T2, T3)->Unit), ((T1, T2, T3)->Boolean)>() {
     fun emit(value1 : T1, value2 : T2, value3 : T3): Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
+        var handled = false;
 
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
@@ -137,6 +131,7 @@ class Event3<T1, T2, T3>() : EventBase<((T1, T2, T3)->Unit), ((T1, T2, T3)->Bool
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke(value1, value2, value3);
         }

app/src/main/java/com/futo/platformplayer/constructs/TaskHandler.kt

@@ -57,6 +57,7 @@ class TaskHandler<TParameter, TResult> {
     fun run(parameter: TParameter) {
         val id = ++_idGenerator;
 
+        var handled = false;
         _scope().launch(_dispatcher) {
             if (id != _idGenerator)
                 return@launch;
@@ -67,24 +68,31 @@ class TaskHandler<TParameter, TResult> {
                     return@launch;
 
                 withContext(Dispatchers.Main) {
-                    if (id != _idGenerator)
+                    if (id != _idGenerator) {
+                        handled = true;
                         return@withContext;
+                    }
 
                     try {
                         onSuccess.emit(result);
+                        handled = true;
                     }
                     catch (e: Throwable) {
                         Logger.w(TAG, "Handled exception in TaskHandler onSuccess.", e);
                         onError.emit(e, parameter);
+                        handled = true;
                     }
                 }
             }
             catch (e: Throwable) {
                 Log.i("TaskHandler", "TaskHandler.run in exception: " + e.message);
-                if (id != _idGenerator)
+                if (id != _idGenerator) {
+                    handled = true;
                     return@launch;
+                }
 
                 withContext(Dispatchers.Main) {
+                    handled = true;
                     if (id != _idGenerator)
                         return@withContext;
 
@@ -95,7 +103,18 @@ class TaskHandler<TParameter, TResult> {
                     }
                 }
             }
-        }
+        }/*.invokeOnCompletion { //Commented for now, because it doesn't fix the bug it was intended to fix, but might want it later anyway
+            if(!handled) {
+                if(it is CancellationException) {
+                    Logger.w(TAG, "Detected unhandled TaskHandler due to cancellation, forwarding cancellation");
+                    onError.emit(it, parameter);
+                }
+                else {
+                    //TODO: Forward exception?
+                    Logger.w(TAG, "Detected unhandled TaskHandler due to [${it}]", it);
+                }
+            }
+        }*/
     }
 
     @Synchronized

app/src/main/java/com/futo/platformplayer/developer/DeveloperEndpoints.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.developer
 
 import android.content.Context
+import com.futo.platformplayer.activities.CaptchaActivity
 import com.futo.platformplayer.activities.LoginActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.http.server.HttpContext
@@ -201,6 +202,28 @@ class DeveloperEndpoints(private val context: Context) {
             context.respondCode(500, (ex::class.simpleName + ":" + ex.message) ?: "", "text/plain")
         }
     }
+    @HttpPOST("/plugin/captchaTestPlugin")
+    fun pluginCaptchaTestPlugin(context: HttpContext) {
+        val config = _testPlugin?.config as SourcePluginConfig;
+        val url = context.query.get("url")
+        val html = context.readContentString();
+        try {
+            val captchaConfig = config.captcha;
+            if(captchaConfig == null) {
+                context.respondCode(403, "This plugin doesn't support captcha");
+                return;
+            }
+            CaptchaActivity.showCaptcha(StateApp.instance.context, config, url, html) {
+                _testPluginVariables.clear();
+                _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, it), JSHttpClient(null, null, it));
+
+            };
+            context.respondCode(200, "Captcha started");
+        }
+        catch(ex: Throwable) {
+            context.respondCode(500, (ex::class.simpleName + ":" + ex.message) ?: "", "text/plain")
+        }
+    }
     @HttpGET("/plugin/loginTestPlugin")
     fun pluginLoginTestPlugin(context: HttpContext) {
         val config = _testPlugin?.config as SourcePluginConfig;
@@ -416,7 +439,7 @@ class DeveloperEndpoints(private val context: Context) {
             val resp = _client.get(body.url!!, body.headers);
 
             context.respondCode(200,
-                Json.encodeToString(PackageHttp.BridgeHttpResponse(resp.code, resp.body?.string())),
+                Json.encodeToString(PackageHttp.BridgeHttpResponse(resp.url, resp.code, resp.body?.string())),
                 context.query.getOrDefault("CT", "text/plain"));
         }
         catch(ex: Exception) {

app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt

@@ -2,12 +2,16 @@ package com.futo.platformplayer.dialogs
 
 import android.app.AlertDialog
 import android.content.Context
+import android.graphics.Color
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
@@ -32,6 +36,8 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
     private lateinit var _buttonCancel: MaterialButton;
     private lateinit var _editComment: EditText;
     private lateinit var _inputMethodManager: InputMethodManager;
+    private lateinit var _textCharacterCount: TextView;
+    private lateinit var _textCharacterCountMax: TextView;
 
     val onCommentAdded = Event1<IPlatformComment>();
 
@@ -42,6 +48,26 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
         _buttonCancel = findViewById(R.id.button_cancel);
         _buttonCreate = findViewById(R.id.button_create);
         _editComment = findViewById(R.id.edit_comment);
+        _textCharacterCount = findViewById(R.id.character_count);
+        _textCharacterCountMax = findViewById(R.id.character_count_max);
+
+        _editComment.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) = Unit
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                _textCharacterCount.text = count.toString();
+
+                if (count > PolycentricPlatformComment.MAX_COMMENT_SIZE) {
+                    _textCharacterCount.setTextColor(Color.RED);
+                    _textCharacterCountMax.setTextColor(Color.RED);
+                    _buttonCreate.alpha = 0.4f;
+                } else {
+                    _textCharacterCount.setTextColor(Color.WHITE);
+                    _textCharacterCountMax.setTextColor(Color.WHITE);
+                    _buttonCreate.alpha = 1.0f;
+                }
+            }
+        });
 
         _inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
 
@@ -53,6 +79,11 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
         _buttonCreate.setOnClickListener {
             clearFocus();
 
+            if (_editComment.text.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) {
+                UIDialogs.toast(context, "Comment should be less than 5000 characters");
+                return@setOnClickListener;
+            }
+
             val comment = _editComment.text.toString();
             val processHandle = StatePolycentric.instance.processHandle!!
             val eventPointer = processHandle.post(comment, null, ref)

app/src/main/java/com/futo/platformplayer/downloads/PlaylistDownloadDescriptor.kt

@@ -1,8 +1,19 @@
 package com.futo.platformplayer.downloads
 
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+
 @kotlinx.serialization.Serializable
 data class PlaylistDownloadDescriptor(
     val id: String,
     val targetPxCount: Long?,
     val targetBitrate: Long?
-);
+) {
+    var preventDownload: MutableList<String> = arrayListOf();
+
+    fun getPreventDownloadList(): List<String> = synchronized(preventDownload){ preventDownload };
+    fun shouldDownload(video: IPlatformVideo): Boolean {
+        synchronized(preventDownload) {
+            return !preventDownload.contains(video.url);
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt

@@ -13,12 +13,16 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.exceptions.DownloadException
+import com.futo.platformplayer.hasAnySource
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.helpers.VideoHelper
+import com.futo.platformplayer.isDownloadable
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -27,7 +31,6 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.time.OffsetDateTime
-import java.util.concurrent.CancellationException
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
@@ -147,27 +150,37 @@ class VideoDownload {
             if(original !is IPlatformVideoDetails)
                 throw IllegalStateException("Original content is not media?");
 
+            if(original.video.hasAnySource() && !original.isDownloadable()) {
+                Logger.i(TAG, "Attempted to download unsupported video [${original.name}]:${original.url}");
+                throw DownloadException("Unsupported video for downloading", false);
+            }
+
             videoDetails = SerializedPlatformVideoDetails.fromVideo(original, if (subtitleSource != null) listOf(subtitleSource!!) else listOf());
             if(videoSource == null && targetPixelCount != null) {
                 val vsource = VideoHelper.selectBestVideoSource(videoDetails!!.video, targetPixelCount!!.toInt(), arrayOf())
-                    ?: throw IllegalStateException("Could not find a valid video source for video");
-                if(vsource is IVideoUrlSource)
-                    videoSource = VideoUrlSource.fromUrlSource(vsource);
-                else
-                    throw IllegalStateException("Download video source is not a url source");
+                //    ?: throw IllegalStateException("Could not find a valid video source for video");
+                if(vsource != null) {
+                    if (vsource is IVideoUrlSource)
+                        videoSource = VideoUrlSource.fromUrlSource(vsource);
+                    else
+                        throw DownloadException("Video source is not supported for downloading (yet)", false);
+                }
             }
 
             if(audioSource == null && targetBitrate != null) {
                 val asource = VideoHelper.selectBestAudioSource(videoDetails!!.video, arrayOf(), null, targetPixelCount)
                     ?: if(videoSource != null ) null
-                    else throw IllegalStateException("Could not find a valid audio source for video");
+                    else throw DownloadException("Could not find a valid video or audio source for download")
                 if(asource == null)
                     audioSource = null;
                 else if(asource is IAudioUrlSource)
                     audioSource = AudioUrlSource.fromUrlSource(asource);
                 else
-                    throw IllegalStateException("Download audio source is not a url source");
+                    throw DownloadException("Audio source is not supported for downloading (yet)", false);
             }
+
+            if(videoSource == null && audioSource == null)
+                throw DownloadException("No valid sources found for video/audio");
         }
     }
     suspend fun download(client: ManagedHttpClient, onProgress: ((Double) -> Unit)? = null) = coroutineScope {
@@ -358,7 +371,7 @@ class VideoDownload {
             }
 
             if (isCancelled)
-                throw IllegalStateException("Cancelled");
+                throw CancellationException("Cancelled");
         } while (read > 0);
 
         lastSpeed = 0;
@@ -410,7 +423,7 @@ class VideoDownload {
             }
 
             if(isCancelled)
-                throw IllegalStateException("Cancelled");
+                throw CancellationException("Cancelled", null);
         }
         onProgress(sourceLength, totalRead, 0);
     }

app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt

@@ -1,7 +1,6 @@
 package com.futo.platformplayer.engine
 
 import android.content.Context
-import android.os.Looper
 import com.caoccao.javet.exceptions.JavetCompilationException
 import com.caoccao.javet.exceptions.JavetExecutionException
 import com.caoccao.javet.interop.V8Host
@@ -18,9 +17,7 @@ import com.futo.platformplayer.engine.exceptions.*
 import com.futo.platformplayer.engine.internal.V8Converter
 import com.futo.platformplayer.engine.packages.*
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateAssets
-import kotlinx.coroutines.*
 
 class V8Plugin {
     val config: IV8PluginConfig;
@@ -31,14 +28,31 @@ class V8Plugin {
     val httpClient: ManagedHttpClient get() = _client;
     val httpClientAuth: ManagedHttpClient get() = _clientAuth;
 
+    private val _runtimeLock = Object();
     var _runtime : V8Runtime? = null;
 
     private val _deps : LinkedHashMap<String, String> = LinkedHashMap();
     private val _depsPackages : MutableList<V8Package> = mutableListOf();
     private var _script : String? = null;
 
+    var isStopped = true;
     val onStopped = Event1<V8Plugin>();
 
+    //TODO: Implement a more universal isBusy system for plugins + JSClient + pooling? TBD if propagation would be beneficial
+    private val _busyCounterLock = Object();
+    private var _busyCounter = 0;
+    val isBusy get() = synchronized(_busyCounterLock) { _busyCounter > 0 };
+
+    /**
+     * Called before a busy counter is about to be removed.
+     * Is primarily used to prevent additional calls to dead runtimes.
+     *
+     * Parameter is the busy count after this execution
+     */
+    val afterBusy = Event1<Int>();
+
+    val onScriptException = Event1<ScriptException>();
+
     constructor(context: Context, config: IV8PluginConfig, script: String? = null, client: ManagedHttpClient = ManagedHttpClient(), clientAuth: ManagedHttpClient = ManagedHttpClient()) {
         this._client = client;
         this._clientAuth = clientAuth;
@@ -81,7 +95,7 @@ class V8Plugin {
 
     fun start() {
         val script = _script ?: throw IllegalStateException("Attempted to start V8 without script");
-        synchronized(this) {
+        synchronized(_runtimeLock) {
             if (_runtime != null)
                 return;
 
@@ -121,19 +135,25 @@ class V8Plugin {
                 catchScriptErrors("Plugin[${config.name}]") {
                     it.getExecutor(script).executeVoid()
                 };
+                isStopped = false;
             }
         }
     }
     fun stop(){
         Logger.i(TAG, "Stopping plugin [${config.name}]");
-        synchronized(this) {
-            _runtime?.let {
-                _runtime = null;
-                if(!it.isClosed && !it.isDead)
-                    it.close();
-            };
+        isStopped = true;
+        whenNotBusy {
+            synchronized(_runtimeLock) {
+                isStopped = true;
+                _runtime?.let {
+                    _runtime = null;
+                    if(!it.isClosed && !it.isDead)
+                        it.close();
+                    Logger.i(TAG, "Stopped plugin [${config.name}]");
+                };
+            }
+            onStopped.emit(this);
         }
-        onStopped.emit(this);
     }
 
     fun execute(js: String) : V8Value {
@@ -141,14 +161,53 @@ class V8Plugin {
     }
     fun <T : V8Value> executeTyped(js: String) : T {
         warnIfMainThread("V8Plugin.executeTyped");
+        if(isStopped)
+            throw PluginEngineStoppedException(config, "Instance is stopped", js);
+
+        synchronized(_busyCounterLock) {
+            _busyCounter++;
+        }
 
         val runtime = _runtime ?: throw IllegalStateException("JSPlugin not started yet");
-        return catchScriptErrors("Plugin[${config.name}]", js) { runtime.getExecutor(js).execute() };
+        try {
+            return catchScriptErrors("Plugin[${config.name}]", js) {
+                runtime.getExecutor(js).execute()
+            };
+        }
+        finally {
+            synchronized(_busyCounterLock) {
+                //Free busy *after* afterBusy calls are done to prevent calls on dead runtimes
+                try {
+                    afterBusy.emit(_busyCounter - 1);
+                }
+                catch(ex: Throwable) {
+                    Logger.e(TAG, "Unhandled V8Plugin.afterBusy", ex);
+                }
+                _busyCounter--;
+            }
+        }
     }
     fun executeBoolean(js: String) : Boolean? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueBoolean>(js).value };
     fun executeString(js: String) : String? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueString>(js).value };
     fun executeInteger(js: String) : Int? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueInteger>(js).value };
 
+    fun whenNotBusy(handler: (V8Plugin)->Unit) {
+        synchronized(_busyCounterLock) {
+            if(_busyCounter == 0)
+                handler(this);
+            else {
+                val tag = Object();
+                afterBusy.subscribe(tag) {
+                    if(it == 0) {
+                        Logger.w(TAG, "V8Plugin afterBusy handled");
+                        afterBusy.remove(tag);
+                        handler(this);
+                    }
+                }
+            }
+        }
+    }
+
     private fun getPackage(context: Context, packageName: String): V8Package {
         //TODO: Auto get all package types?
         return when(packageName) {
@@ -160,7 +219,13 @@ class V8Plugin {
     }
 
     fun <T : Any> catchScriptErrors(context: String, code: String? = null, handle: ()->T): T {
-        return catchScriptErrors(this.config, context, code, handle);
+        try {
+            return catchScriptErrors(this.config, context, code, handle);
+        }
+        catch(ex: ScriptException) {
+            onScriptException.emit(ex);
+            throw ex;
+        }
     }
 
     companion object {
@@ -185,7 +250,7 @@ class V8Plugin {
                 if(result is V8ValueObject) {
                     val type = result.getString("plugin_type");
                     if(type != null && type.endsWith("Exception"))
-                        Companion.throwExceptionFromV8(
+                        throwExceptionFromV8(
                             config,
                             result.getOrThrow(config, "plugin_type", "V8Plugin"),
                             result.getOrThrow(config, "message", "V8Plugin"),
@@ -202,19 +267,28 @@ class V8Plugin {
                 throw ScriptCompilationException(config, "Compilation: ${scriptEx.message}\n(${scriptEx.scriptingError.lineNumber})[${scriptEx.scriptingError.startColumn}-${scriptEx.scriptingError.endColumn}]: ${scriptEx.scriptingError.sourceLine}", null, codeStripped);
             }
             catch(executeEx: JavetExecutionException) {
-                val exMessage = extractJSExceptionMessage(executeEx);
+                if(executeEx.scriptingError?.context?.containsKey("plugin_type") == true) {
+                    val pluginType = executeEx.scriptingError.context["plugin_type"].toString();
 
-                if(executeEx.scriptingError?.context?.containsKey("plugin_type") == true)
+                    //Captcha
+                    if (pluginType == "CaptchaRequiredException") {
+                        throw ScriptCaptchaRequiredException(config,
+                            executeEx.scriptingError.context["url"]?.toString(),
+                            executeEx.scriptingError.context["body"]?.toString(),
+                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                    }
+
+                    //Others
                     throwExceptionFromV8(
                         config,
-                        executeEx.scriptingError.context["plugin_type"].toString(),
-                        (exMessage ?: ""),
+                        pluginType,
+                        (extractJSExceptionMessage(executeEx) ?: ""),
                         executeEx,
                         executeEx.scriptingError?.stack,
                         codeStripped
                     );
-
-                throw ScriptExecutionException(config, "${exMessage}", null, executeEx.scriptingError?.stack, codeStripped);
+                }
+                throw ScriptExecutionException(config, extractJSExceptionMessage(executeEx) ?: "", null, executeEx.scriptingError?.stack, codeStripped);
             }
             catch(ex: Exception) {
                 throw ex;
@@ -224,6 +298,7 @@ class V8Plugin {
         private fun throwExceptionFromV8(config: IV8PluginConfig, pluginType: String, msg: String, innerEx: Exception? = null, stack: String? = null, code: String? = null) {
             when(pluginType) {
                 "ScriptException" -> throw ScriptException(config, msg, innerEx, stack, code);
+                "CriticalException" -> throw ScriptCriticalException(config, msg, innerEx, stack, code);
                 "AgeException" -> throw ScriptAgeException(config, msg, innerEx, stack, code);
                 "UnavailableException" -> throw ScriptUnavailableException(config, msg, innerEx, stack, code);
                 "ScriptExecutionException" -> throw ScriptExecutionException(config, msg, innerEx, stack, code);

app/src/main/java/com/futo/platformplayer/engine/exceptions/PluginEngineException.kt

@@ -0,0 +1,11 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrThrow
+import java.lang.Exception
+
+
+open class PluginEngineException(config: IV8PluginConfig, error: String, code: String? = null) : PluginException(config, error, null, code) {
+
+}

app/src/main/java/com/futo/platformplayer/engine/exceptions/PluginEngineStoppedException.kt

@@ -0,0 +1,11 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrThrow
+import java.lang.Exception
+
+
+class PluginEngineStoppedException(config: IV8PluginConfig, error: String, code: String? = null) : PluginEngineException(config, error, code) {
+
+}

app/src/main/java/com/futo/platformplayer/engine/exceptions/ScriptCaptchaRequiredException.kt

@@ -0,0 +1,18 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+
+class ScriptCaptchaRequiredException(config: IV8PluginConfig, val url: String?, val body: String?, ex: Exception? = null, stack: String? = null, code: String? = null) : ScriptException(config, "Captcha required", ex, stack, code) {
+
+    companion object {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject) : ScriptException {
+            val contextName = "ScriptCaptchaRequiredException";
+            return ScriptCaptchaRequiredException(config,
+                obj.getOrDefault<String>(config, "url", contextName, null),
+                obj.getOrDefault<String>(config, "body", contextName, null));
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/engine/exceptions/ScriptCriticalException.kt

@@ -0,0 +1,17 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrThrow
+
+open class ScriptCriticalException(config: IV8PluginConfig, error: String, ex: Exception? = null, stack: String? = null, code: String? = null) : ScriptException(config, error, ex, stack, code) {
+
+
+
+
+    companion object {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject) : ScriptException {
+            return ScriptCriticalException(config, obj.getOrThrow(config, "message", "ScriptCriticalException"));
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt

@@ -108,11 +108,12 @@ class PackageHttp: V8Package {
     }
 
     @kotlinx.serialization.Serializable
-    class BridgeHttpResponse(val code: Int, val body: String?, val headers: Map<String, List<String>>? = null) : IV8Convertable {
+    class BridgeHttpResponse(val url: String, val code: Int, val body: String?, val headers: Map<String, List<String>>? = null) : IV8Convertable {
         val isOk = code >= 200 && code < 300;
 
         override fun toV8(runtime: V8Runtime): V8Value? {
             val obj = runtime.createV8ValueObject();
+            obj.set("url", url);
             obj.set("code", code);
             obj.set("body", body);
             obj.set("headers", headers);
@@ -227,7 +228,7 @@ class PackageHttp: V8Package {
                     val resp = client.requestMethod(method, url, headers);
                     val responseBody = resp.body?.string();
                     logResponse(method, url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -241,7 +242,7 @@ class PackageHttp: V8Package {
                     val resp = client.requestMethod(method, url, body, headers);
                     val responseBody = resp.body?.string();
                     logResponse(method, url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -256,7 +257,7 @@ class PackageHttp: V8Package {
                     val resp = client.get(url, headers);
                     val responseBody = resp.body?.string();
                     logResponse("GET", url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -270,7 +271,7 @@ class PackageHttp: V8Package {
                     val resp = client.post(url, body, headers);
                     val responseBody = resp.body?.string();
                     logResponse("POST", url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -367,7 +368,7 @@ class PackageHttp: V8Package {
             }
             //Forward timeouts
             catch(ex: SocketTimeoutException) {
-                return BridgeHttpResponse(408, null);
+                return BridgeHttpResponse("", 408, null);
             }
         }
     }
@@ -461,7 +462,7 @@ class PackageHttp: V8Package {
         }
         //Forward timeouts
         catch(ex: SocketTimeoutException) {
-            return BridgeHttpResponse(408, null);
+            return BridgeHttpResponse("", 408, null);
         }
     }
 

app/src/main/java/com/futo/platformplayer/exceptions/DownloadException.kt

@@ -0,0 +1,12 @@
+package com.futo.platformplayer.exceptions
+
+class DownloadException : Throwable {
+    val isRetryable: Boolean;
+
+    constructor(innerException: Throwable, retryable: Boolean = true): super(innerException) {
+        isRetryable = retryable;
+    }
+    constructor(msg: String, retryable: Boolean = true): super(msg) {
+        isRetryable = retryable;
+    }
+}

app/src/main/java/com/futo/platformplayer/exceptions/RateLimitException.kt

@@ -0,0 +1,9 @@
+package com.futo.platformplayer.exceptions
+
+class RateLimitException : Throwable {
+    val pluginIds: List<String>;
+
+    constructor(pluginIds: List<String>): super() {
+        this.pluginIds = pluginIds ?: listOf();
+    }
+}

app/src/main/java/com/futo/platformplayer/exceptions/UnsupportedCastException.kt

@@ -0,0 +1,6 @@
+package com.futo.platformplayer.exceptions
+
+import java.lang.Exception
+
+class UnsupportedCastException(msg: String) : Exception(msg) {
+}

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelAboutFragment.kt

@@ -77,7 +77,7 @@ class ChannelAboutFragment : Fragment, IChannelTabFragment {
         };
         _textName?.text = channel.name;
 
-        val metadata = "${channel.subscribers.toHumanNumber()} subscribers";
+        val metadata = if(channel.subscribers > 0) "${channel.subscribers.toHumanNumber()} subscribers" else "";
         _textMetadata?.text = metadata;
         _lastChannel = channel;
         setLinks(channel.links, channel.name);

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt

@@ -29,6 +29,7 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.states.StatePolycentric
@@ -76,7 +77,9 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
         }).success {
             setLoading(false);
             setPager(it);
-        }.exception<Throwable> {
+        }
+        .exception<ScriptCaptchaRequiredException> {  }
+        .exception<Throwable> {
             Logger.w(TAG, "Failed to load initial videos.", it);
             UIDialogs.showGeneralRetryErrorDialog(requireContext(), it.message ?: "", it, { loadNextPage() });
     };
@@ -245,7 +248,6 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
 
         if(_pager is IReplacerPager<*>)
             (_pager as IReplacerPager<*>).onReplaced.remove(this);
-
         if(pager is IReplacerPager<*>) {
             pager.onReplaced.subscribe(this) { oldItem, newItem ->
                 if(_pager != pager)
@@ -254,11 +256,14 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
                 if(_pager !is IPager<IPlatformContent>)
                     return@subscribe;
 
-                val toReplaceIndex = _results.indexOfFirst { it == newItem };
-                if(toReplaceIndex >= 0) {
-                    _results[toReplaceIndex] = newItem as IPlatformContent;
-                    _adapterResults?.let {
-                        it.notifyItemChanged(it.childToParentPosition(toReplaceIndex));
+
+                lifecycleScope.launch(Dispatchers.Main) {
+                    val toReplaceIndex = _results.indexOfFirst { it == oldItem };
+                    if (toReplaceIndex >= 0) {
+                        _results[toReplaceIndex] = newItem as IPlatformContent;
+                        _adapterResults?.let {
+                            it.notifyItemChanged(it.childToParentPosition(toReplaceIndex));
+                        }
                     }
                 }
             }

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelListFragment.kt

@@ -14,6 +14,7 @@ import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
@@ -52,7 +53,8 @@ class ChannelListFragment : Fragment, IChannelTabFragment {
         _authorLinks.add(PlatformAuthorLink(it.id, it.name, it.url, it.thumbnail));
         adapter.notifyItemInserted(adapter.childToParentPosition(_authorLinks.size - 1));
         loadNext();
-    }.exceptionWithParameter<Throwable> { ex, para ->
+    }.exception<ScriptCaptchaRequiredException> {  }
+        .exceptionWithParameter<Throwable> { ex, para ->
         Logger.w(ChannelFragment.TAG, "Failed to load results.", ex);
         UIDialogs.toast(requireContext(), "Failed to fetch\n${para}", false)
         loadNext();

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt

@@ -220,6 +220,13 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 buttons.removeAt(buyIndex)
                 buttons.add(0, button)
             }
+            //Force faq to be second
+            val faqIndex = buttons.indexOfFirst { b -> b.id == 97 };
+            if (faqIndex != -1) {
+                val button = buttons[faqIndex]
+                buttons.removeAt(faqIndex)
+                buttons.add(1, button)
+            }
 
             for (data in buttons) {
                 val button = MenuButton(context, data, _fragment, true);
@@ -289,6 +296,9 @@ class MenuBottomBarFragment : MainActivityFragment() {
             if (!StatePayment.instance.hasPaid) {
                 newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate<BuyFragment>() }))
             }
+            newCurrentButtonDefinitions.add(ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz, R.string.faq, canToggle = false, { false }, {
+                it.navigate<BrowserFragment>(Settings.URL_FAQ);
+            }))
 
             //Add conditional buttons here, when you add a conditional button, be sure to add the register and unregister events for when the button needs to be updated
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BuyFragment.kt

@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.lifecycle.lifecycleScope
 import com.futo.futopay.PaymentConfigurations
 import com.futo.futopay.PaymentManager
+import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
@@ -68,9 +69,12 @@ class BuyFragment : MainFragment() {
                 }
             }
 
-            _buttonBuy.setOnClickListener {
-                buy();
-            }
+            if(!BuildConfig.IS_PLAYSTORE_BUILD)
+                _buttonBuy.setOnClickListener {
+                    buy();
+                }
+            else
+                _buttonBuy.visibility = View.GONE;
             _buttonPaid.setOnClickListener {
                 paid();
             }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ChannelFragment.kt

@@ -246,28 +246,45 @@ class ChannelFragment : MainFragment() {
 
                 if (parameter is String) {
                     _buttonSubscribe.setSubscribeChannel(parameter);
-                    _textChannel.text = "";
-                    _textChannelSub.text = "";
+                    setPolycentricProfileOr(parameter) {
+                        _textChannel.text = "";
+                        _textChannelSub.text = "";
+                        _creatorThumbnail.setThumbnail(null, true);
+                        Glide.with(_imageBanner)
+                            .clear(_imageBanner);
+                    };
 
                     _url = parameter;
                     loadChannel();
                 } else if (parameter is SerializedChannel) {
                     showChannel(parameter);
                     _url = parameter.url;
-                    _creatorThumbnail.setThumbnail(parameter.url, false);
                     loadChannel();
                 } else if (parameter is IPlatformChannel)
                     showChannel(parameter);
                 else if (parameter is PlatformAuthorLink) {
-                    _textChannel.text = parameter.name;
-                    _textChannelSub.text = "";
-                    _creatorThumbnail.setThumbnail(parameter.url, false);
+                    setPolycentricProfileOr(parameter.url) {
+                        _textChannel.text = parameter.name;
+                        _textChannelSub.text = "";
+                        _creatorThumbnail.setThumbnail(parameter.thumbnail, true);
+                        Glide.with(_imageBanner)
+                            .clear(_imageBanner);
+
+                        _taskLoadPolycentricProfile.run(parameter.id);
+                    };
+
                     _url = parameter.url;
                     loadChannel();
                 } else if (parameter is Subscription) {
-                    _textChannel.text = parameter.channel.name;
-                    _textChannelSub.text = "";
-                    _creatorThumbnail.setThumbnail(parameter.channel.thumbnail, false);
+                    setPolycentricProfileOr(parameter.channel.url) {
+                        _textChannel.text = parameter.channel.name;
+                        _textChannelSub.text = "";
+                        _creatorThumbnail.setThumbnail(parameter.channel.thumbnail, true);
+                        Glide.with(_imageBanner)
+                            .clear(_imageBanner);
+
+                        _taskLoadPolycentricProfile.run(parameter.channel.id);
+                    };
 
                     _url = parameter.channel.url;
                     loadChannel();
@@ -360,14 +377,7 @@ class ChannelFragment : MainFragment() {
             _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons);
 
             _buttonSubscribe.setSubscribeChannel(channel);
-            _textChannel.text = channel.name;
-            _textChannelSub.text = "${channel.subscribers.toHumanNumber()} subscribers";
-
-            _creatorThumbnail.setThumbnail(channel.thumbnail, true);
-            Glide.with(_imageBanner)
-                .load(channel.banner)
-                .crossfade()
-                .into(_imageBanner)
+            _textChannelSub.text = if(channel.subscribers > 0) "${channel.subscribers.toHumanNumber()} subscribers" else "";
 
             //TODO: Find a better way to access the adapter fragments..
 
@@ -381,51 +391,68 @@ class ChannelFragment : MainFragment() {
 
             this.channel = channel;
 
-            val cachedProfile = PolycentricCache.instance.getCachedProfile(channel.url);
+            setPolycentricProfileOr(channel.url) {
+                _textChannel.text = channel.name;
+                _creatorThumbnail.setThumbnail(channel.thumbnail, true);
+                Glide.with(_imageBanner)
+                    .load(channel.banner)
+                    .crossfade()
+                    .into(_imageBanner);
+
+                _taskLoadPolycentricProfile.run(channel.id);
+            };
+        }
+
+        private fun setPolycentricProfileOr(url: String, or: () -> Unit) {
+            val cachedProfile = channel?.let { PolycentricCache.instance.getCachedProfile(it.url) };
             if (cachedProfile != null) {
                 setPolycentricProfile(cachedProfile, animate = false);
             } else {
                 setPolycentricProfile(null, animate = false);
-                _taskLoadPolycentricProfile.run(channel.id);
+                or();
             }
         }
 
         private fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
             Log.i(TAG, "setPolycentricProfile(cachedPolycentricProfile = $cachedPolycentricProfile, animate = $animate)")
 
-            val polycentricProfile = cachedPolycentricProfile?.profile;
-            if (polycentricProfile != null) {
-                _fragment.topBar?.onShown(polycentricProfile);
+            val dp_35 = 35.dp(resources)
+            val profile = cachedPolycentricProfile?.profile;
+            val avatar = profile?.systemState?.avatar?.selectBestImage(dp_35 * dp_35)
+                ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
 
-                if (polycentricProfile.systemState.username.isNotBlank())
-                    _textChannel.text = polycentricProfile.systemState.username;
+            if (avatar != null) {
+                _creatorThumbnail.setThumbnail(avatar, animate);
+            } else {
+                _creatorThumbnail.setThumbnail(channel?.thumbnail, animate);
+                _creatorThumbnail.setHarborAvailable(profile != null, animate);
+            }
 
-                val dp_35 = 35.dp(resources)
-                val avatar = polycentricProfile.systemState.avatar?.selectBestImage(dp_35 * dp_35)
-                    ?.let { it.toURLInfoSystemLinkUrl(polycentricProfile.system.toProto(), it.process, polycentricProfile.systemState.servers.toList()) };
+            val banner = profile?.systemState?.banner?.selectHighestResolutionImage()
+                ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
 
-                if (avatar != null) {
-                    _creatorThumbnail.setThumbnail(avatar, true);
-                } else {
-                    _creatorThumbnail.setHarborAvailable(true, true);
-                }
+            if (banner != null) {
+                Glide.with(_imageBanner)
+                    .load(banner)
+                    .crossfade()
+                    .into(_imageBanner);
+            } else {
+                Glide.with(_imageBanner)
+                    .load(channel?.banner)
+                    .crossfade()
+                    .into(_imageBanner);
+            }
 
-                val banner = polycentricProfile.systemState.banner?.selectHighestResolutionImage()
-                    ?.let { it.toURLInfoSystemLinkUrl(polycentricProfile.system.toProto(), it.process, polycentricProfile.systemState.servers.toList()) };
-
-                if (banner != null) {
-                    Glide.with(_imageBanner)
-                        .load(banner)
-                        .crossfade()
-                        .into(_imageBanner);
-                }
+            if (profile != null) {
+                _fragment.topBar?.onShown(profile);
+                _textChannel.text = profile.systemState.username;
             }
 
             (_viewPager.adapter as ChannelViewPagerAdapter?)?.let {
-                it.getFragment<ChannelAboutFragment>().setPolycentricProfile(polycentricProfile, animate);
-                it.getFragment<ChannelMonetizationFragment>().setPolycentricProfile(polycentricProfile, animate);
-                it.getFragment<ChannelListFragment>().setPolycentricProfile(polycentricProfile, animate);
-                it.getFragment<ChannelContentsFragment>().setPolycentricProfile(polycentricProfile, animate);
+                it.getFragment<ChannelAboutFragment>().setPolycentricProfile(profile, animate);
+                it.getFragment<ChannelMonetizationFragment>().setPolycentricProfile(profile, animate);
+                it.getFragment<ChannelListFragment>().setPolycentricProfile(profile, animate);
+                it.getFragment<ChannelContentsFragment>().setPolycentricProfile(profile, animate);
                 //TODO: Call on other tabs as needed
             }
         }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt

@@ -15,7 +15,9 @@ import com.futo.platformplayer.api.media.models.post.IPlatformPost
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.structures.*
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.video.PlayerManager
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.adapters.PreviewContentListAdapter
@@ -24,6 +26,7 @@ import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
 import com.futo.platformplayer.views.adapters.PreviewNestedVideoViewHolder
 import com.futo.platformplayer.views.adapters.PreviewVideoViewHolder
+import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import kotlin.math.floor
 
 abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent, IPlatformContent, IPager<IPlatformContent>, ContentPreviewViewHolder> where TFragment : MainFragment {
@@ -69,15 +72,24 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
             //TODO: Reconstruct search video from detail if search is null
             _overlayContainer.let {
                 if(content is IPlatformVideo)
-                    UISlideOverlays.showVideoOptionsOverlay(content, it) {
-                        if (fragment is HomeFragment) {
-                            val removeIndex = recyclerData.results.indexOf(content);
-                            if (removeIndex >= 0) {
-                                recyclerData.results.removeAt(removeIndex);
-                                recyclerData.adapter.notifyItemRemoved(recyclerData.adapter.childToParentPosition(removeIndex));
+                    UISlideOverlays.showVideoOptionsOverlay(content, it, SlideUpMenuItem(context, R.drawable.ic_visibility_off, "Hide", "Hide from Home", "hide",
+                        { StateMeta.instance.addHiddenVideo(content.url);
+                            if (fragment is HomeFragment) {
+                                val removeIndex = recyclerData.results.indexOf(content);
+                                if (removeIndex >= 0) {
+                                    recyclerData.results.removeAt(removeIndex);
+                                    recyclerData.adapter.notifyItemRemoved(recyclerData.adapter.childToParentPosition(removeIndex));
+                                }
                             }
-                        }
-                    };
+                        }),
+                        SlideUpMenuItem(context, R.drawable.ic_playlist, "Play Feed as Queue", "Play entire feed", "playFeed",
+                            {
+                                val newQueue = listOf(content) + recyclerData.results
+                                    .filterIsInstance<IPlatformVideo>()
+                                    .filter { it != content };
+                                StatePlayer.instance.setQueue(newQueue, StatePlayer.TYPE_QUEUE, "Feed Queue", true, false);
+                            })
+                    );
             }
         };
         adapter.onAddToQueueClicked.subscribe(this) {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentSearchResultsFragment.kt

@@ -15,6 +15,7 @@ import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.views.FeedStyle
 import kotlinx.coroutines.Dispatchers
@@ -86,7 +87,7 @@ class ContentSearchResultsFragment : MainFragment() {
                     StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
                 }
             })
-            .success { loadedResult(it); }
+            .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
             .exception<Throwable> {
                 Logger.w(ChannelFragment.TAG, "Failed to load results.", it);
                 UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
@@ -100,14 +101,12 @@ class ContentSearchResultsFragment : MainFragment() {
 
         fun onShown(parameter: Any?, isBack: Boolean) {
             if(parameter is SuggestionsFragmentData) {
-                if(!isBack) {
-                    setQuery(parameter.query, false);
-                    setChannelUrl(parameter.channelUrl, false);
+                setQuery(parameter.query, false);
+                setChannelUrl(parameter.channelUrl, false);
 
-                    fragment.topBar?.apply {
-                        if (this is SearchTopBarFragment) {
-                            this.setText(parameter.query);
-                        }
+                fragment.topBar?.apply {
+                    if (this is SearchTopBarFragment) {
+                        this.setText(parameter.query);
                     }
                 }
             }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorSearchResultsFragment.kt

@@ -13,6 +13,7 @@ import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.views.FeedStyle
 
@@ -56,6 +57,7 @@ class CreatorSearchResultsFragment : MainFragment() {
         constructor(fragment: CreatorSearchResultsFragment, inflater: LayoutInflater): super(fragment, inflater) {
             _taskSearch = TaskHandler<String, IPager<PlatformAuthorLink>>({fragment.lifecycleScope}, { query -> StatePlatform.instance.searchChannels(query) })
                 .success { loadedResult(it); }
+                .exception<ScriptCaptchaRequiredException> {  }
                 .exception<Throwable> {
                     Logger.w(ChannelFragment.TAG, "Failed to load results.", it);
                     UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
@@ -69,16 +71,14 @@ class CreatorSearchResultsFragment : MainFragment() {
 
         fun onShown(parameter: Any?, isBack: Boolean) {
             if(parameter is String) {
-                if(!isBack) {
-                    setQuery(parameter);
+                setQuery(parameter);
 
-                    fragment.topBar?.apply {
-                        if (this is SearchTopBarFragment) {
-                            setText(parameter);
-                            onSearch.subscribe(this) {
-                                setQuery(it);
-                            };
-                        }
+                fragment.topBar?.apply {
+                    if (this is SearchTopBarFragment) {
+                        setText(parameter);
+                        onSearch.subscribe(this) {
+                            setQuery(it);
+                        };
                     }
                 }
             }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt

@@ -39,6 +39,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     private val _spinnerSortBy: Spinner;
     private val _containerSortBy: LinearLayout;
     private val _tagsView: TagsView;
+    private val _textCentered: TextView;
 
     protected val _toolbarContentView: LinearLayout;
 
@@ -68,6 +69,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         this.fragment = fragment;
         inflater.inflate(R.layout.fragment_feed, this);
 
+        _textCentered = findViewById(R.id.text_centered);
         _progress_bar = findViewById(R.id.progress_bar);
         _progress_bar.inactiveColor = Color.TRANSPARENT;
 
@@ -169,6 +171,10 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         _recyclerResults.addOnScrollListener(_scrollListener);
     }
 
+    protected fun setTextCentered(text: String?) {
+        _textCentered.text = text;
+    }
+
     fun onResume() {
         //Reload the pager if the plugin was killed
         val pager = recyclerData.pager;

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt

@@ -8,21 +8,27 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.futo.platformplayer.*
+import com.futo.platformplayer.activities.CaptchaActivity
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.others.CaptchaWebViewClient
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins
+import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.announcements.AnnouncementView
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
@@ -92,6 +98,7 @@ class HomeFragment : MainFragment() {
                 StatePlatform.instance.getHomeRefresh(fragment.lifecycleScope)
             })
             .success { loadedResult(it); }
+            .exception<ScriptCaptchaRequiredException> {  }
             .exception<ScriptExecutionException> {
                 Logger.w(ChannelFragment.TAG, "Plugin failure.", it);
                 UIDialogs.showDialog(context, R.drawable.ic_error_pred, "Failed to get Home\nPlugin [${it.config.name}]", it.message, null, 0,
@@ -100,17 +107,20 @@ class HomeFragment : MainFragment() {
                 );
             }
             .exception<ScriptImplementationException> {
-                Logger.w(ChannelFragment.TAG, "Plugin failure.", it);
+                Logger.w(TAG, "Plugin failure.", it);
                 UIDialogs.showDialog(context, R.drawable.ic_error_pred, "Failed to get Home\nPlugin [${it.config.name}]", it.message, null, 0,
                     UIDialogs.Action("Ignore", {}),
                     UIDialogs.Action("Sources", { fragment.navigate<SourcesFragment>() }, UIDialogs.ActionStyle.PRIMARY)
                 );
             }
             .exception<Throwable> {
-                Logger.w(ChannelFragment.TAG, "Failed to load channel.", it);
+                Logger.w(TAG, "Failed to load channel.", it);
                 UIDialogs.showGeneralRetryErrorDialog(context, "Failed to get Home", it, {
                     loadResults()
-                });
+                }) {
+                    finishRefreshLayoutLoader();
+                    setLoading(false);
+                };
             };
         }
 
@@ -131,6 +141,8 @@ class HomeFragment : MainFragment() {
             } else {
                 setLoading(false);
             }
+
+            finishRefreshLayoutLoader();
         }
 
         override fun reload() {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ImportSubscriptionsFragment.kt

@@ -69,6 +69,8 @@ class ImportSubscriptionsFragment : MainFragment() {
         private var _currentLoadIndex = 0;
 
         private var _taskLoadChannel: TaskHandler<String, IPlatformChannel>;
+        private var _counter: Int = 0;
+        private var _limitToastShown = false;
 
         constructor(fragment: ImportSubscriptionsFragment, inflater: LayoutInflater) : super(inflater.context) {
             _fragment = fragment;
@@ -104,6 +106,7 @@ class ImportSubscriptionsFragment : MainFragment() {
             setLoading(false);
 
             _taskLoadChannel = TaskHandler<String, IPlatformChannel>({_fragment.lifecycleScope}, { link ->
+                _counter++;
                 val channel: IPlatformChannel = StatePlatform.instance.getChannelLive(link, false);
                 return@TaskHandler channel;
             }).success {
@@ -124,6 +127,8 @@ class ImportSubscriptionsFragment : MainFragment() {
         }
 
         fun onShown(parameter: Any ?, isBack: Boolean) {
+            _counter = 0;
+            _limitToastShown = false;
             updateSelected();
 
             val itemsRemoved = _items.size;
@@ -157,6 +162,15 @@ class ImportSubscriptionsFragment : MainFragment() {
 
         private fun load() {
             setLoading(true);
+            if (_counter >= MAXIMUM_BATCH_SIZE) {
+                if (!_limitToastShown) {
+                    _limitToastShown = true;
+                    UIDialogs.toast(context, "Stopped after $MAXIMUM_BATCH_SIZE to avoid rate limit, re-enter to import rest");
+                }
+
+                setLoading(false);
+                return;
+            }
             _taskLoadChannel.run(_links[_currentLoadIndex]);
         }
 
@@ -196,6 +210,7 @@ class ImportSubscriptionsFragment : MainFragment() {
 
     companion object {
         val TAG = "ImportSubscriptionsFragment";
+        private const val MAXIMUM_BATCH_SIZE = 75;
         fun newInstance() = ImportSubscriptionsFragment().apply {}
     }
 }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PlaylistSearchResultsFragment.kt

@@ -73,16 +73,14 @@ class PlaylistSearchResultsFragment : MainFragment() {
 
         fun onShown(parameter: Any?, isBack: Boolean) {
             if(parameter is String) {
-                if(!isBack) {
-                    setQuery(parameter);
+                setQuery(parameter);
 
-                    fragment.topBar?.apply {
-                        if (this is SearchTopBarFragment) {
-                            setText(parameter);
-                            onSearch.subscribe(this) {
-                                setQuery(it);
-                            };
-                        }
+                fragment.topBar?.apply {
+                    if (this is SearchTopBarFragment) {
+                        setText(parameter);
+                        onSearch.subscribe(this) {
+                            setQuery(it);
+                        };
                     }
                 }
             }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt

@@ -346,24 +346,24 @@ class PostDetailFragment : MainFragment {
 
                         _rating.visibility = VISIBLE;
                         _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                        _rating.onLikeDislikeUpdated.subscribe(this) { processHandle, newHasLiked, newHasDisliked ->
-                            if (newHasLiked) {
-                                processHandle.opinion(ref, Opinion.like);
-                            } else if (newHasDisliked) {
-                                processHandle.opinion(ref, Opinion.dislike);
+                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            if (args.hasLiked) {
+                                args.processHandle.opinion(ref, Opinion.like);
+                            } else if (args.hasDisliked) {
+                                args.processHandle.opinion(ref, Opinion.dislike);
                             } else {
-                                processHandle.opinion(ref, Opinion.neutral);
+                                args.processHandle.opinion(ref, Opinion.neutral);
                             }
 
                             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                                 try {
-                                    processHandle.fullyBackfillServers();
+                                    args.processHandle.fullyBackfillServers();
                                 } catch (e: Throwable) {
                                     Logger.e(TAG, "Failed to backfill servers", e)
                                 }
                             }
 
-                            StatePolycentric.instance.updateLikeMap(ref, newHasLiked, newHasDisliked)
+                            StatePolycentric.instance.updateLikeMap(ref, args.hasLiked, args.hasDisliked)
                         };
                     }
                 } catch (e: Throwable) {
@@ -601,7 +601,7 @@ class PostDetailFragment : MainFragment {
             val subscribers = value?.author?.subscribers;
             if(subscribers != null && subscribers > 0) {
                 _channelMeta.visibility = View.VISIBLE;
-                _channelMeta.text = value.author.subscribers!!.toHumanNumber() + " subscribers";
+                _channelMeta.text = if((value.author?.subscribers ?: 0) > 0) value.author.subscribers!!.toHumanNumber() + " subscribers" else "";
             } else {
                 _channelMeta.visibility = View.GONE;
                 _channelMeta.text = "";

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt

@@ -258,11 +258,25 @@ class SourceDetailFragment : MainFragment() {
                 }
             }
 
+            val clientIfExists = StatePlugins.instance.getPlugin(config.id);
             groups.add(
                 BigButtonGroup(c, "Management",
                     BigButton(c, "Uninstall", "Removes the plugin from the app", R.drawable.ic_block) {
                         uninstallSource();
-                    }.withBackground(R.drawable.background_big_button_red)
+                    }.withBackground(R.drawable.background_big_button_red).apply {
+                        this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                            setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
+                        };
+                    },
+                    if(clientIfExists?.captchaEncrypted != null)
+                        BigButton(c, "Delete Captcha", "Deletes stored captcha answer for this plugin", R.drawable.ic_block) {
+                            clientIfExists?.updateCaptcha(null);
+                        }.apply {
+                            this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                                setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
+                            };
+                        }.withBackground(R.drawable.background_big_button_red)
+                    else null
                 )
             )
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt

@@ -12,13 +12,17 @@ import com.futo.platformplayer.*
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.cache.ChannelContentCache
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.exceptions.ChannelException
+import com.futo.platformplayer.exceptions.RateLimitException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
@@ -28,8 +32,10 @@ import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
 import com.futo.platformplayer.views.subscriptions.SubscriptionBar
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -129,6 +135,10 @@ class SubscriptionsFeedFragment : MainFragment() {
                     };
                 }
             }
+
+            if (!StateSubscriptions.instance.isGlobalUpdating) {
+                finishRefreshLayoutLoader();
+            }
         }
 
         override fun cleanup() {
@@ -155,8 +165,17 @@ class SubscriptionsFeedFragment : MainFragment() {
         private val _filterLock = Object();
         private val _filterSettings = FragmentedStorage.get<FeedFilterSettings>("subFeedFilter");
 
+        private var _bypassRateLimit = false;
         private val _lastExceptions: List<Throwable>? = null;
         private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { withRefresh ->
+            if(!_bypassRateLimit) {
+                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
+                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.config.subscriptionRateLimit}" }.joinToString("\n");
+                val rateLimitPlugins = subRequestCounts.filter { clientCount -> clientCount.key.config.subscriptionRateLimit?.let { rateLimit -> clientCount.value > rateLimit } == true }
+                Logger.w(TAG, "Refreshing subscriptions with requests:\n" + reqCountStr);
+                if(rateLimitPlugins.any())
+                    throw RateLimitException(rateLimitPlugins.map { it.key.id });
+            }
             val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(StateApp.instance.scope, withRefresh);
 
             val currentExs = StateSubscriptions.instance.globalSubscriptionExceptions;
@@ -166,9 +185,37 @@ class SubscriptionsFeedFragment : MainFragment() {
             return@TaskHandler resp;
         })
             .success { loadedResult(it); }
+            .exception<RateLimitException> {
+                fragment.lifecycleScope.launch(Dispatchers.IO) {
+                    val subs = StateSubscriptions.instance.getSubscriptions();
+                    val subsByLimited = it.pluginIds.map{ StatePlatform.instance.getClientOrNull(it) }
+                        .filterIsInstance<JSClient>()
+                        .associateWith { client -> subs.filter { it.getClient() == client } }
+                        .map { Pair(it.key, it.value) }
+
+                    withContext(Dispatchers.Main) {
+                        UIDialogs.showDialog(context, R.drawable.ic_security_pred,
+                            "Rate Limit Warning",  "This is a temporary measure to prevent people from hitting rate limit until we have better support for lots of subscriptions." +
+                                    "\n\nYou have too many subscriptions for the following plugins:\n",
+                            subsByLimited.map { "${it.first.config.name}: ${it.second.size} Subscriptions" } .joinToString("\n"), 0, UIDialogs.Action("Refresh Anyway", {
+                                _bypassRateLimit = true;
+                                loadResults();
+                            }, UIDialogs.ActionStyle.DANGEROUS_TEXT),
+                            UIDialogs.Action("OK", {
+                                finishRefreshLayoutLoader();
+                                setLoading(false);
+                            }, UIDialogs.ActionStyle.PRIMARY));
+                    }
+                }
+            }
             .exception<Throwable> {
                 Logger.w(ChannelFragment.TAG, "Failed to load channel.", it);
-                UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                if(it !is CancellationException)
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                else {
+                    finishRefreshLayoutLoader();
+                    setLoading(false);
+                }
             };
 
         private fun initializeToolbarContent() {
@@ -234,8 +281,12 @@ class SubscriptionsFeedFragment : MainFragment() {
             Logger.i(TAG, "Subscriptions load");
             if(recyclerData.results.size == 0) {
                 val cachePager = ChannelContentCache.instance.getSubscriptionCachePager();
-                Logger.i(TAG, "Subscription show cache (${cachePager.getResults().size})");
+                val results = cachePager.getResults();
+                Logger.i(TAG, "Subscription show cache (${results.size})");
+                setTextCentered(if (results.isEmpty()) "No results found\nSwipe down to refresh" else null);
                 setPager(cachePager);
+            } else {
+                setTextCentered(null);
             }
             _taskGetPager.run(withRefetch);
         }
@@ -248,10 +299,15 @@ class SubscriptionsFeedFragment : MainFragment() {
                     finishRefreshLayoutLoader();
                     setLoading(false);
                     setPager(pager);
+                    setTextCentered(if (pager.getResults().isEmpty()) "No results found\nSwipe down to refresh" else null);
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to finish loading", e)
                 }
-            }
+            }/*.invokeOnCompletion { //Commented for now, because it doesn't fix the bug it was intended to fix, but might want it later anyway
+                if(it is CancellationException) {
+                    setLoading(false);
+                }
+            }*/
         }
 
         private fun handleExceptions(exs: List<Throwable>) {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt

@@ -62,6 +62,7 @@ import com.futo.platformplayer.engine.exceptions.ScriptAgeException
 import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
+import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
@@ -608,7 +609,7 @@ class VideoDetailView : ConstraintLayout {
             },
             RoundButton(context, R.drawable.ic_download, "Download", TAG_DOWNLOAD) {
                 video?.let {
-                    _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(context.contentResolver, it, _overlayContainer);
+                    _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(it, _overlayContainer, context.contentResolver);
                 };
             },
             RoundButton(context, R.drawable.ic_share, "Share", TAG_SHARE) {
@@ -870,10 +871,9 @@ class VideoDetailView : ConstraintLayout {
         _commentsList.clear();
         _platform.setPlatformFromClientID(video.id.pluginId);
         _subTitle.text = subTitleSegments.joinToString(" • ");
-        _channelName.text = video.author.name;
         _playWhenReady = true;
         if(video.author.subscribers != null) {
-            _channelMeta.text = video.author.subscribers!!.toHumanNumber() + " subscribers";
+            _channelMeta.text = if((video.author.subscribers ?: 0) > 0) video.author.subscribers!!.toHumanNumber() + " subscribers" else "";
             (_channelName.layoutParams as MarginLayoutParams).setMargins(0, (DP_5 * -1).toInt(), 0, 0);
         } else {
             _channelMeta.text = "";
@@ -897,6 +897,7 @@ class VideoDetailView : ConstraintLayout {
         } else {
             setPolycentricProfile(null, animate = false);
             _taskLoadPolycentricProfile.run(video.author.id);
+            _channelName.text = video.author.name;
         }
 
         _player.clear();
@@ -982,7 +983,7 @@ class VideoDetailView : ConstraintLayout {
         _title.text = video.name;
         _channelName.text = video.author.name;
         if(video.author.subscribers != null) {
-            _channelMeta.text = video.author.subscribers!!.toHumanNumber() + " subscribers";
+            _channelMeta.text = if((video.author.subscribers ?: 0) > 0) video.author.subscribers!!.toHumanNumber() + " subscribers" else "";
             (_channelName.layoutParams as MarginLayoutParams).setMargins(0, (DP_5 * -1).toInt(), 0, 0);
         } else {
             _channelMeta.text = "";
@@ -1042,24 +1043,24 @@ class VideoDetailView : ConstraintLayout {
                     withContext(Dispatchers.Main) {
                         _rating.visibility = View.VISIBLE;
                         _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                        _rating.onLikeDislikeUpdated.subscribe(this) { processHandle, newHasLiked, newHasDisliked ->
-                            if (newHasLiked) {
-                                processHandle.opinion(ref, Opinion.like);
-                            } else if (newHasDisliked) {
-                                processHandle.opinion(ref, Opinion.dislike);
+                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            if (args.hasLiked) {
+                                args.processHandle.opinion(ref, Opinion.like);
+                            } else if (args.hasDisliked) {
+                                args.processHandle.opinion(ref, Opinion.dislike);
                             } else {
-                                processHandle.opinion(ref, Opinion.neutral);
+                                args.processHandle.opinion(ref, Opinion.neutral);
                             }
 
                             fragment.lifecycleScope.launch(Dispatchers.IO) {
                                 try {
-                                    processHandle.fullyBackfillServers();
+                                    args.processHandle.fullyBackfillServers();
                                 } catch (e: Throwable) {
                                     Logger.e(TAG, "Failed to backfill servers", e)
                                 }
                             }
 
-                            StatePolycentric.instance.updateLikeMap(ref, newHasLiked, newHasDisliked)
+                            StatePolycentric.instance.updateLikeMap(ref, args.hasLiked, args.hasDisliked)
                         };
                     }
                 } catch (e: Throwable) {
@@ -1254,6 +1255,10 @@ class VideoDetailView : ConstraintLayout {
             _lastVideoSource = videoSource;
             _lastAudioSource = audioSource;
         }
+        catch(ex: UnsupportedCastException) {
+            Logger.e(TAG, "Failed to load cast media", ex);
+            UIDialogs.showGeneralErrorDialog(context, "Unsupported Cast format", ex);
+        }
         catch(ex: Throwable) {
             Logger.e(TAG, "Failed to load media", ex);
             UIDialogs.showGeneralErrorDialog(context, "Failed to load media", ex);
@@ -1610,10 +1615,10 @@ class VideoDetailView : ConstraintLayout {
         _lastSubtitleSource = toSet;
     }
 
-    private fun handleUnavailableVideo() {
+    private fun handleUnavailableVideo(msg: String? = null) {
         if (!nextVideo()) {
             if(video?.datetime == null || video?.datetime!! < OffsetDateTime.now().minusHours(1))
-                UIDialogs.showDialog(context, R.drawable.ic_lock, "Unavailable video", "This video is unavailable.", null, 0,
+                UIDialogs.showDialog(context, R.drawable.ic_lock, "Unavailable video", msg ?: "This video is unavailable.", null, 0,
                     UIDialogs.Action("Back", {
                         this@VideoDetailView.onClose.emit();
                     }, UIDialogs.ActionStyle.PRIMARY));
@@ -1971,14 +1976,24 @@ class VideoDetailView : ConstraintLayout {
     private fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
         _polycentricProfile = cachedPolycentricProfile;
 
-        if (cachedPolycentricProfile?.profile == null) {
-            _layoutMonetization.visibility = View.GONE;
-            _creatorThumbnail.setHarborAvailable(false, animate);
-            return;
+        val dp_35 = 35.dp(context.resources)
+        val profile = cachedPolycentricProfile?.profile;
+        val avatar = profile?.systemState?.avatar?.selectBestImage(dp_35 * dp_35)
+            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) };
+
+        if (avatar != null) {
+            _creatorThumbnail.setThumbnail(avatar, animate);
+        } else {
+            _creatorThumbnail.setThumbnail(video?.author?.thumbnail, animate);
+            _creatorThumbnail.setHarborAvailable(profile != null, animate);
         }
 
-        _layoutMonetization.visibility = View.VISIBLE;
-        _creatorThumbnail.setHarborAvailable(true, animate);
+        if (profile != null) {
+            _channelName.text = cachedPolycentricProfile.profile.systemState.username;
+            _layoutMonetization.visibility = View.VISIBLE;
+        } else {
+            _layoutMonetization.visibility = View.GONE;
+        }
     }
 
     fun setProgressBarOverlayed(isOverlayed: Boolean?) {
@@ -2092,7 +2107,7 @@ class VideoDetailView : ConstraintLayout {
         }
         .exception<ScriptUnavailableException> {
             Logger.w(TAG, "exception<ScriptUnavailableException>", it);
-            handleUnavailableVideo();
+            handleUnavailableVideo(it.message);
         }
         .exception<ScriptException> {
             Logger.w(TAG, "exception<ScriptException>", it)

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoListEditorView.kt

@@ -57,10 +57,8 @@ abstract class VideoListEditorView : LinearLayout {
         buttonPlayAll.setOnClickListener { onPlayAllClick(); };
         buttonShuffle.setOnClickListener { onShuffleClick(); };
 
-        if (canEdit())
-            _buttonEdit.setOnClickListener { onEditClick(); };
-        else
-            _buttonEdit.visibility = View.GONE;
+        _buttonEdit.setOnClickListener { onEditClick(); };
+        setButtonDownloadVisible(canEdit());
 
         videoListEditorView.onVideoOrderChanged.subscribe(::onVideoOrderChanged);
         videoListEditorView.onVideoRemoved.subscribe(::onVideoRemoved);

app/src/main/java/com/futo/platformplayer/helpers/VideoHelper.kt

@@ -4,7 +4,10 @@ import android.net.Uri
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSAudioUrlRangeSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
 import com.futo.platformplayer.logging.Logger
@@ -17,6 +20,12 @@ import com.google.android.exoplayer2.upstream.ResolvingDataSource
 class VideoHelper {
     companion object {
 
+        fun isDownloadable(detail: IPlatformVideoDetails) =
+            (detail.video.videoSources.any { isDownloadable(it) }) ||
+                    (if (detail is VideoUnMuxedSourceDescriptor) detail.audioSources.any { isDownloadable(it) } else false);
+        fun isDownloadable(source: IVideoSource) = source is IVideoUrlSource;
+        fun isDownloadable(source: IAudioSource) = source is IAudioUrlSource;
+
         fun selectBestVideoSource(desc: IVideoSourceDescriptor, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? = selectBestVideoSource(desc.videoSources.toList(), desiredPixelCount, prefContainers);
         fun selectBestVideoSource(sources: Iterable<IVideoSource>, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? {
             val targetVideo = if(desiredPixelCount > 0)

app/src/main/java/com/futo/platformplayer/images/PolycentricModelLoader.java

@@ -61,9 +61,21 @@ public class PolycentricModelLoader implements ModelLoader<String, ByteBuffer> {
             _deferred.invokeOnCompletion(throwable -> {
                 if (throwable != null) {
                     callback.onLoadFailed(new Exception(throwable));
+                    return Unit.INSTANCE;
+                }
+
+                Deferred<ByteBuffer> deferred = _deferred;
+                if (deferred == null) {
+                    callback.onLoadFailed(new Exception("Deferred is null"));
+                    return Unit.INSTANCE;
+                }
+
+                ByteBuffer completed = deferred.getCompleted();
+                if (completed != null) {
+                    callback.onDataReady(completed);
+                } else {
+                    callback.onLoadFailed(new Exception("Completed is null"));
                 }
-                final ByteBuffer completed = _deferred.getCompleted();
-                callback.onDataReady(completed);
                 return Unit.INSTANCE;
             });
         }

app/src/main/java/com/futo/platformplayer/logging/Logging.kt

@@ -64,12 +64,11 @@ class Logging {
 
             val client = OkHttpClient()
             val response: Response = client.newCall(request).execute()
-            if (response.isSuccessful) {
-                val body = response.body?.string();
-                return if (body != null) Json.decodeFromString<String>(body) else null;
+            return if (response.isSuccessful) {
+                response.body?.string();
             } else {
                 Logger.e("Failed to submit log.") { "Failed to submit logs (${response.code}): ${response.body?.string()}" };
-                return null;
+                null;
             }
         }
     }

app/src/main/java/com/futo/platformplayer/models/Subscription.kt

@@ -3,24 +3,48 @@ package com.futo.platformplayer.models
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
+import com.futo.platformplayer.states.StatePlatform
 import java.time.OffsetDateTime
 
 @kotlinx.serialization.Serializable
 class Subscription {
     var channel: SerializedChannel;
 
+    //Last found content
     @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
     var lastVideo : OffsetDateTime = OffsetDateTime.MAX;
     @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
     var lastLiveStream : OffsetDateTime = OffsetDateTime.MAX;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastPost : OffsetDateTime = OffsetDateTime.MAX;
 
+    //Last update time
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastVideoUpdate : OffsetDateTime = OffsetDateTime.MIN;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastStreamUpdate : OffsetDateTime = OffsetDateTime.MIN;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastLiveStreamUpdate : OffsetDateTime = OffsetDateTime.MIN;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastPostUpdate : OffsetDateTime = OffsetDateTime.MIN;
+
+    //Last video interval
     var uploadInterval : Int = 0;
+    var uploadPostInterval : Int = 0;
+
 
     constructor(channel : SerializedChannel) {
         this.channel = channel;
     }
 
+    fun shouldFetchStreams() = lastLiveStream.getNowDiffDays() < 7;
+    fun shouldFetchLiveStreams() = lastLiveStream.getNowDiffDays() < 14;
+    fun shouldFetchPosts() = lastPost.getNowDiffDays() < 2;
+
+    fun getClient() = StatePlatform.instance.getChannelClientOrNull(channel.url);
+
     fun updateChannel(channel: IPlatformChannel) {
         this.channel = SerializedChannel.fromChannel(channel);
     }

app/src/main/java/com/futo/platformplayer/models/Telemetry.kt

@@ -9,8 +9,8 @@ data class Telemetry(
     val buildType: String,
     val debug: Boolean,
     val isUnstableBuild: Boolean,
-    val time: Long,
     val brand: String,
     val manufacturer: String,
-    val model: String
+    val model: String,
+    val sdkVersion: Int
 ) { }

app/src/main/java/com/futo/platformplayer/others/CaptchaWebViewClient.kt

@@ -0,0 +1,76 @@
+package com.futo.platformplayer.others
+
+import android.webkit.*
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginCaptchaConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.logging.Logger
+import kotlinx.serialization.encodeToString
+
+class CaptchaWebViewClient : WebViewClient {
+    val onCaptchaFinished = Event1<SourceCaptchaData?>();
+    val onPageLoaded = Event2<WebView?, String?>()
+
+    private val _pluginConfig: SourcePluginConfig?;
+    private val _captchaConfig: SourcePluginCaptchaConfig;
+
+    private var _didNotify = false;
+    private val _extractor: WebViewRequirementExtractor;
+
+    constructor(config: SourcePluginConfig) : super() {
+        _pluginConfig = config;
+        _captchaConfig = config.captcha!!;
+        _extractor = WebViewRequirementExtractor(
+            config.allowUrls,
+            null,
+            null,
+            config.captcha!!.cookiesToFind,
+            config.captcha!!.completionUrl,
+            config.captcha!!.cookiesExclOthers
+        );
+        Logger.i(TAG, "Captcha [${config.name}]" +
+                "\nRequired Cookies: ${Serializer.json.encodeToString(config.captcha!!.cookiesToFind)}",);
+    }
+    constructor(captcha: SourcePluginCaptchaConfig) : super() {
+        _pluginConfig = null;
+        _captchaConfig = captcha;
+        _extractor = WebViewRequirementExtractor(
+            null,
+            null,
+            null,
+            captcha.cookiesToFind,
+            captcha.completionUrl,
+            captcha.cookiesExclOthers
+        );
+    }
+
+    override fun onPageFinished(view: WebView?, url: String?) {
+        super.onPageFinished(view, url);
+        Logger.i(TAG, "onPageFinished url = ${url}")
+        onPageLoaded.emit(view, url);
+    }
+
+    override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
+        if(request == null)
+            return super.shouldInterceptRequest(view, request as WebResourceRequest?);
+
+        val extracted = _extractor.handleRequest(view, request);
+        if(extracted != null && !_didNotify) {
+            _didNotify = true;
+            onCaptchaFinished.emit(SourceCaptchaData(
+               extracted.cookies,
+               extracted.headers
+            ));
+        }
+
+        return super.shouldInterceptRequest(view, request);
+    }
+
+    companion object {
+        private val TAG = "CaptchaWebViewClient";
+    }
+}

app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt

@@ -2,6 +2,7 @@ package com.futo.platformplayer.others
 
 import android.net.Uri
 import android.webkit.*
+import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.constructs.Event1
@@ -12,6 +13,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.matchesDomain
 import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 
 class LoginWebViewClient : WebViewClient {
     private val LOG_VERBOSE = false;
@@ -42,10 +44,13 @@ class LoginWebViewClient : WebViewClient {
     private var urlFound = false;
 
     override fun onPageFinished(view: WebView?, url: String?) {
+        if(BuildConfig.DEBUG)
+            Logger.i(TAG, "Login Url Page: " + url);
         super.onPageFinished(view, url);
         onPageLoaded.emit(view, url);
     }
 
+    //TODO: Use new WebViewRequirementExtractor when time to test extensively
     override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
         if(request == null)
             return super.shouldInterceptRequest(view, request as WebResourceRequest?);
@@ -54,11 +59,29 @@ class LoginWebViewClient : WebViewClient {
             return null;
         }
 
+        var completionUrlExcludeQuery = false
+        var completionUrlToCheck = if(urlFound) null else _authConfig.completionUrl;
+        if(completionUrlToCheck != null) {
+            if(completionUrlToCheck.endsWith("?*")) {
+                completionUrlToCheck = completionUrlToCheck.substring(0, completionUrlToCheck.length - 2);
+                completionUrlExcludeQuery = true;
+            }
+        }
+
+
         val domain = request.url.host;
         val domainLower = request.url.host?.lowercase();
+        val urlString = request.url.toString();
         if(_authConfig.completionUrl == null)
             urlFound = true;
-        else urlFound = urlFound || request.url == Uri.parse(_authConfig.completionUrl);
+        else urlFound = urlFound || (
+                if(completionUrlExcludeQuery)
+                    (if(urlString.contains("?"))
+                        urlString.substring(0, urlString.indexOf("?")) == completionUrlToCheck
+                    else urlString == completionUrlToCheck)
+                else
+                    request.url == Uri.parse(_authConfig.completionUrl)
+        );
 
         //HEADERS
         if(domainLower != null) {

app/src/main/java/com/futo/platformplayer/others/WebViewRequirementExtractor.kt

@@ -0,0 +1,125 @@
+package com.futo.platformplayer.others
+
+import android.net.Uri
+import android.webkit.CookieManager
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.matchesDomain
+
+class WebViewRequirementExtractor {
+    private val allowedUrls: List<String>;
+    private val headersToFind: List<String>?;
+    private val domainHeadersToFind: Map<String, List<String>>?;
+    private val cookiesToFind: List<String>?;
+    private val completionUrl: String?;
+
+    private val exclOtherCookies: Boolean;
+
+
+    private val headersFoundMap: HashMap<String, HashMap<String, String>> = hashMapOf();
+    private val cookiesFoundMap = hashMapOf<String, HashMap<String, String>>();
+    private var urlFound = false;
+
+
+    constructor(allowedUrls: List<String>?, headers: List<String>?, domainHeaders: Map<String, List<String>>?, cookies: List<String>?, url: String?, exclOtherCookies: Boolean = false) {
+        this.allowedUrls = allowedUrls ?: listOf("everywhere");
+        this.exclOtherCookies = exclOtherCookies;
+        headersToFind = headers;
+        domainHeadersToFind = domainHeaders;
+        cookiesToFind = cookies;
+        completionUrl = url;
+    }
+
+
+    fun handleRequest(view: WebView?, request: WebResourceRequest, logVerbose: Boolean = false): ExtractedData? {
+
+        val domain = request.url.host;
+        val domainLower = request.url.host?.lowercase();
+        if(completionUrl == null)
+            urlFound = true;
+        else urlFound = urlFound || request.url == Uri.parse(completionUrl);
+
+        //HEADERS
+        if(domainLower != null) {
+            val headersToFind = ((headersToFind?.map { Pair(it.lowercase(), domainLower) } ?: listOf()) +
+                    (domainHeadersToFind?.filter { domainLower.matchesDomain(it.key.lowercase())}
+                        ?.flatMap { it.value.map { header -> Pair(header.lowercase(), it.key.lowercase()) } } ?: listOf()));
+
+            val foundHeaders = request.requestHeaders.filter { requestHeader -> headersToFind.any { it.first.equals(requestHeader.key, true)} &&
+                    (!requestHeader.key.equals("Authorization", ignoreCase = true) || requestHeader.value != "undefined") } //TODO: More universal fix (optional regex?)
+            for(header in foundHeaders) {
+                for(headerDomain in headersToFind.filter { it.first.equals(header.key, true) }) {
+                    if (!headersFoundMap.containsKey(headerDomain.second))
+                        headersFoundMap[headerDomain.second] = hashMapOf();
+                    headersFoundMap[headerDomain.second]!![header.key.lowercase()] = header.value;
+                }
+            }
+        }
+
+
+        //COOKIES
+        //TODO: This is not an ideal solution, we want to intercept the response, but interception need to be rewritten to support that. Correct implementation commented underneath
+        //TODO: For now we assume cookies are legit for all subdomains of a top-level domain, this is the most common scenario anyway
+        val cookieString = CookieManager.getInstance().getCookie(request.url.toString());
+        if(cookieString != null) {
+            val domainParts = domain!!.split(".");
+            val cookieDomain = "." + domainParts.drop(domainParts.size - 2).joinToString(".");
+            if(allowedUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) })
+                cookiesToFind?.let { cookiesToFind ->
+                    val cookies = cookieString.split(";");
+                    for(cookieStr in cookies) {
+                        val cookieSplitIndex = cookieStr.indexOf("=");
+                        if(cookieSplitIndex <= 0) continue;
+                        val cookieKey = cookieStr.substring(0, cookieSplitIndex).trim();
+                        val cookieVal = cookieStr.substring(cookieSplitIndex + 1).trim();
+
+                        if (exclOtherCookies && !cookiesToFind.contains(cookieKey))
+                            continue;
+
+                        if (cookiesFoundMap.containsKey(cookieDomain))
+                            cookiesFoundMap[cookieDomain]!![cookieKey] = cookieVal;
+                        else
+                            cookiesFoundMap[cookieDomain] = hashMapOf(Pair(cookieKey, cookieVal));
+                    }
+                };
+        }
+
+        val headersFound = headersToFind?.map { it.lowercase() }?.all { reqHeader -> headersFoundMap.any { it.value.containsKey(reqHeader) } } ?: true
+        val domainHeadersFound = domainHeadersToFind?.all {
+            if(it.value.isEmpty())
+                return@all true;
+            if(!headersFoundMap.containsKey(it.key.lowercase()))
+                return@all false;
+            val foundDomainHeaders = headersFoundMap[it.key.lowercase()] ?: mapOf();
+            return@all it.value.all { reqHeader -> foundDomainHeaders.containsKey(reqHeader.lowercase()) };
+        } ?: true;
+        val cookiesFound = cookiesToFind?.all { toFind -> cookiesFoundMap.any { it.value.containsKey(toFind) } } ?: true;
+
+        if(logVerbose) {
+            val builder = StringBuilder();
+            builder.appendLine("Request (method: ${request.method}, host: ${request.url.host}, url: ${request.url}, path: ${request.url.path}):");
+            for (pair in request.requestHeaders) {
+                builder.appendLine(" ${pair.key}: ${pair.value}");
+            }
+            builder.appendLine(" Cookies: ${cookiesFoundMap.values.sumOf { it.values.size }}");
+            Logger.i(TAG, builder.toString());
+            Logger.i(TAG, "Result (urlFound: $urlFound, headersFound: $headersFound, cookiesFound: $cookiesFound)");
+        }
+
+        if (urlFound && headersFound && domainHeadersFound && cookiesFound)
+            return ExtractedData(cookiesFoundMap, headersFoundMap);
+        return null;
+    }
+
+
+
+    data class ExtractedData(
+        val cookies: HashMap<String, HashMap<String, String>>,
+        val headers: HashMap<String, HashMap<String, String>>
+    );
+    companion object {
+        val TAG = "WebViewRequirementExtractor";
+    }
+}

app/src/main/java/com/futo/platformplayer/polycentric/PolycentricCache.kt

@@ -8,6 +8,7 @@ import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.resolveChannelUrl
+import com.futo.platformplayer.resolveChannelUrls
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import com.futo.platformplayer.stores.CachedPolycentricProfileStorage
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -37,7 +38,8 @@ class PolycentricCache {
                     ContentType.AVATAR.value,
                     ContentType.USERNAME.value,
                     ContentType.DESCRIPTION.value,
-                    ContentType.STORE.value
+                    ContentType.STORE.value,
+                    ContentType.SERVER.value
                 )
             ).eventsList.map { e -> SignedEvent.fromProto(e) };
 
@@ -88,8 +90,9 @@ class PolycentricCache {
 
                 if (result.profile != null) {
                     for (claim in result.profile.ownedClaims) {
-                        val url = claim.claim.resolveChannelUrl() ?: continue;
-                        _profileUrlCache.map[url] = result;
+                        val urls = claim.claim.resolveChannelUrls();
+                        for (url in urls)
+                            _profileUrlCache.map[url] = result;
                     }
                 }
 

app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt

@@ -20,10 +20,10 @@ class PlatformContentSerializer() : JsonContentPolymorphicSerializer<SerializedP
         if(obj?.jsonPrimitive?.isString ?: true)
             return when(obj?.jsonPrimitive?.contentOrNull) {
                 "MEDIA" -> SerializedPlatformVideo.serializer();
-                "NESTED" -> SerializedPlatformNestedContent.serializer();
+                "NESTED_VIDEO" -> SerializedPlatformNestedContent.serializer();
                 "ARTICLE" -> throw NotImplementedError("Articles not yet implemented");
                 "POST" -> throw NotImplementedError("Post not yet implemented");
-                else -> throw NotImplementedError("Unknown Content Type Value: ${obj?.jsonPrimitive?.int}")
+                else -> throw NotImplementedError("Unknown Content Type Value: ${obj?.jsonPrimitive?.contentOrNull}")
             };
         else
             return when(obj?.jsonPrimitive?.int) {

app/src/main/java/com/futo/platformplayer/services/DownloadService.kt

@@ -12,12 +12,14 @@ import com.futo.platformplayer.*
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.downloads.VideoDownload
+import com.futo.platformplayer.exceptions.DownloadException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.Announcement
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.stores.FragmentedStorage
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -134,15 +136,21 @@ class DownloadService : Service() {
                     Logger.w(TAG, "Video had no video or videodetail, removing download");
                     StateDownloads.instance.removeDownload(currentVideo);
                 }
+                else if(ex is DownloadException && !ex.isRetryable) {
+                    Logger.w(TAG, "Video had exception that should not be retried");
+                    StateDownloads.instance.removeDownload(currentVideo);
+                    StateDownloads.instance.preventPlaylistDownload(currentVideo);
+                }
                 else
                     Logger.e(TAG, "Failed download [${currentVideo.name}]: ${ex.message}", ex);
                 currentVideo.error = ex.message;
                 currentVideo.changeState(VideoDownload.State.ERROR);
                 ignore.add(currentVideo);
 
-                StateAnnouncement.instance.registerAnnouncement(currentVideo?.id?.value?:"" + currentVideo?.id?.pluginId?:"" + "_FailDownload",
-                    "Download failed",
-                    "Download for [${currentVideo.name}] failed.\nDownloads are automatically retried.\nReason: ${ex.message}", AnnouncementType.SESSION, null, "download");
+                if(ex !is CancellationException)
+                    StateAnnouncement.instance.registerAnnouncement(currentVideo?.id?.value?:"" + currentVideo?.id?.pluginId?:"" + "_FailDownload",
+                        "Download failed",
+                        "Download for [${currentVideo.name}] failed.\nDownloads are automatically retried.\nReason: ${ex.message}", AnnouncementType.SESSION, null, "download");
 
                 //Give it a sec
                 Thread.sleep(500);

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

@@ -25,11 +25,19 @@ import androidx.lifecycle.lifecycleScope
 import androidx.work.*
 import com.futo.platformplayer.*
 import com.futo.platformplayer.R
+import com.futo.platformplayer.activities.CaptchaActivity
 import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.api.media.platforms.js.DevJSClient
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.background.BackgroundWorker
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
+import com.futo.platformplayer.fragment.mainactivity.main.HomeFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
 import com.futo.platformplayer.logging.AndroidLogConsumer
 import com.futo.platformplayer.logging.FileLogConsumer
 import com.futo.platformplayer.logging.LogLevel
@@ -38,7 +46,10 @@ import com.futo.platformplayer.receivers.AudioNoisyReceiver
 import com.futo.platformplayer.services.DownloadService
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.stripe.android.core.utils.encodeToJson
 import kotlinx.coroutines.*
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
 import java.util.*
@@ -85,7 +96,7 @@ class StateApp {
                     onChanged?.invoke(getExternalGeneralDirectory(context));
                 }
                 else
-                    StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                    scopeOrNull?.launch(Dispatchers.Main) {
                         UIDialogs.toast("Failed to gain access to\n [${it?.lastPathSegment}]");
                     };
             };
@@ -97,10 +108,14 @@ class StateApp {
         return null;
     }
     fun changeExternalDownloadDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
+
+        scopeOrNull?.launch(Dispatchers.Main) {
+            UIDialogs.toast("External download directory not yet used by export (WIP)");
+        };
         if(context is Context)
             requestDirectoryAccess(context, "Download Exports", "This directory is used to export downloads to for external usage.", null) {
                 if(it != null)
-                    context.contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION.or(Intent.FLAG_GRANT_WRITE_URI_PERMISSION.or(Intent.FLAG_GRANT_READ_URI_PERMISSION)));
+                    context.contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_WRITE_URI_PERMISSION.or(Intent.FLAG_GRANT_READ_URI_PERMISSION));
                 if(it != null && isValidStorageUri(context, it)) {
                     Logger.i(TAG, "Changed external download directory: ${it}");
                     Settings.instance.storage.storage_general = it.toString();
@@ -419,9 +434,19 @@ class StateApp {
             StatePlaylists.instance.toMigrateCheck()
         ).flatten(), 0);
 
-        scope.launch {
-            delay(5000);
-            StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
+        if(Settings.instance.subscriptions.fetchOnAppBoot) {
+            scope.launch(Dispatchers.IO) {
+                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
+                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.config.subscriptionRateLimit}" }.joinToString("\n");
+                val isRateLimitReached = !subRequestCounts.any { clientCount -> clientCount.key.config.subscriptionRateLimit?.let { rateLimit -> clientCount.value > rateLimit } == true };
+                if (isRateLimitReached) {
+                    Logger.w(TAG, "Subscriptions request on boot, request counts:\n${reqCountStr}");
+                    delay(5000);
+                    StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
+                }
+                else
+                    Logger.w(TAG, "Too many subscription requests required:\n${reqCountStr}");
+            }
         }
 
         val interval = Settings.instance.subscriptions.getSubscriptionsBackgroundIntervalMinutes();
@@ -637,6 +662,40 @@ class StateApp {
         }
     }
 
+    private var hasCaptchaDialog = false;
+    fun handleCaptchaException(client: JSClient, exception: ScriptCaptchaRequiredException) {
+        Logger.w(HomeFragment.TAG, "[${client.name}] Plugin captcha required.", exception);
+
+        scopeOrNull?.launch(Dispatchers.Main) {
+            if(hasCaptchaDialog)
+                return@launch;
+            hasCaptchaDialog = true;
+            UIDialogs.showConfirmationDialog(context, "Captcha required\nPlugin [${client.config.name}]", {
+                CaptchaActivity.showCaptcha(context, client.config, exception.url, exception.body) {
+                    hasCaptchaDialog = false;
+
+                    if(client is DevJSClient) {
+                        client.setCaptcha(it);
+                        client.recreate(context);
+                    }
+                    else {
+                        StatePlugins.instance.setPluginCaptcha(client.config.id, it);
+                        scopeOrNull?.launch(Dispatchers.IO) {
+                            try {
+                                StatePlatform.instance.reloadClient(context, client.config.id);
+                            } catch (e: Throwable) {
+                                Logger.e(SourceDetailFragment.TAG, "Failed to reload client.", e)
+                                return@launch;
+                            }
+                        }
+                    }
+                }
+            }, {
+                hasCaptchaDialog = false;
+            })
+        }
+    }
+
     companion object {
         private val TAG = "StateApp";
         @SuppressLint("StaticFieldLeak") //This is only alive while MainActivity is alive

app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt

@@ -1,12 +1,16 @@
 package com.futo.platformplayer.states
 
+import android.content.ContentResolver
+import android.net.Uri
 import android.os.StatFs
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.AlreadyQueuedException
 import com.futo.platformplayer.api.media.models.streams.sources.*
+import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event0
@@ -108,6 +112,11 @@ class StateDownloads {
     fun getPlaylistDownload(playlistId: String): PlaylistDownloadDescriptor? {
         return _downloadPlaylists.findItem { it.id == playlistId };
     }
+    fun savePlaylistDownload(playlistDownload: PlaylistDownloadDescriptor) {
+        synchronized(playlistDownload.preventDownload) {
+            _downloadPlaylists.save(playlistDownload);
+        }
+    }
     fun deleteCachedPlaylist(id: String) {
         val pdl = getPlaylistDownload(id);
         if(pdl != null)
@@ -142,6 +151,19 @@ class StateDownloads {
         _downloading.delete(download);
         onDownloadsChanged.emit();
     }
+    fun preventPlaylistDownload(download: VideoDownload) {
+        if(download.video != null && download.groupID != null && download.groupType == VideoDownload.GROUP_PLAYLIST) {
+            getPlaylistDownload(download.groupID!!)?.let {
+                synchronized(it.preventDownload) {
+                    if(download.video?.url != null && !it.preventDownload.contains(download.video!!.url)) {
+                        it.preventDownload.add(download.video!!.url);
+                        savePlaylistDownload(it);
+                        Logger.w(TAG, "Preventing further download attempts in playlist [${it.id}] for [${download.name}]:${download.video?.url}");
+                    }
+                }
+            }
+        }
+    }
 
     fun checkForDownloadsTodos() {
         val hasPlaylistChanged = checkForOutdatedPlaylists();
@@ -157,12 +179,15 @@ class StateDownloads {
         val playlistsDownloaded = getCachedPlaylists();
         for(playlist in playlistsDownloaded) {
             val playlistDownload = getPlaylistDownload(playlist.playlist.id) ?: continue;
-
-            if(playlist.playlist.videos.any{ getCachedVideo(it.id) == null }) {
-                Logger.i(TAG, "Found new videos on playlist [${playlist.playlist.name}]");
+            val toIgnore = playlistDownload.getPreventDownloadList();
+            val missingVideoCount = playlist.playlist.videos.count { !toIgnore.contains(it.url) && getCachedVideo(it.id) == null };
+            if(missingVideoCount > 0) {
+                Logger.i(TAG, "Found new videos (${missingVideoCount}) on playlist [${playlist.playlist.name}] to download");
                 continueDownload(playlistDownload, playlist.playlist);
                 hasChanged = true;
             }
+            else
+                Logger.v(TAG, "Offline playlist [${playlist.playlist.name}] is up to date");
         }
         return hasChanged;
     }
@@ -171,6 +196,11 @@ class StateDownloads {
         var hasNew = false;
         for(item in playlist.videos) {
             val existing = getCachedVideo(item.id);
+
+            if(!playlistDownload.shouldDownload(item)) {
+                Logger.i(TAG, "Not downloading for playlist [${playlistDownload.id}] Video [${item.name}]:${item.url}")
+                continue;
+            }
             if(existing == null) {
                 val ongoingDownload = getDownloading().find { it.id.value == item.id.value && it.id.value != null };
                 if(ongoingDownload != null) {
@@ -291,6 +321,32 @@ class StateDownloads {
         }
     }
 
+    suspend fun downloadSubtitles(subtitle: ISubtitleSource, contentResolver: ContentResolver): SubtitleRawSource? {
+        val subtitleUri = subtitle.getSubtitlesURI();
+        if(subtitleUri == null)
+            return null;
+        var subtitles: String? = null;
+        if ("file" == subtitleUri.scheme) {
+            val inputStream = contentResolver.openInputStream(subtitleUri);
+            inputStream?.use { stream ->
+                val reader = stream.bufferedReader();
+                subtitles = reader.use { it.readText() };
+            }
+        } else if ("http" == subtitleUri.scheme || "https" == subtitleUri.scheme) {
+            val client = ManagedHttpClient();
+            val subtitleResponse = client.get(subtitleUri.toString());
+            if (!subtitleResponse.isOk) {
+                throw Exception("Cannot fetch subtitles from source '${subtitleUri}': ${subtitleResponse.code}");
+            }
+
+            subtitles = subtitleResponse.body?.toString()
+                ?: throw Exception("Subtitles are invalid '${subtitleUri}': ${subtitleResponse.code}");
+        } else {
+            throw NotImplementedError("Unsuported scheme");
+        }
+        return if (subtitles != null) SubtitleRawSource(subtitle.name, subtitle.format, subtitles!!) else null;
+    }
+
     fun cleanupDownloads(): Pair<Int, Long> {
         val expected = getDownloadedVideos();
         val validFiles = HashSet(expected.flatMap { it.videoSource.map { it.filePath } + it.audioSource.map { it.filePath } });

app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt

@@ -172,7 +172,11 @@ class StatePlatform {
                     _icons[plugin.config.id] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
                             ImageVariable(plugin.config.absoluteIconUrl, null);
 
-                    _availableClients.add(JSClient(context, plugin));
+                    val client = JSClient(context, plugin);
+                    client.onCaptchaException.subscribe { client, ex ->
+                        StateApp.instance.handleCaptchaException(client, ex);
+                    }
+                    _availableClients.add(client);
                 }
 
                 if(_availableClients.distinctBy { it.id }.count() < _availableClients.size)
@@ -287,6 +291,9 @@ class StatePlatform {
                     StatePlugins.instance.getPlugin(id)
                         ?: throw IllegalStateException("Client existed, but plugin config didn't")
                 );
+            newClient.onCaptchaException.subscribe { client, ex ->
+                StateApp.instance.handleCaptchaException(client, ex);
+            }
 
             synchronized(_clientsLock) {
                 if (_enabledClients.contains(client)) {
@@ -399,13 +406,15 @@ class StatePlatform {
                     return@async searchResult;
                 } catch(ex: Throwable) {
                     Logger.e(TAG, "getHomeRefresh", ex);
-                    return@async null;
+                    throw ex;
+                    //return@async null;
                 }
             });
         }.toList();
 
         val finishedPager = deferred.map { it.second }.awaitFirstNotNullDeferred() ?: return EmptyPager();
         val toAwait = deferred.filter { it.second != finishedPager.first };
+
         return RefreshDistributionContentPager(
             listOf(finishedPager.second),
             toAwait.map { it.second },
@@ -616,9 +625,13 @@ class StatePlatform {
     }
 
     fun hasEnabledChannelClient(url : String) : Boolean = getEnabledClients().any { it.isChannelUrl(url) };
-    fun getChannelClient(url : String) : IPlatformClient = getChannelClientOrNull(url)
+    fun getChannelClient(url : String, exclude: List<String>? = null) : IPlatformClient = getChannelClientOrNull(url, exclude)
         ?: throw NoPlatformClientException("No client enabled that supports this channel url (${url})");
-    fun getChannelClientOrNull(url : String) : IPlatformClient? = getEnabledClients().find { it.isChannelUrl(url) };
+    fun getChannelClientOrNull(url : String, exclude: List<String>? = null) : IPlatformClient? =
+        if(exclude == null)
+            getEnabledClients().find { it.isChannelUrl(url) }
+        else
+            getEnabledClients().find { !exclude.contains(it.id) && it.isChannelUrl(url) };
 
     fun getChannel(url: String, updateSubscriptions: Boolean = true): Deferred<IPlatformChannel>  {
         Logger.i(TAG, "Platform - getChannel");
@@ -629,9 +642,9 @@ class StatePlatform {
             return _scope.async { getChannelLive(url, updateSubscriptions) };
     }
 
-    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0): IPager<IPlatformContent> {
+    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, ignorePlugins: List<String>? = null): IPager<IPlatformContent> {
         Logger.i(TAG, "Platform - getChannelVideos");
-        val baseClient = getChannelClient(channelUrl);
+        val baseClient = getChannelClient(channelUrl, ignorePlugins);
         val clientCapabilities = baseClient.getChannelCapabilities();
 
         val client = if(usePooledClients > 1)
@@ -651,19 +664,24 @@ class StatePlatform {
                 toQuery.add(ResultCapabilities.TYPE_STREAMS);
             if(clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE))
                 toQuery.add(ResultCapabilities.TYPE_LIVE);
+            if(clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS))
+                toQuery.add(ResultCapabilities.TYPE_POSTS);
 
             if(isSubscriptionOptimized) {
                 val sub = StateSubscriptions.instance.getSubscription(channelUrl);
                 if(sub != null) {
-                    val daysSinceLiveStream = sub.lastLiveStream.getNowDiffDays()
-                    if(daysSinceLiveStream > 7) {
-                        Logger.i(TAG, "Subscription [${channelUrl}] Last livestream > 7 days, skipping live streams [${daysSinceLiveStream} days ago]");
+                    if(!sub.shouldFetchStreams()) {
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 7 days, skipping live streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
                         toQuery.remove(ResultCapabilities.TYPE_LIVE);
                     }
-                    if(daysSinceLiveStream > 14) {
-                        Logger.i(TAG, "Subscription [${channelUrl}] Last livestream > 15 days, skipping streams [${daysSinceLiveStream} days ago]");
+                    if(!sub.shouldFetchLiveStreams()) {
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 15 days, skipping streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
                         toQuery.remove(ResultCapabilities.TYPE_STREAMS);
                     }
+                    if(!sub.shouldFetchPosts()) {
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 5 days, skipping posts [${sub.lastPost.getNowDiffDays()} days ago]");
+                        toQuery.remove(ResultCapabilities.TYPE_POSTS);
+                    }
                 }
             }
 
@@ -766,6 +784,15 @@ class StatePlatform {
         return null;
     }
 
+    fun resolveChannelUrlsByClaimTemplates(claimType: Int, claimValues: Map<Int, String>): List<String> {
+        val urls = arrayListOf<String>();
+        for(client in getClientsByClaimType(claimType).filter { it is JSClient }) {
+            val res = (client as JSClient).resolveChannelUrlsByClaimTemplates(claimType, claimValues);
+            urls.addAll(res);
+        }
+        return urls;
+    }
+
     fun getPlaylistClientOrNull(url: String): IPlatformClient? = getEnabledClients().find { it.isPlaylistUrl(url) }
     fun getPlaylistClient(url: String): IPlatformClient = getEnabledClients().find { it.isPlaylistUrl(url) }
         ?: throw NoPlatformClientException("No client enabled that supports this playlist url (${url})");

app/src/main/java/com/futo/platformplayer/states/StatePlaylists.kt

@@ -5,6 +5,7 @@ import android.net.Uri
 import androidx.core.content.FileProvider
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
@@ -265,6 +266,12 @@ class StatePlaylists {
                     builder.messages.add("${name}:[${it}] is no longer available");
                     return@map null;
                 }
+                catch(ex: NoPlatformClientException) {
+                    throw ReconstructionException(name, "No source enabled for [${it}]", ex);
+                    //TODO: Propagate this to dialog, and then back, allowing users to enable plugins...
+                    //builder.messages.add("No source enabled for [${it}]");
+                    //return@map null;
+                }
                 catch(ex: Throwable) {
                     throw ReconstructionException(name, "${name}:[${it}] ${ex.message}", ex);
                 }

app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
 import com.futo.platformplayer.logging.Logger
@@ -115,8 +116,9 @@ class StatePlugins {
             else if(embeddedConfig != null) {
                 val existing = getPlugin(embedded.key);
                 if(existing != null && existing.config.version < embeddedConfig.version ) {
-                    Logger.i(TAG, "Found outdated embedded plugin [${existing.config.id}] ${existing.config.name}, deleting and reinstalling");
-                    deletePlugin(embedded.key);
+                    Logger.i(TAG, "Outdated Embedded plugin [${existing.config.id}] ${existing.config.name} (${existing.config.version} < ${embeddedConfig?.version}), reinstalling");
+                    //deletePlugin(embedded.key);
+                    installEmbeddedPlugin(context, embedded.value)
                 }
                 else if(existing != null && _isFirstEmbedUpdate)
                     Logger.i(TAG, "Embedded plugin [${existing.config.id}] ${existing.config.name}, up to date (${existing.config.version} >= ${embeddedConfig?.version})");
@@ -359,6 +361,8 @@ class StatePlugins {
             }
 
             val existing = getPlugin(config.id)
+            val existingAuth = existing?.getAuth();
+            val existingCaptcha = existing?.getCaptchaData();
             if (existing != null) {
                 if(!reinstall)
                     throw IllegalStateException("Plugin with id ${config.id} already exists");
@@ -372,7 +376,7 @@ class StatePlugins {
             if(icon != null)
                 iconsDir.saveIconBinary(config.id, icon);
 
-            _plugins.save(SourcePluginDescriptor(config, null, flags));
+            _plugins.save(SourcePluginDescriptor(config, existingAuth?.toEncrypted(), existingCaptcha?.toEncrypted(), flags));
             return null;
         }
         catch(ex: Throwable) {
@@ -407,6 +411,18 @@ class StatePlugins {
         }
     }
 
+    fun setPluginCaptcha(id: String, captcha: SourceCaptchaData?) {
+        if(id == StateDeveloper.DEV_ID) {
+            StatePlatform.instance.getDevClient()?.let {
+                it.setCaptcha(captcha);
+            };
+            return;
+        }
+
+        val descriptor = getPlugin(id) ?: throw IllegalArgumentException("Plugin [${id}] does not exist");
+        descriptor.updateCaptcha(captcha);
+        _plugins.save(descriptor);
+    }
     fun setPluginAuth(id: String, auth: SourceAuth?) {
         if(id == StateDeveloper.DEV_ID) {
             StatePlatform.instance.getDevClient()?.let {

app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt

@@ -19,6 +19,7 @@ import com.futo.platformplayer.api.media.structures.IAsyncPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.MultiChronoContentPager
 import com.futo.platformplayer.api.media.structures.PlaceholderPager
+import com.futo.platformplayer.api.media.structures.RefreshChronoContentPager
 import com.futo.platformplayer.api.media.structures.RefreshDedupContentPager
 import com.futo.platformplayer.api.media.structures.RefreshDistributionContentPager
 import com.futo.platformplayer.awaitFirstDeferred
@@ -126,19 +127,16 @@ class StatePolycentric {
         }
     }
 
-    fun getChannelContent(profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1): IPager<IPlatformContent> {
+    fun getChannelContent(profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1, ignorePlugins: List<String>? = null): IPager<IPlatformContent> {
         //TODO: Currently abusing subscription concurrency for parallelism
         val concurrency = if (channelConcurrency == -1) Settings.instance.subscriptions.getSubscriptionsConcurrency() else channelConcurrency;
         val pagers = profile.ownedClaims.groupBy { it.claim.claimType }.mapNotNull {
-            //TODO: Deduplicate once multiple urls in single claim is supported
-            return@mapNotNull it.value.firstOrNull();
-        }.mapNotNull {
-            val url = it.claim.resolveChannelUrl() ?: return@mapNotNull null;
+            val url = it.value.firstOrNull()?.claim?.resolveChannelUrl() ?: return@mapNotNull null;
             if (!StatePlatform.instance.hasEnabledChannelClient(url)) {
                 return@mapNotNull null;
             }
 
-            return@mapNotNull StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency);
+            return@mapNotNull StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency, ignorePlugins);
         }.toTypedArray();
 
         val pager = MultiChronoContentPager(pagers);
@@ -151,10 +149,7 @@ class StatePolycentric {
         val concurrency = if (channelConcurrency == -1) Settings.instance.subscriptions.getSubscriptionsConcurrency() else channelConcurrency;
         val deferred = profile.ownedClaims.groupBy { it.claim.claimType }
             .mapNotNull {
-                //TODO: Deduplicate once multiple urls in single claim is supported
-                return@mapNotNull it.value.firstOrNull();
-            }.mapNotNull {
-                val url = it.claim.resolveChannelUrl() ?: return@mapNotNull null;
+                val url = it.value.firstOrNull()?.claim?.resolveChannelUrl() ?: return@mapNotNull null;
                 val client = StatePlatform.instance.getChannelClientOrNull(url) ?: return@mapNotNull null;
 
                 return@mapNotNull Pair(client, scope.async(Dispatchers.IO) {
@@ -173,12 +168,21 @@ class StatePolycentric {
             }) ?: return null;
 
         val toAwait = deferred.filter { it.second != finishedPager.first };
+
+        //TODO: Get a Parallel pager to work here.
+        val innerPager = MultiChronoContentPager(listOf(finishedPager.second!!) + toAwait.mapNotNull { runBlocking { it.second.await(); } });
+        innerPager.initialize();
+        //return RefreshChronoContentPager(listOf(finishedPager.second!!), toAwait.map { it.second }, listOf());
+        //return RefreshDedupContentPager(RefreshChronoContentPager(listOf(finishedPager.second!!), toAwait.map { it.second }, listOf()), StatePlatform.instance.getEnabledClients().map { it.id });
+        return DedupContentPager(innerPager, StatePlatform.instance.getEnabledClients().map { it.id });
+
+    /* //Gives out-of-order results
         return RefreshDedupContentPager(RefreshDistributionContentPager(
             listOf(finishedPager.second!!),
             toAwait.map { it.second },
             toAwait.map { PlaceholderPager(5) { PlatformContentPlaceholder(it.first.id) } }),
             StatePlatform.instance.getEnabledClients().map { it.id }
-        );
+        );*/
     }
     suspend fun getChannelContent(profile: PolycentricProfile): IPager<IPlatformContent> {
         return withContext(Dispatchers.IO) {
@@ -302,7 +306,7 @@ class StatePolycentric {
                         thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
                         subscribers = null
                     ),
-                    msg = post.content,
+                    msg = if (post.content.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE) else post.content,
                     rating = RatingLikeDislikes(likes, dislikes),
                     date = if (unixMilliseconds != null) Instant.ofEpochMilli(unixMilliseconds).atOffset(ZoneOffset.UTC) else OffsetDateTime.MIN,
                     replyCount = replies.toInt(),

app/src/main/java/com/futo/platformplayer/states/StateSubscriptions.kt

@@ -2,9 +2,12 @@ package com.futo.platformplayer.states
 
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.*
 import com.futo.platformplayer.api.media.structures.ReusablePager.Companion.asReusable
 import com.futo.platformplayer.cache.ChannelContentCache
@@ -12,9 +15,12 @@ import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.engine.exceptions.PluginException
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
+import com.futo.platformplayer.engine.exceptions.ScriptCriticalException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.findNonRuntimeException
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.polycentric.PolycentricCache
@@ -216,13 +222,38 @@ class StateSubscriptions {
         }
     }
 
-    fun getSubscriptionsFeed(allowFailure: Boolean = false): MultiChronoContentPager {
+    fun getSubscriptionRequestCount(): Map<JSClient, Int> {
+        val subs = getSubscriptions();
+        val pluginReqCounts = mutableMapOf<JSClient, Int>();
+
+        for(sub in subs) {
+            val client = StatePlatform.instance.getChannelClientOrNull(sub.channel.url);
+            if(client !is JSClient)
+                continue;
+
+            val channelCaps = client.getChannelCapabilities();
+            if(!pluginReqCounts.containsKey(client))
+                pluginReqCounts[client] = 1;
+            else
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+
+            if(channelCaps.hasType(ResultCapabilities.TYPE_STREAMS) && sub.shouldFetchStreams())
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+            if(channelCaps.hasType(ResultCapabilities.TYPE_LIVE) && sub.shouldFetchLiveStreams())
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+            if(channelCaps.hasType(ResultCapabilities.TYPE_POSTS) && sub.shouldFetchPosts())
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+        }
+        return pluginReqCounts;
+    }
+
+    fun getSubscriptionsFeed(allowFailure: Boolean = false): IPager<IPlatformContent> {
         val result = getSubscriptionsFeedWithExceptions(allowFailure, true);
         if(result.second.any())
             throw result.second.first();
         return result.first;
     }
-    fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope? = null, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null): Pair<MultiChronoContentPager, List<Throwable>> {
+    fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope? = null, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null): Pair<IPager<IPlatformContent>, List<Throwable>> {
         val subsPager: Array<IPager<IPlatformContent>>;
         val exs: ArrayList<Throwable> = arrayListOf();
 
@@ -230,8 +261,11 @@ class StateSubscriptions {
         var finished = 0;
         val exceptionMap: HashMap<Subscription, Throwable> = hashMapOf();
         val concurrency = Settings.instance.subscriptions.getSubscriptionsConcurrency();
+        val failedPlugins = arrayListOf<String>();
         for (sub in getSubscriptions().filter { StatePlatform.instance.hasEnabledChannelClient(it.channel.url) }) {
             tasks.add(_subscriptionsPool.submit<Pair<Subscription, IPager<IPlatformContent>?>> {
+                val toIgnore = synchronized(failedPlugins){ failedPlugins.toList() };
+
                 var polycentricProfile : PolycentricCache.CachedPolycentricProfile? = null;
                 val getProfileTime = measureTimeMillis {
                     try {
@@ -258,9 +292,9 @@ class StateSubscriptions {
                     val time = measureTimeMillis {
                         val profile = polycentricProfile?.profile
                         pager = if (profile != null)
-                            StatePolycentric.instance.getChannelContent(profile, true, concurrency)
+                            StatePolycentric.instance.getChannelContent(profile, true, concurrency, toIgnore)
                         else
-                            StatePlatform.instance.getChannelContent(sub.channel.url, true, concurrency);
+                            StatePlatform.instance.getChannelContent(sub.channel.url, true, concurrency, toIgnore);
 
                         if (cacheScope != null)
                             pager = ChannelContentCache.cachePagerResults(cacheScope, pager) {
@@ -276,12 +310,31 @@ class StateSubscriptions {
                     );
                 }
                 catch(ex: Throwable) {
+                    Logger.e(TAG, "Subscription [${sub.channel.name}] failed", ex);
                     finished++;
                     onProgress?.invoke(finished, tasks.size);
                     val channelEx = ChannelException(sub.channel, ex);
                     synchronized(exceptionMap) {
                         exceptionMap.put(sub, channelEx);
                     }
+                    if(ex is ScriptCaptchaRequiredException) {
+                        synchronized(failedPlugins) {
+                            //Fail all subscription calls to plugin if it has a captcha issue
+                            if(ex.config is SourcePluginConfig && !failedPlugins.contains(ex.config.id)) {
+                                Logger.w(TAG, "Subscriptionsgnoring plugin [${ex.config.name}] due to Captcha");
+                                failedPlugins.add(ex.config.id);
+                            }
+                        }
+                    }
+                    else if(ex is ScriptCriticalException) {
+                        synchronized(failedPlugins) {
+                            //Fail all subscription calls to plugin if it has a critical issue
+                            if(ex.config is SourcePluginConfig && !failedPlugins.contains(ex.config.id)) {
+                                Logger.w(TAG, "Subscriptions ignoring plugin [${ex.config.name}] due to critical exception:\n" + ex.message);
+                                failedPlugins.add(ex.config.id);
+                            }
+                        }
+                    }
                     if(!withCacheFallback)
                         throw channelEx;
                     else {
@@ -327,9 +380,10 @@ class StateSubscriptions {
             throw exs.first();
 
         Logger.i(TAG, "Subscription pager with ${subsPager.size} channels");
-        val pager = MultiChronoContentPager(subsPager, allowFailure);
+        val pager = MultiChronoContentPager(subsPager, allowFailure, 15);
         pager.initialize();
-        return Pair(pager, exs);
+        //return Pair(pager, exs);
+        return Pair(DedupContentPager(pager), exs);
     }
 
     //New Migration

app/src/main/java/com/futo/platformplayer/states/StateTelemetry.kt

@@ -37,14 +37,14 @@ class StateTelemetry {
                     BuildConfig.BUILD_TYPE,
                     BuildConfig.DEBUG,
                     BuildConfig.IS_UNSTABLE_BUILD,
-                    Instant.now().epochSecond,
                     Build.BRAND,
                     Build.MANUFACTURER,
-                    Build.MODEL
+                    Build.MODEL,
+                    Build.VERSION.SDK_INT
                 );
 
                 val headers = hashMapOf(
-                    "Content-Type" to "text/plain"
+                    "Content-Type" to "application/json"
                 );
 
                 val json = Json.encodeToString(telemetry);

app/src/main/java/com/futo/platformplayer/stores/v2/ManagedStore.kt

@@ -118,6 +118,7 @@ class ManagedStore<T>{
         val builder = ReconstructStore.Builder();
 
         for (recon in items) {
+            onProgress?.invoke(0, total);
             //Retry once
             for (i in 0 .. 1) {
                 try {

app/src/main/java/com/futo/platformplayer/views/Loader.kt

@@ -5,8 +5,10 @@ import android.graphics.drawable.Animatable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.core.view.updateLayoutParams
 import com.futo.platformplayer.R
 
 class Loader : LinearLayout {
@@ -15,7 +17,7 @@ class Loader : LinearLayout {
     private val _animatable: Animatable;
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
-        LayoutInflater.from(context).inflate(R.layout.view_loader, this, true);
+        inflate(context, R.layout.view_loader, this);
         _imageLoader = findViewById(R.id.image_loader);
         _animatable = _imageLoader.drawable as Animatable;
 
@@ -29,6 +31,18 @@ class Loader : LinearLayout {
 
         visibility = View.GONE;
     }
+    constructor(context: Context, automatic: Boolean, height: Int = -1) : super(context) {
+        inflate(context, R.layout.view_loader, this);
+        _imageLoader = findViewById(R.id.image_loader);
+        _animatable = _imageLoader.drawable as Animatable;
+        _automatic = automatic;
+
+        if(height > 0) {
+            layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, height);
+        }
+
+        visibility = View.GONE;
+    }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()