From e8adec624423b5cac33d2af1823422733d992b43 Mon Sep 17 00:00:00 2001
From: Itay Brenner <itaybrenner@hotmail.com>
Date: Thu, 6 Feb 2025 12:18:02 -0300
Subject: [PATCH] Add report flag button + fix collapse on comments (#356)

---
 ios/HackerNews/Comments/CommentRow.swift      | 51 +++++++++++--------
 ios/HackerNews/Comments/CommentsHeader.swift  | 17 +++++++
 ios/HackerNews/Comments/CommentsScreen.swift  | 12 +++++
 .../Comments/CommentsViewModel.swift          | 28 ++++++++++
 ios/HackerNews/Network/HNWebClient.swift      | 32 +++++++++++-
 ios/HackerNews/Utils/Previews.swift           |  2 +
 6 files changed, 119 insertions(+), 23 deletions(-)

diff --git a/ios/HackerNews/Comments/CommentRow.swift b/ios/HackerNews/Comments/CommentRow.swift
index 73f58835..bf7ba310 100644
--- a/ios/HackerNews/Comments/CommentRow.swift
+++ b/ios/HackerNews/Comments/CommentRow.swift
@@ -14,6 +14,7 @@ private let maxIndentationLevel: Int = 5
 struct CommentRow: View {
   let state: CommentState
   let likeComment: (CommentState) -> Void
+  let flagComment: (CommentState) -> Void
   let toggleComment: () -> Void
 
   @Environment(Theme.self) private var theme
@@ -50,15 +51,36 @@ struct CommentRow: View {
               .padding(.horizontal, 8)
               .padding(.vertical, 4)
           }
+          .frame(height: 20)
           .background(state.upvoted ? .green.opacity(0.2) : .white.opacity(0.2))
           .foregroundStyle(state.upvoted ? .green : .onBackground)
           .clipShape(Capsule())
+          
+          Menu {
+            Button("Report Comment") {
+              flagComment(state)
+            }
+            Button(state.hidden ? "Show" : "Collapse") {
+              toggleComment()
+            }
+          } label: {
+            Image(systemName: "ellipsis")
+              .font(.system(size: 12))
+              .padding(.horizontal, 8)
+              .padding(.vertical, 4)
+              .frame(height: 20)
+              .background(.white.opacity(0.2))
+              .foregroundStyle(.onBackground)
+              .clipShape(Capsule())
+          }
         }
       }
       .padding(8)
       .background(isPressed ? .surface.opacity(0.85) : .surface)
       .zIndex(1)  // Ensure header stays on top
-      .simultaneousGesture(makeCommentGesture())
+      .onTapGesture(count: 1) {
+        toggleComment()
+      }
 
       // Comment Body
       if !state.hidden {
@@ -90,33 +112,13 @@ struct CommentRow: View {
   }
 }
 
