From 2cfff1b8b9c642e9284483d6658312d9a3763417 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 12 Aug 2021 02:49:37 +0300
Subject: remove new options for style and separate line, now groups all
 chained mentions on a mentionsline regardless of placement. fixes spacing

---
 src/components/status/status.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3c21cb76..8aa73a22 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -184,10 +184,7 @@ const Status = {
       })
     },
     mentionsLine () {
-      return this.mentionsOwnLine ? this.mentions : this.alsoMentions
-    },
-    mentionsOwnLine () {
-      return this.mergedConfig.mentionsOwnLine
+      return this.alsoMentions
     },
     hasMentionsLine () {
       return this.mentionsLine.length > 0
-- 
cgit v1.2.3-70-g09d2


From 2182af405864cffcc7ddca8d373cc14f38770c9e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 12 Aug 2021 03:08:57 +0300
Subject: made the code responsible for showing unwritten mentions actually
 work

---
 src/components/status/status.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 8aa73a22..54f304a2 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -176,15 +176,18 @@ const Status = {
         userId: attn.id
       }))
     },
-    alsoMentions () {
-      if (!this.headTailLinks) return []
-      const set = new Set(this.headTailLinks.writtenMentions.map(m => m.url))
-      return this.headTailLinks.writtenMentions.filter(mention => {
-        return !set.has(mention.url)
-      })
-    },
     mentionsLine () {
-      return this.alsoMentions
+      const writtenMentions = this.headTailLinks ? this.headTailLinks.writtenMentions : []
+      const set = new Set(writtenMentions.map(_ => _.url))
+      return this.status.attentions.filter(attn => {
+        return attn.screen_name !== this.replyToName &&
+          attn.screen_name !== this.status.user.screen_name &&
+          !set.has(attn.url)
+      }).map(attn => ({
+        url: attn.statusnet_profile_url,
+        content: attn.screen_name,
+        userId: attn.id
+      }))
     },
     hasMentionsLine () {
       return this.mentionsLine.length > 0
-- 
cgit v1.2.3-70-g09d2


From 4465de5241a6ed148d00d20de9e348f4991a4400 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 14 Aug 2021 21:55:38 +0300
Subject: fixed mentions line again

---
 src/components/status/status.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 54f304a2..ac481534 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -166,23 +166,16 @@ const Status = {
     muteWordHits () {
       return muteWordHits(this.status, this.muteWords)
     },
-    mentions () {
-      return this.status.attentions.filter(attn => {
-        return attn.screen_name !== this.replyToName &&
-          attn.screen_name !== this.status.user.screen_name
-      }).map(attn => ({
-        url: attn.statusnet_profile_url,
-        content: attn.screen_name,
-        userId: attn.id
-      }))
-    },
     mentionsLine () {
-      const writtenMentions = this.headTailLinks ? this.headTailLinks.writtenMentions : []
-      const set = new Set(writtenMentions.map(_ => _.url))
+      if (!this.headTailLinks) return []
+      const writtenSet = new Set(this.headTailLinks.writtenMentions.map(_ => _.url))
       return this.status.attentions.filter(attn => {
-        return attn.screen_name !== this.replyToName &&
-          attn.screen_name !== this.status.user.screen_name &&
-          !set.has(attn.url)
+        // no reply user
+        return attn.id !== this.status.in_reply_to_user_id &&
+          // no self-replies
+          attn.statusnet_profile_url !== this.status.user.statusnet_profile_url &&
+          // don't include if mentions is written
+          !writtenSet.has(attn.statusnet_profile_url)
       }).map(attn => ({
         url: attn.statusnet_profile_url,
         content: attn.screen_name,
-- 
cgit v1.2.3-70-g09d2