Login fix, reply webview hack, bypass age verification, and fixes

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build and Release NeoFreeBird
+name: Build NeoFreeBird
 
 on:
   workflow_dispatch:
@@ -19,27 +19,37 @@ on:
         type: string
       deploy_format:
         description: "Deployment format"
-        default: rootfull
+        default: sideloaded
         required: true
         type: choice
         options:
           - rootfull
           - sideloaded
           - trollstore
           - rootless
+      twitter_branding:
+        description: "Set app name to Twitter (IPA builds only)"
+        default: true
+        required: false
+        type: boolean
+      resource_pack_url:
+        description: "Override app icons (.ZIP) (IPA builds only)"
+        default: "https://files.catbox.moe/dq8zon.zip"
+        required: false
+        type: string
       commit_id:
         description: "(Optional) Commit ID to build at"
         default: ""
         required: false
         type: string
       upload_artifact:
         description: "Upload iPA as artifact (Public)"
-        default: false
+        default: true
         required: false
         type: boolean
       create_release:
         description: "Create a draft release (Private)"
-        default: true
+        default: false
         required: false
         type: boolean
 
@@ -50,13 +60,13 @@ concurrency:
 jobs:
   build:
     name: Build BHTwitter
-    runs-on: macos-14
+    runs-on: macos-latest
     permissions:
       contents: write
 
     steps:
       - name: Checkout Main
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: main
           ref: ${{ github.event.inputs.commit_id || github.ref }}
@@ -70,7 +80,7 @@ jobs:
           echo "$(brew --prefix make)/libexec/gnubin" >> "$GITHUB_PATH"
 
       - name: Download Theos
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: theos/theos
           ref: master
@@ -83,7 +93,7 @@ jobs:
 
       - name: iOS SDK Caching
         id: SDK
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: iOS-${{ inputs.sdk_version }}-SDK
         with:
@@ -122,21 +132,31 @@ jobs:
         env:
           IPA_URL: ${{ inputs.decrypted_ipa_url }}
 
+      - name: Prepare Image Pack
+        if: inputs.resource_pack_url != '' && (inputs.deploy_format == 'sideloaded' || inputs.deploy_format == 'trollstore')
+        run: |
+          wget "$IMAGE_URL" --no-verbose -O main/resource-pack.zip
+        env:
+          IMAGE_URL: ${{ inputs.resource_pack_url }}
+
       - name: Build Package
         run: |
           cd ${{ github.workspace }}/main
           sed -i '' "s/^TARGET.*$/TARGET := iphone:clang:${{ inputs.sdk_version }}:${{ inputs.target_version }}/" Makefile
-          ./build.sh --${{ inputs.deploy_format }}
+          IMAGE_FLAG=""
+          if [ -f resource-pack.zip ]; then IMAGE_FLAG="--resource-pack resource-pack.zip"; fi
+          ./build.sh --${{ inputs.deploy_format }}${{ inputs.twitter_branding && ' --twitter-branding' || '' }} $IMAGE_FLAG
         env:
           THEOS: ${{ github.workspace }}/theos
 
       - name: Rename IPA to include IPA version
         if: inputs.deploy_format == 'sideloaded' || inputs.deploy_format == 'trollstore'
         run: |
           mv "main/packages/$(ls -t main/packages | head -n1)" \
-             "main/packages/NeoFreeBird-${{ inputs.deploy_format }}_${{ env.BHTWITTER_VERSION }}_${{ env.X_VERSION }}.${IPA_EXT}"
+             "main/packages/NeoFreeBird-${BRANDING}-${{ inputs.deploy_format }}_${{ env.BHTWITTER_VERSION }}_${{ env.X_VERSION }}.${IPA_EXT}"
         env:
           IPA_EXT: ${{ inputs.deploy_format == 'trollstore' && 'tipa' || 'ipa' }}
+          BRANDING: ${{ inputs.twitter_branding && 'Twitter' || 'X' }}
 
       - name: Pass package name
         id: package_name
