From 6c4c8fe51f0e2c4ce55f5915a2bc5434aef5e5e7 Mon Sep 17 00:00:00 2001
From: marcin mikołajczak <git@mkljczk.pl>
Date: Thu, 4 Jan 2024 22:46:04 +0100
Subject: Display quotes count on posts and add quotes list page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 src/components/quotes_timeline/quotes_timeline.js  | 26 ++++++++++++++++++++++
 src/components/quotes_timeline/quotes_timeline.vue | 10 +++++++++
 src/components/status/status.scss                  |  1 +
 src/components/status/status.vue                   | 13 +++++++++++
 src/components/timeline/timeline.js                |  3 +++
 src/components/timeline_menu/timeline_menu.js      |  3 ++-
 6 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/components/quotes_timeline/quotes_timeline.js
 create mode 100644 src/components/quotes_timeline/quotes_timeline.vue

(limited to 'src/components')

diff --git a/src/components/quotes_timeline/quotes_timeline.js b/src/components/quotes_timeline/quotes_timeline.js
new file mode 100644
index 00000000..a5f42da5
--- /dev/null
+++ b/src/components/quotes_timeline/quotes_timeline.js
@@ -0,0 +1,26 @@
+import Timeline from '../timeline/timeline.vue'
+
+const QuotesTimeline = {
+  created () {
+    this.$store.commit('clearTimeline', { timeline: 'quotes' })
+    this.$store.dispatch('startFetchingTimeline', { timeline: 'quotes', statusId: this.statusId })
+  },
+  components: {
+    Timeline
+  },
+  computed: {
+    statusId () { return this.$route.params.id },
+    timeline () { return this.$store.state.statuses.timelines.quotes }
+  },
+  watch: {
+    statusId () {
+      this.$store.commit('clearTimeline', { timeline: 'quotes' })
+      this.$store.dispatch('startFetchingTimeline', { timeline: 'quotes', statusId: this.statusId })
+    }
+  },
+  unmounted () {
+    this.$store.dispatch('stopFetchingTimeline', 'quotes')
+  }
+}
+
+export default QuotesTimeline
diff --git a/src/components/quotes_timeline/quotes_timeline.vue b/src/components/quotes_timeline/quotes_timeline.vue
new file mode 100644
index 00000000..835abd12
--- /dev/null
+++ b/src/components/quotes_timeline/quotes_timeline.vue
@@ -0,0 +1,10 @@
+<template>
+  <Timeline
+    :title="$t('nav.quotes')"
+    :timeline="timeline"
+    :timeline-name="'quotes'"
+    :status-id="statusId"
+  />
+</template>
+
+<script src='./quotes_timeline.js'></script>
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 760c6ac1..54c4b4ff 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -398,6 +398,7 @@
       font-weight: bolder;
       font-size: 1.1em;
       line-height: 1em;
+      color: var(--selectedPostText, $fallback--text);
     }
 
     &:hover .stat-title {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index fa9d6f0b..11dc1e2e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -506,6 +506,19 @@
                     </div>
                   </div>
                 </UserListPopover>
+                <router-link
+                  v-if="statusFromGlobalRepository.quotes_count > 0"
+                  :to="{ name: 'quotes', params: { id: status.id } }"
+                >
+                  <div
+                    class="stat-count"
+                  >
+                    <a class="stat-title">{{ $t('status.quotes') }}</a>
+                    <div class="stat-number">
+                      {{ statusFromGlobalRepository.quotes_count }}
+                    </div>
+                  </div>
+                </router-link>
                 <div class="avatar-row">
                   <AvatarList :users="combinedFavsAndRepeatsUsers" />
                 </div>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 1050b87a..6cb9d1f1 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -25,6 +25,7 @@ const Timeline = {
     'title',
     'userId',
     'listId',
+    'statusId',
     'tag',
     'embedded',
     'count',
@@ -121,6 +122,7 @@ const Timeline = {
       showImmediately,
       userId: this.userId,
       listId: this.listId,
+      statusId: this.statusId,
       tag: this.tag
     })
   },
@@ -183,6 +185,7 @@ const Timeline = {
         showImmediately: true,
         userId: this.userId,
         listId: this.listId,
+        statusId: this.statusId,
         tag: this.tag
       }).then(({ statuses }) => {
         if (statuses && statuses.length === 0) {
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 5a2a86c2..c4586b32 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -19,7 +19,8 @@ export const timelineNames = () => {
     bookmarks: 'nav.bookmarks',
     dms: 'nav.dms',
     'public-timeline': 'nav.public_tl',
-    'public-external-timeline': 'nav.twkn'
+    'public-external-timeline': 'nav.twkn',
+    quotes: 'nav.quotes'
   }
 }
 
-- 
cgit v1.2.3-70-g09d2


From f6d3a66a5b7bcbbecc72a66532866ee096c7752d Mon Sep 17 00:00:00 2001
From: marcin mikołajczak <git@mkljczk.pl>
Date: Fri, 19 Jan 2024 19:01:11 +0100
Subject: shouldDisplayFavsAndRepeats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 src/components/status/status.js  | 3 +++
 src/components/status/status.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 129929a3..9e6c9528 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -374,6 +374,9 @@ const Status = {
     hidePostStats () {
       return this.mergedConfig.hidePostStats
     },
+    shouldDisplayFavsAndRepeats () {
+      return !this.hidePostStats && this.isFocused && (this.combinedFavsAndRepeatsUsers.length > 0 || this.statusFromGlobalRepository.quotes_count)
+    },
     muteBotStatuses () {
       return this.mergedConfig.muteBotStatuses
     },
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 11dc1e2e..54fcc60f 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -478,7 +478,7 @@
 
           <transition name="fade">
             <div
-              v-if="!hidePostStats && isFocused && combinedFavsAndRepeatsUsers.length > 0"
+              v-if="shouldDisplayFavsAndRepeats"
               class="favs-repeated-users"
             >
               <div class="stats">
-- 
cgit v1.2.3-70-g09d2


From a4264b9cd21d10dd373394f9b94405e0eb54d414 Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 29 Apr 2024 07:39:00 +0000
Subject: Apply 1 suggestion(s) to 1 file(s)

---
 src/components/status/status.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 54c4b4ff..760c6ac1 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -398,7 +398,6 @@
       font-weight: bolder;
       font-size: 1.1em;
       line-height: 1em;
-      color: var(--selectedPostText, $fallback--text);
     }
 
     &:hover .stat-title {
-- 
cgit v1.2.3-70-g09d2


From 9d2572ffdb384ca4458cd96daf6c11e5d46dd03a Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 29 Apr 2024 08:09:05 +0000
Subject: Update status.scss

---
 src/components/status/status.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components')

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 760c6ac1..758a030b 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -398,6 +398,7 @@
       font-weight: bolder;
       font-size: 1.1em;
       line-height: 1em;
+      color: var(--text);
     }
 
     &:hover .stat-title {
-- 
cgit v1.2.3-70-g09d2