Added “Remove” & “Report” for chat messages

Author: boyarkin-anton

Adamant/Assets/l18n/de.lproj/Localizable.strings

@@ -277,6 +277,21 @@
 /* Alert "Block this user?" */
 "Chats.BlockUser" = "Diesen Benutzer sperren?";
 
+/* Button "Remove" */
+"Chats.Remove" = "Entfernen";
+
+/* Alert "Delete this message?" */
+"Chats.RemoveMessage" = "Diese Nachricht löschen?";
+
+/* Button "Report" */
+"Chats.Report" = "Bericht";
+
+/* Alert "Report as inappropriate?" */
+"Chats.ReportMessage" = "Als unangemessen melden?";
+
+/* Alert "Report has been sent" */
+"Chats.ReportSent" = "Bericht wurde gesendet";
+
 /* Chat: inform user that he can't cancel transaction, that was sent */
 "ChatScene.Error.cancelError" = "Nachricht bereits versendet";
 

Adamant/Assets/l18n/en.lproj/Localizable.strings

@@ -274,6 +274,21 @@
 /* Alert "Block this user?" */
 "Chats.BlockUser" = "Block this user?";
 
+/* Button "Remove" */
+"Chats.Remove" = "Remove";
+
+/* Alert "Delete this message?" */
+"Chats.RemoveMessage" = "Delete this message?";
+
+/* Button "Report" */
+"Chats.Report" = "Report";
+
+/* Alert "Report as inappropriate?" */
+"Chats.ReportMessage" = "Report as inappropriate?";
+
+/* Alert "Report has been sent" */
+"Chats.ReportSent" = "Report has been sent";
+
 /* Chat: inform user that he can't cancel transaction, that was sent */
 "ChatScene.Error.cancelError" = "Message is already sent";
 

Adamant/Assets/l18n/ru.lproj/Localizable.strings

@@ -275,6 +275,21 @@
 /* Alert "Block this user?" */
 "Chats.BlockUser" = "Заблокировать пользователя?";
 
+/* Button "Remove" */
+"Chats.Remove" = "Удалить";
+
+/* Alert "Delete this message?" */
+"Chats.RemoveMessage" = "Удалить сообщение?";
+
+/* Button "Report" */
+"Chats.Report" = "Пожаловаться";
+
+/* Alert "Report as inappropriate?" */
+"Chats.ReportMessage" = "Пожаловаться на сообщение?";
+
+/* Alert "Report has been sent" */
+"Chats.ReportSent" = "Запрос отправлен";
+
 /* Chat: inform user that he can't cancel transaction, that was sent */
 "ChatScene.Error.cancelError" = "Сообщение уже отправлено";
 

Adamant/CoreData/Chatroom+CoreDataClass.swift

@@ -48,7 +48,7 @@ public class Chatroom: NSManagedObject {
             semaphore?.signal()
         }
 
