From ad74b55dbfe44ea5760932b3f582e396dcb6c8d5 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 3 Mar 2026 11:28:32 +0100
Subject: [PATCH] Revert "fix: github folder not getting pr list, p=#12578,
 c=folders", p=#12599

---
 .../browser/browser/zen-live-folders.ftl      |  3 ++
 .../base/content/zen-panels/popups.inc        |  4 ++
 src/zen/live-folders/ZenLiveFolder.sys.mjs    |  2 +
 .../ZenLiveFoldersManager.sys.mjs             |  4 ++
 .../providers/GithubLiveFolder.sys.mjs        | 42 ++++++++++++-------
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-live-folders.ftl b/locales/en-US/browser/browser/zen-live-folders.ftl
index bf02ed00e..79988c1dc 100644
--- a/locales/en-US/browser/browser/zen-live-folders.ftl
+++ b/locales/en-US/browser/browser/zen-live-folders.ftl
@@ -91,6 +91,9 @@ zen-live-folder-github-option-repo =
 zen-live-folder-github-pull-requests =
     .label = Pull Requests
 
+zen-live-folder-github-issues =
+    .label = Issues
+
 zen-live-folder-github-option-repo-list-note =
     .label = This list is generated based on your currently active pull requests.
 
diff --git a/src/browser/base/content/zen-panels/popups.inc b/src/browser/base/content/zen-panels/popups.inc
index b98b0cdb9..42dcbe14d 100644
--- a/src/browser/base/content/zen-panels/popups.inc
+++ b/src/browser/base/content/zen-panels/popups.inc
@@ -9,6 +9,10 @@
         data-l10n-id="zen-live-folder-github-pull-requests"
         command="cmd_zenNewLiveFolder"
         image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
+      <menuitem
+        data-l10n-id="zen-live-folder-github-issues"
+        command="cmd_zenNewLiveFolder"
+        image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
       <menuitem
         data-l10n-id="zen-live-folder-type-rss"
         command="cmd_zenNewLiveFolder"
diff --git a/src/zen/live-folders/ZenLiveFolder.sys.mjs b/src/zen/live-folders/ZenLiveFolder.sys.mjs
index 6434d6c20..36d17d42f 100644
--- a/src/zen/live-folders/ZenLiveFolder.sys.mjs
+++ b/src/zen/live-folders/ZenLiveFolder.sys.mjs
@@ -123,6 +123,8 @@ export class nsZenLiveFolderProvider {
 
   fetch(url, { maxContentLength = 5 * 1024 * 1024 } = {}) {
     const uri = lazy.NetUtil.newURI(url);
+    // TODO: Support userContextId when fetching, it should be inherited from the folder's
+    // current space context ID.
     let userContextId = 0;
     let folder = this.manager.getFolderForLiveFolder(this);
     if (folder) {
diff --git a/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs b/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
index ac62890a0..ef7b515a1 100644
--- a/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
+++ b/src/zen/live-folders/ZenLiveFoldersManager.sys.mjs
@@ -98,6 +98,10 @@ class nsZenLiveFoldersManager {
             this.createFolder("github:pull-requests");
             break;
           }
+          case "zen-live-folder-github-issues": {
+            this.createFolder("github:issues");
+            break;
+          }
           case "zen-live-folder-type-rss": {
             this.createFolder("rss");
             break;
diff --git a/src/zen/live-folders/providers/GithubLiveFolder.sys.mjs b/src/zen/live-folders/providers/GithubLiveFolder.sys.mjs
index d03561611..834738c9d 100644
--- a/src/zen/live-folders/providers/GithubLiveFolder.sys.mjs
+++ b/src/zen/live-folders/providers/GithubLiveFolder.sys.mjs
@@ -10,7 +10,9 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
   constructor({ id, state, manager }) {
     super({ id, state, manager });
 
-    this.state.url = "https://github.com/pulls/assigned";
+    this.state.url = "https://github.com/issues/assigned";
+    this.state.type = state.type;
+
     this.state.options = state.options ?? {};
     this.state.repos = new Set(state.repos ?? []);
     this.state.options.repoExcludes = new Set(state.options.repoExcludes ?? []);
@@ -38,34 +40,37 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
       }
 
       const document = new DOMParser().parseFromString(text, "text/html");
-      const pull_requests = document.querySelectorAll("div[class^=Description-module__container]");
+      const issues = document.querySelectorAll(
+        "div[class^=IssueItem-module__defaultRepoContainer]"
+      );
       const items = [];
       const activeRepos = new Set();
 
-      if (pull_requests.length) {
-        const authors = document.querySelectorAll(
-          "div[class^=MainContent-module__inner] [data-testid='timestamp-container'] span:nth-child(2)"
-        );
+      if (issues.length) {
+        const authors = document.querySelectorAll("a[class^=IssueItem-module__authorCreatedLink]");
         const titles = document.querySelectorAll("div[class^=Title-module__container]");
-        const links = document.querySelectorAll("a[class^=Title-module__anchor]");
+        const links = document.querySelectorAll('[data-testid="issue-pr-title-link"]');
 
-        for (let i = 0; i < pull_requests.length; i++) {
-          const repo = pull_requests[i].childNodes[0].textContent;
-          const prNum = pull_requests[i].childNodes[4].textContent;
-          const author = authors[i]?.firstChild?.textContent;
+        for (let i = 0; i < issues.length; i++) {
+          const [rawRepo, rawNumber] = issues[i].childNodes;
+          const author = authors[i]?.textContent;
           const title = titles[i]?.textContent;
-          const prUrl = links[i]?.href;
+          const issueUrl = links[i]?.href;
 
+          const repo = rawRepo.textContent?.trim();
           if (repo) {
             activeRepos.add(repo);
           }
 
+          const numberMatch = rawNumber?.textContent?.match(/[0-9]+/);
+          const number = numberMatch?.[0] ?? "";
+
           items.push({
             title,
             subtitle: author,
             icon: "chrome://browser/content/zen-images/favicons/github.svg",
-            url: new URL(prUrl, this.state.url).href,
-            id: `${repo}#${prNum}`,
+            url: "https://github.com" + issueUrl,
+            id: `${repo}#${number}`,
           });
         }
       }
@@ -83,7 +88,7 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
     let searchParams = new URLSearchParams();
     const options = [
       {
-        value: "is:open",
+        value: "state:open",
         enabled: true,
       },
       {
@@ -93,7 +98,11 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
       [
         {
           value: "is:pr",
-          enabled: true,
+          enabled: this.state.type === "pull-requests",
+        },
+        {
+          value: "is:issue",
+          enabled: this.state.type === "issues",
         },
       ],
       [
@@ -177,6 +186,7 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
         l10nId: "zen-live-folder-github-option-review-requested",
         key: "reviewRequested",
         checked: this.state.options.reviewRequested ?? false,
+        hidden: this.state.type === "issues",
       },
       { type: "separator" },
       {