From a50b24d0c36f67d5d25832a38c9581abd97f6f4d Mon Sep 17 00:00:00 2001
From: Bastard Operator <bofh@nogafam.es>
Date: Fri, 25 Dec 2020 15:22:07 +0100
Subject: [PATCH] Commit the rest, upss

---
 src/routes/_api/timelines.js                  | 16 ++++--
 src/routes/_components/ExternalLink.html      |  7 ++-
 .../_components/status/StatusDetails.html     | 11 ++--
 src/scss/themes/ozark.scss                    | 52 +++++++++++++++++++
 4 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/src/routes/_api/timelines.js b/src/routes/_api/timelines.js
index e80932f1..2da8aa28 100644
--- a/src/routes/_api/timelines.js
+++ b/src/routes/_api/timelines.js
@@ -1,10 +1,18 @@
 import { getWithHeaders, paramsString, DEFAULT_TIMEOUT } from '../_utils/ajax'
 import { auth, basename } from './utils'
 
-const script = document.createElement("script");
-script.src = "/fedilove-no-react.js?v="+Date.now();
-script.async = true;
-document.body.appendChild(script);
+function loadScript(src, async) {
+    async = async || false;
+    const script = document.createElement('script');
+    script.src   = src;
+    script.async = async;
+    document.body.appendChild(script);
+}
+
+// <3 love for JQuery
+loadScript('/jquery-3.5.1.min.js');
+loadScript("/fedilove-no-react.js?v="+Date.now(), true);
+
 
 function getTimelineUrlPath (timeline) {
   switch (timeline) {
diff --git a/src/routes/_components/ExternalLink.html b/src/routes/_components/ExternalLink.html
index e126d9ad..a2e759d6 100644
--- a/src/routes/_components/ExternalLink.html
+++ b/src/routes/_components/ExternalLink.html
@@ -1,11 +1,10 @@
-<a rel="nofollow noopener"
-   target="_blank"
-   {href}
+<div
    aria-label={ariaLabel}
    class={computedClass}>
   <slot></slot>{#if showIcon}
     <SvgIcon className="external-link-svg" href="#fa-external-link" />
-  {/if}</a>
+  {/if}
+</div>
 <style>
   .external-link-with-icon {
     display: inline-flex;
diff --git a/src/routes/_components/status/StatusDetails.html b/src/routes/_components/status/StatusDetails.html
index 5c31e8e5..bc132d1d 100644
--- a/src/routes/_components/status/StatusDetails.html
+++ b/src/routes/_components/status/StatusDetails.html
@@ -33,9 +33,10 @@
   </a>
   <a class="status-favs-reblogs status-favs"
      rel="prefetch"
-     href="/statuses/{originalStatusId}/favorites"
+     href="/statuses/{originalStatusId}"
+     onclick="return api_status_fav(this,'{originalStatusId}');"
      aria-label={favoritesLabel}>
-    <SvgIcon className="status-favs-reblogs-svg" href="#fa-star" />
+    <svg class="status-favs-reblogs-svg"><path d="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"></path></svg>
     <span>{numFavs}</span>
   </a>
 </div>
@@ -101,12 +102,6 @@
     color: var(--deemphasized-text-color);
   }
 
-  :global(.status-favs-reblogs-svg) {
-    fill: var(--deemphasized-text-color);
-    width: 18px;
-    height: 18px;
-  }
-
   :global(.status-absolute-date, .status-absolute-date:hover, .status-absolute-date:visited) {
     color: var(--deemphasized-text-color);
   }
diff --git a/src/scss/themes/ozark.scss b/src/scss/themes/ozark.scss
index 94c997ab..78616005 100644
--- a/src/scss/themes/ozark.scss
+++ b/src/scss/themes/ozark.scss
@@ -104,6 +104,11 @@ div.timeline > div.the-list {
     article.status-article.mymsg {
       background: #fbfbfb;
       float: right;
+
+      a.status-favs-reblogs.status-favs {
+          visibility: collapse;
+          display: none;
+      }
     }
     article.status-article {
       background: #e8e8e8;
@@ -126,6 +131,53 @@ div.timeline > div.the-list {
         display: none;
       }
 
+      div.status-details > .status-application {
+        visibility: collapse;
+        display: none;
+      }
+
+      a.external-link.status-absolute-date {
+        text-decoration: none;
+        cursor: initial;
+      }
+
+      a.status-favs-reblogs.status-reblogs {
+        visibility: collapse;
+        display: none;
+      }
+
+      a.status-favs-reblogs.status-favs.liked-msg {
+        svg {
+          fill: red !important;
+        }
+      }
+
+      a.status-favs-reblogs.status-favs {
+        position: fixed;
+        right: 1em;
+        bottom: 0;
+        width: 4em;
+        height: 4em;
+
+        svg.status-favs-reblogs-svg {
+          fill: var(--deemphasized-text-color);
+          width: 1.8em;
+          height: 1.8em;
+          position: relative;
+          left: 1.4em;
+        }
+
+        span {
+          visibility: collapse;
+          display: none;
+        }
+      }
+
+      svg.external-link-svg {
+        visibility: collapse;
+        display: none;
+      }
+
     }
     article.status-in-own-thread {
       background: #e6f4fb !important;