From 261a1d8b52bf59ad5da35e77e90ee9029ad57b2d Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Mon, 24 May 2021 19:34:36 +0200 Subject: [PATCH] Use patched goldmark-emoji --- go.mod | 4 +++- go.sum | 6 ++---- markdown.go | 22 +--------------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 2bf6ccb..15af317 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,9 @@ module git.jlel.se/jlelse/GoBlog go 1.16 +// master +replace github.com/yuin/goldmark-emoji => github.com/jlelse/goldmark-emoji v1.0.2-0.20210524171342-a1615b7be38a + require ( git.jlel.se/jlelse/goldmark-mark v0.0.0-20210522162520-9788c89266a4 git.jlel.se/jlelse/template-strings v0.0.0-20210523080439-57437f8d23ee @@ -31,7 +34,6 @@ require ( github.com/jonboulle/clockwork v0.2.2 // indirect github.com/kaorimatz/go-opml v0.0.0-20210201121027-bc8e2852d7f9 github.com/kr/text v0.2.0 // indirect - github.com/kyokomi/emoji/v2 v2.2.8 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lestrrat-go/strftime v1.0.4 // indirect github.com/lib/pq v1.9.0 // indirect diff --git a/go.sum b/go.sum index 23063f0..881f550 100644 --- a/go.sum +++ b/go.sum @@ -175,6 +175,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/inconshreveable/log15 v0.0.0-20170622235902-74a0988b5f80/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jlelse/goldmark-emoji v1.0.2-0.20210524171342-a1615b7be38a h1:40Q83HyOI4DTtHDXOZmzhPhVj6vF6piANkyh+OgdTrU= +github.com/jlelse/goldmark-emoji v1.0.2-0.20210524171342-a1615b7be38a/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= @@ -202,8 +204,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/kyokomi/emoji/v2 v2.2.8 h1:jcofPxjHWEkJtkIbcLHvZhxKgCPl6C7MyjTrD4KDqUE= -github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4= @@ -346,8 +346,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.7 h1:NSaHgaeJFCtWXCBkBKXw0rhgMuJ0VoE9FB5mWldcrQ4= github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os= -github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= diff --git a/markdown.go b/markdown.go index ce91c75..e1a6fc9 100644 --- a/markdown.go +++ b/markdown.go @@ -2,14 +2,11 @@ package main import ( "bytes" - "strings" marktag "git.jlel.se/jlelse/goldmark-mark" "github.com/PuerkitoBio/goquery" - kemoji "github.com/kyokomi/emoji/v2" "github.com/yuin/goldmark" emoji "github.com/yuin/goldmark-emoji" - "github.com/yuin/goldmark-emoji/definition" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/extension" "github.com/yuin/goldmark/parser" @@ -18,8 +15,6 @@ import ( "github.com/yuin/goldmark/util" ) -var emojilib definition.Emojis - var defaultMarkdown, absoluteMarkdown goldmark.Markdown func initMarkdown() { @@ -37,10 +32,7 @@ func initMarkdown() { extension.Typographer, extension.Linkify, marktag.Mark, - // Emojis - emoji.New( - emoji.WithEmojis(emojiGoLib()), - ), + emoji.Emoji, ), } defaultMarkdown = goldmark.New(append(defaultGoldmarkOptions, goldmark.WithExtensions(&customExtension{absoluteLinks: false}))...) @@ -71,18 +63,6 @@ func renderText(s string) string { // Extensions etc... -// All emojis from emoji lib -func emojiGoLib() definition.Emojis { - if emojilib == nil { - var emojis []definition.Emoji - for shotcode, e := range kemoji.CodeMap() { - emojis = append(emojis, definition.NewEmoji(e, []rune(e), strings.ReplaceAll(shotcode, ":", ""))) - } - emojilib = definition.NewEmojis(emojis...) - } - return emojilib -} - // Links type customExtension struct { absoluteLinks bool