From de16fe2cce5c418fa4281c8fb33291347fdc2d0f Mon Sep 17 00:00:00 2001
From: vatsal <vatsalsinghkv@gmail.com>
Date: Tue, 3 Dec 2024 15:49:22 +0530
Subject: [PATCH] fix: url query filters

---
 src/containers/Issues.tsx | 37 +++++++++++++++++++++----------------
 src/lib/utils/index.ts    |  4 ++--
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/containers/Issues.tsx b/src/containers/Issues.tsx
index 18d2870..b16008e 100644
--- a/src/containers/Issues.tsx
+++ b/src/containers/Issues.tsx
@@ -47,22 +47,27 @@ const Issues = () => {
   return (
     <div>
       <div className='py-5 space-y-3'>
-        {data.items.map((issue) => (
-          <Issue
-            date={issue.created_at}
-            key={issue.html_url}
-            repoUrl={issue.repository_url}
-            title={issue.title}
-            url={issue.html_url}
-            comments={issue.comments}
-          >
-            {issue.labels.map((label) => (
-              <Label key={toId(label.name)} className='mr-1.5 mt-2'>
-                {label.name}
-              </Label>
-            ))}
-          </Issue>
-        ))}
+        {/* Filters out pull requests */}
+        {data.items.map((issue) =>
+          !issue.html_url.includes('/pull/') ? (
+            <Issue
+              date={issue.created_at}
+              key={issue.html_url}
+              repoUrl={issue.repository_url}
+              title={issue.title}
+              url={issue.html_url}
+              comments={issue.comments}
+            >
+              {issue.labels.map((label) => (
+                <Label key={toId(label.name)} className='mr-1.5 mt-2'>
+                  {label.name}
+                </Label>
+              ))}
+            </Issue>
+          ) : (
+            <></>
+          )
+        )}
       </div>
       <Pagination
         currentPage={page}
diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts
index 7fab4e6..3824ce5 100644
--- a/src/lib/utils/index.ts
+++ b/src/lib/utils/index.ts
@@ -1,5 +1,4 @@
 import {
-  DEFAULT_LABEL,
   INITIAL_LABELS,
   ISSUE_PER_PAGE,
   ISSUE_URL,
@@ -156,7 +155,7 @@ export const composeUrl = (
     order,
     page,
     per_page: ISSUE_PER_PAGE,
-    q: `${QUERIES}+${langQuery}${labelQuery}`,
+    q: `${QUERIES}${langQuery}${labelQuery}`,
     sort,
   };
 
@@ -170,5 +169,6 @@ export const composeUrl = (
   // the API is not parsing the URL correctly :(
   url.search = decodeURIComponent(url.search);
 
+  console.log({ url: url.toString() });
   return url.toString();
 };