@@ -145,7 +165,7 @@ jobs:
 
       - name: Upload Artifact
         if: ${{ inputs.upload_artifact }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: BHTwitter_${{ env.BHTWITTER_VERSION }}
           path: ${{ github.workspace }}/main/packages/${{ steps.package_name.outputs.package }}
@@ -154,7 +174,7 @@ jobs:
       - name: Create Draft Release
         if: ${{ inputs.create_release }}
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/release.yml

@@ -0,0 +1,180 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      sdk_version:
+        description: "iOS SDK Version"
+        default: "16.5"
+        required: true
+        type: string
+      target_version:
+        description: "Target iOS Version"
+        default: "14.0"
+        required: true
+        type: string
+      decrypted_ipa_url:
+        description: "Direct URL of the decrypted X ipa (required for sideloaded/trollstore)"
+        default: ""
+        required: true
+        type: string
+      resource_pack_url:
+        description: "Custom app icon pack (.ZIP) used for the branded IPA builds"
+        default: "https://files.catbox.moe/dq8zon.zip"
+        required: false
+        type: string
+      commit_id:
+        description: "(Optional) Commit ID to build at"
+        default: ""
+        required: false
+        type: string
+      create_release:
+        description: "Collect every build into a single draft release"
+        default: true
+        required: false
+        type: boolean
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build ${{ matrix.deploy_format }}${{ matrix.branded && ' (Twitter)' || matrix.ipa && ' (X)' || '' }}
+    runs-on: macos-latest
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Non-IPA formats: branding does not apply, so a single build each.
+          - deploy_format: rootfull
+            ipa: false
+            branded: false
+          - deploy_format: rootless
+            ipa: false
+            branded: false
+          # IPA formats: built both with and without custom branding.
+          - deploy_format: sideloaded
+            ipa: true
+            branded: false
+          - deploy_format: sideloaded
+            ipa: true
+            branded: true
+          - deploy_format: trollstore
+            ipa: true
+            branded: false
+          - deploy_format: trollstore
+            ipa: true
+            branded: true
+
+    steps:
+      - name: Checkout Main
+        uses: actions/checkout@v6
+        with:
+          path: main
+          ref: ${{ github.event.inputs.commit_id || github.ref }}
+          submodules: recursive
+
+      - name: Install Dependencies
+        run: brew install make dpkg ldid
+
+      - name: Add GNU Make to PATH
+        run: |
+          echo "$(brew --prefix make)/libexec/gnubin" >> "$GITHUB_PATH"
+
+      - name: Download Theos
+        uses: actions/checkout@v6
+        with:
+          repository: theos/theos
+          ref: master
+          path: theos
+          submodules: recursive
+
+      - name: Install cyan
+        if: matrix.ipa
+        run: pip install https://github.com/asdfzxcvbn/pyzule-rw/archive/main.zip
+
+      - name: iOS SDK Caching
+        id: SDK
+        uses: actions/cache@v5
+        env:
+          cache-name: iOS-${{ inputs.sdk_version }}-SDK
+        with:
+          path: theos/sdks/
+          key: ${{ env.cache-name }}
+          restore-keys: ${{ env.cache-name }}
+
+      - name: Download iOS SDK
+        if: steps.SDK.outputs.cache-hit != 'true'
+        run: |
+          # Only download the specific SDK version
+          git clone -n --depth=1 --filter=tree:0 https://github.com/theos/sdks/
+          cd sdks
+          git sparse-checkout set --no-cone iPhoneOS${{ inputs.sdk_version }}.sdk
+          git checkout
+          mv ./*.sdk "${THEOS}/sdks"
+        env:
+          THEOS: ${{ github.workspace }}/theos
+
+      - name: Get BHTwitter Version
+        run: |
+          BHTWITTER_VERSION=$(awk '/Version:/ {print $2}' main/control)
+          echo "BHTWITTER_VERSION=${BHTWITTER_VERSION}" >> "$GITHUB_ENV"
+          echo "$BHTWITTER_VERSION"
+
+      - name: Prepare X iPA
+        if: matrix.ipa
+        run: |
+          wget "$IPA_URL" --no-verbose -O main/packages/com.atebits.Tweetie2.ipa
+          unzip -q main/packages/com.atebits.Tweetie2.ipa -d main/tmp
+          # Get the version number of the X app and store it
+          X_VERSION=$(grep -A 1 '<key>CFBundleShortVersionString</key>' main/tmp/Payload/Twitter.app/Info.plist |
+            grep '<string>' | awk -F'[><]' '{print $3}')
+          echo "X_VERSION=${X_VERSION}" >> "$GITHUB_ENV"
+          echo "$X_VERSION"
+        env:
+          IPA_URL: ${{ inputs.decrypted_ipa_url }}
+
+      - name: Prepare Image Pack
+        if: matrix.branded && inputs.resource_pack_url != ''
+        run: |
+          wget "$IMAGE_URL" --no-verbose -O main/resource-pack.zip
+        env:
+          IMAGE_URL: ${{ inputs.resource_pack_url }}
+
+      - name: Build Package
+        run: |
+          cd ${{ github.workspace }}/main
+          sed -i '' "s/^TARGET.*$/TARGET := iphone:clang:${{ inputs.sdk_version }}:${{ inputs.target_version }}/" Makefile
+          IMAGE_FLAG=""
+          if [ -f resource-pack.zip ]; then IMAGE_FLAG="--resource-pack resource-pack.zip"; fi
+          ./build.sh --${{ matrix.deploy_format }}${{ matrix.branded && ' --twitter-branding' || '' }} $IMAGE_FLAG
+        env:
+          THEOS: ${{ github.workspace }}/theos
+
+      - name: Rename IPA to include IPA version
+        if: matrix.ipa
+        run: |
+          mv "main/packages/$(ls -t main/packages | head -n1)" \
+             "main/packages/NeoFreeBird-${{ matrix.deploy_format }}${BRAND_SUFFIX}_${{ env.BHTWITTER_VERSION }}_${{ env.X_VERSION }}.${IPA_EXT}"
+        env:
+          IPA_EXT: ${{ matrix.deploy_format == 'trollstore' && 'tipa' || 'ipa' }}
+          BRAND_SUFFIX: ${{ matrix.branded && '-Twitter' || '-X' }}
+
+      - name: Pass package name
+        id: package_name
+        run: |
+          echo "package=$(ls -t main/packages | head -n1)" >> "$GITHUB_OUTPUT"
+
+      - name: Add to Draft Release
+        if: ${{ inputs.create_release }}
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ env.BHTWITTER_VERSION }}
+          name: v${{ env.BHTWITTER_VERSION }} - BHTwitter
+          files: main/packages/${{ steps.package_name.outputs.package }}
+          draft: true

.gitignore

@@ -4,4 +4,8 @@
 classdump/
 autopush.sh
 *.ipa
-packages/stuff/*
+packages/
+!packages/PUT_IPA_HERE
+
+*.md
+!README.md

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "libflex/FLEX"]
 	path = libflex/FLEX
 	url = https://github.com/FLEXTool/FLEX
+[submodule "zxPluginsInject"]
+	path = zxPluginsInject
+	url = https://github.com/asdfzxcvbn/zxPluginsInject

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "ms-vscode.cpptools-extension-pack",
+    "tale.logos-vscode"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "files.associations": {
+    "*.h": "objective-c"
+  }
+}