Merge pull request #5 from vladfrangu/feat/sideload-fixer

feat: sideload fixer in tweak & readme

README.md

@@ -0,0 +1,60 @@
+# VendettaTweak
+
+A rootful/rootless tweak to inject Vendetta into Discord.
+
+## Installation
+
+### Jailbroken (Rootful/Rootless)
+
+1. Install Orion runtime via your preferred package manager, by adding `https://repo.chariz.com/` to your sources, then finding `Orion Runtime`.
+1. Install Vendetta by downloading the appropriate `.deb` file (or by building your own, see [Building VendettaTweak locally](#building-vendettatweak-locally)). Use the file ending in `arm.deb` for rootful jailbreaks, and the file ending in `arm64.deb` for rootless jailbreaks.
+
+### Non-Jailbroken
+
+1. Download Orion from [here](https://github.com/theos/orion/releases). You will need the `deb` file ending in `arm.deb` NOT `arm64.deb`.
+1. Download the rootful Vendetta `.deb` file (file ending in `arm.deb`) or build your own by following the [Building VendettaTweak locally](#building-vendettatweak-locally) steps.
+1. Clone [azule](https://github.com/Al4ise/Azule/tree/main) into a folder and `cd` into it.
+1. Extract or obtain a decrypted Discord IPA. To extract the IPA from a jailbroken iDevice, we recommend [bagbak](https://github.com/ChiChou/bagbak).
+1. Run `./azule -i <path to decrypted IPA> -o <path to output folder> -f <path to Orion deb> <path to Vendetta deb>`. Make sure to provide the full paths to the files (you cannot use relative paths unfortunately). Example: `./azule -i /Users/vendetta/IPA/Discord.ipa -o /Users/vendetta/IPA/VendettaDiscord -f /Users/vendetta/IPA/dev.theos.orion14_1.0.1_iphoneos-arm.deb /Users/vendetta/IPA/dev.beefers.vendetta_0.0.2_iphoneos-arm.deb`
+1. Install the generated IPA using your preferred sideloading method (at the time of writing this, only Sideloadly works).
+
+## Building VendettaTweak locally
+
+> **Note**
+> These steps assume you use MacOS.
+
+1. Install Xcode from the App Store. If you've previously installed the `Command Line Utilities` package, you will need to run `sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer` to make sure you're using the Xcode tools instead.
+
+> If you want to revert the `xcode-select` change, run `sudo xcode-select -switch /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk`
+
+2. Install the required dependencies. You can do this by running `brew install make ldid` in your terminal. If you do not have brew installed, follow the instructions [here](https://brew.sh/).
+
+3. Setup your path accordingly. We recommend you run the following before running the next commands, as well as any time you want to build VendettaTweak.
+
+```bash
+export PATH="$(brew --prefix make)/libexec/gnubin:$PATH"
+# feel free to set whatever path you want, but it needs to be a direct path, without relative parts
+export THEOS="/Users/vendetta/IPA/theos"
+```
+
+4. Setup [theos](https://theos.dev/docs/installation-macos) by running the script provided by theos.
+
+```bash
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/theos/theos/master/bin/install-theos)"
+```
+
+If you've already installed theos, you can run `$THEOS/bin/update-theos` to make sure it's up to date.
+
+5. Clone this repository with `git clone git@github.com:vendetta-mod/VendettaTweak.git --recurse-submodules` and `cd` into it. Replace the URL with your fork if you've forked this repository.
+
+6. To build VendettaTweak, you can run `rm -rf packages && make clean && make package FINALPACKAGE=1 && make package FINALPACKAGE=1 THEOS_PACKAGE_SCHEME=rootless`. The first command will remove any previous packages, the second will clean the project, the third will build the rootful package (which is denoted by the `arm.deb` ending), and the fourth will build the rootless package (which is denoted by the `arm64.deb` ending).
+
+The first time you run this, it might take a bit longer, but subsequent builds should be much faster.
+
+The resulting `.deb` files will be in the `packages` folder. As a reminder, `*arm.deb` is for rootful jailbreaks and sideloading, and `*arm64.deb` is for rootless jailbreaks.
+
+## Contributing
+
+If you want to contribute, you will basically need to follow the steps for [Building VendettaTweak locally](#building-vendettatweak-locally), as well as run `make spm` for the Swift LSP to work.
+
+<!-- @vladdy was here, battling all these steps so you don't have to. Have fun! :3 -->

Sources/VendettaTweak/Tweak.x.swift

@@ -6,12 +6,27 @@ let vendettaLog = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "ven
 let source = URL(string: "vendetta")!
 
 let install_prefix = String(cString: get_install_prefix())
+let isJailbroken = FileManager.default.fileExists(atPath: "\(install_prefix)/Library/Application Support/VendettaTweak/VendettaPatches.bundle")
 
-let vendettaPatchesBundlePath =
-  FileManager.default.fileExists(
-    atPath: "\(install_prefix)/Library/Application Support/VendettaTweak/VendettaPatches.bundle")
-  ? "\(install_prefix)/Library/Application Support/VendettaTweak/VendettaPatches.bundle"
-  : "\(Bundle.main.bundleURL.path)/VendettaPatches.bundle"
+let vendettaPatchesBundlePath = if isJailbroken {
+  "\(install_prefix)/Library/Application Support/VendettaTweak/VendettaPatches.bundle"
+} else {
+  "\(Bundle.main.bundleURL.path)/VendettaPatches.bundle"
+}
+
+class FileManagerLoadHook: ClassHook<FileManager> {
+  func containerURLForSecurityApplicationGroupIdentifier(_ groupIdentifier: NSString?) -> URL? {
+    os_log("containerURLForSecurityApplicationGroupIdentifier called! %{public}@ groupIdentifier", log: vendettaLog, type: .debug, groupIdentifier ?? "nil")
+
+    if (isJailbroken) {
+      return orig.containerURLForSecurityApplicationGroupIdentifier(groupIdentifier)
+    }
+
+    let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
+    let lastPath = paths.last!
+    return lastPath.appendingPathComponent("AppGroup")
+  }
+}
 
 class LoadHook: ClassHook<RCTCxxBridge> {
   func executeApplicationScript(_ script: Data, url: URL, async: Bool) {

control

@@ -1,6 +1,6 @@
 Package: dev.beefers.vendetta
 Name: Vendetta
-Version: 0.0.1
+Version: 0.0.2
 Architecture: iphoneos-arm
 Description: A mod for Discord's mobile apps.
 Maintainer: FieryFlames