feat: Show icons for shared object messages

Signed-off-by: Marcel Müller <[email protected]>

Author: SystemKeeper

NextcloudTalk.xcodeproj/project.pbxproj

@@ -743,6 +743,7 @@
 				AvatarManager.swift,
 				ColorGenerator.swift,
 				Extensions/DateExtension.swift,
+				Extensions/NSAttributedStringExtension.swift,
 				Extensions/UIFontExtension.swift,
 			);
 			target = 2CC0014E24A1F0E900A20167 /* NotificationServiceExtension */;
@@ -770,6 +771,7 @@
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Extensions/DateExtension.swift,
+				Extensions/NSAttributedStringExtension.swift,
 				Extensions/UIFontExtension.swift,
 			);
 			target = 1FF2FD5A2AB99CCB000C9905 /* BroadcastUploadExtension */;
@@ -785,6 +787,7 @@
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Extensions/DateExtension.swift,
+				Extensions/NSAttributedStringExtension.swift,
 				Extensions/UIFontExtension.swift,
 			);
 			target = 1FA93D9B2D70FCC200DF6CDF /* TalkIntents */;

NextcloudTalk/Chat/Chat cells/BaseChatTableViewCell.swift

@@ -260,7 +260,7 @@ class BaseChatTableViewCell: UITableViewCell, AudioPlayerViewDelegate, Reactions
         if let parent = message.parent, message.willShowParentMessageInThread(thread) {
             self.showQuotePart()
 
-            self.quotedMessageView?.messageLabel.attributedText = parent.messageForLastMessagePreview()
+            self.quotedMessageView?.messageLabel.attributedText = parent.messageForLastMessagePreview()?.prefix(characters: 80)
             self.quotedMessageView?.actorLabel.attributedText = parent.actor.attributedDisplayName
             self.quotedMessageView?.highlighted = parent.isMessage(from: account.userId)
             self.quotedMessageView?.avatarImageView.setActorAvatar(forMessage: parent, withAccount: account)

NextcloudTalk/Chat/Chat views/PinnedMessageView.swift

@@ -122,7 +122,7 @@ protocol PinnedMessageViewDelegate: AnyObject {
         }
 
         self.title.attributedText = titleLabel
-        self.subtitle.attributedText = message.parsedMarkdownForChat()
+        self.subtitle.attributedText = message.messageForLastMessagePreview()
 
         var pinnedInfoText: String
 

NextcloudTalk/Chat/Chat views/PinnedMessageView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24128" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24063"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -59,6 +59,7 @@
                                 </label>
                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGe-4e-Cfj">
                                     <rect key="frame" x="0.0" y="28.333333333333336" width="546" height="112.66666666666666"/>
+                                    <color key="tintColor" systemColor="labelColor"/>
                                     <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                     <color key="textColor" systemColor="labelColor"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>

NextcloudTalk/Chat/ChatViewController.swift

@@ -1688,6 +1688,11 @@ import SwiftUI
 
         self.updateMessage(withMessageId: updateMessage.messageId, updatedMessage: updateMessage)
 
+        // Update pinned message if needed
+        if let pinnedMessageView = self.pinnedMessageView, pinnedMessageView.message?.messageId == updateMessage.messageId {
+            pinnedMessageView.setupPinnedMessage(withMessage: updateMessage, inRoom: self.room)
+        }
+
         if message.systemMessage == "message_pinned" {
             // When a message was pinned, we can directly set the message id and update the view
             self.room.lastPinnedId = updateMessage.messageId

NextcloudTalk/Chat/NCChatMessage.swift

@@ -345,7 +345,7 @@ import SwiftyAttributes
     }
 
     public func lastMessagePreview(forOneToOneRoom: Bool = false) -> NSMutableAttributedString? {
-        guard let message = messageForLastMessagePreview()
+        guard let message = messageForLastMessagePreview()?.prefix(characters: 80)
         else {return nil}
 
         let lastMessageAttributedString = NSMutableAttributedString()
@@ -391,8 +391,7 @@ import SwiftyAttributes
     }
 
     public func messageForLastMessagePreview() -> NSAttributedString? {
-        let message = String(self.parsedMarkdown().string.prefix(80))
-        if message.isEmpty { return nil}
+        guard let message = self.parsedMarkdown(), message.length > 0 else { return nil }
 
         let messageAttributedString = NSMutableAttributedString()
         // Icon
@@ -402,7 +401,7 @@ import SwiftyAttributes
             messageAttributedString.append(attachmentAttributedString)
         }
         // Message
-        messageAttributedString.append(NSAttributedString(string: message))
+        messageAttributedString.append(message)
 
         return messageAttributedString
     }

NextcloudTalk/User Interface/Extensions/NSAttributedStringExtension.swift

@@ -67,4 +67,8 @@ extension NSAttributedString {
 
         self.init(attributedString: mutableAttributedString)
     }
+
+    public func prefix(characters: Int) -> NSAttributedString {
+        return self.attributedSubstring(from: .init(location: 0, length: min(characters, self.length)))
+    }
 }