CONTRIBUTING.md

@@ -0,0 +1,5 @@
+# Contributing
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+
+[![Contributors](https://opencollective.com/WeChatTweak-macOS/contributors.svg?width=890&button=false)](https://github.com/Sunnyyoung/WeChatTweak-macOS/graphs/contributors)

README.md

@@ -1,8 +1,6 @@
 # WeChatTweak
 
-[![README](https://img.shields.io/badge/GitHub-black?logo=github&logoColor=white)](https://github.com/sunnyyoung/WeChatTweak)
+[![README](https://img.shields.io/badge/Telegram-WeChatTweak-brightgreen?logo=telegram)](https://t.me/wechattweak)
-[![README](https://img.shields.io/badge/Telegram-black?logo=telegram&logoColor=white)](https://t.me/wechattweak)
-[![README](https://img.shields.io/badge/FAQ-black?logo=googledocs&logoColor=white)](https://github.com/sunnyyoung/WeChatTweak/wiki/FAQ)
 
 A command-line tool for tweaking WeChat.
 
@@ -36,9 +34,9 @@ wechattweak versions
 
 ## 贡献者
 
-This project exists thanks to all the people who contribute.
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
 
-[![Contributors](https://contrib.rocks/image?repo=sunnyyoung/WeChatTweak)](https://github.com/sunnyyoung/WeChatTweak/graphs/contributors)
+[![Contributors](https://opencollective.com/WeChatTweak-macOS/contributors.svg?width=890&button=false)](https://github.com/Sunnyyoung/WeChatTweak-macOS/graphs/contributors)
 
 ## License
 

Sources/WeChatTweak/Config.swift

@@ -81,7 +81,7 @@ struct Config: Decodable {
     let version: String
     let targets: [Target]
 
-    static func load(url: URL) async throws -> [Config] {
+    static func load(from url: URL) async throws -> [Config] {
         if url.isFileURL {
             return try JSONDecoder().decode(
                 [Config].self,

Sources/WeChatTweak/main.swift

@@ -8,64 +8,16 @@ import Foundation
 import Dispatch
 import ArgumentParser
 
-// MARK: Versions
-extension Tweak {
 struct Versions: AsyncParsableCommand {
     static let configuration = CommandConfiguration(abstract: "List all supported WeChat versions")
 
-        @OptionGroup
-        var options: Tweak.Options
-
     mutating func run() async throws {
-            print("------ Current version ------")
+        try await Config.load(from: Tweak.config).forEach({ print($0.version) })
-            print(try await Command.version(app: options.app) ?? "unknown")
-            print("------ Supported versions ------")
-            try await Config.load(url: options.config).forEach({ print($0.version) })
         Darwin.exit(EXIT_SUCCESS)
     }
 }
-}
 
-// MARK: Patch
-extension Tweak {
 struct Patch: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(abstract: "Patch WeChat.app")
-
-        @OptionGroup
-        var options: Tweak.Options
-
-        mutating func run() async throws {
-            print("------ Version ------")
-            let version = try await Command.version(app: options.app)
-            print("WeChat version: \(version ?? "unknown")")
-
-            print("------ Config ------")
-            guard let config = (try await Config.load(url: options.config)).first(where: { $0.version == version }) else {
-                throw Error.unsupportedVersion
-            }
-            print("Matched config: \(config)")
-
-            print("------ Patch ------")
-            try await Command.patch(
-                app: options.app,
-                config: config
-            )
-            print("Done!")
-
-            print("------ Resign ------")
-            try await Command.resign(
-                app: options.app
-            )
-            print("Done!")
-
-            Darwin.exit(EXIT_SUCCESS)
-        }
-    }
-
-}
-
-// MARK: Tweak
-struct Tweak: AsyncParsableCommand {
     enum Error: LocalizedError {
         case invalidApp
         case invalidConfig
@@ -86,7 +38,8 @@ struct Tweak: AsyncParsableCommand {
         }
     }
 
-    struct Options: ParsableArguments {
+    static let configuration = CommandConfiguration(abstract: "Patch WeChat.app")
+
     @Option(
         name: .shortAndLong,
         help: "Path of WeChat.app",
@@ -113,9 +66,39 @@ struct Tweak: AsyncParsableCommand {
             }
         }
     )
-        var config: URL = URL(string:"https://raw.githubusercontent.com/sunnyyoung/WeChatTweak/refs/heads/master/config.json")!
+    var config: URL = Tweak.config
+
+    mutating func run() async throws {
+        print("------ Version ------")
+        guard let version = try await Command.version(app: self.app) else {
+            throw Error.invalidVersion
+        }
+        print("WeChat version: \(version)")
+
+        print("------ Config ------")
+        guard let config = (try await Config.load(from: self.config)).first(where: { $0.version == version }) else {
+            throw Error.unsupportedVersion
+        }
+        print("Matched config: \(config)")
+
+        print("------ Patch ------")
+        try await Command.patch(
+            app: self.app,
+            config: config
+        )
+        print("Done!")
+
+        print("------ Resign ------")
+        try await Command.resign(
+            app: self.app
+        )
+        print("Done!")
+
+        Darwin.exit(EXIT_SUCCESS)
+    }
 }
 
+struct Tweak: AsyncParsableCommand {
     static let configuration = CommandConfiguration(
         commandName: "wechattweak",
         abstract: "A command-line tool for tweaking WeChat.",
@@ -125,6 +108,8 @@ struct Tweak: AsyncParsableCommand {
         ]
     )
 
+    static let config = URL(string:"https://raw.githubusercontent.com/sunnyyoung/WeChatTweak/refs/heads/master/config.json")!
+
     mutating func run() async throws {
         print(Tweak.helpMessage())
         Darwin.exit(EXIT_SUCCESS)

config.json

@@ -168,115 +168,5 @@
         ]
       }
     ]
-  },
-  {
-    "version": "32288",
-    "targets": [
-      {
-        "identifier": "revoke",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "103db34c0",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "startUpdater",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001e9ed0",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "startBackgroundUpdatesCheck",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001ecb10",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "checkForUpdates",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001ec73c",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "enableAutoUpdate",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001ecfc0",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "automaticallyDownloadsUpdates",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001f59e0",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "canCheckForUpdate",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001f59e0",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "multiInstance",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001e1a74",
-            "asm": "20008052C0035FD6"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "version": "31960",
-    "targets": [
-      {
-        "identifier": "revoke",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "10408a408",
-            "asm": "00008052C0035FD6"
-          }
-        ]
-      },
-      {
-        "identifier": "multiInstance",
-        "entries": [
-          {
-            "arch": "arm64",
-            "addr": "1001e4a38",
-            "asm": "20008052C0035FD6"
-          }
-        ]
-      }
-    ]
   }
 ]