From 34e32abe51be631f3f70a6de4e0230ac9b226d08 Mon Sep 17 00:00:00 2001
From: Ayo Ayco <ramon.aycojr@gmail.com>
Date: Mon, 26 Jun 2023 14:10:51 +0200
Subject: [PATCH] fix: prevent history mess (#70)

* chore: add favicon

* fix: home article url

* fix: prevent duplicated history entry (unencoded & encoded)

* fix: prevent own app

* remove console.log

* fix: prevent showing cached cozy
---
 README.md                    |   5 +----
 favicon.ico                  | Bin 0 -> 4286 bytes
 src/components/Footer.astro  |   1 +
 src/components/Library.astro |  21 ++++++++++++++++-----
 src/layouts/Layout.astro     |   9 ++-------
 src/pages/index.astro        |   2 +-
 src/utils/library.ts         |   9 ++++++---
 7 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 favicon.ico

diff --git a/README.md b/README.md
index 1a5ea2b..e160898 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<h1 align="center"><s>Cozy 🧸</s> Uh, we need a new name! See why <a href="https://social.ayco.io/@ayo/110547172702258070">here</a></h1>
+<h1 align="center"><s>Cozy</s> Uh, we need a new name! See why <a href="https://social.ayco.io/@ayo/110547172702258070">here</a></h1>
 <p align="center">
   <a href="https://github.com/ayoayco/cozy">
     <img alt="Last Commit" src="https://img.shields.io/github/last-commit/ayoayco/cozy?logo=github" />
@@ -58,6 +58,3 @@ It doesn't exist yet... I'll probably get to creating a browser extension at som
 
 ## Contributing
 Speaking of PRs being welcome, see our [CONTRIBUTING guide](/CONTRIBUTING.md).
-
-🧸
-
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..85a9aac9664c2e409f6b24ed07e31bfa0525abdc
GIT binary patch
literal 4286
zcmc&&OHUI~7#;tCE7v4$T=^UP4<IVWXjIs+5_L&pqAL@PF}^msaAg7%5s-u?J`;!)
zLSmvI0>)s92|6=vXP9AL$MfAnTA-8xhR$uK?L2zV`5yPX=c}e2;;X4ilXvaKVNE-t
zY1%O!yriArA=lO5y`#s=NBM%LVTTcg9)eOH?))f9A8x{Uc@BE-$=XNXDHKMpVCBnm
z_<yGnc@}4nc0kzXb`&A7{=oS$j6(Jr^uE)?Y^{yEfe)V{4`c8W?8ztam%jqEVOJvz
z;N>S#`glvtrT4bPz^&nvo)#2dcfy&;AYAzui$WBv!krs|InoKer+II<)&3v{J#z+D
z?g0YxSA7nl4`+4|CVi*N@2cn7*LRt#6{WG;2#deB<>3B&17oP2&n95^7QST;R_<ZV
zSoq7+<vdH&?oBztxedm`ndt|DN=`;@0oKH$Wa7QW?yVdox74~=i-ec|3}fIt{hnmZ
zH{n+Eq95#u$B0%-5ZmqC{l?f{#X;(W#5~aFnD3Vp%=J2USK-TguvsTv);FnF$*r~c
z_$F($HGVfGeDYNLMHg+4Q`h6#wY%rcfeR`4zQWPS$i7xNZ}fK~b2e3cbEqR#{Nmeg
z=3#pIXHPv#ZT*Rs^A^XHK4^5_iO)q(hSn1I-K&ky0qRM2A&V$*;Y{}uzd?JSTI<w>
z+3N_Yt7QcGywc6dYOXppg>~1N9foLoHK=!;@2{v$+78|i)U=|j!_rb2d+j}RbXcG6
zQ3urFz3)2NqI9*FpV)xCei9f9D89dOKt5<@PjXRdd(hw84bdcugVLc1<s^M>4z{Zp
zgZ;%$!#CztEJUmBFDJ>L*wVj=wvX6f#2wNvNlr>XxhD>ywYj(3)Ybm-H@2Z+T<FSk
z())64N_|i@O4f&HHML)C-ZOYE*LmNdo)k^%<#PyEi=1zdJ@7gc#w=tn>@AMNo_dPn
nyKb1n9WeUaV6cvforTdZYPmZ~Px{ofk>JL#dHsKYv_Ag>$U2bG

literal 0
HcmV?d00001

diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 7933534..d4790b6 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -12,6 +12,7 @@ import Icon from 'astro-iconify'
     <a href="http://ayos.blog/building-a-cozy-web/">Hand-crafted</a> with <Icon name="line-md:heart" /> by <a href="https://ayo.ayco.io">Ayo Ayco</a>
     <br />
     <a href="https://github.com/ayoayco/cozy">Star on GitHub to support!</a>
+    <!-- <Icon name="twemoji:blue-circle" /> -->
   </section>
 
   <section class="disclaimer">All rights reserved to content owners.</section>
diff --git a/src/components/Library.astro b/src/components/Library.astro
index 7c23cb1..78ce5c8 100644
--- a/src/components/Library.astro
+++ b/src/components/Library.astro
@@ -17,19 +17,30 @@ const {routerOutlet, skipSave = false} = Astro.props;
 <script>
   import { getPostCard, renderPost } from '../utils/library'
   const cache = await caches.open('cozy-reader');
-  const url = new URL(window.location.href);
-  const response = await cache.match(url)
+  let url= new URL(window.location.href);
+  // only cached unencoded url param
+  const urlParam = url.searchParams.get('url')
+  if (urlParam) {
+    url = new URL(`${url.origin}/?url=${urlParam}`);
+  }
+  const response = await cache.match(url);
   const postDivSelector = document.querySelector<HTMLInputElement>('#postDivSelector');
   const skipSave = document.querySelector<HTMLInputElement>('#skipSave');
+  const includesAppURL = urlParam?.includes(window.location.origin)
 
-  if (!response && !skipSave?.checked) {
-      await cache.add(url);
+  if (!response && !skipSave?.checked && !includesAppURL) {
+    await cache.add(url);
   }
 
   const cachedRequests = (await cache.keys())
     .filter(request => {
       const urlObj = new URL(request.url);
-      return urlObj.search !== '' && urlObj.searchParams.get('url') !== '';
+      const urlParam = urlObj.searchParams.get('url'); 
+
+      return urlObj.search !== ''
+      && !urlParam?.startsWith(window.location.origin)
+      && urlParam !== ''
+      && urlParam !== 'null';
     });
 
   if(cachedRequests?.length && postDivSelector !== null) {
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 3ef321d..440ee77 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -5,14 +5,9 @@ import Footer from "../components/Footer.astro";
 export interface Props {
   article: ArticleData | null
 }
-const app: ArticleData = {
-    title: "Cozy 🧸",
-    description: "Remove distractions. Save your favorites. Get useful insights. Cozy is your modern-day reading assistant.",
-    content: "<p>Enter a URL in the address bar to get started.</p>",
-    url: '/'
-  };
+
 const { article } = Astro.props;
-const appTitle = article?.title ? `${article.title} | Cozy 🧸` : app.title;
+const appTitle = article?.title ? `${article.title} | Cozy` : 'Cozy';
 ---
 
 <!DOCTYPE html>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index b1024a2..1dbecdb 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -7,7 +7,7 @@ import Library from "../components/Library.astro";
 import Footer from "../components/Footer.astro";
 
 const url = Astro.url.searchParams.get('url');
-let article: ArticleData | null = {};
+let article: ArticleData | null = {url: '/'};
 
 if (url)
   try {
diff --git a/src/utils/library.ts b/src/utils/library.ts
index bd04c97..23d9d67 100644
--- a/src/utils/library.ts
+++ b/src/utils/library.ts
@@ -65,13 +65,13 @@ export function renderPost(responseText, url, postDivSelector: string, preventPu
       backBtn?.removeAttribute('disabled');
       submitBtn?.removeAttribute('disabled');
       homeBtn?.removeAttribute('disabled');
-      document.title = `${getCozyTitle(html)} | Cozy 🧸`;
+      document.title = `${getCozyTitle(html)} | Cozy`;
     } else {
       appUrl.value = '';
       backBtn?.setAttribute('disabled', 'true');
       submitBtn?.setAttribute('disabled', 'true');
       homeBtn?.setAttribute('disabled', 'true');
-      document.title = `Cozy 🧸`;
+      document.title = `Cozy`;
     }
 
     if(!preventPushState) {
@@ -102,6 +102,9 @@ function getCozyTitle(html: HTMLHtmlElement): string | undefined {
   return html.querySelector('meta[property="cozy:title"]')?.getAttribute("content")
     /**
      * backwards compatibility for stuff before we implemented cozy:meta tags
+     * REMOVE ON V1 release
      */
-    ?? html.querySelector("title")?.innerHTML?.replace("Cozy 🧸 | ", "");
+    ?? html.querySelector("title")?.innerHTML
+        ?.replace("Cozy 🧸 | ", "")
+    
 }
\ No newline at end of file