From 810c15078158e221585b9a3dda819544432628f5 Mon Sep 17 00:00:00 2001
From: c0ncord2 <59669788+c0ncord2@users.noreply.github.com>
Date: Thu, 9 Jan 2020 17:02:53 +0000
Subject:  move stripCustomoji logic to default Tengo script (#973)

*  move stripCustomoji logic to default Tengo script

Removing the image ID from the message (without any possibility of recovering it later) is a loss of valuable data that prevents users from giving support to custom emoji via Tengo scripts.

* bugfix - do send colors to other irc bridges

"if we're not sending to an irc bridge we strip the IRC colors"

Co-authored-by: c0ncord <59654954+c0ncord@users.noreply.github.com>
---
 bridge/discord/helpers.go | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'bridge/discord/helpers.go')

diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go
index 734de3cd..c094e47a 100644
--- a/bridge/discord/helpers.go
+++ b/bridge/discord/helpers.go
@@ -129,7 +129,6 @@ func (b *Bdiscord) getCategoryChannelName(name, parentID string) string {
 var (
 	// See https://discordapp.com/developers/docs/reference#message-formatting.
 	channelMentionRE = regexp.MustCompile("<#[0-9]+>")
-	emojiRE          = regexp.MustCompile("<(:.*?:)[0-9]+>")
 	userMentionRE    = regexp.MustCompile("@[^@\n]{1,32}")
 )
 
@@ -176,10 +175,6 @@ func (b *Bdiscord) replaceUserMentions(text string) string {
 	return userMentionRE.ReplaceAllStringFunc(text, replaceUserMentionFunc)
 }
 
-func (b *Bdiscord) stripCustomoji(text string) string {
-	return emojiRE.ReplaceAllString(text, `$1`)
-}
-
 func (b *Bdiscord) replaceAction(text string) (string, bool) {
 	if strings.HasPrefix(text, "_") && strings.HasSuffix(text, "_") {
 		return text[1 : len(text)-1], true
-- 
cgit v1.2.3