Added "Search thread" option to hamburger menu, leveraging Forums Search feature

dfsm · dfsm · commit d9c3e67f94ed · 2026-04-27T10:21:02.000+10:00
diff --git a/App/Resources/Localizable.xcstrings b/App/Resources/Localizable.xcstrings
@@ -56,86 +56,86 @@
     "Back" : {
 
     },
-    "bookmarks.title" : {
-      "comment" : "Title of the bookmarks screen, shown in the navbar and the tab bar.",
-      "extractionState" : "migrated",
+    "bookmarks.filter.all" : {
+      "comment" : "Segmented control label for showing all bookmarks.",
+      "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bookmarks"
+            "value" : "All"
           }
         }
       }
     },
-    "bookmarks.filter.all" : {
-      "comment" : "Segmented control label for showing all bookmarks.",
+    "bookmarks.filter.button.accessibility-label" : {
+      "comment" : "Accessibility label for the filter button in the bookmarks navigation bar.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "All"
+            "value" : "Filter bookmarks"
           }
         }
       }
     },
-    "bookmarks.filter.unread" : {
-      "comment" : "Segmented control label for showing only unread bookmarks.",
+    "bookmarks.filter.menu.accessibility-hint" : {
+      "comment" : "Accessibility hint for the filter menu popover.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Unread"
+            "value" : "Filter bookmarks by read status or star color"
           }
         }
       }
     },
-    "bookmarks.filter.read" : {
-      "comment" : "Segmented control label for showing only read bookmarks.",
+    "bookmarks.filter.menu.accessibility-label" : {
+      "comment" : "Accessibility label for the filter menu popover.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Read"
+            "value" : "Filter Menu"
           }
         }
       }
     },
-    "bookmarks.filter.button.accessibility-label" : {
-      "comment" : "Accessibility label for the filter button in the bookmarks navigation bar.",
+    "bookmarks.filter.read" : {
+      "comment" : "Segmented control label for showing only read bookmarks.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Filter bookmarks"
+            "value" : "Read"
           }
         }
       }
     },
-    "bookmarks.filter.menu.accessibility-label" : {
-      "comment" : "Accessibility label for the filter menu popover.",
+    "bookmarks.filter.star.accessibility-hint.selected" : {
+      "comment" : "Accessibility hint for a currently selected star color filter button.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Filter Menu"
+            "value" : "Currently selected. Double-tap to deselect."
           }
         }
       }
     },
-    "bookmarks.filter.menu.accessibility-hint" : {
-      "comment" : "Accessibility hint for the filter menu popover.",
+    "bookmarks.filter.star.accessibility-hint.unselected" : {
+      "comment" : "Accessibility hint for an unselected star color filter button.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Filter bookmarks by read status or star color"
+            "value" : "Double-tap to filter by this star color."
           }
         }
       }
@@ -152,50 +152,50 @@
         }
       }
     },
-    "bookmarks.filter.star.accessibility-hint.selected" : {
-      "comment" : "Accessibility hint for a currently selected star color filter button.",
+    "bookmarks.filter.unread" : {
+      "comment" : "Segmented control label for showing only unread bookmarks.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Currently selected. Double-tap to deselect."
+            "value" : "Unread"
           }
         }
       }
     },
-    "bookmarks.filter.star.accessibility-hint.unselected" : {
-      "comment" : "Accessibility hint for an unselected star color filter button.",
+    "bookmarks.search.button.accessibility-label" : {
+      "comment" : "Accessibility label for the search button in the bookmarks navigation bar.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Double-tap to filter by this star color."
+            "value" : "Search bookmarks"
           }
         }
       }
     },
-    "bookmarks.search.button.accessibility-label" : {
-      "comment" : "Accessibility label for the search button in the bookmarks navigation bar.",
+    "bookmarks.search.placeholder" : {
+      "comment" : "Placeholder text for the bookmarks search bar.",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Search bookmarks"
+            "value" : "Search by title or author…"
           }
         }
       }
     },
-    "bookmarks.search.placeholder" : {
-      "comment" : "Placeholder text for the bookmarks search bar.",
-      "extractionState" : "manual",
+    "bookmarks.title" : {
+      "comment" : "Title of the bookmarks screen, shown in the navbar and the tab bar.",
+      "extractionState" : "migrated",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Search by title or author\u2026"
+            "value" : "Bookmarks"
           }
         }
       }
@@ -1148,46 +1148,46 @@
         }
       }
     },
