Dodo codes: add comments

Author: Dimillian

ACHNBrowserUI/ACHNBrowserUI.xcodeproj/project.pbxproj

@@ -179,6 +179,8 @@
 		69CFCAF9245ADDA80059C067 /* photos in Resources */ = {isa = PBXBuildFile; fileRef = 69CFCA9B245AAF520059C067 /* photos */; };
 		69CFCAFB245ADDA80059C067 /* fish in Resources */ = {isa = PBXBuildFile; fileRef = 69CFCA9D245AAF520059C067 /* fish */; };
 		69CFCAFC245ADDA80059C067 /* rugs in Resources */ = {isa = PBXBuildFile; fileRef = 69CFCA9E245AAF520059C067 /* rugs */; };
+		69D44C1D2497462A00378FDD /* DodoCodeDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69D44C1C2497462A00378FDD /* DodoCodeDetailView.swift */; };
+		69D44C1F249746F100378FDD /* DodoCodeDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69D44C1E249746F100378FDD /* DodoCodeDetailViewModel.swift */; };
 		69E4BBB2245AE06B001035E2 /* UI in Frameworks */ = {isa = PBXBuildFile; productRef = 69E4BBB1245AE06B001035E2 /* UI */; };
 		69E4BBB4245AE472001035E2 /* ItemRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69E4BBB3245AE472001035E2 /* ItemRow.swift */; };
 		69E4BBB6245AE5C9001035E2 /* ItemDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69E4BBB5245AE5C9001035E2 /* ItemDetailView.swift */; };
@@ -387,6 +389,8 @@
 		69CFCAD2245ADC7A0059C067 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		69CFCAD4245ADC7A0059C067 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		69CFCADA245ADC9C0059C067 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
+		69D44C1C2497462A00378FDD /* DodoCodeDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DodoCodeDetailView.swift; sourceTree = "<group>"; };
+		69D44C1E249746F100378FDD /* DodoCodeDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DodoCodeDetailViewModel.swift; sourceTree = "<group>"; };
 		69E4BBAE245ADF26001035E2 /* UI */ = {isa = PBXFileReference; lastKnownFileType = folder; name = UI; path = ACHNBrowserUI/packages/UI; sourceTree = "<group>"; };
 		69E4BBB3245AE472001035E2 /* ItemRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemRow.swift; sourceTree = "<group>"; };
 		69E4BBB5245AE5C9001035E2 /* ItemDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemDetailView.swift; sourceTree = "<group>"; };
@@ -771,6 +775,7 @@
 				AE2562F324841B48008B0779 /* DesignListViewModel.swift */,
 				694C8B4624861D4E000B9B5F /* LikeButtonViewModel.swift */,
 				69855148248A281300F7BDBA /* TabbarViewModel.swift */,
+				69D44C1E249746F100378FDD /* DodoCodeDetailViewModel.swift */,
 			);
 			path = viewModels;
 			sourceTree = "<group>";
@@ -956,6 +961,7 @@
 				69E67EF12493833200ED7AC8 /* DodoCodeFormView.swift */,
 				69E67EED24935DD200ED7AC8 /* DodoCodeListView.swift */,
 				69E67EEF249376DF00ED7AC8 /* DodoCodeRow.swift */,
+				69D44C1C2497462A00378FDD /* DodoCodeDetailView.swift */,
 			);
 			path = dodocode;
 			sourceTree = "<group>";
@@ -1186,6 +1192,7 @@
 				69157B7F2471A5A1005B9002 /* TodayNookazonSection.swift in Sources */,
 				69157B802471A5A1005B9002 /* UserListFormView.swift in Sources */,
 				69157B812471A5A1005B9002 /* RowLoadingView.swift in Sources */,
+				69D44C1F249746F100378FDD /* DodoCodeDetailViewModel.swift in Sources */,
 				157C03E7247AE56600568917 /* TodaySectionView.swift in Sources */,
 				69157B822471A5A1005B9002 /* ItemDetailViewModel.swift in Sources */,
 				6985514C248A297400F7BDBA /* PlayerView.swift in Sources */,
@@ -1213,6 +1220,7 @@
 				69157B922471A5A1005B9002 /* TurnipsChart.swift in Sources */,
 				69157B932471A5A1005B9002 /* TabbarView.swift in Sources */,
 				69157B942471A5A1005B9002 /* ActivityControllerView.swift in Sources */,
+				69D44C1D2497462A00378FDD /* DodoCodeDetailView.swift in Sources */,
 				3D7A1786247B21D200DB873D /* CustomTasksListView.swift in Sources */,
 				69157B952471A5A1005B9002 /* ItemsCrosslineSectionView.swift in Sources */,
 				69867DF1247C136900C6A759 /* CollectionProgressRowViewModel.swift in Sources */,
@@ -1382,7 +1390,7 @@
 				CODE_SIGN_ENTITLEMENTS = ACHNBrowserUI/ACHNBrowserUI.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development: Thomas Ricouard (7MB55D6BJ5)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 061412020;
