Merge branch 'main' of https://github.com/qnblackcat/uYouPlus into main

.github/ISSUE_TEMPLATE/bug.md

@@ -20,5 +20,9 @@ assignees: ''
 _(Please attach videos or screenshots if possible)_
 
 
+**Crash log (if possible):**
+_(The crash log can be found in the  Settings app - Privacy - Analytics & Improvements - Analytics Data - Youtube...)_
+
+
 **Additional context:**
 _(Add any other context about the problem here)_

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 packages
 obj
+Resources/Frameworks

.gitmodules

@@ -0,0 +1,28 @@
+[submodule "Tweaks/iSponsorBlock"]
+	path = Tweaks/iSponsorBlock
+	url = https://github.com/qnblackcat/iSponsorBlock.git
+	branch = master
+[submodule "Tweaks/YTUHD"]
+	path = Tweaks/YTUHD
+	url = https://github.com/PoomSmart/YTUHD.git
+	branch = master
+[submodule "Tweaks/YouPiP"]
+	path = Tweaks/YouPiP
+	url = https://github.com/PoomSmart/YouPiP.git
+	branch = main
+[submodule "Tweaks/Return-YouTube-Dislikes"]
+	path = Tweaks/Return-YouTube-Dislikes
+	url = https://github.com/PoomSmart/Return-YouTube-Dislikes.git
+	branch = main
+[submodule "Tweaks/YouTubeHeader"]
+	path = Tweaks/YouTubeHeader
+	url = https://github.com/PoomSmart/YouTubeHeader.git
+	branch = main
+[submodule "Tweaks/Alderis"]
+	path = Tweaks/Alderis
+	url = https://github.com/qnblackcat/Alderis.git
+	branch = master
+[submodule "Tweaks/PSHeader"]
+	path = Tweaks/PSHeader
+	url = https://github.com/PoomSmart/PSHeader.git
+	branch = master

Makefile

@@ -1,5 +1,6 @@
-uYouPlus_INJECT_DYLIBS = Tweaks/uYou.dylib Tweaks/libcolorpicker.dylib Tweaks/iSponsorBlock.dylib Tweaks/YTUHD.dylib Tweaks/YouPiP.dylib
+uYouPlus_INJECT_DYLIBS = Tweaks/uYou.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib 
 
+uYouPlus_USE_FLEX = 0
 ARCHS = arm64
 MODULES = jailed
 FINALPACKAGE = 1
@@ -10,8 +11,16 @@ DISPLAY_NAME = YouTube
 BUNDLE_ID = com.google.ios.youtube
  
 uYouPlus_FILES = uYouPlus.x
-uYouPlus_IPA = /Volumes/Data_Macintosh/Sideloads/IPAs/YouTube_16.45.2.ipa
+uYouPlus_IPA = /path/to/your/decrypted/YouTube.ipa
 ### Important: edit the path to your decrypted YouTube IPA!!! 
 
 include $(THEOS)/makefiles/common.mk
 include $(THEOS_MAKE_PATH)/tweak.mk
+SUBPROJECTS += Tweaks/iSponsorBlock Tweaks/Alderis Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes
+include $(THEOS_MAKE_PATH)/aggregate.mk
+
+all::
+	rm -rf Resources/Frameworks && mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \;
+	install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib
+	install_name_tool -change /Library/Frameworks/Alderis.framework/Alderis @rpath/Alderis.framework/Alderis .theos/obj/libcolorpicker.dylib
+	

README.md