-    "private-message-folder.delete-error-title" : {
-      "comment" : "Error title when folder deletion fails",
+    "private-message-folder.delete-button" : {
+      "comment" : "Button to confirm folder deletion",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Could not delete folder"
+            "value" : "Delete"
           }
         }
       }
     },
-    "private-message-folder.delete-confirm-title" : {
-      "comment" : "Title of confirmation dialog when deleting a folder",
+    "private-message-folder.delete-confirm-message" : {
+      "comment" : "Message shown when deleting a folder explaining that messages will be moved",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Delete Folder?"
+            "value" : "Messages in this folder will be moved to Inbox or Sent."
           }
         }
       }
     },
-    "private-message-folder.delete-confirm-message" : {
-      "comment" : "Message shown when deleting a folder explaining that messages will be moved",
+    "private-message-folder.delete-confirm-title" : {
+      "comment" : "Title of confirmation dialog when deleting a folder",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Messages in this folder will be moved to Inbox or Sent."
+            "value" : "Delete Folder?"
           }
         }
       }
     },
-    "private-message-folder.delete-button" : {
-      "comment" : "Button to confirm folder deletion",
+    "private-message-folder.delete-error-title" : {
+      "comment" : "Error title when folder deletion fails",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Delete"
+            "value" : "Could not delete folder"
           }
         }
       }
@@ -1615,6 +1615,12 @@
     },
     "Search smilies…" : {
 
+    },
+    "Search Thread" : {
+
+    },
+    "Search thread..." : {
+
     },
     "Select Forums" : {
 
@@ -1797,4 +1803,4 @@
     }
   },
   "version" : "1.0"
-}
+}
diff --git a/App/View Controllers/Posts/PostsPageViewController.swift b/App/View Controllers/Posts/PostsPageViewController.swift
@@ -113,6 +113,13 @@ final class PostsPageViewController: ViewController {
                 identifier: .init("yourPosts"),
                 handler: { [unowned self] in yourPosts(action: $0) }
             ),
+            // Search thread
+            UIAction(
+                title: "Search thread",
+                image: UIImage(named: "view-in-thread")!.withRenderingMode(.alwaysTemplate),
+                identifier: .init("searchThread"),
+                handler: { [unowned self] in searchThread(action: $0) }
+            ),
         ])
     }
 
@@ -1193,6 +1200,17 @@ final class PostsPageViewController: ViewController {
         }
     }
 
