chore(release): 0.101.1 [skip ci]

## [0.101.1](https://github.com/revanced/revanced-integrations/compare/v0.101.0...v0.101.1) (2023-04-13)

### Bug Fixes

* **youtube/spoof-signature-verification:** additional fixes for subtitle locations ([#346](https://github.com/revanced/revanced-integrations/issues/346)) ([eeddb59](eeddb59b08))
* **youtube/spoof-signature-verification:** fixed subtitles in wrong location ([#343](https://github.com/revanced/revanced-integrations/issues/343)) ([1a0a6ee](1a0a6ee90b))
* **youtube/spoof-signature-verification:** spoof videos in playlists ([86bedb2](86bedb2183))

.github/workflows/pull_request.yml

@@ -21,5 +21,10 @@ jobs:
         with:
           destination_branch: 'main'
           pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_body: |
+            This pull request will ${{ env.MESSAGE }}.
+            
+            ## Dependencies before merge
+
+            - [] https://github.com/revanced/revanced-patches
           pr_draft: true

.releaserc

@@ -34,7 +34,7 @@
     [
       "@saithodev/semantic-release-backmerge",
       {
-        branches: [{from: "main", to: "dev"}],
+        backmergeBranches: [{"from": "main", "to": "dev"}],
         clearWorkspace: true
       }
     ]

app/build.gradle.kts

@@ -1,6 +1,3 @@
-import java.io.FileInputStream
-import java.util.Properties
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -47,7 +44,7 @@ android {
 dependencies {
     compileOnly(project(mapOf("path" to ":dummy")))
     compileOnly("androidx.annotation:annotation:1.5.0")
-    compileOnly("androidx.appcompat:appcompat:1.5.1")
+    compileOnly("androidx.appcompat:appcompat:1.6.1")
     compileOnly("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
     compileOnly("com.squareup.retrofit2:retrofit:2.9.0")
 }

app/src/main/java/app/revanced/integrations/patches/FullscreenPanelsRemoverPatch.java

@@ -1,13 +1,10 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class FullscreenPanelsRemoverPatch {
-
     public static int getFullscreenPanelsVisibility() {
         return SettingsEnum.HIDE_FULLSCREEN_PANELS.getBoolean() ? View.GONE : View.VISIBLE;
     }
-
 }

app/src/main/java/app/revanced/integrations/patches/GeneralAdsPatch.java

@@ -33,16 +33,20 @@ public final class GeneralAdsPatch extends Filter {
         var infoPanel = new BlockRule(SettingsEnum.ADREMOVER_INFO_PANEL_REMOVAL, "publisher_transparency_panel", "single_item_information_panel");
         var latestPosts = new BlockRule(SettingsEnum.ADREMOVER_HIDE_LATEST_POSTS, "post_shelf");
         var channelGuidelines = new BlockRule(SettingsEnum.ADREMOVER_HIDE_CHANNEL_GUIDELINES, "channel_guidelines_entry_banner");
-        var artistCard = new BlockRule(SettingsEnum.HIDE_ARTIST_CARD, "official_card");
+        var artistCard = new BlockRule(SettingsEnum.HIDE_ARTIST_CARDS, "official_card");
         var selfSponsor = new BlockRule(SettingsEnum.ADREMOVER_SELF_SPONSOR_REMOVAL, "cta_shelf_card");
-        var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata");
+        var chapterTeaser = new BlockRule(SettingsEnum.ADREMOVER_CHAPTER_TEASER_REMOVAL, "expandable_metadata", "macro_markers_carousel");
         var viewProducts = new BlockRule(SettingsEnum.ADREMOVER_VIEW_PRODUCTS, "product_item", "products_in_video");
         var webLinkPanel = new BlockRule(SettingsEnum.ADREMOVER_WEB_SEARCH_RESULTS, "web_link_panel");
+        var channelBar = new BlockRule(SettingsEnum.ADREMOVER_CHANNEL_BAR, "channel_bar");
+        var relatedVideos = new BlockRule(SettingsEnum.ADREMOVER_RELATED_VIDEOS, "fullscreen_related_videos");
+        var quickActions = new BlockRule(SettingsEnum.ADREMOVER_QUICK_ACTIONS, "quick_actions");
+        var imageShelf = new BlockRule(SettingsEnum.ADREMOVER_IMAGE_SHELF, "image_shelf");
         var graySeparator = new BlockRule(SettingsEnum.ADREMOVER_GRAY_SEPARATOR,
                 "cell_divider" // layout residue (gray line above the buttoned ad),
         );
         var buttonedAd = new BlockRule(SettingsEnum.ADREMOVER_BUTTONED_REMOVAL,
-                "video_display_full_buttoned_layout",
+                "_buttoned_layout",
                 "full_width_square_image_layout",
                 "_ad_with",
                 "landscape_image_wide_button_layout"
@@ -53,7 +57,11 @@ public final class GeneralAdsPatch extends Filter {
                 "banner_text_icon",
                 "square_image_layout",
                 "watch_metadata_app_promo",
-                "video_display_full_layout"
+                "video_display_full_layout",
+                "hero_promo_image",
+                "statement_banner",
+                "carousel_footered_layout",
+                "text_image_button_layout"
         );
         var movieAds = new BlockRule(
                 SettingsEnum.ADREMOVER_MOVIE_REMOVAL,
@@ -67,12 +75,15 @@ public final class GeneralAdsPatch extends Filter {
         this.pathRegister.registerAll(
                 generalAds,
                 buttonedAd,
+                channelBar,
                 communityPosts,
                 paidContent,
                 latestPosts,
                 movieAds,
                 chapterTeaser,
                 communityGuidelines,
+                quickActions,
+                relatedVideos,
                 compactBanner,
                 inFeedSurvey,
                 viewProducts,
@@ -83,6 +94,7 @@ public final class GeneralAdsPatch extends Filter {
                 artistCard,
                 selfSponsor,
                 webLinkPanel,
+                imageShelf,
                 subscribersCommunityGuidelines,
                 channelMemberShelf
         );

app/src/main/java/app/revanced/integrations/patches/HideAutoplayButtonPatch.java

@@ -3,8 +3,7 @@ package app.revanced.integrations.patches;
 import app.revanced.integrations.settings.SettingsEnum;
 
 public class HideAutoplayButtonPatch {
-
     public static boolean isButtonShown() {
-        return SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean() == false;
+        return !SettingsEnum.HIDE_AUTOPLAY_BUTTON.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideFloatingMicrophoneButtonPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public final class HideFloatingMicrophoneButtonPatch {
+    public static boolean hideFloatingMicrophoneButton(final boolean original) {
+        return SettingsEnum.HIDE_FLOATING_MICROPHONE_BUTTON.getBoolean() || original;
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideInfoCardsPatch.java

@@ -1,16 +1,15 @@
 package app.revanced.integrations.patches;
 
 import android.view.View;
-
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class HideInfocardsPatch {
-    public static void hideInfocardsIncognito(View view) {
+public class HideInfoCardsPatch {
+    public static void hideInfoCardsIncognito(View view) {
         if (!SettingsEnum.HIDE_INFO_CARDS.getBoolean()) return;
         view.setVisibility(View.GONE);
     }
 
-    public static boolean hideInfocardsMethodCall() {
+    public static boolean hideInfoCardsMethodCall() {
         return SettingsEnum.HIDE_INFO_CARDS.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/HideSeekbarPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideSeekbarPatch {
+    public static boolean hideSeekbar() {
+        return SettingsEnum.HIDE_SEEKBAR.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideTimeAndSeekbarPatch.java

@@ -1,10 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class HideTimeAndSeekbarPatch {
-    //Used by app.revanced.patches.youtube.layout.hidetimeandseekbar.patch.HideTimeAndSeekbarPatch
-    public static boolean hideTimeAndSeekbar() {
-        return SettingsEnum.HIDE_TIME_AND_SEEKBAR.getBoolean();
-    }
-}

app/src/main/java/app/revanced/integrations/patches/HideTimestampPatch.java

@@ -0,0 +1,9 @@
+package app.revanced.integrations.patches;
+
+import app.revanced.integrations.settings.SettingsEnum;
+
+public class HideTimestampPatch {
+    public static boolean hideTimestamp() {
+        return SettingsEnum.HIDE_TIMESTAMP.getBoolean();
+    }
+}

app/src/main/java/app/revanced/integrations/patches/HideWatchInVRPatch.java

@@ -2,9 +2,8 @@ package app.revanced.integrations.patches;
 
 import app.revanced.integrations.settings.SettingsEnum;
 
-public class HideWatchinVRPatch {
-    //Used by app.revanced.patches.youtube.layout.watchinvr.patch.HideWatchinVRPatch
-    public static boolean hideWatchinVR() {
+public class HideWatchInVRPatch {
+    public static boolean hideWatchInVR() {
         return SettingsEnum.HIDE_WATCH_IN_VR.getBoolean();
     }
 }

app/src/main/java/app/revanced/integrations/patches/OpenLinksDirectlyPatch.java

@@ -1,18 +0,0 @@
-package app.revanced.integrations.patches;
-
-import java.net.URLDecoder;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class OpenLinksDirectlyPatch {
-
-    public static String parseRedirectUri(String uri) {
-        if (SettingsEnum.OPEN_LINKS_DIRECTLY.getBoolean()) {
-            Matcher matcher = Pattern.compile("&q=(http.+?)&v=").matcher(uri);
-            return matcher.find() ? URLDecoder.decode(matcher.group(1)) : uri;
-        }
-        return uri;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/ReturnYouTubeDislikePatch.java

@@ -1,22 +1,25 @@
 package app.revanced.integrations.patches;
 
-import java.util.concurrent.atomic.AtomicReference;
-
+import android.text.Spanned;
 import app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Used by app.revanced.patches.youtube.layout.returnyoutubedislike.patch.ReturnYouTubeDislikePatch
  */
 public class ReturnYouTubeDislikePatch {
 
     /**
-     * Called when the video id changes
+     * Injection point
      */
     public static void newVideoLoaded(String videoId) {
         ReturnYouTubeDislike.newVideoLoaded(videoId);
     }
 
     /**
+     * Injection point
+     *
      * Called when a litho text component is created
      */
     public static void onComponentCreated(Object conversionContext, AtomicReference<Object> textRef) {
@@ -24,16 +27,22 @@ public class ReturnYouTubeDislikePatch {
     }
 
     /**
+     * Injection point
+     *
+     * Called when a Shorts dislike Spannable is created
+     */
+    public static Spanned onShortsComponentCreated(Spanned dislike) {
+        return ReturnYouTubeDislike.onShortsComponentCreated(dislike);
+    }
+
+    /**
+     * Injection point
+     *
      * Called when the like/dislike button is clicked
      *
      * @param vote -1 (dislike), 0 (none) or 1 (like)
      */
     public static void sendVote(int vote) {
-        for (ReturnYouTubeDislike.Vote v : ReturnYouTubeDislike.Vote.values()) {
-            if (v.value == vote) {
-                ReturnYouTubeDislike.sendVote(v);
-                return;
-            }
-        }
+        ReturnYouTubeDislike.sendVote(vote);
     }
 }

app/src/main/java/app/revanced/integrations/patches/SpoofSignatureVerificationPatch.java

@@ -0,0 +1,185 @@
+package app.revanced.integrations.patches;
+
+import android.widget.Toast;
+
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.shared.PlayerType;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+import static app.revanced.integrations.utils.ReVancedUtils.containsAny;
+
+public class SpoofSignatureVerificationPatch {
+    /**
+     * Protobuf parameters used for autoplay in scrim.
+     * Prepend this parameter to mute video playback (for autoplay in feed)
+     */
+    private static final String PROTOBUF_PARAMETER_SCRIM = "SAFgAXgB";
+
+    /**
+     * Protobuf parameter of shorts and YouTube stories.
+     * Known issue: captions are positioned on upper area in the player.
+     */
+    private static final String PROTOBUF_PARAMETER_SHORTS = "8AEB"; // "8AEByAMTuAQP"
+
+    /**
+     * Target Protobuf parameters.
+     */
+    private static final String[] PROTOBUF_PARAMETER_TARGETS = {
+            "YAHI", // Autoplay in feed
+            "SAFg"  // Autoplay in scrim
+    };
+
+    /**
+     * Injection point.
+     *
+     * @param originalValue originalValue protobuf parameter
+     */
+    public static String overrideProtobufParameter(String originalValue) {
+        try {
+            if (!SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+                return originalValue;
+            }
+
+            LogHelper.printDebug(() -> "Original protobuf parameter value: " + originalValue);
+
+            // Video is Short or Story.
+            var isPlayingShorts = originalValue.contains(PROTOBUF_PARAMETER_SHORTS);
+            if (isPlayingShorts) return originalValue;
+
+            boolean isPlayingFeed = containsAny(originalValue, PROTOBUF_PARAMETER_TARGETS) && PlayerType.getCurrent() == PlayerType.INLINE_MINIMAL;
+            if (isPlayingFeed) {
+                // Videos in feed won't autoplay with sound.
+                return PROTOBUF_PARAMETER_SCRIM + PROTOBUF_PARAMETER_SHORTS;
+            } else{
+                // Spoof the parameter to prevent playback issues.
+                return PROTOBUF_PARAMETER_SHORTS;
+            }
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "overrideProtobufParameter failure", ex);
+        }
+
+        return originalValue;
+    }
+
+
+    /**
+     * Injection point. Runs off the main thread.
+     * <p>
+     * Used to check the response code of video playback requests made by YouTube.
+     * Response code of interest is 403 that indicate a signature verification failure for the current request
+     *
+     * @param responseCode HTTP status code of the completed YouTube connection
+     */
+    public static void onResponse(int responseCode) {
+        try {
+            if (responseCode < 400 || responseCode >= 500) {
+                return; // everything normal
+            }
+            LogHelper.printDebug(() -> "YouTube HTTP status code: " + responseCode);
+
+            if (SettingsEnum.SIGNATURE_SPOOFING.getBoolean()) {
+                return;  // already enabled
+            }
+
+            SettingsEnum.SIGNATURE_SPOOFING.saveValue(true);
+            ReVancedUtils.runOnMainThread(() -> {
+                Toast.makeText(
+                        ReVancedUtils.getContext(),
+                        "Spoofing app signature to prevent playback issues", Toast.LENGTH_LONG
+                ).show();
+                // it would be great if the video could be forcefully reloaded, but currently there is no code to do this
+            });
+
+        } catch (Exception ex) {
+            LogHelper.printException(() -> "onResponse failure", ex);
+        }
+    }
+
+    /**
+     * Last WindowsSetting constructor values. Values are checked for changes to reduce log spam.
+     */
+    private static int lastAp, lastAh, lastAv;
+    private static boolean lastVs, lastSd;
+
+    /**
+     * Injection point.  Overrides values passed into SubtitleWindowSettings constructor.
+     *
+     * @param ap anchor position. A bitmask with 6 bit fields, that appears to indicate the layout position on screen
+     * @param ah anchor horizontal. A percentage [0, 100], that appears to be a horizontal text anchor point
+     * @param av anchor vertical. A percentage [0, 100], that appears to be a vertical text anchor point
+     * @param vs appears to indicate if subtitles exist, and the value is always true.
+     * @param sd function is not entirely clear
+     */
+    public static int[] getSubtitleWindowSettingsOverride(int ap, int ah, int av, boolean vs, boolean sd) {
+        final boolean signatureSpoofing = SettingsEnum.SIGNATURE_SPOOFING.getBoolean();
+        if (SettingsEnum.DEBUG.getBoolean()) {
+            if (ap != lastAp || ah != lastAh || av != lastAv || vs != lastVs || sd != lastSd) {
+                LogHelper.printDebug(() -> "video: " + VideoInformation.getCurrentVideoId() + " spoof: " + signatureSpoofing
+                        + " ap:" + ap + " ah:" + ah + " av:" + av + " vs:" + vs + " sd:" + sd);
+                lastAp = ap;
+                lastAh = ah;
+                lastAv = av;
+                lastVs = vs;
+                lastSd = sd;
+            }
+        }
+
+        // Videos with custom captions that specify screen positions appear to always have correct screen positions (even with spoofing).
+        // But for auto generated and most other captions, the spoof incorrectly gives various default Shorts caption settings.
+        // Check for these known default shorts captions parameters, and replace with the known correct values.
+        if (signatureSpoofing && !PlayerType.getCurrent().isNoneOrHidden()) { // video is not a Short or Story
+            for (SubtitleWindowReplacementSettings setting : SubtitleWindowReplacementSettings.values()) {
+                if (setting.match(ap, ah, av, vs, sd)) {
+                    return setting.replacementSetting();
+                }
+            }
+            // Parameters are either subtitles with custom positions, or a set of unidentified (and incorrect) default parameters.
+            // The subtitles could be forced to the bottom no matter what, but that would override custom screen positions.
+            // For now, just return the original parameters.
+        }
+
+        // No matches, pass back the original values
+        return new int[]{ap, ah, av};
+    }
+
+
+    /**
+     * Known incorrect default Shorts subtitle parameters, and the corresponding correct (non-Shorts) values.
+     */
+    private enum SubtitleWindowReplacementSettings {
+        DEFAULT_SHORTS_PARAMETERS_1(10, 50, 0, true, false,
+                34, 50, 95),
+        DEFAULT_SHORTS_PARAMETERS_2(9, 20, 0, true, false,
+                34, 50, 90),
+        DEFAULT_SHORTS_PARAMETERS_3(9, 20, 0, true, true,
+                33, 20, 100);
+
+        // original values
+        final int ap, ah, av;
+        final boolean vs, sd;
+
+        // replacement values
+        final int replacementAp, replacementAh, replacementAv;
+
+        SubtitleWindowReplacementSettings(int ap, int ah, int av, boolean vs, boolean sd,
+                                          int replacementAp, int replacementAh, int replacementAv) {
+            this.ap = ap;
+            this.ah = ah;
+            this.av = av;
+            this.vs = vs;
+            this.sd = sd;
+            this.replacementAp = replacementAp;
+            this.replacementAh = replacementAh;
+            this.replacementAv = replacementAv;
+        }
+
+        boolean match(int ap, int ah, int av, boolean vs, boolean sd) {
+            return this.ap == ap && this.ah == ah && this.av == av && this.vs == vs && this.sd == sd;
+        }
+
+        int[] replacementSetting() {
+            return new int[]{replacementAp, replacementAh, replacementAv};
+        }
+    }
+}

app/src/main/java/app/revanced/integrations/patches/VideoBufferPatch.java

@@ -1,26 +0,0 @@
-package app.revanced.integrations.patches;
-
-import app.revanced.integrations.settings.SettingsEnum;
-
-public class VideoBufferPatch {
-
-    public static int getMaxBuffer() {
-        int confVal = SettingsEnum.MAX_BUFFER.getInt();
-        if (confVal < 1) confVal = 1;
-        return confVal;
-    }
-
-    public static int getPlaybackBuffer() {
-        int confVal = SettingsEnum.PLAYBACK_MAX_BUFFER.getInt();
-        if (confVal < 1) confVal = 1;
-        return confVal;
-    }
-
-    public static int getReBuffer() {
-        int confVal = SettingsEnum.MAX_PLAYBACK_BUFFER_AFTER_REBUFFER.getInt();
-        if (confVal < 1) confVal = 1;
-        return confVal;
-    }
-
-
-}

app/src/main/java/app/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch.java

@@ -1,21 +1,18 @@
 package app.revanced.integrations.patches.playback.quality;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.widget.Toast;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+import app.revanced.integrations.utils.SharedPrefHelper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-import app.revanced.integrations.utils.SharedPrefHelper;
-
 public class RememberVideoQualityPatch {
 
     public static int selectedQuality1 = -2;
@@ -24,38 +21,37 @@ public class RememberVideoQualityPatch {
 
     public static void changeDefaultQuality(int defaultQuality) {
         Context context = ReVancedUtils.getContext();
-        if (isConnectedWifi(context)) {
-            try {
-                SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", defaultQuality + "");
-                String message = "Changing default Wi-Fi quality to: " + defaultQuality;
-                LogHelper.printDebug(() -> message);
-                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
-            } catch (Exception ex) {
-                LogHelper.printException(() -> "Failed to change default WI-FI quality", ex);
-            }
-        } else if (isConnectedMobile(context)) {
-            try {
-                SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", defaultQuality + "");
-                String message = "Changing default mobile data quality to:" + defaultQuality;
-                LogHelper.printDebug(() -> message);
-                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
-            } catch (Exception ex) {
-                LogHelper.printException(() -> "Failed to change default mobile data quality", ex);
-            }
-        } else {
+
+        var networkType = getNetworType(context);
+
+        if (networkType == NetworkType.NONE) {
             String message = "No internet connection.";
             LogHelper.printDebug(() -> message);
             Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        } else {
+            var preferenceKey = "wifi_quality";
+            var networkTypeMessage = "WIFI";
+
+            if (networkType == NetworkType.MOBILE) {
+                networkTypeMessage = "mobile";
+                preferenceKey = "mobile_quality";
+            }
+
+            SharedPrefHelper.saveString(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, preferenceKey, defaultQuality + "");
+            String message = "Changing default " + networkTypeMessage + " quality to: " + defaultQuality;
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
         }
+
         userChangedQuality = false;
     }
 
     public static int setVideoQuality(Object[] qualities, int quality, Object qInterface, String qIndexMethod) {
-        int preferredQuality;
         Field[] fields;
+
         if (!(newVideo || userChangedQuality) || qInterface == null) {
             return quality;
         }
+
         Class<?> intType = Integer.TYPE;
         ArrayList<Integer> iStreamQualities = new ArrayList<>();
         try {
@@ -93,51 +89,48 @@ public class RememberVideoQualityPatch {
             LogHelper.printException(() -> "Context is null or settings not initialized, returning quality: " + qualityToLog);
             return quality;
         }
-        if (isConnectedWifi(context)) {
-            preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "wifi_quality", -2);
-            LogHelper.printDebug(() -> "Wi-Fi connection detected, preferred quality: " + preferredQuality);
-        } else if (isConnectedMobile(context)) {
-            preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, "mobile_quality", -2);
-            LogHelper.printDebug(() -> "Mobile data connection detected, preferred quality: " + preferredQuality);
-        } else {
+        var networkType = getNetworType(context);
+        if (networkType == NetworkType.NONE) {
             LogHelper.printDebug(() -> "No Internet connection!");
             return quality;
-        }
-        if (preferredQuality == -2) {
-            return quality;
-        }
-        for (int streamQuality2 : iStreamQualities) {
-            final int indexToLog = index;
-            LogHelper.printDebug(() -> "Quality at index " + indexToLog + ": " + streamQuality2);
-            index++;
-        }
-        for (Integer iStreamQuality : iStreamQualities) {
-            int streamQuality3 = iStreamQuality;
-            if (streamQuality3 <= preferredQuality) {
-                quality = streamQuality3;
+        } else {
+            var preferenceKey = "wifi_quality";
+            if (networkType == NetworkType.MOBILE) preferenceKey = "mobile_quality";
+
+            int preferredQuality = SharedPrefHelper.getInt(SharedPrefHelper.SharedPrefNames.REVANCED_PREFS, preferenceKey, -2);
+            if (preferredQuality == -2) return quality;
+
+            for (int streamQuality2 : iStreamQualities) {
+                final int indexToLog = index;
+                LogHelper.printDebug(() -> "Quality at index " + indexToLog + ": " + streamQuality2);
+                index++;
+            }
+            for (Integer iStreamQuality : iStreamQualities) {
+                int streamQuality3 = iStreamQuality;
+                if (streamQuality3 <= preferredQuality) {
+                    quality = streamQuality3;
+                }
+            }
+            if (quality == -2) return quality;
+
+            int qualityIndex = iStreamQualities.indexOf(quality);
+            final int qualityToLog2 = quality;
+            LogHelper.printDebug(() -> "Index of quality " + qualityToLog2 + " is " + qualityIndex);
+            try {
+                Class<?> cl = qInterface.getClass();
+                Method m = cl.getMethod(qIndexMethod, Integer.TYPE);
+                LogHelper.printDebug(() -> "Method is: " + qIndexMethod);
+                m.invoke(qInterface, iStreamQualities.get(qualityIndex));
+                LogHelper.printDebug(() -> "Quality changed to: " + qualityIndex);
+                return qualityIndex;
+            } catch (Exception ex) {
+                LogHelper.printException(() -> "Failed to set quality", ex);
+                return qualityIndex;
             }
-        }
-        if (quality == -2) {
-            return quality;
-        }
-        int qualityIndex = iStreamQualities.indexOf(quality);
-        final int qualityToLog2 = quality;
-        LogHelper.printDebug(() -> "Index of quality " + qualityToLog2 + " is " + qualityIndex);
-        try {
-            Class<?> cl = qInterface.getClass();
-            Method m = cl.getMethod(qIndexMethod, Integer.TYPE);
-            LogHelper.printDebug(() -> "Method is: " + qIndexMethod);
-            m.invoke(qInterface, iStreamQualities.get(qualityIndex));
-            LogHelper.printDebug(() -> "Quality changed to: " + qualityIndex);
-            return qualityIndex;
-        } catch (Exception ex) {
-            LogHelper.printException(() -> "Failed to set quality", ex);
-            return qualityIndex;
         }
     }
 
     public static void userChangedQuality(int selectedQuality) {
-        // Do not remember a **new** quality if REMEMBER_VIDEO_QUALITY is false
         if (!SettingsEnum.REMEMBER_VIDEO_QUALITY_LAST_SELECTED.getBoolean()) return;
 
         selectedQuality1 = selectedQuality;
@@ -148,20 +141,23 @@ public class RememberVideoQualityPatch {
         newVideo = true;
     }
 
-    @SuppressLint("MissingPermission")
-    private static NetworkInfo getNetworkInfo(Context context) {
+    private static NetworkType getNetworType(Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return cm.getActiveNetworkInfo();
+        var networkInfo = cm.getActiveNetworkInfo();
+
+        if (networkInfo == null || !networkInfo.isConnected()) {
+            return NetworkType.NONE;
+        } else {
+            var type = networkInfo.getType();
+
+            return type == ConnectivityManager.TYPE_MOBILE || type == ConnectivityManager.TYPE_BLUETOOTH ? NetworkType.MOBILE : NetworkType.OTHER;
+        }
     }
 
-    private static boolean isConnectedWifi(Context context) {
-        NetworkInfo info = getNetworkInfo(context);
-        return info != null && info.isConnected() && info.getType() == 1;
-    }
-
-    private static boolean isConnectedMobile(Context context) {
-        NetworkInfo info = getNetworkInfo(context);
-        return info != null && info.isConnected() && info.getType() == 0;
+    enum NetworkType {
+        MOBILE,
+        OTHER,
+        NONE
     }
 
 }

app/src/main/java/app/revanced/integrations/patches/playback/speed/RememberPlaybackRatePatch.java

@@ -1,32 +0,0 @@
-package app.revanced.integrations.patches.playback.speed;
-
-import static app.revanced.integrations.utils.SharedPrefHelper.SharedPrefNames.REVANCED_PREFS;
-import static app.revanced.integrations.utils.SharedPrefHelper.getFloat;
-import static app.revanced.integrations.utils.SharedPrefHelper.saveFloat;
-
-import android.widget.Toast;
-
-import app.revanced.integrations.settings.SettingsEnum;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
-
-
-public final class RememberPlaybackRatePatch {
-    private static final String REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY = "revanced_remember_playback_rate_last_value";
-
-    public static void rememberPlaybackRate(final float selectedPlaybackRate) {
-        if (!SettingsEnum.REMEMBER_PLAYBACK_RATE_SELECTED.getBoolean()) return;
-
-        Toast.makeText(ReVancedUtils.getContext(), "Playback rate will be remembered", Toast.LENGTH_SHORT).show();
-
-        LogHelper.printDebug(() -> "Remembering playback rate: " + selectedPlaybackRate);
-        saveFloat(REVANCED_PREFS, REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY, selectedPlaybackRate);
-    }
-
-    public static float getRememberedPlaybackRate() {
-        final var playbackRateOverride = getFloat(REVANCED_PREFS, REMEMBERED_PLAYBACK_RATE_PREFERENCE_KEY, -2f);
-
-        LogHelper.printDebug(() -> "Overriding playback rate: " + playbackRateOverride);
-        return playbackRateOverride;
-    }
-}

app/src/main/java/app/revanced/integrations/patches/playback/speed/RememberPlaybackSpeedPatch.java

@@ -0,0 +1,83 @@
+package app.revanced.integrations.patches.playback.speed;
+
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.integrations.settings.SettingsEnum;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
+
+public final class RememberPlaybackSpeedPatch {
+
+    /**
+     * The current playback speed
+     */
+    private static float currentPlaybackSpeed = getLastRememberedPlaybackSpeed();
+
+    private final static float DEFAULT_PLAYBACK_SPEED = (float) SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE.getDefaultValue();
+
+    @Nullable
+    private static String currentVideoId;
+
+    private static void showToast(final String message) {
+        Toast.makeText(ReVancedUtils.getContext(), message, Toast.LENGTH_LONG).show();
+    }
+
+    private static float getLastRememberedPlaybackSpeed() {
+        return SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE.getFloat();
+    }
+
+    private static void rememberPlaybackSpeed() {
+        SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE.saveValue(currentPlaybackSpeed);
+    }
+
+    private static boolean rememberLastSelectedPlaybackSpeed() {
+        return SettingsEnum.REMEMBER_PLAYBACK_SPEED_LAST_SELECTED.getBoolean();
+    }
+
+    /**
+     * Injection point.
+     * Called when a new video loads.
+     */
+    public static void newVideoLoaded(@NonNull String videoId) {
+        if (videoId.equals(currentVideoId)) {
+            return;
+        }
+
+        currentVideoId = videoId;
+        currentPlaybackSpeed = getLastRememberedPlaybackSpeed();
+    }
+
+    /**
+     * Injection point.
+     * Called when a playback speed is selected.
+     *
+     * @param playbackSpeed The playback speed to set.
+     */
+    public static void setPlaybackSpeed(final float playbackSpeed) {
+        LogHelper.printDebug(() -> "Playback speed changed to: " + playbackSpeed);
+
+        currentPlaybackSpeed = playbackSpeed;
+
+        if (rememberLastSelectedPlaybackSpeed()) {
+            rememberPlaybackSpeed();
+
+            showToast("Remembering playback speed: " + playbackSpeed + "x");
+        } else {
+            if (getLastRememberedPlaybackSpeed() == DEFAULT_PLAYBACK_SPEED) return;
+
+            showToast("Applying playback speed: " + playbackSpeed + "x");
+        }
+    }
+
+    /**
+     * Injection point.
+     * Called when playback first starts,
+     * and also called immediately after the user selects a new video speed.
+     *
+     * @return The currently set playback speed.
+     */
+    public static float getCurrentPlaybackSpeed() {
+        return currentPlaybackSpeed;
+    }
+}

app/src/main/java/app/revanced/integrations/returnyoutubedislike/requests/RYDVoteData.java

@@ -1,9 +1,13 @@
 package app.revanced.integrations.returnyoutubedislike.requests;
 
+import static app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike.Vote;
+
+import androidx.annotation.NonNull;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.Objects;
+import app.revanced.integrations.utils.LogHelper;
 
 /**
  * ReturnYouTubeDislike API estimated like/dislike/view counts.
@@ -12,7 +16,7 @@ import java.util.Objects;
  * So these values may lag behind what YouTube shows.
  */
 public final class RYDVoteData {
-
+    @NonNull
     public final String videoId;
 
     /**
@@ -20,46 +24,87 @@ public final class RYDVoteData {
      */
     public final long viewCount;
 
+    private final long fetchedLikeCount;
+    private volatile long likeCount; // read/write from different threads
+    private volatile float likePercentage;
+
+    private final long fetchedDislikeCount;
+    private volatile long dislikeCount; // read/write from different threads
+    private volatile float dislikePercentage;
+
+    /**
+     * @throws JSONException if JSON parse error occurs, or if the values make no sense (ie: negative values)
+     */
+    public RYDVoteData(@NonNull JSONObject json) throws JSONException {
+        videoId = json.getString("id");
+        viewCount = json.getLong("viewCount");
+        fetchedLikeCount = json.getLong("likes");
+        fetchedDislikeCount = json.getLong("dislikes");
+        if (viewCount < 0 || fetchedLikeCount < 0 || fetchedDislikeCount < 0) {
+            throw new JSONException("Unexpected JSON values: " + json);
+        }
+        likeCount = fetchedLikeCount;
+        dislikeCount = fetchedDislikeCount;
+        updatePercentages();
+    }
+
     /**
      * Estimated like count
      */
-    public final long likeCount;
+    public long getLikeCount() {
+        return likeCount;
+    }
 
     /**
      * Estimated dislike count
      */
-    public final long dislikeCount;
+    public long getDislikeCount() {
+        return dislikeCount;
+    }
 
     /**
      * Estimated percentage of likes for all votes.  Value has range of [0, 1]
      *
      * A video with 400 positive votes, and 100 negative votes, has a likePercentage of 0.8
      */
-    public final float likePercentage;
+    public float getLikePercentage() {
+        return likePercentage;
+    }
 
     /**
      * Estimated percentage of dislikes for all votes. Value has range of [0, 1]
      *
      * A video with 400 positive votes, and 100 negative votes, has a dislikePercentage of 0.2
      */
-    public final float dislikePercentage;
-
-    /**
-     * @throws JSONException if JSON parse error occurs, or if the values make no sense (ie: negative values)
-     */
-    public RYDVoteData(JSONObject json) throws JSONException {
-        Objects.requireNonNull(json);
-        videoId = json.getString("id");
-        viewCount = json.getLong("viewCount");
-        likeCount = json.getLong("likes");
-        dislikeCount = json.getLong("dislikes");
-        if (likeCount < 0 || dislikeCount < 0 || viewCount < 0) {
-            throw new JSONException("Unexpected JSON values: " + json);
-        }
-        likePercentage = (likeCount == 0 ? 0 : (float)likeCount / (likeCount + dislikeCount));
-        dislikePercentage = (dislikeCount == 0 ? 0 : (float)dislikeCount / (likeCount + dislikeCount));
+    public float getDislikePercentage() {
+        return dislikePercentage;
     }
 
+    public void updateUsingVote(Vote vote) {
+        if (vote == Vote.LIKE) {
+            LogHelper.printDebug(() -> "Increasing like count");
+            likeCount = fetchedLikeCount + 1;
+            dislikeCount = fetchedDislikeCount;
+        } else if (vote == Vote.DISLIKE) {
+            LogHelper.printDebug(() -> "Increasing dislike count");
+            likeCount = fetchedLikeCount;
+            dislikeCount = fetchedDislikeCount + 1;
+        } else if (vote == Vote.LIKE_REMOVE) {
+            LogHelper.printDebug(() -> "Resetting like/dislike to fetched values");
+            likeCount = fetchedLikeCount;
+            dislikeCount = fetchedDislikeCount;
+        } else {
+            throw new IllegalStateException();
+        }
+        updatePercentages();
+    }
+
+    private void updatePercentages() {
+        likePercentage = (likeCount == 0 ? 0 : (float) likeCount / (likeCount + dislikeCount));
+        dislikePercentage = (dislikeCount == 0 ? 0 : (float) dislikeCount / (likeCount + dislikeCount));
+    }
+
+    @NonNull
     @Override
     public String toString() {
         return "RYDVoteData{"
@@ -73,4 +118,5 @@ public final class RYDVoteData {
     }
 
     // equals and hashcode is not implemented (currently not needed)
+
 }

app/src/main/java/app/revanced/integrations/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java

@@ -1,29 +1,27 @@
 package app.revanced.integrations.returnyoutubedislike.requests;
 
-import static app.revanced.integrations.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute;
-import static app.revanced.integrations.sponsorblock.StringRef.str;
-
 import android.util.Base64;
 import android.widget.Toast;
-
 import androidx.annotation.Nullable;
-
+import app.revanced.integrations.requests.Requester;
+import app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike;
+import app.revanced.integrations.utils.LogHelper;
+import app.revanced.integrations.utils.ReVancedUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.ProtocolException;
+import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Objects;
 
-import app.revanced.integrations.requests.Requester;
-import app.revanced.integrations.returnyoutubedislike.ReturnYouTubeDislike;
-import app.revanced.integrations.utils.LogHelper;
-import app.revanced.integrations.utils.ReVancedUtils;
+import static app.revanced.integrations.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute;
+import static app.revanced.integrations.sponsorblock.StringRef.str;
 
 public class ReturnYouTubeDislikeApi {
     /**
@@ -48,7 +46,13 @@ public class ReturnYouTubeDislikeApi {
     /**
      * Response code of a successful API call
      */
-    private static final int SUCCESS_HTTP_STATUS_CODE = 200;
+    private static final int HTTP_STATUS_CODE_SUCCESS = 200;
+
+    /**
+     * Response code indicating the video id is not for a video that can be voted for.
+     * (it's not a Short or a regular video, and it's likely a YouTube Story)
+     */
+    private static final int HTTP_STATUS_CODE_NOT_FOUND = 404;
 
     /**
      * Indicates a client rate limit has been reached
@@ -57,9 +61,9 @@ public class ReturnYouTubeDislikeApi {
 
     /**
      * How long to wait until API calls are resumed, if a rate limit is hit.
-     * No clear guideline of how long to backoff.  Using 60 seconds for now.
+     * No clear guideline of how long to backoff. Using 2 minutes for now.
      */
-    private static final int RATE_LIMIT_BACKOFF_SECONDS = 60;
+    private static final int RATE_LIMIT_BACKOFF_SECONDS = 120;
 
     /**
      * Last time a {@link #RATE_LIMIT_HTTP_STATUS_CODE} was reached.
@@ -133,6 +137,7 @@ public class ReturnYouTubeDislikeApi {
      *
      * @param maximumTimeToWait maximum time to wait
      */
+    @SuppressWarnings("UnusedReturnValue")
     private static long randomlyWaitIfLocallyDebugging(long maximumTimeToWait) {
         final boolean DEBUG_RANDOMLY_DELAY_NETWORK_CALLS = false; // set true to debug UI
         if (DEBUG_RANDOMLY_DELAY_NETWORK_CALLS) {
@@ -183,6 +188,8 @@ public class ReturnYouTubeDislikeApi {
 
         if (httpResponseCode == RATE_LIMIT_HTTP_STATUS_CODE) {
             lastTimeRateLimitWasHit = System.currentTimeMillis();
+            //noinspection NonAtomicOperationOnVolatileField // don't care, field is used only as an estimate
+            numberOfRateLimitRequestsEncountered++;
             LogHelper.printDebug(() -> "API rate limit was hit. Stopping API calls for the next "
                     + RATE_LIMIT_BACKOFF_SECONDS + " seconds");
             ReVancedUtils.runOnMainThread(() -> { // must show toasts on main thread
@@ -208,7 +215,6 @@ public class ReturnYouTubeDislikeApi {
             fetchCallNumberOfFailures++;
         } else if (rateLimitHit) {
             fetchCallResponseTimeLast = FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT;
-            numberOfRateLimitRequestsEncountered++;
         } else {
             fetchCallResponseTimeLast = responseTimeOfFetchCall;
         }
@@ -228,7 +234,6 @@ public class ReturnYouTubeDislikeApi {
         LogHelper.printDebug(() -> "Fetching votes for: " + videoId);
         final long timeNetworkCallStarted = System.currentTimeMillis();
 
-        String connectionErrorMessageStringKey = "revanced_ryd_failure_connection_timeout";
         try {
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.GET_DISLIKES, videoId);
             // request headers, as per https://returnyoutubedislike.com/docs/fetching
@@ -250,7 +255,7 @@ public class ReturnYouTubeDislikeApi {
                 return null;
             }
 
-            if (responseCode == SUCCESS_HTTP_STATUS_CODE) {
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 final long timeNetworkCallEnded = System.currentTimeMillis(); // record end time before parsing
                 // do not disconnect, the same server connection will likely be used again soon
                 JSONObject json = Requester.parseJSONObject(connection);
@@ -263,13 +268,20 @@ public class ReturnYouTubeDislikeApi {
                     LogHelper.printException(() -> "Failed to parse video: " + videoId + " json: " + json, ex);
                     // fall thru to update statistics
                 }
+            } else if (responseCode == HTTP_STATUS_CODE_NOT_FOUND) {
+                // normal response when viewing YouTube Stories (cannot vote for these)
+                LogHelper.printDebug(() -> "Video has no like/dislikes (video is a YouTube Story?): " + videoId);
+                return null; // do not updated connection statistics
             } else {
-                LogHelper.printException(() -> "Failed to fetch votes for video: " + videoId
-                        + " response code was: " + responseCode, null, str(connectionErrorMessageStringKey));
+                LogHelper.printException(() -> "Failed to fetch votes for video: " + videoId + " response code was: " + responseCode,
+                        null, str("revanced_ryd_failure_connection_status_code", responseCode));
                 connection.disconnect(); // something went wrong, might as well disconnect
             }
-        } catch (Exception ex) { // connection timed out, response timeout, or some other network error
-            LogHelper.printException(() -> "Failed to fetch votes", ex, str(connectionErrorMessageStringKey));
+        } catch (SocketTimeoutException ex) { // connection timed out, response timeout, or some other network error
+            LogHelper.printException(() -> "Failed to fetch votes", ex, str("revanced_ryd_failure_connection_timeout"));
+        } catch (Exception ex) {
+            // should never happen
+            LogHelper.printException(() -> "Failed to fetch votes", ex, str("revanced_ryd_failure_generic", ex.getMessage()));
         }
 
         updateStatistics(timeNetworkCallStarted, System.currentTimeMillis(), true, false);
@@ -299,7 +311,7 @@ public class ReturnYouTubeDislikeApi {
                 connection.disconnect(); // disconnect, as no more connections will be made for a little while
                 return null;
             }
-            if (responseCode == SUCCESS_HTTP_STATUS_CODE) {
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 JSONObject json = Requester.parseJSONObject(connection);
                 String challenge = json.getString("challenge");
                 int difficulty = json.getInt("difficulty");
@@ -340,7 +352,7 @@ public class ReturnYouTubeDislikeApi {
                 connection.disconnect(); // disconnect, as no more connections will be made for a little while
                 return null;
             }
-            if (responseCode == SUCCESS_HTTP_STATUS_CODE) {
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 String result = Requester.parseJson(connection);
                 if (result.equalsIgnoreCase("true")) {
                     LogHelper.printDebug(() -> "Registration confirmation successful for user: " + userId);
@@ -387,7 +399,7 @@ public class ReturnYouTubeDislikeApi {
                 connection.disconnect(); // disconnect, as no more connections will be made for a little while
                 return false;
             }
-            if (responseCode == SUCCESS_HTTP_STATUS_CODE) {
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 JSONObject json = Requester.parseJSONObject(connection);
                 String challenge = json.getString("challenge");
                 int difficulty = json.getInt("difficulty");
@@ -431,7 +443,7 @@ public class ReturnYouTubeDislikeApi {
                 return false;
             }
 
-            if (responseCode == SUCCESS_HTTP_STATUS_CODE) {
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 String result = Requester.parseJson(connection);
                 if (result.equalsIgnoreCase("true")) {
                     LogHelper.printDebug(() -> "Vote confirm successful for video: " + videoId);
@@ -469,9 +481,7 @@ public class ReturnYouTubeDislikeApi {
         byte[] decodedChallenge = Base64.decode(challenge, Base64.NO_WRAP);
 
         byte[] buffer = new byte[20];
-        for (int i = 4; i < 20; i++) { // FIXME replace with System.arrayCopy
-            buffer[i] = decodedChallenge[i - 4];
-        }
+        System.arraycopy(decodedChallenge, 0, buffer, 4, 16);
 
         MessageDigest md;
         try {
@@ -513,9 +523,9 @@ public class ReturnYouTubeDislikeApi {
 
     private static int countLeadingZeroes(byte[] uInt8View) {
         int zeroes = 0;
-        int value = 0;
-        for (int i = 0; i < uInt8View.length; i++) {
-            value = uInt8View[i] & 0xFF;
+        int value;
+        for (byte b : uInt8View) {
+            value = b & 0xFF;
             if (value == 0) {
                 zeroes += 8;
             } else {

app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java

@@ -5,9 +5,6 @@ import app.revanced.integrations.utils.LogHelper;
 import app.revanced.integrations.utils.ReVancedUtils;
 import app.revanced.integrations.utils.SharedPrefHelper;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public enum SettingsEnum {
     //Download Settings
     // TODO: DOWNLOAD_PATH("revanced_download_path", Environment.getExternalStorageDirectory().getPath() + "/Download", ReturnType.STRING),
@@ -21,11 +18,11 @@ public enum SettingsEnum {
     // Video settings
     OLD_STYLE_VIDEO_QUALITY_PLAYER_SETTINGS("revanced_use_old_style_quality_settings", true, ReturnType.BOOLEAN),
     REMEMBER_VIDEO_QUALITY_LAST_SELECTED("revanced_remember_video_quality_last_selected", true, ReturnType.BOOLEAN),
-    REMEMBER_PLAYBACK_RATE_SELECTED("revanced_remember_playback_rate_selected", true, ReturnType.BOOLEAN),
-
+    REMEMBER_PLAYBACK_SPEED_LAST_SELECTED("revanced_remember_playback_speed_last_selected", true, ReturnType.BOOLEAN),
+    REMEMBER_PLAYBACK_SPEED_LAST_SELECTED_VALUE("revanced_remember_playback_speed_last_selected_value", 1.0f, ReturnType.FLOAT),
 
+    // TODO: Unused currently
     // Whitelist settings
-    //ToDo: Not used atm, Patch missing
     ENABLE_WHITELIST("revanced_whitelist_ads_enabled", false, ReturnType.BOOLEAN),
 
     // Ad settings
@@ -54,14 +51,18 @@ public enum SettingsEnum {
     ADREMOVER_GRAY_SEPARATOR("revanced_adremover_separator", true, ReturnType.BOOLEAN),
     ADREMOVER_VIEW_PRODUCTS("revanced_adremover_view_products", true, ReturnType.BOOLEAN),
     ADREMOVER_WEB_SEARCH_RESULTS("revanced_adremover_web_search_result", true, ReturnType.BOOLEAN),
+    ADREMOVER_CHANNEL_BAR("revanced_hide_channel_bar", false, ReturnType.BOOLEAN),
+    ADREMOVER_QUICK_ACTIONS("revanced_hide_quick_actions", false, ReturnType.BOOLEAN),
+    ADREMOVER_RELATED_VIDEOS("revanced_hide_related_videos", false, ReturnType.BOOLEAN),
+    ADREMOVER_IMAGE_SHELF("revanced_hide_image_shelf", true, ReturnType.BOOLEAN),
 
     // Action buttons
-    HIDE_LIKE_BUTTON("revanced_hide_like_button", false, ReturnType.BOOLEAN, false),
-    HIDE_DISLIKE_BUTTON("revanced_hide_dislike_button", false, ReturnType.BOOLEAN, false),
-    HIDE_DOWNLOAD_BUTTON("revanced_hide_download_button", false, ReturnType.BOOLEAN, false),
-    HIDE_PLAYLIST_BUTTON("revanced_hide_playlist_button", false, ReturnType.BOOLEAN, false),
-    HIDE_ACTION_BUTTON("revanced_hide_action_button", false, ReturnType.BOOLEAN, false),
-    HIDE_SHARE_BUTTON("revanced_hide_share_button", false, ReturnType.BOOLEAN, false),
+    HIDE_LIKE_BUTTON("revanced_hide_like_button", false, ReturnType.BOOLEAN),
+    HIDE_DISLIKE_BUTTON("revanced_hide_dislike_button", false, ReturnType.BOOLEAN),
+    HIDE_DOWNLOAD_BUTTON("revanced_hide_download_button", false, ReturnType.BOOLEAN),
+    HIDE_PLAYLIST_BUTTON("revanced_hide_playlist_button", false, ReturnType.BOOLEAN),
+    HIDE_ACTION_BUTTON("revanced_hide_action_button", false, ReturnType.BOOLEAN),
+    HIDE_SHARE_BUTTON("revanced_hide_share_button", false, ReturnType.BOOLEAN),
 
     // Layout settings
     DISABLE_STARTUP_SHORTS_PLAYER("revanced_startup_shorts_player_enabled", false, ReturnType.BOOLEAN),
@@ -70,7 +71,7 @@ public enum SettingsEnum {
     SPOOF_APP_VERSION("revanced_spoof_app_version", false, ReturnType.BOOLEAN, true),
     WIDE_SEARCHBAR("revanced_wide_searchbar", false, ReturnType.BOOLEAN, true),
     HIDE_ALBUM_CARDS("revanced_hide_album_cards", false, ReturnType.BOOLEAN, true),
-    HIDE_ARTIST_CARD("revanced_hide_artist_card", false, ReturnType.BOOLEAN),
+    HIDE_ARTIST_CARDS("revanced_hide_artist_cards", false, ReturnType.BOOLEAN),
     HIDE_AUTOPLAY_BUTTON("revanced_hide_autoplay_button", true, ReturnType.BOOLEAN, true),
     HIDE_VIDEO_WATERMARK("revanced_hide_video_watermark", true, ReturnType.BOOLEAN),
     HIDE_CAPTIONS_BUTTON("revanced_hide_captions_button", false, ReturnType.BOOLEAN),
@@ -87,20 +88,22 @@ public enum SettingsEnum {
     HIDE_REEL_BUTTON("revanced_hide_reel_button", true, ReturnType.BOOLEAN, true),
     HIDE_SHORTS_BUTTON("revanced_hide_shorts_button", true, ReturnType.BOOLEAN, true),
     HIDE_SHORTS_COMMENTS_BUTTON("revanced_hide_shorts_comments_button", false, ReturnType.BOOLEAN),
-    HIDE_TIME_AND_SEEKBAR("revanced_hide_time_and_seekbar", false, ReturnType.BOOLEAN),
+    HIDE_TIMESTAMP("revanced_hide_timestamp", false, ReturnType.BOOLEAN),
+    HIDE_SEEKBAR("revanced_hide_seekbar", false, ReturnType.BOOLEAN),
     HIDE_WATCH_IN_VR("revanced_hide_watch_in_vr", false, ReturnType.BOOLEAN, true),
     HIDE_BREAKING_NEWS("revanced_hide_breaking_news", true, ReturnType.BOOLEAN, true),
-    HIDE_PLAYER_BUTTONS("revanced_hide_player_buttons", false, ReturnType.BOOLEAN, false),
+    HIDE_PLAYER_BUTTONS("revanced_hide_player_buttons", false, ReturnType.BOOLEAN),
+    HIDE_FLOATING_MICROPHONE_BUTTON("revanced_hide_floating_microphone_button", true, ReturnType.BOOLEAN, true),
 
     // Misc. Settings
-    FIX_PLAYBACK("revanced_fix_playback", false, ReturnType.BOOLEAN, false),
-    CAPTIONS_ENABLED("revanced_autocaptions_enabled", false, ReturnType.BOOLEAN, false),
+    SIGNATURE_SPOOFING("revanced_spoof_signature_verification", false, ReturnType.BOOLEAN),
+    CAPTIONS_ENABLED("revanced_autocaptions_enabled", false, ReturnType.BOOLEAN),
     PREFERRED_AUTO_REPEAT("revanced_pref_auto_repeat", false, ReturnType.BOOLEAN),
     USE_HDR_AUTO_BRIGHTNESS("revanced_pref_hdr_autobrightness", true, ReturnType.BOOLEAN),
     TAP_SEEKING_ENABLED("revanced_enable_tap_seeking", true, ReturnType.BOOLEAN),
     ENABLE_MINIMIZED_PLAYBACK("revanced_enable_minimized_playback", true, ReturnType.BOOLEAN),
     OPEN_LINKS_DIRECTLY("revanced_uri_redirect", true, ReturnType.BOOLEAN, true),
-    DISABLE_ZOOM_HAPTICS("revanced_disable_zoom_haptics", true, ReturnType.BOOLEAN, false),
+    DISABLE_ZOOM_HAPTICS("revanced_disable_zoom_haptics", true, ReturnType.BOOLEAN),
     ENABLE_EXTERNAL_BROWSER("revanced_enable_external_browser", true, ReturnType.BOOLEAN, true),
 
     // Swipe controls
@@ -113,11 +116,6 @@ public enum SettingsEnum {
     SWIPE_OVERLAY_BACKGROUND_ALPHA("revanced_swipe_overlay_background_alpha", 127, ReturnType.INTEGER),
     SWIPE_MAGNITUDE_THRESHOLD("revanced_swipe_magnitude_threshold", 30f, ReturnType.FLOAT),
 
-    // Buffer settings
-    MAX_BUFFER("revanced_pref_max_buffer_ms", 120000, ReturnType.INTEGER),
-    PLAYBACK_MAX_BUFFER("revanced_pref_buffer_for_playback_ms", 2500, ReturnType.INTEGER),
-    MAX_PLAYBACK_BUFFER_AFTER_REBUFFER("revanced_pref_buffer_for_playback_after_rebuffer_ms", 5000, ReturnType.INTEGER),
-
     // Debug settings
     DEBUG("revanced_debug_enabled", false, ReturnType.BOOLEAN),
     DEBUG_STACKTRACE("revanced_debug_stacktrace_enabled", false, ReturnType.BOOLEAN),
@@ -147,51 +145,7 @@ public enum SettingsEnum {
     SB_IS_VIP("sb-is-vip", false, SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK, ReturnType.BOOLEAN),
     SB_LAST_VIP_CHECK("sb-last-vip-check", 0L, SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK, ReturnType.LONG),
     SB_SHOW_BROWSER_BUTTON("sb-browser-button", false, SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK, ReturnType.BOOLEAN),
-    SB_API_URL("sb-api-host-url", "https://sponsor.ajay.app", SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK, ReturnType.STRING),
-
-    //
-    // old deprecated settings, kept around to migrate user settings on existing installations
-    // FIXME: after a few months, eventually delete these settings
-    //
-    @Deprecated
-    DEPRECATED_HIDE_MIX_PLAYLISTS("revanced_mix_playlists_hidden", false, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_HIDE_LIKE_BUTTON("revanced_like_button", false, ReturnType.BOOLEAN, false),
-    @Deprecated
-    DEPRECATED_HIDE_DISLIKE_BUTTON("revanced_dislike_button", false, ReturnType.BOOLEAN, false),
-    @Deprecated
-    DEPRECATED_HIDE_DOWNLOAD_BUTTON("revanced_download_button", false, ReturnType.BOOLEAN, false),
-    @Deprecated
-    DEPRECATED_HIDE_PLAYLIST_BUTTON("revanced_playlist_button", false, ReturnType.BOOLEAN, false),
-    @Deprecated
-    DEPRECATED_HIDE_ACTION_BUTTON("revanced_action_button", false, ReturnType.BOOLEAN, false),
-    @Deprecated
-    DEPRECATED_HIDE_SHARE_BUTTON("revanced_share_button", false, ReturnType.BOOLEAN, false),
-    @Deprecated
-    DEPRECATED_FULLSCREEN_PANELS_SHOWN("revanced_fullscreen_panels_enabled", false, ReturnType.BOOLEAN),
-    @Deprecated
-    DEPRECATED_CREATE_BUTTON_ENABLED("revanced_create_button_enabled", false, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_SHORTS_BUTTON_SHOWN("revanced_shorts_button_enabled", false, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_REEL_BUTTON_SHOWN("revanced_reel_button_enabled", false, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_AUTOPLAY_BUTTON_SHOWN("revanced_autoplay_button_enabled", false, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_CAST_BUTTON_SHOWN("revanced_cast_button_enabled", false, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_BRANDING_SHOWN("revanced_branding_watermark_enabled", false, ReturnType.BOOLEAN),
-    @Deprecated
-    DEPRECATED_REMEMBER_VIDEO_QUALITY("revanced_remember_video_quality_selection", false, ReturnType.BOOLEAN),
-    @Deprecated
-    DEPRECATED_DOWNLOADS_BUTTON_SHOWN("revanced_downloads", true, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_COPY_VIDEO_URL_BUTTON_SHOWN("revanced_copy_video_url", true, ReturnType.BOOLEAN, true),
-    @Deprecated
-    DEPRECATED_COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN("revanced_copy_video_url_timestamp", true, ReturnType.BOOLEAN, true);
-    //
-    // end deprecated settings
-    //
+    SB_API_URL("sb-api-host-url", "https://sponsor.ajay.app", SharedPrefHelper.SharedPrefNames.SPONSOR_BLOCK, ReturnType.STRING);
 
     private final String path;
     private final Object defaultValue;
@@ -225,68 +179,6 @@ public enum SettingsEnum {
 
     static {
         load();
-
-        //
-        // temporary code to migrate user configuration of old settings into current settings
-        // FIXME: eventually delete this code
-        //
-
-        // old/new settings where old is default off, and new has inverted value and is default on
-        SettingsEnum[][] invertedSettingsToMigrate = {
-                {DEPRECATED_FULLSCREEN_PANELS_SHOWN, HIDE_FULLSCREEN_PANELS},
-                {DEPRECATED_CREATE_BUTTON_ENABLED, HIDE_CREATE_BUTTON},
-                {DEPRECATED_SHORTS_BUTTON_SHOWN, HIDE_SHORTS_BUTTON},
-                {DEPRECATED_REEL_BUTTON_SHOWN, HIDE_REEL_BUTTON},
-                {DEPRECATED_AUTOPLAY_BUTTON_SHOWN, HIDE_AUTOPLAY_BUTTON},
-                {DEPRECATED_CAST_BUTTON_SHOWN, HIDE_CAST_BUTTON},
-                {DEPRECATED_BRANDING_SHOWN, HIDE_VIDEO_WATERMARK},
-                {DEPRECATED_REMEMBER_VIDEO_QUALITY, REMEMBER_VIDEO_QUALITY_LAST_SELECTED},
-        };
-        for (SettingsEnum[] oldNewSetting : invertedSettingsToMigrate) {
-            // by default, old setting was default off
-            // migrate to new setting of default on
-            SettingsEnum oldSetting = oldNewSetting[0];
-            SettingsEnum newSetting = oldNewSetting[1];
-
-            // only need to check if old setting was turned on
-            if (oldSetting.getBoolean()) {
-                // this code will only run once
-                LogHelper.printInfo(() -> "Migrating setting: " + oldSetting + " of 'true' to new setting: "
-                        + newSetting + " of 'false'");
-                newSetting.saveValue(false); // set opposite of old value
-                oldSetting.saveValue(false); // clear old value
-            }
-        }
-
-        //
-        // renamed settings with new path names, but otherwise the new and old settings are identical
-        //
-        SettingsEnum[][] renamedSettings = {
-                {DEPRECATED_HIDE_MIX_PLAYLISTS, HIDE_MIX_PLAYLISTS},
-                {DEPRECATED_HIDE_LIKE_BUTTON, HIDE_LIKE_BUTTON},
-                {DEPRECATED_HIDE_DISLIKE_BUTTON, HIDE_DISLIKE_BUTTON},
-                {DEPRECATED_HIDE_DOWNLOAD_BUTTON, HIDE_DOWNLOAD_BUTTON},
-                {DEPRECATED_HIDE_PLAYLIST_BUTTON, HIDE_PLAYLIST_BUTTON},
-                {DEPRECATED_HIDE_ACTION_BUTTON, HIDE_ACTION_BUTTON},
-                {DEPRECATED_HIDE_SHARE_BUTTON, HIDE_SHARE_BUTTON},
-                {DEPRECATED_DOWNLOADS_BUTTON_SHOWN, DOWNLOADS_BUTTON_SHOWN},
-                {DEPRECATED_COPY_VIDEO_URL_BUTTON_SHOWN, COPY_VIDEO_URL_BUTTON_SHOWN},
-                {DEPRECATED_COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN, COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN},
-        };
-        for (SettingsEnum[] oldNewSetting : renamedSettings) {
-            SettingsEnum oldSetting = oldNewSetting[0];
-            SettingsEnum newSetting = oldNewSetting[1];
-
-            if (!oldSetting.value.equals(oldSetting.defaultValue)) {
-                LogHelper.printInfo(() -> "Migrating old setting of '" + oldSetting.value
-                        + "' from: " + oldSetting + " into replacement setting: " + newSetting);
-                newSetting.saveValue(oldSetting.value);
-                oldSetting.saveValue(oldSetting.getDefaultValue()); // reset old value
-            }
-        }
-        //
-        // end temporary code
-        //
     }
 
     private static void load() {
@@ -322,16 +214,6 @@ public enum SettingsEnum {
         }
     }
 
-    public static List<SettingsEnum> getAdRemovalSettings() {
-        List<SettingsEnum> list = new ArrayList<>();
-        for (SettingsEnum var : SettingsEnum.values()) {
-            if (var.toString().startsWith("ADREMOVER")) {
-                list.add(var);
-            }
-        }
-        return list;
-    }
-
     /**
      * Sets, but does _not_ persistently save the value.
      *

app/src/main/java/app/revanced/integrations/shared/PlayerType.kt

@@ -7,8 +7,8 @@ import app.revanced.integrations.utils.Event
  */
 @Suppress("unused")
 enum class PlayerType {
-    NONE, // this also includes when shorts are playing
-    HIDDEN,
+    NONE, // includes Shorts playback
+    HIDDEN, // also includes YouTube Shorts and Stories, if a regular video is minimized and a Short/Story is then opened
     WATCH_WHILE_MINIMIZED,
     WATCH_WHILE_MAXIMIZED,
     WATCH_WHILE_FULLSCREEN,
@@ -42,6 +42,7 @@ enum class PlayerType {
                 currentPlayerType = value
                 onChange(currentPlayerType)
             }
+        @Volatile // value is read/write from different threads
         private var currentPlayerType = NONE
 
         /**
@@ -51,7 +52,9 @@ enum class PlayerType {
     }
 
     /**
-     * Weather Shorts are being played.
+     * Check if the current player type is [NONE] or [HIDDEN]
+     *
+     * @return True, if nothing, a Short, or a Story is playing.
      */
     fun isNoneOrHidden(): Boolean {
         return this == NONE || this == HIDDEN

app/src/main/java/app/revanced/twitter/patches/hook/json/BaseJsonHook.kt

@@ -0,0 +1,9 @@
+package app.revanced.twitter.patches.hook.json
+
+import org.json.JSONObject
+
+abstract class BaseJsonHook : JsonHook {
+    abstract fun apply(json: JSONObject)
+
+    override fun transform(json: JSONObject) = json.apply { apply(json) }
+}

app/src/main/java/app/revanced/twitter/patches/hook/json/JsonHook.kt

@@ -0,0 +1,15 @@
+package app.revanced.twitter.patches.hook.json
+
+import app.revanced.twitter.patches.hook.patch.Hook
+import org.json.JSONObject
+
+interface JsonHook : Hook<JSONObject> {
+    /**
+     * Transform a JSONObject.
+     *
+     * @param json The JSONObject.
+     */
+    fun transform(json: JSONObject): JSONObject
+
+    override fun hook(type: JSONObject) = transform(type)
+}

app/src/main/java/app/revanced/twitter/patches/hook/json/JsonHookPatch.kt

@@ -0,0 +1,28 @@
+package app.revanced.twitter.patches.hook.json
+
+import app.revanced.twitter.utils.json.JsonUtils.parseJson
+import app.revanced.twitter.utils.stream.StreamUtils
+import org.json.JSONException
+import java.io.IOException
+import java.io.InputStream
+
+object JsonHookPatch {
+    private val hooks = buildList<JsonHook> {
+        // Modified by corresponding patch.
+    }
+
+    @JvmStatic
+    fun parseJsonHook(jsonInputStream: InputStream): InputStream {
+        var jsonObject = try {
+            parseJson(jsonInputStream)
+        } catch (ignored: IOException) {
+            return jsonInputStream // Unreachable.
+        } catch (ignored: JSONException) {
+            return jsonInputStream
+        }
+
+        for (hook in hooks) jsonObject = hook.hook(jsonObject)
+
+        return StreamUtils.fromString(jsonObject.toString())
+    }
+}

app/src/main/java/app/revanced/twitter/patches/hook/patch/Hook.kt

@@ -0,0 +1,9 @@
+package app.revanced.twitter.patches.hook.patch
+
+interface Hook<T> {
+    /**
+     * Hook the given type.
+     * @param type The type to hook
+     */
+    fun hook(type: T): T
+}

app/src/main/java/app/revanced/twitter/patches/hook/patch/ads/AdsHook.kt

@@ -0,0 +1,15 @@
+package app.revanced.twitter.patches.hook.patch.ads
+
+import app.revanced.twitter.patches.hook.json.BaseJsonHook
+import app.revanced.twitter.patches.hook.twifucker.TwiFucker
+import org.json.JSONObject
+
+
+object AdsHook : BaseJsonHook() {
+    /**
+     * Strips JSONObject from promoted ads.
+     *
+     * @param json The JSONObject.
+     */
+    override fun apply(json: JSONObject) = TwiFucker.hidePromotedAds(json)
+}

app/src/main/java/app/revanced/twitter/patches/hook/patch/recommendation/RecommendedUsersHook.kt

@@ -0,0 +1,15 @@
+package app.revanced.twitter.patches.hook.patch.recommendation
+
+import app.revanced.twitter.patches.hook.json.BaseJsonHook
+import app.revanced.twitter.patches.hook.twifucker.TwiFucker
+import org.json.JSONObject
+
+
+object RecommendedUsersHook : BaseJsonHook() {
+    /**
+     * Strips JSONObject from recommended users.
+     *
+     * @param json The JSONObject.
+     */
+    override fun apply(json: JSONObject) = TwiFucker.hideRecommendedUsers(json)
+}

app/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFucker.kt

@@ -0,0 +1,177 @@
+package app.revanced.twitter.patches.hook.twifucker
+
+import android.util.Log
+import app.revanced.twitter.patches.hook.twifucker.TwiFuckerUtils.forEach
+import app.revanced.twitter.patches.hook.twifucker.TwiFuckerUtils.forEachIndexed
+import org.json.JSONArray
+import org.json.JSONObject
+
+// https://raw.githubusercontent.com/Dr-TSNG/TwiFucker/880cdf1c1622e54ab45561ffcb4f53d94ed97bae/app/src/main/java/icu/nullptr/twifucker/hook/JsonHook.kt
+internal object TwiFucker {
+    // root
+    private fun JSONObject.jsonGetInstructions(): JSONArray? =
+        optJSONObject("timeline")?.optJSONArray("instructions")
+
+    private fun JSONObject.jsonGetData(): JSONObject? = optJSONObject("data")
+
+    private fun JSONObject.jsonHasRecommendedUsers(): Boolean = has("recommended_users")
+
+    private fun JSONObject.jsonRemoveRecommendedUsers() {
+        remove("recommended_users")
+    }
+
+    private fun JSONObject.jsonCheckAndRemoveRecommendedUsers() {
+        if (jsonHasRecommendedUsers()) {
+            Log.d("revanced", "Handle recommended users: $this")
+            jsonRemoveRecommendedUsers()
+        }
+    }
+
+    private fun JSONObject.jsonHasThreads(): Boolean = has("threads")
+
+    private fun JSONObject.jsonRemoveThreads() {
+        remove("threads")
+    }
+
+    private fun JSONObject.jsonCheckAndRemoveThreads() {
+        if (jsonHasThreads()) {
+            Log.d("revabced", "Handle threads: $this")
+            jsonRemoveThreads()
+        }
+    }
+
+    // data
+    private fun JSONObject.dataGetInstructions(): JSONArray? {
+        val timeline = optJSONObject("user_result")?.optJSONObject("result")
+            ?.optJSONObject("timeline_response")?.optJSONObject("timeline")
+            ?: optJSONObject("timeline_response")?.optJSONObject("timeline")
+            ?: optJSONObject("timeline_response")
+        return timeline?.optJSONArray("instructions")
+    }
+
+    private fun JSONObject.dataCheckAndRemove() {
+        dataGetInstructions()?.forEach { instruction ->
+            instruction.instructionCheckAndRemove()
+        }
+    }
+
+    private fun JSONObject.dataGetLegacy(): JSONObject? =
+        optJSONObject("tweet_result")?.optJSONObject("result")?.let {
+            if (it.has("tweet")) {
+                it.optJSONObject("tweet")
+            } else {
+                it
+            }
+        }?.optJSONObject("legacy")
+
+
+    // entry
+    private fun JSONObject.entryHasPromotedMetadata(): Boolean =
+        optJSONObject("content")?.optJSONObject("item")?.optJSONObject("content")
+            ?.optJSONObject("tweet")
+            ?.has("promotedMetadata") == true || optJSONObject("content")?.optJSONObject("content")
+            ?.has("tweetPromotedMetadata") == true || optJSONObject("item")?.optJSONObject("content")
+            ?.has("tweetPromotedMetadata") == true
+
+    private fun JSONObject.entryGetContentItems(): JSONArray? =
+        optJSONObject("content")?.optJSONArray("items")
+            ?: optJSONObject("content")?.optJSONObject("timelineModule")?.optJSONArray("items")
+
+    private fun JSONObject.entryIsTweetDetailRelatedTweets(): Boolean =
+        optString("entryId").startsWith("tweetdetailrelatedtweets-")
+
+    private fun JSONObject.entryGetTrends(): JSONArray? =
+        optJSONObject("content")?.optJSONObject("timelineModule")?.optJSONArray("items")
+
+    // trend
+    private fun JSONObject.trendHasPromotedMetadata(): Boolean =
+        optJSONObject("item")?.optJSONObject("content")?.optJSONObject("trend")
+            ?.has("promotedMetadata") == true
+
+    private fun JSONArray.trendRemoveAds() {
+        val trendRemoveIndex = mutableListOf<Int>()
+        forEachIndexed { trendIndex, trend ->
+            if (trend.trendHasPromotedMetadata()) {
+                Log.d("revanced", "Handle trends ads $trendIndex $trend")
+                trendRemoveIndex.add(trendIndex)
+            }
+        }
+        for (i in trendRemoveIndex.asReversed()) {
+            remove(i)
+        }
+    }
+
+    // instruction
+    private fun JSONObject.instructionTimelineAddEntries(): JSONArray? = optJSONArray("entries")
+
+    private fun JSONObject.instructionGetAddEntries(): JSONArray? =
+        optJSONObject("addEntries")?.optJSONArray("entries")
+
+    private fun JSONObject.instructionCheckAndRemove() {
+        instructionTimelineAddEntries()?.entriesRemoveAnnoyance()
+        instructionGetAddEntries()?.entriesRemoveAnnoyance()
+    }
+
+    // entries
+    private fun JSONArray.entriesRemoveTimelineAds() {
+        val removeIndex = mutableListOf<Int>()
+        forEachIndexed { entryIndex, entry ->
+            entry.entryGetTrends()?.trendRemoveAds()
+
+            if (entry.entryHasPromotedMetadata()) {
+                Log.d("revanced", "Handle timeline ads $entryIndex $entry")
+                removeIndex.add(entryIndex)
+            }
+
+            val innerRemoveIndex = mutableListOf<Int>()
+            val contentItems = entry.entryGetContentItems()
+            contentItems?.forEachIndexed inner@{ itemIndex, item ->
+                if (item.entryHasPromotedMetadata()) {
+                    Log.d("revanced", "Handle timeline replies ads $entryIndex $entry")
+                    if (contentItems.length() == 1) {
+                        removeIndex.add(entryIndex)
+                    } else {
+                        innerRemoveIndex.add(itemIndex)
+                    }
+                    return@inner
+                }
+            }
+            for (i in innerRemoveIndex.asReversed()) {
+                contentItems?.remove(i)
+            }
+        }
+        for (i in removeIndex.reversed()) {
+            remove(i)
+        }
+    }
+
+    private fun JSONArray.entriesRemoveTweetDetailRelatedTweets() {
+        val removeIndex = mutableListOf<Int>()
+        forEachIndexed { entryIndex, entry ->
+
+            if (entry.entryIsTweetDetailRelatedTweets()) {
+                Log.d("revanced", "Handle tweet detail related tweets $entryIndex $entry")
+                removeIndex.add(entryIndex)
+            }
+        }
+        for (i in removeIndex.reversed()) {
+            remove(i)
+        }
+    }
+
+    private fun JSONArray.entriesRemoveAnnoyance() {
+        entriesRemoveTimelineAds()
+        entriesRemoveTweetDetailRelatedTweets()
+    }
+
+    fun hideRecommendedUsers(json: JSONObject) {
+        json.jsonCheckAndRemoveRecommendedUsers()
+    }
+
+    fun hidePromotedAds(json: JSONObject) {
+        json.jsonGetInstructions()?.forEach { instruction ->
+            instruction.instructionCheckAndRemove()
+        }
+        json.jsonGetData()?.dataCheckAndRemove()
+    }
+}