@@ -7,8 +7,10 @@
 * [Features](#features)
 * [Known issues](#known-issues)
 * [Download](#download)
+* [Support the developers!](#support-the-developers)
+* [FAQ](#faq)
 * [Building (optional)](#building-optional)
-* [FAQ](#FAQ)
+
 
 # Credits
 
@@ -16,6 +18,8 @@
 
 - [Galactic-Dev](https://github.com/Galactic-Dev) and [Luewii](https://github.com/Luewii) for [iSponsorBlock](https://github.com/Galactic-Dev/iSponsorBlock).
 
+- [Lillie](https://github.com/LillieWeeb001), [PoomSmart](https://twitter.com/poomsmart?s=21) and [kirb](https://twitter.com/hbkirb?s=21) for [YouTube Dislike Return](https://github.com/PoomSmart/Return-YouTube-Dislikes)
+
 - [HASHBANG Productions](https://github.com/hbang) for [Alderis Color Picker](https://github.com/hbang/Alderis) - a dependency of iSponsorBlock.
 
 - [PoomSmart](https://twitter.com/poomsmart?s=21) - the developer of many tweaks used by uYouPlus, include: [YouRememberCaption](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/), [YTClassicVideoQuality](https://poomsmart.github.io/repo/depictions/ytclassicvideoquality.html), [YTNoCheckLocalNetwork](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html), [YTSystemAppearance](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html) and [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html).
@@ -33,9 +37,9 @@
 
 2. **iSponsorBlock:** Skips annoying sponsor ads inside videos. iSponsorBlock is based on [SponsorBlock engine](https://sponsor.ajay.app/). Basically, this is the iOS version of the SponsorBlock extension.
 
-3. **YouPiP:** enable YouTube's **native PiP**. More options are in YouTube Settings => General.
+3. **YouPiP:** enable YouTube's **native PiP**. More options are in YouTube Settings - General.
 
-4. **YTUHD:** unlock VP9 codec and in effect, enables video quality of 2K and 4K. You can enable/disable YTUHD in YouTube Settings => Video quality preferences.
+4. **YTUHD:** unlock VP9 codec and in effect, enables video quality of 2K and 4K. You can enable/disable YTUHD in YouTube Settings - Video quality preferences.
 
 <details>
   <summary>And more...!</summary>
@@ -53,24 +57,32 @@
 
 # Known issues 
 
-1. **uYou**: all known-issues of uYou are listed [here](https://github.com/MiRO92/uYou-for-YouTube/issues). Make sure you take a look at it before reporting any bugs! ***Also, keep in mind that uYou+ is a modified version of uYou, DO NOT bother MiRO92 with problems unrelated to uYou!!!***
+- **uYou**: all known-issues of uYou are listed [here](https://github.com/MiRO92/uYou-for-YouTube/issues). Make sure you take a look at it before reporting any bugs! ***Also, keep in mind that uYou+ is a modified version of uYou, DO NOT bother MiRO92 with problems unrelated to uYou!!!***
 
-2. Issues that related to **uYouPlus** are [here](https://github.com/qnblackcat/uYouPlus/issues/)
+- Issues that related to **uYouPlus** are [here](https://github.com/qnblackcat/uYouPlus/issues/)
 
 
 # Download
 
 - **uYouPlus** (or you can call it uYou+) requires iOS & iPadOS 13.0 or later. The latest version of **uYouPlus** can be found in the [Release tab](https://github.com/qnblackcat/uYouPlus/releases).
 
-- For AltStore user: [Open in AltStore](https://tinyurl.com/264u5a28). (Note: It will take a while to install because AltStore need to download the IPA.).
+- For AltStore user: 
 
-- Version info: _(last update: Nov 28)_
+  - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
+
+  - [Open in AltStore (v17.04.3-2.1)](https://tinyurl.com/mr39s9hf) - It will take a while to install because AltStore needs to download the IPA.
+
+- Version info: _(last update: Feb 07)_
+
+<details>
+  <summary>  Expand</summary>
 
 | **Tweaks/App** | **Version** | **Open source** |
 | :------------: | :----------:| :-------------: |
-| **YouTube** | 16.45.4 | ✖︎  |
+| **YouTube** | 17.04.3 | ✖︎  |
 | **uYou** | 2.1 | ✖︎ |
-| **iSponsorBlock** | 1.0-11 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
+| **Return YouTube Dislike** | 1.6.2 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
+| **iSponsorBlock** | 1.0-13 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
 | **Alderis Color Picker** | 1.1.2| [✔︎](https://github.com/hbang/Alderis) |
 | **YouRememberCaption** | 1.0.0 | [✔︎](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/) |
 | **YTClassicVideoQuality** | 1.0.1 | [✔︎](https://github.com/PoomSmart/YTClassicVideoQuality) |
@@ -78,13 +90,45 @@
 | **YTNoHoverCards** | 0.0.3 | [✔︎](https://github.com/level3tjg/YTNoHoverCards) |
 | **YTSystemAppearance** | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html) |
 | **YTUHD** | 1.2.5 | [✔︎](https://github.com/PoomSmart/YTUHD) |
-| **YouPiP** | 1.5.15 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | 1.6.6 | [✔︎](https://github.com/PoomSmart/YouPiP) |
 
+</details>
 
-# Building (optional)
+# Support the developers
 
-See [Building - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Building).
+<details>
+  <summary>MiRO92</summary>
+  
+- CashApp: https://cash.app/$MiRO92M
+ 
+- Other payment methods are available in uYou's settings.
+</details>
+
+<details>
+  <summary>Poomsmart</summary>
+
+- Paypal: https://poomsmart.github.io/
+
+</details>
+
+<details>
+  <summary>Galactic-dev</summary>
+  
+- Paypal: https://www.paypal.com/paypalme/DBrett684 
+
+- Venmo: https://venmo.com/u/DavidBrett
+</details>
+
+<details>
+  <summary>Lillie</summary>
+
+- Patreon: https://patreon.com/lillieweeb
+</details>
 
 # FAQ
 
 See [FAQ - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/FAQ).
+
+# Building (optional)
+
+See [Building - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Building).

uYouPlus.x

@@ -1,6 +1,14 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+// Workaround for https://github.com/MiRO92/uYou-for-YouTube/issues/12
+
+%hook YTAdsInnerTubeContextDecorator
+- (void)decorateContext:(id)arg1 {
+    %orig(nil);
+}
+%end
+
 
 // YouRememberCaption: https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/