Merge pull request #491 from penguin-statistics/dev

Release v3.6.5

ios/App/App.xcodeproj/project.pbxproj

@@ -946,7 +946,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.2;
+				MARKETING_VERSION = 3.6.5;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -978,7 +978,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.2;
+				MARKETING_VERSION = 3.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;

ios/App/App/AppDelegate.swift

@@ -4,8 +4,8 @@ import Capacitor
 import SwiftUI
 import Network
 
-import RxBus
-import RxSwift
+//import RxBus
+//import RxSwift
 import os
 
 let alreadyLaunchedKey = "alreadyLaunched"
@@ -121,11 +121,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                     isConstrained = path.isConstrained
                 }
 
-                RxBus.shared.post(event: Events.NetworkPathChanged(
-                    isConstrained: isConstrained,
-                    isIPv4Supported: path.supportsIPv4,
-                    isIPv6Supported: path.supportsIPv6
-                ), sticky: true)
+//                RxBus.shared.post(event: Events.NetworkPathChanged(
+//                    isConstrained: isConstrained,
+//                    isIPv4Supported: path.supportsIPv4,
+//                    isIPv6Supported: path.supportsIPv6
+//                ), sticky: true)
             }
 
             monitor.start(queue: DispatchQueue.global(qos: .background))

ios/App/App/EventBus.swift

@@ -6,13 +6,13 @@
 //
 
 import Foundation
-import RxBus
-import RxSwift
+//import RxBus
+//import RxSwift
 
-struct Events {
-    struct NetworkPathChanged: BusEvent, Encodable {
-        let isConstrained: Bool
-        let isIPv4Supported: Bool
-        let isIPv6Supported: Bool
-    }
-}
+//struct Events {
+//    struct NetworkPathChanged: BusEvent, Encodable {
+//        let isConstrained: Bool
+//        let isIPv4Supported: Bool
+//        let isIPv6Supported: Bool
+//    }
+//}

ios/App/App/PenguinPlugin.swift

@@ -7,20 +7,20 @@
 
 import Capacitor
 import CoreSpotlight
-import RxBus
-import RxSwift
+//import RxBus
+//import RxSwift
 import CoreHaptics
 
 @objc(PenguinPlugin)
 public class PenguinPlugin: CAPPlugin {
     let currentUserActivityKey = "CurrentUserActivity"
 
     @objc func listenerReady(_ call: CAPPluginCall) {
-        RxBus.shared.asObservable(event: Events.NetworkPathChanged.self, sticky: true).subscribe { event in
-            print("got NetworkPathChanged event", event)
-            let jsonData = try! JSONEncoder().encode(event.element!)
-            self.emitPenguinEvent(on: "networkPathChanged", with: jsonData.toString())
-        }
+//        RxBus.shared.asObservable(event: Events.NetworkPathChanged.self, sticky: true).subscribe { event in
+//            print("got NetworkPathChanged event", event)
+//            let jsonData = try! JSONEncoder().encode(event.element!)
+//            self.emitPenguinEvent(on: "networkPathChanged", with: jsonData.toString())
+//        }
     }
 
     @objc func emitPenguinEvent(on listener: String, with content: String?) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "3.6.2",
+  "version": "3.6.5",
   "private": true,
   "author": "Penguin Statistics Contributors <contributors@penguin-stats.io> (https://github.com/orgs/penguin-statistics/people)",
   "scripts": {
@@ -44,9 +44,9 @@
     "js-cookie": "^2.2.1",
     "jszip": "^3.6.0",
     "katex": "^0.12.0",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "marked": "^1.0.0",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.0.0",
     "protobufjs": "^6.10.2",
     "qs": "^6.9.4",
     "regenerator-runtime": "^0.13.5",
@@ -136,4 +136,4 @@
     }
   },
   "license": "MIT"
-}
+}