-extension CommentRow {
-  fileprivate func makeCommentGesture() -> some Gesture {
-    DragGesture(minimumDistance: 0)
-      .onChanged { value in
-        // Only show press effect if we haven't moved far
-        if abs(value.translation.height) < 2 && abs(value.translation.width) < 2 {
-          isPressed = true
-        } else {
-          isPressed = false
-        }
-      }
-      .onEnded { value in
-        isPressed = false
-        // Trigger tap if it was a small movement (effectively a tap)
-        if abs(value.translation.height) < 2 && abs(value.translation.width) < 2 {
-          toggleComment()
-        }
-      }
-  }
-}
-
 struct CommentView_Preview: PreviewProvider {
   static var previews: some View {
     PreviewVariants {
       CommentRow(
         state: PreviewHelpers.makeFakeComment(),
         likeComment: { _ in },
+        flagComment: { _ in },
         toggleComment: {}
       )
       .environment(Theme())
@@ -131,6 +133,7 @@ struct CommentViewIndentation_Preview: PreviewProvider {
         CommentRow(
           state: PreviewHelpers.makeFakeComment(level: index),
           likeComment: { _ in },
+          flagComment: { _ in },
           toggleComment: {}
         )
         .environment(Theme())
@@ -150,6 +153,7 @@ C# is a hugely underrated language that I feel like often gets overlooked when t
   CommentRow(
     state: PreviewHelpers.makeFakeComment(level: 0, text: text),
     likeComment: { _ in },
+    flagComment: { _ in },
     toggleComment: {}
   )
   .environment(Theme())
@@ -162,6 +166,7 @@ What do you mean that it's not truly cross-platform?<p><a href="https://develope
   CommentRow(
     state: PreviewHelpers.makeFakeComment(level: 0, text: text),
     likeComment: { _ in },
+    flagComment: { _ in },
     toggleComment: {}
   )
   .environment(Theme())
@@ -175,6 +180,7 @@ It's much much more complicated than that. Sun refused to add many language feat
   CommentRow(
     state: PreviewHelpers.makeFakeComment(level: 0, text: text),
     likeComment: { _ in },
+    flagComment: { _ in },
     toggleComment: {}
   )
   .environment(Theme())
@@ -187,6 +193,7 @@ Hudson River Trading | Hybrid | Full-time\n<p>We’re a quantitative trading fir
   CommentRow(
     state: PreviewHelpers.makeFakeComment(level: 0, text: text),
     likeComment: { _ in },
+    flagComment: { _ in },
     toggleComment: {}
   )
   .environment(Theme())
diff --git a/ios/HackerNews/Comments/CommentsHeader.swift b/ios/HackerNews/Comments/CommentsHeader.swift
index 016d8d78..683e0b4d 100644
--- a/ios/HackerNews/Comments/CommentsHeader.swift
+++ b/ios/HackerNews/Comments/CommentsHeader.swift
@@ -10,6 +10,7 @@ import SwiftUI
 struct CommentsHeader: View {
   let state: CommentsHeaderState
   let likePost: () -> Void
+  let flagPost: () -> Void
   let toggleBody: () -> Void
   let onTitleTap: () -> Void
 
@@ -47,6 +48,7 @@ struct CommentsHeader: View {
             .padding(.vertical, 4)
         }
         .background(.surface)
+        .frame(height: 23)
         .foregroundStyle(.onBackground)
         .clipShape(Capsule())
         // upvote button
@@ -56,9 +58,23 @@ struct CommentsHeader: View {
             .padding(.horizontal, 8)
             .padding(.vertical, 4)
         }
+        .frame(height: 23)
         .background(state.upvoted ? .green.opacity(0.2) : .surface)
         .foregroundStyle(state.upvoted ? .green : .onBackground)
         .clipShape(Capsule())
+        
+        Menu {
+          Button("Report Post", action: flagPost)
+        } label: {
+          Image(systemName: "ellipsis")
+            .font(.system(size: 12))
+            .padding(.horizontal, 8)
+            .padding(.vertical, 4)
+            .frame(height: 20)
+            .background(.surface)
+            .foregroundStyle(.onBackground)
+            .clipShape(Capsule())
+        }
       }
       // body
       if let text = state.story.text {
@@ -85,6 +101,7 @@ struct CommentsHeader: View {
   CommentsHeader(
     state: CommentsHeaderState(story: PreviewHelpers.makeFakeStory()),
     likePost: {},
+    flagPost: {},
     toggleBody: {},
     onTitleTap: {}
   )
diff --git a/ios/HackerNews/Comments/CommentsScreen.swift b/ios/HackerNews/Comments/CommentsScreen.swift
index 65042a59..ddc99851 100644
--- a/ios/HackerNews/Comments/CommentsScreen.swift
+++ b/ios/HackerNews/Comments/CommentsScreen.swift
@@ -30,6 +30,13 @@ struct CommentsScreen: View {
               )
             }
           },
+          flagPost: {
+            Task {
+              await model.flagPost(
+                url: model.state.headerState.flagUrl
+              )
+            }
+          },
           toggleBody: {
             model.toggleHeaderBody()
           },
@@ -64,6 +71,11 @@ struct CommentsScreen: View {
                   await model.likeComment(data: state)
                 }
               },
+              flagComment: { state in
+                Task {
+                  await model.flagComment(data: state)
+                }
+              },
               toggleComment: {
                 model.toggleComment(commentId: commentState.id)
               }
diff --git a/ios/HackerNews/Comments/CommentsViewModel.swift b/ios/HackerNews/Comments/CommentsViewModel.swift
index ece7b6b9..9603e849 100644
--- a/ios/HackerNews/Comments/CommentsViewModel.swift
+++ b/ios/HackerNews/Comments/CommentsViewModel.swift
@@ -26,6 +26,8 @@ struct CommentState {
   let id: Int64
   var upvoted: Bool
   let upvoteUrl: String
+  let hideUrl: String
+  let flagUrl: String
   let text: String
   let user: String
   let age: String
@@ -39,6 +41,8 @@ extension CommentInfo {
       id: self.id,
       upvoted: self.upvoted,
       upvoteUrl: self.upvoteUrl,
+      hideUrl: self.hideUrl,
+      flagUrl: self.flagUrl,
       text: self.text,
       user: self.user,
       age: self.age,
@@ -53,6 +57,8 @@ struct CommentsHeaderState {
   var expanded: Bool = false
   var upvoteLink: String = ""
   var upvoted: Bool = false
+  var hideUrl: String = ""
+  var flagUrl: String = ""
 }
 
 struct CommentComposerState {
@@ -119,6 +125,8 @@ class CommentsViewModel {
     case .success(let data):
       state.headerState.upvoted = data.postInfo.upvoted
       state.headerState.upvoteLink = data.postInfo.upvoteUrl
+      state.headerState.hideUrl = data.postInfo.hideUrl
+      state.headerState.flagUrl = data.postInfo.flagUrl
       state.comments = .loaded(comments: data.comments.map { $0.toCommentState() })
       state.postCommentState = data.commentForm?.toCommentComposerState(auth: state.auth)
     case .error:
@@ -162,6 +170,26 @@ class CommentsViewModel {
       navigation(.login)
     }
   }
+  
+  func flagPost(url: String) async {
+    switch state.auth {
+    case .loggedIn:
+      guard !url.isEmpty else { return }
+      await webClient.flagItem(flagUrl: url)
+    case .loggedOut:
+      navigation(.login)
+    }
+  }
+  
+  func flagComment(data: CommentState) async {
+    switch state.auth {
+    case .loggedIn:
+      guard !data.flagUrl.isEmpty else { return }
+      await webClient.flagItem(flagUrl: data.flagUrl)
+    case .loggedOut:
+      navigation(.login)
+    }
+  }
 
   func toggleHeaderBody() {
     state.headerState.expanded.toggle()
diff --git a/ios/HackerNews/Network/HNWebClient.swift b/ios/HackerNews/Network/HNWebClient.swift
index fe19ce31..f29a33c8 100644
--- a/ios/HackerNews/Network/HNWebClient.swift
+++ b/ios/HackerNews/Network/HNWebClient.swift
@@ -28,6 +28,8 @@ struct CommentInfo {
   let id: Int64
   var upvoted: Bool
   let upvoteUrl: String
+  let hideUrl: String
+  let flagUrl: String
   let text: String
   let user: String
   let age: String
@@ -38,6 +40,8 @@ struct PostInfo {
   let id: Int64
   let upvoted: Bool
   let upvoteUrl: String
+  let hideUrl: String
+  let flagUrl: String
 }
 
 struct CommentFormData {
@@ -106,6 +110,23 @@ class HNWebClient {
   @discardableResult
   func upvoteItem(upvoteUrl: String) async -> Bool {
     let url = URL(string: upvoteUrl)!
+    return await actionOnItem(url: url)
+  }
+  
+  @discardableResult
+  func hideItem(hideUrl: String) async -> Bool {
+    let url = URL(string: hideUrl)!
+    return await actionOnItem(url: url)
+  }
+  
+  @discardableResult
+  func flagItem(flagUrl: String) async -> Bool {
+    let url = URL(string: flagUrl)!
+    return await actionOnItem(url: url)
+  }
+  
+  @discardableResult
+  private func actionOnItem(url: URL) async -> Bool {
     do {
       let (_, response) = try await session.data(from: url)
       let httpResponse = response as! HTTPURLResponse
@@ -151,11 +172,15 @@ extension Document {
     let postUpvoteLinkElement = try self.select("#up_\(id)").first()
     let upvoteUrl = try postUpvoteLinkElement?.attr("href") ?? ""
     let upvoted = postUpvoteLinkElement?.hasClass("nosee") ?? false
+    let hideLink = !upvoteUrl.isEmpty ? upvoteUrl.replacingOccurrences(of: "vote", with: "hide") : ""
+    let flagUrl = !upvoteUrl.isEmpty ? upvoteUrl.replacingOccurrences(of: "vote", with: "flag") : ""
 
     return PostInfo(
       id: id,
       upvoted: upvoted,
-      upvoteUrl: !upvoteUrl.isEmpty ? BASE_WEB_URL + upvoteUrl : ""
+      upvoteUrl: !upvoteUrl.isEmpty ? BASE_WEB_URL + upvoteUrl : "",
+      hideUrl: !hideLink.isEmpty ? BASE_WEB_URL + hideLink : "",
+      flagUrl: !flagUrl.isEmpty ? BASE_WEB_URL + flagUrl : ""
     )
   }
 
@@ -173,11 +198,16 @@ extension Document {
       let upvoteUrl = try upvoteLinkElement?.attr("href") ?? ""
       let upvoted = upvoteLinkElement?.hasClass("nosee") ?? false
       let date = String(commentDate).asDate()
+      
+      let hideLink = !upvoteUrl.isEmpty ? upvoteUrl.replacingOccurrences(of: "vote", with: "hide") : ""
+      let flagUrl = !upvoteUrl.isEmpty ? upvoteUrl.replacingOccurrences(of: "vote", with: "flag") : ""
 
       return CommentInfo(
         id: commentId,
         upvoted: upvoted,
         upvoteUrl: !upvoteUrl.isEmpty ? BASE_WEB_URL + upvoteUrl : "",
+        hideUrl: !hideLink.isEmpty ? BASE_WEB_URL + hideLink : "",
+        flagUrl: !flagUrl.isEmpty ? BASE_WEB_URL + flagUrl : "",
         text: commentText,
         user: commentAuthor,
         age: date?.timeAgoDisplay() ?? "",
diff --git a/ios/HackerNews/Utils/Previews.swift b/ios/HackerNews/Utils/Previews.swift
index 5fca0cfa..45de93fd 100644
--- a/ios/HackerNews/Utils/Previews.swift
+++ b/ios/HackerNews/Utils/Previews.swift
@@ -127,6 +127,8 @@ struct PreviewHelpers {
       id: 1,
       upvoted: false,
       upvoteUrl: "",
+      hideUrl: "",
+      flagUrl: "",
       text: text ?? """
         Totally useless commentary:
         It makes me deeply happy to hear success stories like this for a project that's moving in the correctly opposite direction to that of the rest of the world.