updated tweaks

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,28 @@
+---
+name: Bug
+about: Create a report to help us improve
+title: "[Bug]"
+labels: bug
+assignees: ''
+
+---
+
+**Device info:**
+- iOS/iPadOS version: 
+- Device model:
+- Sideload tool (Ex: AltStore, Sideloadly...)
+- Version of uYouPlus: 
+
+**Describe the bug:**
+- 
+
+**How to reproduce the bug:**
+_(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)_

.github/ISSUE_TEMPLATE/question-help.md

@@ -0,0 +1,11 @@
+---
+name: Question/Help
+about: Have questions? Need help?
+title: "[Questions]"
+labels: question
+assignees: ''
+
+---
+
+### Have you read the FAQ? Make sure you visit the FAQ page before asking any question!!!
+https://github.com/qnblackcat/uYouPlus/wiki/FAQ

.gitignore

@@ -2,3 +2,5 @@
 .DS_Store
 packages
 obj
+Resources/com.galacticdev.isponsorblock.bundle/
+Resources/YouPiP.bundle/

.gitmodules

@@ -0,0 +1,20 @@
+[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

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 Tweaks/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,14 @@ 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/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes
+include $(THEOS_MAKE_PATH)/aggregate.mk
+
+all::
+	@install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib && echo "==> Fixed executable path for iSponsorBlock!" 
+	@cp -R .theos/obj/*.bundle Resources && echo "==> Moved tweaks's bundle to Resources!"

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,53 +37,52 @@
 
 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. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
+3. **YouPiP:** enable YouTube's **native PiP**. More options are in YouTube Settings - General.
 
-4. **YTClassicVideoQuality:** since YouTube v16.xx, you need one more step to change the video quality. YTClassicVideoQuality brings back the old video quality selector, which is a lot better than the new one.
+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.
 
-5. **YTNoCheckLocalNetwork**: block the Local Network permission popup.
+<details>
+  <summary>And more...!</summary>
+
+5. **YTClassicVideoQuality:** since YouTube v16.xx, you need one more step to change the video quality. YTClassicVideoQuality brings back the old video quality selector, which is a lot better than the new one.
 
 6. **YTNoHoverCards:** offer an option to enable/disable the annoying suggested videos show up at the end of the videos.
 
 7. **YTSystemAppearance**: sync the YouTube theme (dark/light) with the system theme.
 
-8. **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.
-
-9. **YouPiP:** enable YouTube's **native PiP**. More options are in YouTube Settings => General.
+8. **YTNoCheckLocalNetwork**: block the Local Network permission popup.
 
+9. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
+</details>
 
 # 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!!!***
 
-3. **iSponsorBlock**: the modified time doesn't show up in the seek bar.
-
-3. **YTUHD**: Stuttering on 4K videos (sometimes).
-
-4. **YouPiP** (iOS 14.0 - 14.4.2): due to Apple's fault, you may encounter the *speedup-bug* as described [here](https://drive.google.com/file/d/1NKdv1fr_KRWgD8nhkMDfG2eLBnbdeVtX/view?usp=sharing). The bug also happens when you try to play multi-sources of sound at the same time. Enable **Legacy PiP** is a workaround. Note that Legacy PiP removes UHD quality and breaks the default video quality feature of uYou. Use it at your own risk.
-
-5. **Not a bug**: 
-
-- The app won't be able to receive push notifications if you use a free developer account. 
-
-- appdb PRO users: follow [**this guide**](https://www.reddit.com/r/sideloaded/comments/pub39h/guide_how_to_fix_uyouuyou_download_not_working/) to fix uYou download not working.
-
-- It is impossible to fix deep-link (a.k.a Open in the YouTube app). However, you can use this [Shortcuts](https://shortcutsgallery.com/shortcuts/open-in-youtube/) as a workaround (tested on iOS 14). **Credit:** RandomAccessMemories#5025
+- 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/9jades63). (Note: It will take a while to install because AltStore need to download the IPA).
+- For AltStore user: 
 
-- Version info: _(last update: Oct 28)_
+  - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
+
+  - [Open in AltStore (v17.01.4-2.1)](https://tinyurl.com/39auw3xj) - It will take a while to install because AltStore needs to download the IPA.
+
+- Version info: _(last update: Jan 22)_
+
+<details>
+  <summary>  Expand</summary>
 
 | **Tweaks/App** | **Version** | **Open source** |
 | :------------: | :----------:| :-------------: |
-| **YouTube** | 16.42.3 | ✖︎  |
+| **YouTube** | 17.01.4 | ✖︎  |
 | **uYou** | 2.1 | ✖︎ |
-| **iSponsorBlock** | 1.0-10 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
+| **YouTube Dislike Return** | 1.5.0 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
+| **iSponsorBlock** | 1.0-11 | [✔︎](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) |
@@ -87,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.14 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | 1.6.4 | [✔︎](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/