From fcb448b99f95783419fc8b39eca7a663854b4e16 Mon Sep 17 00:00:00 2001
From: Jacob Sikorski <jacob.sikorski@gmail.com>
Date: Thu, 18 Jan 2024 15:10:38 -0700
Subject: [PATCH] Fix #8667: Fix webcompat url for internal links

---
 .../BrowserViewController/BVC+ToolbarDelegate.swift      | 7 +++++--
 Sources/Shared/Extensions/URLExtensions.swift            | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift
index 9dacdbc77bd..3dd001f37a8 100644
--- a/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift
+++ b/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+ToolbarDelegate.swift
@@ -446,8 +446,11 @@ extension BrowserViewController: TopToolbarDelegate {
     
     shields.showSubmitReportView = { [weak self] shieldsViewController in
       shieldsViewController.dismiss(animated: true) {
-        guard let url = shieldsViewController.tab.url else { return }
-        self?.showSubmitReportView(for: url)
+        if let internalURL = InternalURL(url), let displayURL = internalURL.displayURL {
+          self?.showSubmitReportView(for: displayURL)
+        } else {
+          self?.showSubmitReportView(for: url)
+        }
       }
     }
     
diff --git a/Sources/Shared/Extensions/URLExtensions.swift b/Sources/Shared/Extensions/URLExtensions.swift
index e06d3695dfa..9d34c1a029f 100644
--- a/Sources/Shared/Extensions/URLExtensions.swift
+++ b/Sources/Shared/Extensions/URLExtensions.swift
@@ -631,4 +631,13 @@ public struct InternalURL {
     }
     return nil
   }
+  
+  public var displayURL: URL? {
+    if isErrorPage {
+      return originalURLFromErrorPage
+    } else if isReaderModePage {
+      return extractedUrlParam
+    }
+    return nil
+  }
 }