From 0e5bf60397c1d8463a026276bfabae9c39d3c61c Mon Sep 17 00:00:00 2001
From: Satty9361 <56998894+Satty9361@users.noreply.github.com>
Date: Mon, 1 Jun 2020 21:13:37 +0200
Subject: [PATCH] remove the extra spacing around mentions (#724)

---
 common/templates/context_funcs.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/templates/context_funcs.go b/common/templates/context_funcs.go
index 3267aeafc6..4ed91a1c28 100644
--- a/common/templates/context_funcs.go
+++ b/common/templates/context_funcs.go
@@ -345,12 +345,12 @@ func (c *Context) tmplEditMessage(filterSpecialMentions bool) func(channel inter
 
 func (c *Context) tmplMentionEveryone() string {
 	c.CurrentFrame.MentionEveryone = true
-	return " @everyone "
+	return "@everyone"
 }
 
 func (c *Context) tmplMentionHere() string {
 	c.CurrentFrame.MentionHere = true
-	return " @here "
+	return "@here"
 }
 
 func (c *Context) tmplMentionRoleID(roleID interface{}) string {
@@ -380,7 +380,7 @@ func (c *Context) tmplMentionRoleID(roleID interface{}) string {
 	}
 
 	c.CurrentFrame.MentionRoles = append(c.CurrentFrame.MentionRoles, role)
-	return " <@&" + discordgo.StrID(role) + "> "
+	return "<@&" + discordgo.StrID(role) + ">"
 }
 
 func (c *Context) tmplMentionRoleName(role string) string {
@@ -403,7 +403,7 @@ func (c *Context) tmplMentionRoleName(role string) string {
 		return "(role not found)"
 	}
 
-	return " <@&" + discordgo.StrID(found.ID) + "> "
+	return "<@&" + discordgo.StrID(found.ID) + ">"
 }
 
 func (c *Context) tmplHasRoleID(roleID interface{}) bool {