+				CURRENT_PROJECT_VERSION = 061512020;
 				DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
 				DEVELOPMENT_TEAM = Z6P74P6T99;
 				ENABLE_PREVIEWS = YES;
@@ -1392,7 +1400,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7.4;
+				MARKETING_VERSION = 1.7.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH;
 				PRODUCT_NAME = "AC Helper";
 				PROVISIONING_PROFILE_SPECIFIER = "AC Dev";
@@ -1413,7 +1421,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 061412020;
+				CURRENT_PROJECT_VERSION = 061512020;
 				DEVELOPMENT_ASSET_PATHS = "\"ACHNBrowserUI/Preview Content\"";
 				DEVELOPMENT_TEAM = Z6P74P6T99;
 				ENABLE_PREVIEWS = YES;
@@ -1423,7 +1431,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7.4;
+				MARKETING_VERSION = 1.7.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.thomasricouard.ACNH;
 				PRODUCT_NAME = "AC Helper";
 				PROVISIONING_PROFILE_SPECIFIER = "AC Dev";

ACHNBrowserUI/ACHNBrowserUI/SceneDelegate.swift

@@ -28,6 +28,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             .environmentObject(MusicPlayerManager.shared)
             .environmentObject(AppUserDefaults.shared)
             .environmentObject(DodoCodeService.shared)
