Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fully qualify emojis instead of removing VS16. Fixes #58

Browse Source
This commit is contained in:
Tulir Asokan
2023-02-26 21:53:04 +02:00
parent 77b230f4d8
commit a0cc5ec9bc
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
formatter.go
View File

@@ -206,8 +206,8 @@ func (portal *Portal) parseMatrixHTML(user *User, content *event.MessageEventCon
ctx := format.NewContext() ctx := format.NewContext()
ctx.ReturnData[formatterContextUserKey] = user ctx.ReturnData[formatterContextUserKey] = user
ctx.ReturnData[formatterContextPortalKey] = portal ctx.ReturnData[formatterContextPortalKey] = portal
return variationselector.Remove(matrixHTMLParser.Parse(content.FormattedBody, ctx)) return variationselector.FullyQualify(matrixHTMLParser.Parse(content.FormattedBody, ctx))
} else { } else {
return variationselector.Remove(escapeDiscordMarkdown(content.Body)) return variationselector.FullyQualify(escapeDiscordMarkdown(content.Body))
} }
} }

2
go.mod
View File

@@ -15,7 +15,7 @@ require (
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1
github.com/yuin/goldmark v1.5.4 github.com/yuin/goldmark v1.5.4
maunium.net/go/maulogger/v2 v2.4.1 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 ( require (

4
go.sum
View File

@@ -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/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 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho= 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.0.20230226195153-2ed32c6c6268 h1:12k6eBgd4mFzS2ddrIw4WSoJal1gLGULMOG4+GzrpXQ=
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/go.mod h1:AE3TCX9q4W7fYfrL/1RsuOell9rTUBO27XUULuwArH4=

2
portal.go
View File

@@ -1908,7 +1908,7 @@ func (portal *Portal) handleMatrixReaction(sender *User, evt *event.Event) {
emojiID = fmt.Sprintf("%s:%s", emojiFile.EmojiName, emojiFile.ID) emojiID = fmt.Sprintf("%s:%s", emojiFile.EmojiName, emojiFile.ID)
} else { } else {
emojiID = variationselector.Remove(emojiID) emojiID = variationselector.FullyQualify(emojiID)
} }
existing := portal.bridge.DB.Reaction.GetByDiscordID(portal.Key, msg.DiscordID, sender.DiscordID, emojiID) existing := portal.bridge.DB.Reaction.GetByDiscordID(portal.Key, msg.DiscordID, sender.DiscordID, emojiID)