From 8236f08c187aa99fac7f6b5e64efa8a11ba9b45c Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sat, 14 Dec 2019 17:47:14 +0000
Subject: [PATCH] Fix mentions

---
 service/service.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/service/service.go b/service/service.go
index 8b5562d..b10a5de 100644
--- a/service/service.go
+++ b/service/service.go
@@ -246,15 +246,22 @@ func (svc *service) ServeThreadPage(ctx context.Context, client io.Writer, c *ma
 		return
 	}
 
-	var content string
-	if reply {
-		content += status.Account.Acct + " "
-		for _, m := range status.Mentions {
-			content += m.Acct + " "
-		}
+	u, err := c.GetAccountCurrentUser(ctx)
+	if err != nil {
+		return
 	}
 
-	fmt.Println("content", content)
+	var content string
+	if reply {
+		if u.ID != status.Account.ID {
+			content += "@" + status.Account.Acct + " "
+		}
+		for _, m := range status.Mentions {
+			if u.ID != m.ID {
+				content += "@" + m.Acct + " "
+			}
+		}
+	}
 
 	data := renderer.NewThreadPageTemplateData(status, context, reply, id, content)
 	err = svc.renderer.RenderThreadPage(ctx, client, data)