From ee4cedf9864c8ca6ec7e75bf1a9b8d00703a7366 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 25 Dec 2021 23:12:40 -0800 Subject: [PATCH] fixing notification bug --- nirvana-ios/Views/InnerCircle/CircleGridView.swift | 2 +- nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nirvana-ios/Views/InnerCircle/CircleGridView.swift b/nirvana-ios/Views/InnerCircle/CircleGridView.swift index d66f1fc..eb59211 100644 --- a/nirvana-ios/Views/InnerCircle/CircleGridView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleGridView.swift @@ -146,7 +146,7 @@ struct CircleGridView: View { self.selectedFriendIndex = nil - self.innerCircleVM.stopRecording(senderId: self.authSessionStore.user!.id!, receiver: self.authSessionStore.relevantUsersDict[friendId]!) + self.innerCircleVM.stopRecording(sender: self.authSessionStore.user!, receiver: self.authSessionStore.relevantUsersDict[friendId]!) // self.recordingGestureDeactived() } diff --git a/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift b/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift index 2bbbf30..487994c 100644 --- a/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift +++ b/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift @@ -65,7 +65,7 @@ extension InnerCircleViewModel { // sender should be current user // receiver is the person we are sending to - func stopRecording(senderId:String, receiver: User) { + func stopRecording(sender:User, receiver: User) { audioRecorder.stop() isRecording = false @@ -77,7 +77,7 @@ extension InnerCircleViewModel { return } - let newMessage = Message(sendId: senderId, receivId: receiver.id!, audioDUrl: audioDataUrl!.absoluteString) + let newMessage = Message(sendId: sender.id!, receivId: receiver.id!, audioDUrl: audioDataUrl!.absoluteString) // create a new message in firestore with the url for receiving user to automatically get notified self?.firestoreService.createMessage(message: newMessage) {[weak self] res in @@ -85,7 +85,7 @@ extension InnerCircleViewModel { // sending push notification if there was a device token if receiver.deviceToken != nil && receiver.nickname != nil { - self?.pushNotificationService.sendPushNotification(to: receiver.deviceToken!, title: "🌱Nirvana", body: "continue your conversation with \(receiver.nickname ?? "your friend")") + self?.pushNotificationService.sendPushNotification(to: receiver.deviceToken!, title: "🌱Nirvana", body: "continue your conversation with \(sender.nickname ?? "your friend")") } // delete local audio file from user's phone so that it doesn't get crazy