+            .environmentObject(CommentService.shared)
 
         if let windowScene = scene as? UIWindowScene {
 

ACHNBrowserUI/ACHNBrowserUI/fr.lproj/Localizable.strings

@@ -865,3 +865,13 @@ Merci d'être respecteux. Tout code signalé sera supprimé";
 "To help us support the application and get notifications when a new Dodo code is posted, you can try out AC Helper+" = "Pour nous aider à supporter l'application et recevoir des notifications quand un nouveau Dodo codes est posté, vous pouvez souscrire à AC Helper+";
 "ACDodoCode.notification.title" = "Un nouveau Dodo code est disponible";
 "ACDodoCode.notification.subtitle" = "Quelqu'un a ouvert ses portes et a posté un Dodo code dans l'application!";
+
+// dodo code comments
+"Comments" = "Commentaires";
+"Be the first to leave a comment!" = "Soyez le premier à laisser un commentaire !";
+"%@ from %@" = "%@ de %@";
+"In order to add a comment you must add an island name and a username. Tap here to add them in settings" = "Pour ajouter un nouveau commentaire vous devez ajouter votre nom d'île et un nom d'utilisateur dans les réglages. Tapez ici pour les ajouter";
+"Add your comment" = "Ajouter votre commentaire";
+"Send" = "Envoyer";
+"In game name / username" = "Nom du joueur / nom d'utilisateur";
+"You need to have an iCloud account in your device settings in order to add comments" = "Vous devez avoir un compte iCloud dans les réglages de votre appareil pour ajouter des commentaires"

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/models/Comment.swift

@@ -0,0 +1,56 @@
+//
+//  File.swift
+//  
+//
+//  Created by Thomas Ricouard on 15/06/2020.
+//
+
+import Foundation
+import CloudKit
+
+public struct Comment: Equatable, Identifiable {
+    public let id: String
+    public let text: String
+    public let name: String
+    public let islandName: String
+    public let isMine: Bool
+
+    public var record: CKRecord?
+    public var owner: CKRecord.Reference?
+    
+    public var creationDate: Date {
+        record?.creationDate ?? Date()
+    }
+    
+    enum RecordKeys: String {
+        case id, text, name, islandName, owner
+    }
+    
+    public init(text: String, name: String, islandName: String) {
+        self.id = UUID().uuidString
+        self.text = text
+        self.name = name
+        self.islandName = islandName
+        self.isMine = true
+    }
+    
+    init(withRecord record: CKRecord) {
+        self.id = record[RecordKeys.id.rawValue] as? String ?? ""
+        self.name = record[RecordKeys.name.rawValue] as? String ?? ""
+        self.islandName = record[RecordKeys.islandName.rawValue] as? String ?? ""
+        self.text = record[RecordKeys.text.rawValue] as? String ?? ""
+        self.owner = record[RecordKeys.owner.rawValue] as? CKRecord.Reference
+        self.isMine = record.creatorUserRecordID?.recordName.contains("defaultOwner") == true
+        self.record = record
+    }
+    
+    func toRecord(owner: CKRecord) -> CKRecord {
+        let record = self.record ?? CKRecord(recordType: CommentService.recordType)
+        record[RecordKeys.id.rawValue] = id
+        record[RecordKeys.text.rawValue] = text
+        record[RecordKeys.name.rawValue] = name
+        record[RecordKeys.islandName.rawValue] = islandName
+        record[RecordKeys.owner.rawValue] = CKRecord.Reference(record: owner, action: .deleteSelf)
+        return record
+    }
+}

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/services/CommentService.swift

@@ -0,0 +1,77 @@
+//
+//  File.swift
+//  
+//
+//  Created by Thomas Ricouard on 15/06/2020.
+//
+
+import Foundation
+import CloudKit
+
+public class CommentService: ObservableObject {
+    
+    // MARK: - Vars
+    public static let shared = CommentService()
+    public static let recordType = "ACComment"
+    
+    @Published public var comments: [CKRecord.ID: [Comment]] = [:]
+    @Published public var mostRecentError: Error?
+    
+    private var cloudKitDatabase = CKContainer.default().publicCloudDatabase
+    
+    public func addComment(comment: Comment, owner: CKRecord) {
+        let record = comment.toRecord(owner: owner)
+        var comment = comment
+        let operation = CKModifyRecordsOperation(recordsToSave: [record], recordIDsToDelete: nil)
+        operation.modifyRecordsCompletionBlock = { saved, _, error in
+            if let realRecord = saved?.first {
+                comment.record = realRecord
+                DispatchQueue.main.async {
+                    if var comments = self.comments[owner.recordID] {
+                        comments.insert(comment, at: 0)
+                        self.comments[owner.recordID] = comments
+                    } else {
+                        self.comments[owner.recordID] = [comment]
+                    }
+                }
+            }
+            DispatchQueue.main.async {
+                self.setError(error: error)
+            }
+        }
+        cloudKitDatabase.add(operation)
+    }
+    
+    public func fetchComments(record: CKRecord) {
+        let reference = CKRecord.Reference(record: record, action: .deleteSelf)
+        let predicate = NSPredicate(format: "owner == %@", reference)
+        let sort = NSSortDescriptor(key: "creationDate", ascending: false)
+        let query = CKQuery(recordType: Self.recordType, predicate: predicate)
+        query.sortDescriptors = [sort]
+        cloudKitDatabase.perform(query, inZoneWith: nil) { (records, error) in
+            self.setError(error: error)
+            if let records = records {
+                let comments = records.map{ Comment(withRecord: $0) }
+                DispatchQueue.main.async {
+                    self.comments[record.recordID] = comments
+                }
+            }
+        }
+    }
+    
+    public func deleteComment(comment: Comment, owner: CKRecord) {
+        if let record = comment.record {
+            let operation = CKModifyRecordsOperation(recordsToSave: nil, recordIDsToDelete: [record.recordID])
+            operation.modifyRecordsCompletionBlock = { _, _, _ in
+                self.fetchComments(record: owner)
+            }
+            cloudKitDatabase.add(operation)
+        }
+    }
+    
+    private func setError(error: Error?) {
+        DispatchQueue.main.async {
+            self.mostRecentError = error
+        }
+    }
+}

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/services/DodoCodeService.swift

@@ -71,7 +71,7 @@ public class DodoCodeService: ObservableObject {
     }
 
     public func upvote(code: DodoCode) {
-        if var record = code.record {
+        if let record = code.record {
             record[DodoCode.RecordKeys.upvotes.rawValue] = code.upvotes + 1
             let operation = CKModifyRecordsOperation(recordsToSave: [record],
                                                      recordIDsToDelete: nil)

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/utils/AppUserDefault.swift

@@ -19,6 +19,13 @@ public class AppUserDefaults: ObservableObject {
         }
     }
 
+    @UserDefault("game_name", defaultValue: "")
+    public var inGameName: String {
+        willSet {
+            objectWillChange.send()
+        }
+    }
+    
     @UserDefault("friend_code", defaultValue: "")
     public var friendCode: String {
         willSet {

ACHNBrowserUI/ACHNBrowserUI/viewModels/DodoCodeDetailViewModel.swift

@@ -0,0 +1,65 @@
+//
+//  DodoCodeDetailViewModel.swift
+//  ACHNBrowserUI
+//
+//  Created by Thomas Ricouard on 15/06/2020.
+//  Copyright © 2020 Thomas Ricouard. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+import Combine
+import Backend
+
+class DodoCodeDetailViewModel: ObservableObject {
+    let code: DodoCode
+    
+    @Published var comments: [Comment] = []
+    @Published var isLoading = false
+    @Published var isPosting = false
+    @Published var inDeletion: String?
+    
+    private let commentService: CommentService
+    private var commentsCancellable: AnyCancellable?
+    
+    init(code: DodoCode, commentService: CommentService = .shared) {
+        self.code = code
+        self.commentService = commentService
+        
+        if let record = code.record {
+            self.commentsCancellable = commentService.$comments.sink { comments in
+                DispatchQueue.main.async {
+                    self.comments = comments[record.recordID] ?? []
+                    self.isLoading = false
+                    self.isPosting = false
+                    self.inDeletion = nil
+                }
+            }
+        }
+    }
+    
+    func fetchComments() {
+        isLoading = true
+        if let record = code.record {
+            commentService.fetchComments(record: record)
+        }
+    }
+    
+    func addComment(comment: Comment) {
+        isPosting = true
+        if let record = code.record {
+            commentService.addComment(comment: comment,
+                                      owner: record)
+        }
+    }
+    
+    func deleteComment(comment: Comment) {
+        if let record = code.record {
+            isLoading = true
+            inDeletion = comment.id
+            commentService.deleteComment(comment: comment,
+                                         owner: record)
+        }
+    }
+    
+}