talksik/nirvana-ios
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

good place with rreplacing ordering, and getting my sent messages and keeping things cleaner and composite key

Browse Source
This commit is contained in:
talksik
2021-12-22 17:41:55 -08:00
parent 0d1889a56a
commit cce8655d4f
4 changed files with 60 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios/Views/InnerCircle/CircleGridView.swift
+11 -11
View File
@@ -169,8 +169,9 @@ struct CircleGridView: View {
if self.authSessionStore.user != nil {
let userId = self.authSessionStore.user!.id // O(1) // currUser who is signed in
// get most recent message in the convo and see who has spoken
if let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friendDbId] { // O(1)
return messagesRelatedToFriend.last?.receiverId == userId && messagesRelatedToFriend.last?.listenCount == 0
return messagesRelatedToFriend.first?.receiverId == userId
}
}
@@ -284,25 +285,22 @@ extension CircleGridView {
// TODO: OPTIMIZATION...buffer and load all AVAssets to create AVPlayerItems before a tap happens...but this can also cause load in background if user is not playing a message right now...this isn't an optimization of the data/firestore but rather the player
// I want to play the last x messages if I was the receiver
// ["sarth": [me, me]] -> play nothing
// ["sarth": [me, him, him, him]] -> play his two messages
// I want to play the last x messages if I was the receiver...the array is sorted from backend so that the
// most recent comes first
// ["sarth": [ME, HIM...]] -> play nothing
// ["sarth": [HIM, HIM, me, him...]] -> play his two messages
// traverse through reversed list of messages and add to audio player queue
// TODO: protect against force unwraps
var AVPlayerItems: [AVPlayerItem] = []
let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friend.id!]!.reversed()
let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friend.id!]!
print("have \(messagesRelatedToFriend.count) messages to play")
for message in messagesRelatedToFriend {
// if it's me then don't play
// if it's starting to get to my messages then don't play
if message.senderId == self.authSessionStore.user?.id {
break
}
// if I already listened to this "last" message, then break as well
if message.listenCount >= 1 {
break
}
// only add to queue if we can convert the database url to a valid url here
if let audioUrl = URL(string: message.audioDataUrl) {
@@ -310,9 +308,11 @@ extension CircleGridView {
AVPlayerItems.append(playerMessage)
}
}
// start playing if there are messages to listen to
if AVPlayerItems.count > 0 {
// reverse the items because we want to listen to the most recent messages in order
AVPlayerItems = AVPlayerItems.reversed()
queuePlayer = AVQueuePlayer(items: AVPlayerItems)
// TODO: make sure these options are viable for different scenarios
nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift
+2 -2
View File
@@ -68,8 +68,8 @@ class InnerCircleViewModel: ObservableObject {
return
}
let newMessage = Message(receiverId: receiverId, senderId: senderId, listenCount: 0, audioDataUrl: audioDataUrl!.absoluteString)
let newMessage = Message(sendId: senderId, receivId: receiverId, audioDUrl: audioDataUrl!.absoluteString)
print(newMessage)
// 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
print(res)