From a0cc5ec9bc683f05861e884d5a8e5aac4c704ecd Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 26 Feb 2023 21:53:04 +0200 Subject: [PATCH] Fully qualify emojis instead of removing VS16. Fixes #58 --- formatter.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- portal.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/formatter.go b/formatter.go index ff99313..ba9b72c 100644 --- a/formatter.go +++ b/formatter.go @@ -206,8 +206,8 @@ func (portal *Portal) parseMatrixHTML(user *User, content *event.MessageEventCon ctx := format.NewContext() ctx.ReturnData[formatterContextUserKey] = user ctx.ReturnData[formatterContextPortalKey] = portal - return variationselector.Remove(matrixHTMLParser.Parse(content.FormattedBody, ctx)) + return variationselector.FullyQualify(matrixHTMLParser.Parse(content.FormattedBody, ctx)) } else { - return variationselector.Remove(escapeDiscordMarkdown(content.Body)) + return variationselector.FullyQualify(escapeDiscordMarkdown(content.Body)) } } diff --git a/go.mod b/go.mod index da0731c..ccb8185 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/stretchr/testify v1.8.1 github.com/yuin/goldmark v1.5.4 maunium.net/go/maulogger/v2 v2.4.1 - maunium.net/go/mautrix v0.15.0-beta.1 + maunium.net/go/mautrix v0.15.0-beta.1.0.20230226195153-2ed32c6c6268 ) require ( diff --git a/go.sum b/go.sum index d898d3e..f76826a 100644 --- a/go.sum +++ b/go.sum @@ -82,5 +82,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8= maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho= -maunium.net/go/mautrix v0.15.0-beta.1 h1:ISHvryI5ovYzsm5Tz/RQlDbohOoFiu0ymqL6VO4ucdI= -maunium.net/go/mautrix v0.15.0-beta.1/go.mod h1:AE3TCX9q4W7fYfrL/1RsuOell9rTUBO27XUULuwArH4= +maunium.net/go/mautrix v0.15.0-beta.1.0.20230226195153-2ed32c6c6268 h1:12k6eBgd4mFzS2ddrIw4WSoJal1gLGULMOG4+GzrpXQ= +maunium.net/go/mautrix v0.15.0-beta.1.0.20230226195153-2ed32c6c6268/go.mod h1:AE3TCX9q4W7fYfrL/1RsuOell9rTUBO27XUULuwArH4= diff --git a/portal.go b/portal.go index 772906b..6d22888 100644 --- a/portal.go +++ b/portal.go @@ -1908,7 +1908,7 @@ func (portal *Portal) handleMatrixReaction(sender *User, evt *event.Event) { emojiID = fmt.Sprintf("%s:%s", emojiFile.EmojiName, emojiFile.ID) } else { - emojiID = variationselector.Remove(emojiID) + emojiID = variationselector.FullyQualify(emojiID) } existing := portal.bridge.DB.Reaction.GetByDiscordID(portal.Key, msg.DiscordID, sender.DiscordID, emojiID)