+    private func searchThread(action: UIAction) {
+        if enableHaptics {
+            UIImpactFeedbackGenerator(style: .medium).impactOccurred()
+        }
+        self.dismiss(animated: false) { [self] in
+            let searchVC = SearchHostingController(threadID: thread.threadID)
+            searchVC.modalPresentationStyle = (traitCollection.userInterfaceIdiom == .pad) ? .pageSheet : .fullScreen
+            present(searchVC, animated: true)
+        }
+    }
+
     private func bookmark(action: UIAction) {
         if enableHaptics {
             UIImpactFeedbackGenerator(style: .medium).impactOccurred()
diff --git a/App/Views/SearchView.swift b/App/Views/SearchView.swift
@@ -275,8 +275,12 @@ struct SearchView: View {
                         .padding()
                         .background(theme[color: "sheetBackgroundColor"])
                         
-                        forumSelectionList
-                            .padding(.horizontal)
+                        if model.threadID == nil {
+                            forumSelectionList
+                                .padding(.horizontal)
+                        } else {
+                            Spacer()
+                        }
                     }
                     .background(theme[color: "backgroundColor"]!.ignoresSafeArea(.all))
                     .contentShape(Rectangle())
@@ -286,7 +290,7 @@ struct SearchView: View {
                     .navigationBarTitleDisplayMode(.inline)
                     .toolbar {
                         ToolbarItem(placement: .principal) {
-                            Text("Search Forums")
+                            Text(model.threadID == nil ? "Search Forums" : "Search Thread")
                                 .font(.headline)
                                 .foregroundColor(theme[color: "navigationBarTextColor"])
                         }
@@ -341,7 +345,7 @@ struct SearchView: View {
                 
                 ZStack(alignment: .leading) {
                     if model.searchState.query.isEmpty {
-                        Text("Search forums...")
+                        Text(model.threadID == nil ? "Search forums..." : "Search thread...")
                             .foregroundColor(theme[color: "listSecondaryTextColor"])
                     }
                     
@@ -617,20 +621,23 @@ final class SearchPageViewModel: ObservableObject {
     private let isPreview: Bool
     private var searchQueryID: String?
     private let previewHTML: String?
-    
+    let threadID: String?
+
     init(
         forumSelectOptions: [ForumSelectOption] = [],
         searchHelpHints: [SearchHelpHint] = [],
         searchResults: [SearchResult] = [],
         isPreview: Bool = false,
-        previewHTML: String? = nil
+        previewHTML: String? = nil,
+        threadID: String? = nil
     ) {
         self.forumSelectOptions = forumSelectOptions
         self.searchHelpHints = searchHelpHints
         self.searchResults = searchResults
         self.isPreview = isPreview
         self.previewHTML = previewHTML
-        
+        self.threadID = threadID
+
         // Move the Task creation to after initialization
         Task { [weak self] in
             await self?.loadInitialData()
@@ -831,14 +838,19 @@ final class SearchPageViewModel: ObservableObject {
     
     func performSearch() async {
         searchState.message = ""
-        
+
         let forumIDs = forumSelectOptions
             .filter(\.isSelected)
             .map(\.value)
-        
+
+        let outgoingQuery: String = {
+            guard let threadID, !threadID.isEmpty else { return searchState.query }
+            return "threadid:\(threadID) \(searchState.query)"
+        }()
+
         do {
             let document = try await ForumsClient.shared.searchForums(
-                query: searchState.query,
+                query: outgoingQuery,
                 forumIDs: forumIDs
             )
             
@@ -935,8 +947,8 @@ extension Int {
 final class SearchHostingController: UIHostingController<AnyView> {
     private let searchModel: SearchPageViewModel
 
-    init() {
-        self.searchModel = SearchPageViewModel()
+    init(threadID: String? = nil) {
+        self.searchModel = SearchPageViewModel(threadID: threadID)
         super.init(rootView: AnyView(SearchView(model: searchModel).themed()))
     }
     

Original file line number	Diff line number	Diff line change
`@@ -56,86 +56,86 @@`
`56`	`56`	`"Back" : {`
`57`	`57`
`58`	`58`	`},`
`59`		`- "bookmarks.title" : {`
`60`		`- "comment" : "Title of the bookmarks screen, shown in the navbar and the tab bar.",`
`61`		`- "extractionState" : "migrated",`
	`59`	`+ "bookmarks.filter.all" : {`
	`60`	`+ "comment" : "Segmented control label for showing all bookmarks.",`
	`61`	`+ "extractionState" : "manual",`
`62`	`62`	`"localizations" : {`
`63`	`63`	`"en" : {`
`64`	`64`	`"stringUnit" : {`
`65`	`65`	`"state" : "translated",`
`66`		`- "value" : "Bookmarks"`
	`66`	`+ "value" : "All"`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`},`
`71`		`- "bookmarks.filter.all" : {`
`72`		`- "comment" : "Segmented control label for showing all bookmarks.",`
	`71`	`+ "bookmarks.filter.button.accessibility-label" : {`
	`72`	`+ "comment" : "Accessibility label for the filter button in the bookmarks navigation bar.",`
`73`	`73`	`"extractionState" : "manual",`
`74`	`74`	`"localizations" : {`
`75`	`75`	`"en" : {`
`76`	`76`	`"stringUnit" : {`
`77`	`77`	`"state" : "translated",`
`78`		`- "value" : "All"`
	`78`	`+ "value" : "Filter bookmarks"`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`},`
`83`		`- "bookmarks.filter.unread" : {`
`84`		`- "comment" : "Segmented control label for showing only unread bookmarks.",`
	`83`	`+ "bookmarks.filter.menu.accessibility-hint" : {`
	`84`	`+ "comment" : "Accessibility hint for the filter menu popover.",`
`85`	`85`	`"extractionState" : "manual",`
`86`	`86`	`"localizations" : {`
`87`	`87`	`"en" : {`
`88`	`88`	`"stringUnit" : {`
`89`	`89`	`"state" : "translated",`
`90`		`- "value" : "Unread"`
	`90`	`+ "value" : "Filter bookmarks by read status or star color"`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`},`
`95`		`- "bookmarks.filter.read" : {`
`96`		`- "comment" : "Segmented control label for showing only read bookmarks.",`
	`95`	`+ "bookmarks.filter.menu.accessibility-label" : {`
	`96`	`+ "comment" : "Accessibility label for the filter menu popover.",`
`97`	`97`	`"extractionState" : "manual",`
`98`	`98`	`"localizations" : {`
`99`	`99`	`"en" : {`
`100`	`100`	`"stringUnit" : {`
`101`	`101`	`"state" : "translated",`
`102`		`- "value" : "Read"`
	`102`	`+ "value" : "Filter Menu"`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`},`
`107`		`- "bookmarks.filter.button.accessibility-label" : {`
`108`		`- "comment" : "Accessibility label for the filter button in the bookmarks navigation bar.",`
	`107`	`+ "bookmarks.filter.read" : {`
	`108`	`+ "comment" : "Segmented control label for showing only read bookmarks.",`
`109`	`109`	`"extractionState" : "manual",`
`110`	`110`	`"localizations" : {`
`111`	`111`	`"en" : {`
`112`	`112`	`"stringUnit" : {`
`113`	`113`	`"state" : "translated",`
`114`		`- "value" : "Filter bookmarks"`
	`114`	`+ "value" : "Read"`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`},`
`119`		`- "bookmarks.filter.menu.accessibility-label" : {`
`120`		`- "comment" : "Accessibility label for the filter menu popover.",`
	`119`	`+ "bookmarks.filter.star.accessibility-hint.selected" : {`
	`120`	`+ "comment" : "Accessibility hint for a currently selected star color filter button.",`
`121`	`121`	`"extractionState" : "manual",`
`122`	`122`	`"localizations" : {`
`123`	`123`	`"en" : {`
`124`	`124`	`"stringUnit" : {`
`125`	`125`	`"state" : "translated",`
`126`		`- "value" : "Filter Menu"`
	`126`	`+ "value" : "Currently selected. Double-tap to deselect."`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`},`
`131`		`- "bookmarks.filter.menu.accessibility-hint" : {`
`132`		`- "comment" : "Accessibility hint for the filter menu popover.",`
	`131`	`+ "bookmarks.filter.star.accessibility-hint.unselected" : {`
	`132`	`+ "comment" : "Accessibility hint for an unselected star color filter button.",`
`133`	`133`	`"extractionState" : "manual",`
`134`	`134`	`"localizations" : {`
`135`	`135`	`"en" : {`
`136`	`136`	`"stringUnit" : {`
`137`	`137`	`"state" : "translated",`
`138`		`- "value" : "Filter bookmarks by read status or star color"`
	`138`	`+ "value" : "Double-tap to filter by this star color."`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -152,50 +152,50 @@`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`},`
`155`		`- "bookmarks.filter.star.accessibility-hint.selected" : {`
`156`		`- "comment" : "Accessibility hint for a currently selected star color filter button.",`
	`155`	`+ "bookmarks.filter.unread" : {`
	`156`	`+ "comment" : "Segmented control label for showing only unread bookmarks.",`
`157`	`157`	`"extractionState" : "manual",`
`158`	`158`	`"localizations" : {`
`159`	`159`	`"en" : {`
`160`	`160`	`"stringUnit" : {`
`161`	`161`	`"state" : "translated",`
`162`		`- "value" : "Currently selected. Double-tap to deselect."`
	`162`	`+ "value" : "Unread"`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`},`
`167`		`- "bookmarks.filter.star.accessibility-hint.unselected" : {`
`168`		`- "comment" : "Accessibility hint for an unselected star color filter button.",`
	`167`	`+ "bookmarks.search.button.accessibility-label" : {`
	`168`	`+ "comment" : "Accessibility label for the search button in the bookmarks navigation bar.",`
`169`	`169`	`"extractionState" : "manual",`
`170`	`170`	`"localizations" : {`
`171`	`171`	`"en" : {`
`172`	`172`	`"stringUnit" : {`
`173`	`173`	`"state" : "translated",`
`174`		`- "value" : "Double-tap to filter by this star color."`
	`174`	`+ "value" : "Search bookmarks"`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`},`
`179`		`- "bookmarks.search.button.accessibility-label" : {`
`180`		`- "comment" : "Accessibility label for the search button in the bookmarks navigation bar.",`
	`179`	`+ "bookmarks.search.placeholder" : {`
	`180`	`+ "comment" : "Placeholder text for the bookmarks search bar.",`
`181`	`181`	`"extractionState" : "manual",`
`182`	`182`	`"localizations" : {`
`183`	`183`	`"en" : {`
`184`	`184`	`"stringUnit" : {`
`185`	`185`	`"state" : "translated",`
`186`		`- "value" : "Search bookmarks"`
	`186`	`+ "value" : "Search by title or author…"`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`},`
`191`		`- "bookmarks.search.placeholder" : {`
`192`		`- "comment" : "Placeholder text for the bookmarks search bar.",`
`193`		`- "extractionState" : "manual",`
	`191`	`+ "bookmarks.title" : {`
	`192`	`+ "comment" : "Title of the bookmarks screen, shown in the navbar and the tab bar.",`
	`193`	`+ "extractionState" : "migrated",`
`194`	`194`	`"localizations" : {`
`195`	`195`	`"en" : {`
`196`	`196`	`"stringUnit" : {`
`197`	`197`	`"state" : "translated",`
`198`		`- "value" : "Search by title or author\u2026"`
	`198`	`+ "value" : "Bookmarks"`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
`@@ -1148,46 +1148,46 @@`
`1148`	`1148`	`}`
`1149`	`1149`	`}`
`1150`	`1150`	`},`
`1151`		`- "private-message-folder.delete-error-title" : {`
`1152`		`- "comment" : "Error title when folder deletion fails",`
	`1151`	`+ "private-message-folder.delete-button" : {`
	`1152`	`+ "comment" : "Button to confirm folder deletion",`
`1153`	`1153`	`"localizations" : {`
`1154`	`1154`	`"en" : {`
`1155`	`1155`	`"stringUnit" : {`
`1156`	`1156`	`"state" : "translated",`
`1157`		`- "value" : "Could not delete folder"`
	`1157`	`+ "value" : "Delete"`
`1158`	`1158`	`}`
`1159`	`1159`	`}`
`1160`	`1160`	`}`
`1161`	`1161`	`},`
`1162`		`- "private-message-folder.delete-confirm-title" : {`
`1163`		`- "comment" : "Title of confirmation dialog when deleting a folder",`
	`1162`	`+ "private-message-folder.delete-confirm-message" : {`
	`1163`	`+ "comment" : "Message shown when deleting a folder explaining that messages will be moved",`
`1164`	`1164`	`"localizations" : {`
`1165`	`1165`	`"en" : {`
`1166`	`1166`	`"stringUnit" : {`
`1167`	`1167`	`"state" : "translated",`
`1168`		`- "value" : "Delete Folder?"`
	`1168`	`+ "value" : "Messages in this folder will be moved to Inbox or Sent."`
`1169`	`1169`	`}`
`1170`	`1170`	`}`
`1171`	`1171`	`}`
`1172`	`1172`	`},`
`1173`		`- "private-message-folder.delete-confirm-message" : {`
`1174`		`- "comment" : "Message shown when deleting a folder explaining that messages will be moved",`
	`1173`	`+ "private-message-folder.delete-confirm-title" : {`
	`1174`	`+ "comment" : "Title of confirmation dialog when deleting a folder",`
`1175`	`1175`	`"localizations" : {`
`1176`	`1176`	`"en" : {`
`1177`	`1177`	`"stringUnit" : {`
`1178`	`1178`	`"state" : "translated",`
`1179`		`- "value" : "Messages in this folder will be moved to Inbox or Sent."`
	`1179`	`+ "value" : "Delete Folder?"`
`1180`	`1180`	`}`
`1181`	`1181`	`}`
`1182`	`1182`	`}`
`1183`	`1183`	`},`
`1184`		`- "private-message-folder.delete-button" : {`
`1185`		`- "comment" : "Button to confirm folder deletion",`
	`1184`	`+ "private-message-folder.delete-error-title" : {`
	`1185`	`+ "comment" : "Error title when folder deletion fails",`
`1186`	`1186`	`"localizations" : {`
`1187`	`1187`	`"en" : {`
`1188`	`1188`	`"stringUnit" : {`
`1189`	`1189`	`"state" : "translated",`
`1190`		`- "value" : "Delete"`
	`1190`	`+ "value" : "Could not delete folder"`
`1191`	`1191`	`}`
`1192`	`1192`	`}`
`1193`	`1193`	`}`
`@@ -1615,6 +1615,12 @@`
`1615`	`1615`	`},`
`1616`	`1616`	`"Search smilies…" : {`
`1617`	`1617`
	`1618`	`+ },`
	`1619`	`+ "Search Thread" : {`
	`1620`	`+`
	`1621`	`+ },`
	`1622`	`+ "Search thread..." : {`
	`1623`	`+`
`1618`	`1624`	`},`
`1619`	`1625`	`"Select Forums" : {`
`1620`	`1626`
`@@ -1797,4 +1803,4 @@`
`1797`	`1803`	`}`
`1798`	`1804`	`},`
`1799`	`1805`	`"version" : "1.0"`
`1800`		`-}`
	`1806`	`+}`