diff --git a/go.mod b/go.mod index bb112b94..d5bcd76e 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module github.com/FloatTech/ZeroBot-Plugin go 1.18 require ( - github.com/FloatTech/AnimeAPI v1.5.0 + github.com/Coloured-glaze/gg v1.3.2 + github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958 github.com/FloatTech/sqlite v0.3.3 github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133 - github.com/FloatTech/zbputils v1.5.1-0.20220811111557-511c3fc0b485 + github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa github.com/antchfx/htmlquery v1.2.5 github.com/corona10/goimagehash v1.0.3 - github.com/fogleman/gg v1.3.0 github.com/fumiama/cron v1.3.0 github.com/fumiama/go-base16384 v1.5.4 github.com/fumiama/go-registry v0.1.6 diff --git a/go.sum b/go.sum index a46db94e..9b442661 100644 --- a/go.sum +++ b/go.sum @@ -8,18 +8,18 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/FloatTech/AnimeAPI v1.5.0 h1:/c/VyZc+YmOD6ZkWV30eXaoKyT+Nu2Sklz8W4J+sSQM= -github.com/FloatTech/AnimeAPI v1.5.0/go.mod h1:zkT7ibEafp9Cg6UP1CeYFyetZ1g3eqgroMLaqKqLSgs= +github.com/Coloured-glaze/gg v1.3.2 h1:HRWF0qoIxwhO1O0N5eN2eTPwaO+xHpFu1FfNhtls22w= +github.com/Coloured-glaze/gg v1.3.2/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg= +github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958 h1:BXjlcvPK/7IwaW1HTEPt/pMvbPrc3id1NfFkJ+lh1e4= +github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958/go.mod h1:vhrzmpfFp9p4V1T+xY2OaFUAx498LmMxdk/UqJmPMTc= github.com/FloatTech/sqlite v0.3.3 h1:cSlpv+DcIehqaUG2YyjW0Twh396FoGsybpEpFZnX3Jg= github.com/FloatTech/sqlite v0.3.3/go.mod h1:i33d92OtR8jcp5fBUvQtospf27+MkfUxnGwnZ95E/dA= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133 h1:nP9NI4I+vtwAbiU7wCJwjuzCzMZ/yJYg8h3667HGnv0= github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133/go.mod h1:72BnjyBwQWUC8mqM9dPk5ZrjxXCilQCVp+jfgHATNdw= -github.com/FloatTech/zbputils v1.5.0 h1:mfKZ+Ye+t8eArmgR4PzhhmdwvZM5VPjLfdikyhKffSE= -github.com/FloatTech/zbputils v1.5.0/go.mod h1:Qet1L7sDLCkYectR0cwtTA9yDcW1n4/U1JvnAq2X18A= -github.com/FloatTech/zbputils v1.5.1-0.20220811111557-511c3fc0b485 h1:XqojCzFK7J8rK50D5stcZkBPRco6y5eUIN0y7XUAM4g= -github.com/FloatTech/zbputils v1.5.1-0.20220811111557-511c3fc0b485/go.mod h1:Qet1L7sDLCkYectR0cwtTA9yDcW1n4/U1JvnAq2X18A= +github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa h1:nltmv5w1cdB0vU52zkLFI9a5FdBozaAhZZq/GCLi6Xs= +github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa/go.mod h1:l06shz0lp4jqMBZDJaRRSUdOlIwg99cIKV4sx4YR0DI= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE= @@ -53,8 +53,6 @@ github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4/go.mod h1:H github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= -github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= diff --git a/plugin/bilibili/bilibili.go b/plugin/bilibili/bilibili.go index 2707c258..9b1069f0 100644 --- a/plugin/bilibili/bilibili.go +++ b/plugin/bilibili/bilibili.go @@ -13,6 +13,7 @@ import ( "strconv" "time" + "github.com/Coloured-glaze/gg" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" @@ -21,7 +22,6 @@ import ( "github.com/FloatTech/zbputils/img/text" "github.com/FloatTech/zbputils/img/writer" "github.com/FloatTech/zbputils/web" - "github.com/fogleman/gg" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin/fortune/fortune.go b/plugin/fortune/fortune.go index a964fa12..b62fe9d9 100644 --- a/plugin/fortune/fortune.go +++ b/plugin/fortune/fortune.go @@ -11,7 +11,7 @@ import ( "os" "strconv" - "github.com/fogleman/gg" // 注册了 jpg png gif + "github.com/Coloured-glaze/gg" // 注册了 jpg png gif "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin/gif/gif.go b/plugin/gif/gif.go index c39967d7..21ba45ac 100644 --- a/plugin/gif/gif.go +++ b/plugin/gif/gif.go @@ -5,9 +5,9 @@ import ( "image/color" "sync" + "github.com/Coloured-glaze/gg" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/writer" - "github.com/fogleman/gg" ) // mo 摸 diff --git a/plugin/gif/png.go b/plugin/gif/png.go index c03eb563..0c503774 100644 --- a/plugin/gif/png.go +++ b/plugin/gif/png.go @@ -8,11 +8,11 @@ import ( "strconv" "sync" + "github.com/Coloured-glaze/gg" "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" "github.com/FloatTech/zbputils/img/writer" - "github.com/fogleman/gg" ) // pa 爬 diff --git a/plugin/qqwife/qqmapwife.go b/plugin/qqwife/qqmapwife.go index 3392bfe1..4eb5d220 100644 --- a/plugin/qqwife/qqmapwife.go +++ b/plugin/qqwife/qqmapwife.go @@ -23,10 +23,10 @@ import ( "github.com/wdvxdr1123/ZeroBot/extension/rate" // 画图 + "github.com/Coloured-glaze/gg" "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img/text" "github.com/FloatTech/zbputils/img/writer" - "github.com/fogleman/gg" ) //nolint: asciicheck diff --git a/plugin/score/sign_in.go b/plugin/score/sign_in.go index 1d59a1a0..3ba51488 100644 --- a/plugin/score/sign_in.go +++ b/plugin/score/sign_in.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/fogleman/gg" + "github.com/Coloured-glaze/gg" "github.com/golang/freetype" log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" diff --git a/plugin/wordle/wordle.go b/plugin/wordle/wordle.go index 3f2dc943..7db02abf 100644 --- a/plugin/wordle/wordle.go +++ b/plugin/wordle/wordle.go @@ -14,12 +14,12 @@ import ( "github.com/FloatTech/AnimeAPI/tl" + "github.com/Coloured-glaze/gg" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/writer" - "github.com/fogleman/gg" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/single" "github.com/wdvxdr1123/ZeroBot/message"