Update

mlemgroup · Dec 12, 2024 · b59dad9 · b59dad9
1 parent 59ce59d
commit b59dad9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/Mlem/App/Utility/Extensions/Content Models/Comment1Providing+Extensions.swift b/Mlem/App/Utility/Extensions/Content Models/Comment1Providing+Extensions.swift
@@ -78,14 +78,18 @@ extension Comment1Providing {
             downvoteAction(feedback: feedback)
             saveAction(feedback: feedback)
             replyAction(commentTreeTracker: commentTreeTracker)
-            selectTextAction()
+            if !deleted {
+                selectTextAction()
+            }
             shareAction()
 
             if isOwnComment {
                 editAction()
                 deleteAction(feedback: feedback)
             } else {
-                reportAction()
+                if !canModerate, !deleted {
+                    reportAction()
+                }
                 blockCreatorAction(feedback: feedback)
             }
         }

diff --git a/Mlem/App/Utility/Extensions/Content Models/Message1Providing+Extensions.swift b/Mlem/App/Utility/Extensions/Content Models/Message1Providing+Extensions.swift
@@ -29,7 +29,9 @@ extension Message1Providing {
             replyAction()
             markReadAction(feedback: feedback)
         }
-        selectTextAction()
+        if !deleted {
+            selectTextAction()
+        }
         if isOwnMessage {
             deleteAction(feedback: feedback)
         } else {

diff --git a/Mlem/App/Utility/Extensions/Content Models/Post1Providing+Extensions.swift b/Mlem/App/Utility/Extensions/Content Models/Post1Providing+Extensions.swift
@@ -154,7 +154,9 @@ extension Post1Providing {
             downvoteAction(feedback: feedback)
             saveAction(feedback: feedback)
             replyAction(commentTreeTracker: commentTreeTracker)
-            selectTextAction()
+            if !deleted {
+                selectTextAction()
+            }
             shareAction()
 
             if isOwnPost {
@@ -167,7 +169,7 @@ extension Post1Providing {
                 if (api.fetchedVersion ?? .zero) >= .v19_4 {
                     hideAction(feedback: feedback)
                 }
-                if !canModerate {
+                if !canModerate, !deleted {
                     reportAction()
                 }
                 blockAction(feedback: feedback)

diff --git a/Mlem/App/Utility/Extensions/Content Models/Reply1Providing+Extensions.swift b/Mlem/App/Utility/Extensions/Content Models/Reply1Providing+Extensions.swift
@@ -39,10 +39,14 @@ extension Reply1Providing {
             replyAction()
             markReadAction(feedback: feedback)
             if let comment = self2?.comment {
-                comment.selectTextAction()
+                if !comment.deleted {
+                    comment.selectTextAction()
+                }
                 comment.shareAction()
+                if !comment.deleted {
+                    reportAction()
+                }
             }
-            reportAction()
             blockCreatorAction(feedback: feedback)
         }
     }