-        if let transactions = transactions as? Set<ChatTransaction> {
+        if let transactions = transactions?.filtered(using: NSPredicate(format: "isHidden == false")) as? Set<ChatTransaction> {
             if let newest = transactions.sorted(by: { (lhs: ChatTransaction, rhs: ChatTransaction) in
                 guard let l = lhs.date as Date? else {
                     return true

Adamant/ServiceProtocols/DataProviders/ChatsProvider.swift

@@ -196,6 +196,7 @@ protocol ChatsProvider: DataProvider {
 	// MARK: - Tools
 	func validateMessage(_ message: AdamantMessage) -> ValidateMessageResult
     func blockChat(with address: String)
+    func removeMessage(with id: String)
 
     // MARK: - Unconfirmed Transaction
     func addUnconfirmed(transactionId: UInt64, managedObjectId: NSManagedObjectID)

Adamant/Services/DataProviders/AdamantChatsProvider.swift

@@ -20,6 +20,7 @@ class AdamantChatsProvider: ChatsProvider {
     var securedStore: SecuredStore! {
         didSet {
             self.blackList = self.securedStore.getArray("blackList") ?? []
+            self.removedMessages = self.securedStore.getArray("removedMessages") ?? []
         }
     }
 
@@ -34,6 +35,7 @@ class AdamantChatsProvider: ChatsProvider {
 
     public var chatPositon: [String : Double] = [:]
     private(set) var blackList: [String] = []
+    private(set) var removedMessages: [String] = []
 
     private(set) var isInitiallySynced: Bool = false {
         didSet {
@@ -86,6 +88,7 @@ class AdamantChatsProvider: ChatsProvider {
 			self?.dropStateData()
 
             self?.blackList = []
+            self?.removedMessages = []
 		}
 
         NotificationCenter.default.addObserver(forName: Notification.Name.AdamantAccountService.stayInChanged, object: nil, queue: nil) { [weak self] notification in
@@ -97,6 +100,10 @@ class AdamantChatsProvider: ChatsProvider {
                 if let blackList = self?.blackList {
                     self?.securedStore.set(blackList, for: "blackList")
                 }
+                
+                if let removedMessages = self?.removedMessages {
+                    self?.securedStore.set(removedMessages, for: "removedMessages")
+                }
             }
         }
 	}
@@ -1148,6 +1155,10 @@ extension AdamantChatsProvider {
         messageTransaction.fee = transaction.fee as NSDecimalNumber
         messageTransaction.statusEnum = MessageStatus.delivered
         messageTransaction.partner = partner
+        
+        if let transactionId = messageTransaction.transactionId {
+            messageTransaction.isHidden = self.removedMessages.contains(transactionId)
+        }
 
 		return messageTransaction
 	}
@@ -1184,4 +1195,14 @@ extension AdamantChatsProvider {
             }
         }
     }
+    
+    public func removeMessage(with id: String) {
+        if !self.removedMessages.contains(id) {
+            self.removedMessages.append(id)
+            
+            if self.accountService.hasStayInAccount {
+                self.securedStore.set(removedMessages, for: "removedMessages")
+            }
+        }
+    }
 }

Adamant/Stories/Chats/ChatCell.swift

@@ -13,3 +13,21 @@ protocol ChatCell: class {
 //    var bubbleStyle: MessageStyle { get set }
     var bubbleBackgroundColor: UIColor? { get set }
 }
+
+extension MessageCollectionViewCell {
+    @objc func remove(_ sender: Any?) {
+        trigger(action: "remove:", with: sender)
+    }
+    
+    @objc func report(_ sender: Any?) {
+        trigger(action: "report:", with: sender)
+    }
+    
+    func trigger(action: String, with sender: Any?) {
+        if let collectionView = self.superview as? UICollectionView {
+            if let indexPath = collectionView.indexPath(for: self) {
+                collectionView.delegate?.collectionView?(collectionView, performAction: NSSelectorFromString(action), forItemAt: indexPath, withSender: sender)
+            }
+        }
+    }
+}

Adamant/Stories/Chats/ChatViewController.swift

@@ -30,6 +30,12 @@ extension String.adamantLocalized {
         static let unsupportedUrlWarning = NSLocalizedString("ChatScene.Warning.UnsupportedUrl", comment: "Chat: warning message for opening unsupported url schemes")
 
         static let block = NSLocalizedString("Chats.Block", comment: "Block")
+        
+        static let remove = NSLocalizedString("Chats.Remove", comment: "Remove")
+        static let removeMessage = NSLocalizedString("Chats.RemoveMessage", comment: "Delete this message?")
+        static let report = NSLocalizedString("Chats.Report", comment: "Report")
+        static let reportMessage = NSLocalizedString("Chats.ReportMessage", comment: "Report as inappropriate?")
+        static let reportSent = NSLocalizedString("Chats.ReportSent", comment: "Report has been sent")
 
 		private init() { }
 	}
@@ -405,8 +411,83 @@ class ChatViewController: MessagesViewController {
             scrollToBottomBtn.rightAnchor.constraint(equalTo: messagesCollectionView.rightAnchor, constant: -20),
             scrollToBottomBtnOffetConstraint!
         ])
+        
+        UIMenuController.shared.menuItems = [
+            UIMenuItem(title: String.adamantLocalized.chat.remove, action: NSSelectorFromString("remove:")),
+            UIMenuItem(title: String.adamantLocalized.chat.report, action: NSSelectorFromString("report:"))]
 	}
 
+    override func canPerformAction(_ action: Selector, withSender sender: Any!) -> Bool {
+        return false
+    }
+    
+    override func collectionView(_ collectionView: UICollectionView, shouldShowMenuForItemAt indexPath: IndexPath) -> Bool {
+        return true
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, canPerformAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) -> Bool {
+
+        switch action {
+        case NSSelectorFromString("remove:"): return true
+        case NSSelectorFromString("report:"): return true
+        default:
+            return super.collectionView(collectionView, canPerformAction: action, forItemAt: indexPath, withSender: sender)
+        }
+    }
+
+    override func collectionView(_ collectionView: UICollectionView, performAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) {
+
+        switch action {
+        case NSSelectorFromString("remove:"): removeMessage(at: indexPath)
+        case NSSelectorFromString("report:"): reportMessage(at: indexPath)
+        default:
+            super.collectionView(collectionView, performAction: action, forItemAt: indexPath, withSender: sender)
+        }
+    }
+    
+    func removeMessage(at indexPath: IndexPath) {
+        self.dialogService.showAlert(title: String.adamantLocalized.chat.removeMessage, message: nil, style: .alert, actions: [
+            AdamantAlertAction(title: String.adamantLocalized.alert.ok, style: .destructive, handler: {
+            self.hideMessage(at: indexPath)
+        }),
+        AdamantAlertAction(title: String.adamantLocalized.alert.cancel, style: .default, handler: {
+            //
+        })], from: nil)
+    }
+    
+    func reportMessage(at indexPath: IndexPath) {
+        self.dialogService.showAlert(title: String.adamantLocalized.chat.reportMessage, message: nil, style: .alert, actions: [
+            AdamantAlertAction(title: String.adamantLocalized.alert.ok, style: .destructive, handler: {
+                self.hideMessage(at: indexPath, show: true)
+        }),
+        AdamantAlertAction(title: String.adamantLocalized.alert.cancel, style: .default, handler: {
+            //
+        })], from: nil)
+    }
+    
+    func hideMessage(at indexPath: IndexPath, show: Bool = false) {
+        let message = messageForItem(at: indexPath, in: self.messagesCollectionView)
+        
+        if let item = message as? ChatTransaction {
+            print("\(message.messageId)")
+            print(type(of: message.self))
+            print(item.isHidden)
+            
+            item.isHidden = true
+            try? item.managedObjectContext?.save()
+            
+            chatroom?.updateLastTransaction()
+            
+            if let transactionId = item.transactionId {
+                chatsProvider.removeMessage(with: transactionId)
+            }
+            
+            if show {
+                self.dialogService.showToastMessage( String.adamantLocalized.chat.reportSent )
+            }
+        }
+    }
+    
     @objc func scrollDown() {
         messagesCollectionView.scrollToBottom(animated: true)
     }