mentions fully working

mlemgroup · Oct 27, 2023 · b70496a · b70496a
1 parent 71cb4bb
commit b70496a
Show file tree

Hide file tree

Showing 26 changed files with 630 additions and 271 deletions.
diff --git a/Mlem/API/Models/Person/APIPersonMention.swift b/Mlem/API/Models/Person/APIPersonMention.swift
@@ -14,6 +14,21 @@ struct APIPersonMention: Decodable {
     let commentId: Int
     let read: Bool
     let published: Date
+
+    init(
+        from personMention: APIPersonMention,
+        id: Int? = nil,
+        recipientId: Int? = nil,
+        commentId: Int? = nil,
+        read: Bool? = nil,
+        published: Date? = nil
+    ) {
+        self.id = id ?? personMention.id
+        self.recipientId = recipientId ?? personMention.recipientId
+        self.commentId = commentId ?? personMention.commentId
+        self.read = read ?? personMention.read
+        self.published = published ?? personMention.published
+    }
 }
 
 extension APIPersonMention: Equatable {

diff --git a/Mlem/API/Models/ScoringOperation.swift b/Mlem/API/Models/ScoringOperation.swift
@@ -7,11 +7,20 @@
 //
 
 import Foundation
+import SwiftUI
 
 enum ScoringOperation: Int, Decodable {
     case upvote = 1
     case downvote = -1
     case resetVote = 0
+
+    var color: Color? {
+        switch self {
+        case .upvote: return .blue
+        case .downvote: return .red
+        case .resetVote: return nil
+        }
+    }
 }
 
 extension ScoringOperation: AssociatedIcon {

diff --git a/Mlem/App Constants.swift b/Mlem/App Constants.swift
@@ -64,4 +64,6 @@ struct AppConstants {
 
     static let blockUserPrompt: String = "Really block this user?"
     static let reportPostPrompt: String = "Really report this post?"
+    static let reportMentionPrompt: String = "Really report this mention?"
+    static let reportMessagePrompt: String = "Really report this message?"
 }
diff --git a/Mlem/Icons.swift b/Mlem/Icons.swift
@@ -34,9 +34,9 @@ struct Icons {
     static let unsaveFill: String = "bookmark.slash.fill"
 
     // mark read
-    static let markRead: String = "envelope"
+    static let markRead: String = "envelope.open"
     static let markReadFill: String = "envelope.open.fill"
-    static let markUnread: String = "envelope.open"
+    static let markUnread: String = "envelope"
     static let markUnreadFill: String = "envelope.fill"
 
     // moderation

diff --git a/Mlem/Models/Composers/Response Composers/Replies/ReplyToMention.swift b/Mlem/Models/Composers/Response Composers/Replies/ReplyToMention.swift
@@ -20,11 +20,10 @@ struct ReplyToMention: ResponseEditorModel {
     var id: Int { mention.id }
 
     func embeddedView() -> AnyView {
-        AnyView(InboxMentionView(
-            mention: mention,
-            menuFunctions: []
+        AnyView(
+            InboxMentionView(mention: mention)
+                .padding(.horizontal)
         )
-        .padding(.horizontal))
     }
 
     func sendResponse(responseContents: String) async throws {

diff --git a/Mlem/Models/Composers/Response Composers/Reports/ReportMention.swift b/Mlem/Models/Composers/Response Composers/Reports/ReportMention.swift
@@ -19,8 +19,10 @@ struct ReportMention: ResponseEditorModel {
     let mention: MentionModel
 
     func embeddedView() -> AnyView {
-        AnyView(InboxMentionView(mention: mention, menuFunctions: [])
-            .padding(.horizontal))
+        AnyView(
+            InboxMentionView(mention: mention)
+                .padding(.horizontal)
+        )
     }
 
     func sendResponse(responseContents: String) async throws {