diff --git a/ios/SolianNotifyExt/Info.plist b/ios/SolianNotifyExt/Info.plist index 6e5e8e8..a9e56d5 100644 --- a/ios/SolianNotifyExt/Info.plist +++ b/ios/SolianNotifyExt/Info.plist @@ -3,11 +3,10 @@ NSUserActivityTypes - - INSendMessageIntent - - INStartCallIntent - + + INStartCallIntent + INSendMessageIntent + NSExtension NSExtensionPointIdentifier diff --git a/ios/SolianNotifyExt/NotificationService.swift b/ios/SolianNotifyExt/NotificationService.swift index 42c4efa..105b4fd 100644 --- a/ios/SolianNotifyExt/NotificationService.swift +++ b/ios/SolianNotifyExt/NotificationService.swift @@ -31,7 +31,6 @@ class NotificationService: UNNotificationServiceExtension { } let userId = metadata["user_id"] as! Int let userName = metadata["user_name"] as? String - let userNick = metadata["user_nick"] as? String guard let avatarUrl = bestAttemptContent.userInfo["avatar"] as? String else { throw ParseNotificationPayloadError.noMetadata("The notification has no avatar url.") @@ -43,7 +42,7 @@ class NotificationService: UNNotificationServiceExtension { )! let sender = INPerson(personHandle: handle, nameComponents: nil, - displayName: userNick, + displayName: bestAttemptContent.title, image: avatar, contactIdentifier: nil, customIdentifier: userName) diff --git a/macos/Podfile.lock b/macos/Podfile.lock index cd3c3a0..c9249ee 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -41,8 +41,6 @@ PODS: - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30911.0, >= 2.30908.0) - - flutter_local_notifications (0.0.1): - - FlutterMacOS - flutter_secure_storage_macos (6.1.1): - FlutterMacOS - flutter_webrtc (0.9.36): @@ -127,7 +125,6 @@ DEPENDENCIES: - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`) - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`) - - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`) - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) - flutter_webrtc (from `Flutter/ephemeral/.symlinks/plugins/flutter_webrtc/macos`) - FlutterMacOS (from `Flutter/ephemeral`) @@ -173,8 +170,6 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos firebase_messaging: :path: Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos - flutter_local_notifications: - :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos flutter_secure_storage_macos: :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos flutter_webrtc: @@ -222,7 +217,6 @@ SPEC CHECKSUMS: FirebaseCoreInternal: 58d07f1362fddeb0feb6a857d1d1d1c5e558e698 FirebaseInstallations: 60c1d3bc1beef809fd1ad1189a8057a040c59f2e FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e - flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9 flutter_webrtc: 823284e171ecb2487b7210c214886a949c122a59 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 2130788..b697020 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,8 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 7337962D2C4D64880046C275 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7337962C2C4D64880046C275 /* NotificationService.swift */; }; + 733796312C4D64880046C275 /* SolianNotifyExt.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7337962A2C4D64880046C275 /* SolianNotifyExt.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 7EA791CAE9710BE5D384F1BB /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55FB45492936527B3666668F /* Pods_RunnerTests.framework */; }; 82C4BEF1059AD8782ACC8913 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F5A1F26CD12AC94D82E51EC4 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ @@ -47,6 +49,13 @@ remoteGlobalIDString = 33CC111A2044C6BA0003C045; remoteInfo = FLX; }; + 7337962F2C4D64880046C275 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 733796292C4D64880046C275; + remoteInfo = SolianNotifyExt; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -60,6 +69,17 @@ name = "Bundle Framework"; runOnlyForDeploymentPostprocessing = 0; }; + 733796322C4D64880046C275 /* Embed Foundation Extensions */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 8; + dstPath = ""; + dstSubfolderSpec = 13; + files = ( + 733796312C4D64880046C275 /* SolianNotifyExt.appex in Embed Foundation Extensions */, + ); + name = "Embed Foundation Extensions"; + runOnlyForDeploymentPostprocessing = 1; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -84,6 +104,9 @@ 3793F8988B03A8D2EAECDCBD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 4BD0A28F73121D6B6DD462AF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 55FB45492936527B3666668F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7337962A2C4D64880046C275 /* SolianNotifyExt.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SolianNotifyExt.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + 7337962C2C4D64880046C275 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; + 7337962E2C4D64880046C275 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 8AB030F50C089DAB14480DBD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; @@ -109,6 +132,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 733796272C4D64880046C275 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -150,6 +180,7 @@ 33FAB671232836740065AC1E /* Runner */, 33CEB47122A05771004F2AC0 /* Flutter */, 331C80D6294CF71000263BE5 /* RunnerTests */, + 7337962B2C4D64880046C275 /* SolianNotifyExt */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, 27286574DE31F9C9A78B355D /* Pods */, @@ -162,6 +193,7 @@ children = ( 33CC10ED2044A3C60003C045 /* Solian.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + 7337962A2C4D64880046C275 /* SolianNotifyExt.appex */, ); name = Products; sourceTree = ""; @@ -201,6 +233,15 @@ path = Runner; sourceTree = ""; }; + 7337962B2C4D64880046C275 /* SolianNotifyExt */ = { + isa = PBXGroup; + children = ( + 7337962C2C4D64880046C275 /* NotificationService.swift */, + 7337962E2C4D64880046C275 /* Info.plist */, + ); + path = SolianNotifyExt; + sourceTree = ""; + }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -240,6 +281,7 @@ 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, + 733796322C4D64880046C275 /* Embed Foundation Extensions */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, C5DDC734703B72E778163C68 /* [CP] Embed Pods Frameworks */, @@ -249,12 +291,30 @@ ); dependencies = ( 33CC11202044C79F0003C045 /* PBXTargetDependency */, + 733796302C4D64880046C275 /* PBXTargetDependency */, ); name = Runner; productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* Solian.app */; productType = "com.apple.product-type.application"; }; + 733796292C4D64880046C275 /* SolianNotifyExt */ = { + isa = PBXNativeTarget; + buildConfigurationList = 733796362C4D64880046C275 /* Build configuration list for PBXNativeTarget "SolianNotifyExt" */; + buildPhases = ( + 733796262C4D64880046C275 /* Sources */, + 733796272C4D64880046C275 /* Frameworks */, + 733796282C4D64880046C275 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SolianNotifyExt; + productName = SolianNotifyExt; + productReference = 7337962A2C4D64880046C275 /* SolianNotifyExt.appex */; + productType = "com.apple.product-type.app-extension"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -262,7 +322,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastSwiftUpdateCheck = 0920; + LastSwiftUpdateCheck = 1540; LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { @@ -284,6 +344,9 @@ CreatedOnToolsVersion = 9.2; ProvisioningStyle = Manual; }; + 733796292C4D64880046C275 = { + CreatedOnToolsVersion = 15.4; + }; }; }; buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; @@ -302,6 +365,7 @@ 33CC10EC2044A3C60003C045 /* Runner */, 331C80D4294CF70F00263BE5 /* RunnerTests */, 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + 733796292C4D64880046C275 /* SolianNotifyExt */, ); }; /* End PBXProject section */ @@ -324,6 +388,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 733796282C4D64880046C275 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -464,6 +535,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 733796262C4D64880046C275 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7337962D2C4D64880046C275 /* NotificationService.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -477,6 +556,11 @@ target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; }; + 733796302C4D64880046C275 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 733796292C4D64880046C275 /* SolianNotifyExt */; + targetProxy = 7337962F2C4D64880046C275 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -594,6 +678,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; @@ -603,6 +688,7 @@ DEVELOPMENT_TEAM = W7HPZ53V6B; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Solian; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -734,6 +820,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; @@ -743,6 +830,7 @@ DEVELOPMENT_TEAM = W7HPZ53V6B; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Solian; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -759,6 +847,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; @@ -769,6 +858,7 @@ ENABLE_HARDENED_RUNTIME = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Solian; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -798,6 +888,128 @@ }; name = Release; }; + 733796332C4D64880046C275 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W7HPZ53V6B; + ENABLE_HARDENED_RUNTIME = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = SolianNotifyExt/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = SolianNotifyExt; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@executable_path/../../../../Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 12.0; + MARKETING_VERSION = 1.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianNotifyExt; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 733796342C4D64880046C275 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W7HPZ53V6B; + ENABLE_HARDENED_RUNTIME = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = SolianNotifyExt/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = SolianNotifyExt; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@executable_path/../../../../Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 12.0; + MARKETING_VERSION = 1.0; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianNotifyExt; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 733796352C4D64880046C275 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W7HPZ53V6B; + ENABLE_HARDENED_RUNTIME = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = SolianNotifyExt/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = SolianNotifyExt; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@executable_path/../../../../Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 12.0; + MARKETING_VERSION = 1.0; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianNotifyExt; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -841,6 +1053,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 733796362C4D64880046C275 /* Build configuration list for PBXNativeTarget "SolianNotifyExt" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 733796332C4D64880046C275 /* Debug */, + 733796342C4D64880046C275 /* Release */, + 733796352C4D64880046C275 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements index d1a57ab..70d3e94 100644 --- a/macos/Runner/DebugProfile.entitlements +++ b/macos/Runner/DebugProfile.entitlements @@ -4,6 +4,8 @@ com.apple.developer.aps-environment development + com.apple.developer.usernotifications.communication + com.apple.security.app-sandbox com.apple.security.cs.allow-jit diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements index 7fe6128..8679d81 100644 --- a/macos/Runner/Release.entitlements +++ b/macos/Runner/Release.entitlements @@ -4,6 +4,8 @@ com.apple.developer.aps-environment development + com.apple.developer.usernotifications.communication + com.apple.security.app-sandbox com.apple.security.device.audio-input diff --git a/macos/SolianNotifyExt/Info.plist b/macos/SolianNotifyExt/Info.plist new file mode 100644 index 0000000..a9e56d5 --- /dev/null +++ b/macos/SolianNotifyExt/Info.plist @@ -0,0 +1,18 @@ + + + + + NSUserActivityTypes + + INStartCallIntent + INSendMessageIntent + + NSExtension + + NSExtensionPointIdentifier + com.apple.usernotifications.service + NSExtensionPrincipalClass + $(PRODUCT_MODULE_NAME).NotificationService + + + diff --git a/macos/SolianNotifyExt/NotificationService.swift b/macos/SolianNotifyExt/NotificationService.swift new file mode 100644 index 0000000..105b4fd --- /dev/null +++ b/macos/SolianNotifyExt/NotificationService.swift @@ -0,0 +1,80 @@ +// +// NotificationService.swift +// SolianNotifyExt +// +// Created by LittleSheep on 2024/7/19. +// + +import UserNotifications +import Intents + +enum ParseNotificationPayloadError: Error { + case noMetadata(String) + case noAvatarUrl(String) +} + +class NotificationService: UNNotificationServiceExtension { + + var contentHandler: ((UNNotificationContent) -> Void)? + var bestAttemptContent: UNMutableNotificationContent? + + override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) { + self.contentHandler = contentHandler + bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent) + + if let bestAttemptContent = bestAttemptContent { + do { + switch bestAttemptContent.categoryIdentifier { + case "messaging.message", "messaging.callStart": + guard let metadata = bestAttemptContent.userInfo["metadata"] as? [AnyHashable : Any] else { + throw ParseNotificationPayloadError.noMetadata("The notification has no metadata.") + } + let userId = metadata["user_id"] as! Int + let userName = metadata["user_name"] as? String + + guard let avatarUrl = bestAttemptContent.userInfo["avatar"] as? String else { + throw ParseNotificationPayloadError.noMetadata("The notification has no avatar url.") + } + + let handle = INPersonHandle(value: String(userId), type: .unknown) + let avatar = INImage( + url: URL(string: avatarUrl)! + )! + let sender = INPerson(personHandle: handle, + nameComponents: nil, + displayName: bestAttemptContent.title, + image: avatar, + contactIdentifier: nil, + customIdentifier: userName) + let intent = INSendMessageIntent(recipients: nil, + outgoingMessageType: .outgoingMessageText, + content: bestAttemptContent.body, + speakableGroupName: nil, + conversationIdentifier: String(metadata["channel_id"] as! Int), + serviceName: "PostPigeon", + sender: sender, + attachments: nil) + + let interaction = INInteraction(intent: intent, response: nil) + interaction.direction = .incoming + interaction.donate(completion: nil) + break + default: + contentHandler(bestAttemptContent) + break + } + } catch { + contentHandler(bestAttemptContent) + } + } + } + + override func serviceExtensionTimeWillExpire() { + // Called just before the extension will be terminated by the system. + // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used. + if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent { + contentHandler(bestAttemptContent) + } + } + +}