Network Improvements

Lakr233 · May 8, 2023 · d4a5667 · d4a5667
1 parent 3e4c25e
commit d4a5667
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 31 deletions.
diff --git a/Foundation/Source/Sources/Module/RemoteNotification.swift b/Foundation/Source/Sources/Module/RemoteNotification.swift
@@ -22,7 +22,7 @@ public class RemoteNotification: Codable, Identifiable, Hashable, Equatable {
  public let noteId: String?
  public let reaction: String?
 
- public init(notificationId: String, createdAt: Date, isRead: Bool, type: RemoteNotification.Kind, userId: String? = nil, noteId: String? = nil, reaction: String? = nil) {
+ public init(notificationId: String, createdAt: Date, isRead: Bool = false, type: RemoteNotification.Kind, userId: String? = nil, noteId: String? = nil, reaction: String? = nil) {
  self.notificationId = notificationId
  self.createdAt = createdAt
  self.isRead = isRead

diff --git a/Foundation/Source/Sources/ModuleBridge/RemoteNotification.swift b/Foundation/Source/Sources/ModuleBridge/RemoteNotification.swift
@@ -21,7 +21,7 @@ public extension RemoteNotification {
  return RemoteNotification(
  notificationId: notification.id,
  createdAt: date,
- isRead: notification.isRead,
+ isRead: notification.isRead ?? false,
  type: type,
  userId: notification.userId,
  noteId: notification.note?.id,

diff --git a/Foundation/Source/Sources/Network/Network.swift b/Foundation/Source/Sources/Network/Network.swift
@@ -237,7 +237,7 @@ public extension Network {
 
  func makeRequest(
  with request: URLRequest,
- with session: URLSession = .shared,
+ with session: URLSession = .newEphemeral(),
  setTask: (URLSessionDataTask) -> Void = { _ in },
  completion: @escaping (Data) -> Void
  ) {
@@ -296,3 +296,11 @@ public extension Network {
  return object
  }
 }
+
+public extension URLSession {
+ static func newEphemeral() -> URLSession {
+ let config = URLSessionConfiguration.ephemeral
+ let session = URLSession(configuration: config)
+ return session
+ }
+}
diff --git a/Foundation/Source/Sources/NetworkModule/Module+Notification.swift b/Foundation/Source/Sources/NetworkModule/Module+Notification.swift
@@ -11,7 +11,7 @@ import Foundation
 public struct NMNotification: Codable {
  public let id: String
  public let createdAt: String
- public let isRead: Bool
+ public let isRead: Bool?
  public let type: NotificationType
 
  public enum NotificationType: String, Codable {

diff --git a/Foundation/Source/Tests/SourceTest/SourceTest+Meta.swift b/Foundation/Source/Tests/SourceTest/SourceTest+Meta.swift
@@ -51,20 +51,20 @@ private extension Network.RequestTarget {
  case .account_i: return SourceTest.test_201_api_user.self
 
  case .i_favorites: return SourceTest.test_202_api_i_favorites.self
- case .i_notification: return SourceTest.test_203_api_i_notification.self
+ case .i_notification: return SourceTest.test_204_api_i_notification.self
 
- case .following_create: return SourceTest.test_204_api_following.self
- case .following_delete: return SourceTest.test_204_api_following.self
- case .following_requests_accept: return SourceTest.test_204_api_following.self
- case .following_requests_reject: return SourceTest.test_204_api_following.self
- case .following_requests_cancel: return SourceTest.test_204_api_following.self
- case .following_invalidate: return SourceTest.test_204_api_following.self
+ case .following_create: return SourceTest.test_203_api_following.self
+ case .following_delete: return SourceTest.test_203_api_following.self
+ case .following_requests_accept: return SourceTest.test_203_api_following.self
+ case .following_requests_reject: return SourceTest.test_203_api_following.self
+ case .following_requests_cancel: return SourceTest.test_203_api_following.self
+ case .following_invalidate: return SourceTest.test_203_api_following.self
 
- case .users: return SourceTest.test_204_api_following.self
+ case .users: return SourceTest.test_203_api_following.self
  case .users_report_abuse: return SourceTest.test_215_report_abuse.self
- case .user_show: return SourceTest.test_204_api_following.self
- case .users_followers: return SourceTest.test_204_api_following.self
- case .users_following: return SourceTest.test_204_api_following.self
+ case .user_show: return SourceTest.test_203_api_following.self
+ case .users_followers: return SourceTest.test_203_api_following.self
+ case .users_following: return SourceTest.test_203_api_following.self
 
  case .user_notes: return SourceTest.test_205_api_user.self
 

diff --git a/Foundation/Source/Tests/SourceTest/SourceTest.swift b/Foundation/Source/Tests/SourceTest/SourceTest.swift
@@ -71,12 +71,12 @@ class SourceTest: XCTestCase {
  checkApi_Favorite()
  }
 
- func test_203_api_i_notification() {
- checkApi_Notification()
+ func test_203_api_following() {
+ checkApi_Following()
  }
 
- func test_204_api_following() {
- checkApi_Following()
+ func test_204_api_i_notification() {
+ checkApi_Notification()
  }
 
  func test_205_api_user() {

diff --git a/Foundation/Source/Tests/SourceTest/Tests/Login.swift b/Foundation/Source/Tests/SourceTest/Tests/Login.swift
@@ -102,7 +102,7 @@ extension SourceTest {
  "session": challenge.requestSession,
  "permission": permission,
  "i": firstToken,
- ]) else {
+ ] as [String: Any]) else {
  XCTFail("unable to create data")
  return nil
  }

diff --git a/Kimis.xcodeproj/project.pbxproj b/Kimis.xcodeproj/project.pbxproj
@@ -360,6 +360,7 @@
  5069EBC4295EEAD100677A3F /* UserPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreview.swift; sourceTree = "<group>"; };
  5080C6A3297EC3B300F73CCD /* Launcher.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launcher.storyboard; sourceTree = "<group>"; };
  50831AAA296AB77F002A166A /* TableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
+ 508AC67329E8EBF100342409 /* KimisDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KimisDebug.entitlements; sourceTree = "<group>"; };
  508FC8292962C16F00B032D8 /* PostEditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostEditorView.swift; sourceTree = "<group>"; };
  508FC82B296328AD00B032D8 /* CGRect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGRect.swift; sourceTree = "<group>"; };
  508FC82D296329F900B032D8 /* CGSize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGSize.swift; sourceTree = "<group>"; };
@@ -1012,6 +1013,7 @@
  children = (
  50BED14129277CDF00C9D7E2 /* Info.plist */,
  50BED14729277D0D00C9D7E2 /* Kimis.entitlements */,
+ 508AC67329E8EBF100342409 /* KimisDebug.entitlements */,
  50BED19C29277D0E00C9D7E2 /* App */,
  50BED16A29277D0E00C9D7E2 /* Interface */,
  50BED1A129277D0E00C9D7E2 /* Backend */,
@@ -1858,10 +1860,10 @@
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
  ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
- CODE_SIGN_ENTITLEMENTS = Kimis/Kimis.entitlements;
+ CODE_SIGN_ENTITLEMENTS = Kimis/KimisDebug.entitlements;
  "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
  CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 111;
+ CURRENT_PROJECT_VERSION = 130;
  DEVELOPMENT_TEAM = 6CMYQQFFT8;
  "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
  GENERATE_INFOPLIST_FILE = YES;
@@ -1879,7 +1881,7 @@
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 1.11;
+ MARKETING_VERSION = 1.13;
  PRODUCT_BUNDLE_IDENTIFIER = wiki.qaq.kimis.inhouse;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1900,7 +1902,7 @@
  CODE_SIGN_ENTITLEMENTS = Kimis/Kimis.entitlements;
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 111;
+ CURRENT_PROJECT_VERSION = 130;
  DEVELOPMENT_TEAM = 6CMYQQFFT8;
  "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
  GENERATE_INFOPLIST_FILE = YES;
@@ -1918,7 +1920,7 @@
  "$(inherited)",
  "@executable_path/Frameworks",
  );
- MARKETING_VERSION = 1.11;
+ MARKETING_VERSION = 1.13;
  PRODUCT_BUNDLE_IDENTIFIER = as.wiki.qaq.kimis;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kimis.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
  "kind" : "remoteSourceControl",
  "location" : "https://github.com/bugsnag/bugsnag-cocoa",
  "state" : {
- "revision" : "5be1c4c544752c90774cf5b464683064a5bb1015",
- "version" : "6.26.1"
+ "revision" : "c730af7a4676617d82394782300df997d9a356cd",
+ "version" : "6.26.2"
  }
  },
  {
@@ -59,8 +59,8 @@
  "kind" : "remoteSourceControl",
  "location" : "https://github.com/SDWebImage/SDWebImage",
  "state" : {
- "revision" : "fb50c1d20f24db5322b2f8f379de3618f75fe08e",
- "version" : "5.15.5"
+ "revision" : "3289629ef6cbf1ad8c3d1dccf0cf09ac97547cd6",
+ "version" : "5.15.7"
  }
  },
  {
@@ -77,8 +77,8 @@
  "kind" : "remoteSourceControl",
  "location" : "https://github.com/ivanvorobei/SPIndicator",
  "state" : {
- "revision" : "43600857729d9efff046dc6673e6f94e095882c7",
- "version" : "1.6.4"
+ "revision" : "e8a045f91757b32bb29c6feff1644ef79c8daedf",
+ "version" : "1.6.5"
  }
  },
  {

diff --git a/Kimis/Extension/Generic/CGPoint.swift b/Kimis/Extension/Generic/CGPoint.swift
@@ -5,6 +5,7 @@
 // Created by Lakr Aream on 2023/1/18.
 //
 
+import CoreGraphics
 import Foundation
 
 extension CGPoint: Hashable {

diff --git a/Kimis/Extension/Generic/CGRect.swift b/Kimis/Extension/Generic/CGRect.swift
@@ -5,6 +5,7 @@
 // Created by Lakr Aream on 2022/11/24.
 //
 
+import CoreGraphics
 import Foundation
 
 extension CGRect: Hashable {

diff --git a/Kimis/Extension/Generic/CGSize.swift b/Kimis/Extension/Generic/CGSize.swift
@@ -5,6 +5,7 @@
 // Created by Lakr Aream on 2023/1/2.
 //
 
+import CoreGraphics
 import Foundation
 
 extension CGSize: Hashable {

diff --git a/Kimis/KimisDebug.entitlements b/Kimis/KimisDebug.entitlements
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.app-sandbox</key>
+ <true/>
+ <key>com.apple.security.device.audio-input</key>
+ <true/>
+ <key>com.apple.security.device.camera</key>
+ <true/>
+ <key>com.apple.security.files.user-selected.read-write</key>
+ <true/>
+ <key>com.apple.security.network.client</key>
+ <true/>
+ <key>com.apple.security.network.server</key>
+ <true/>
+ <key>com.apple.security.personal-information.photos-library</key>
+ <true/>
+</dict>
+</plist>