From 25e21eeba8826dd8830eae441e8ee93efa53a5c3 Mon Sep 17 00:00:00 2001 From: nobody Date: Mon, 12 Jul 2021 13:04:37 +0000 Subject: [PATCH] Minor improvements --- Dockerfile | 3 +++ Dockerfile.dev | 3 +++ go.mod | 9 ++++++--- go.sum | 22 +++++++++++++--------- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf022814..3e553478 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,9 @@ ARG TOR_EXCLUDE_EXIT_NODE="{cn},{hk},{mo},{sg},{kp},{th},{pk},{by},{ru},{ir},{sy ENV BASE_DIR /wayback ENV PUSER wayback ENV PGROUP wayback +ENV LANG en_US.UTF-8 +ENV LC_ALL en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 WORKDIR $BASE_DIR diff --git a/Dockerfile.dev b/Dockerfile.dev index c0bf77cf..8b06f3c6 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -25,6 +25,9 @@ ARG TOR_EXCLUDE_EXIT_NODE="{cn},{hk},{mo},{sg},{kp},{th},{pk},{by},{ru},{ir},{sy ENV BASE_DIR /wayback ENV PUSER wayback ENV PGROUP wayback +ENV LANG en_US.UTF-8 +ENV LC_ALL en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 WORKDIR $BASE_DIR diff --git a/go.mod b/go.mod index e95853b5..c46d992b 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ module github.com/wabarc/wayback go 1.16 require ( + github.com/PuerkitoBio/goquery v1.7.1 // indirect github.com/btcsuite/btcd v0.22.0-beta // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cixtor/readability v1.0.0 @@ -13,6 +14,7 @@ require ( github.com/dghubble/oauth1 v0.7.0 github.com/go-shiori/dom v0.0.0-20210627111528-4e4722cd0d65 // indirect github.com/go-shiori/obelisk v0.0.0-20201115143556-8de0d40b0a9b // indirect + github.com/gobwas/ws v1.1.0 // indirect github.com/google/go-github/v37 v37.0.0 github.com/gorilla/mux v1.8.0 github.com/klauspost/cpuid/v2 v2.0.8 // indirect @@ -29,16 +31,17 @@ require ( github.com/tdewolff/parse/v2 v2.5.19 // indirect github.com/thoj/go-ircevent v0.0.0-20190807115034-8e7ce4b5a1eb github.com/wabarc/archive.is v1.3.0 - github.com/wabarc/archive.org v1.2.0 + github.com/wabarc/archive.org v1.2.1-0.20210708220121-cb9b83ff9896 github.com/wabarc/helper v0.0.0-20210706220001-6ba9e89c752b github.com/wabarc/logger v0.0.0-20210708144517-a9651f538672 github.com/wabarc/playback v0.0.0-20210706162327-6ba67b324cc8 - github.com/wabarc/screenshot v1.2.1-0.20210708041031-92addf723bba - github.com/wabarc/telegra.ph v0.0.0-20210706221033-79350ef1df55 + github.com/wabarc/screenshot v1.2.1-0.20210708225510-eb68213a95f1 + github.com/wabarc/telegra.ph v0.0.0-20210708231234-c10dbc08962f github.com/wabarc/warcraft v0.1.1-0.20210707001544-e897dbede7c3 github.com/wabarc/wbipfs v0.2.0 github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b // indirect go.etcd.io/bbolt v1.3.5 + golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect golang.org/x/net v0.0.0-20210614182718-04defd469f4e golang.org/x/sync v0.0.0-20210220032951-036812b2e83c gopkg.in/tucnak/telebot.v2 v2.3.5 diff --git a/go.sum b/go.sum index b4b3037e..81215d51 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,9 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/PuerkitoBio/goquery v1.7.0 h1:O5SP3b9JWqMSVMG69zMfj577zwkSNpxrFf7ybS74eiw= github.com/PuerkitoBio/goquery v1.7.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4= +github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -161,8 +162,10 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.1.0-rc.5 h1:QOAag7FoBaBYYHRqzqkhhd8fq5RTubvI4v3Ft/gDVVQ= github.com/gobwas/ws v1.1.0-rc.5/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= +github.com/gobwas/ws v1.1.0-rc.6/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= +github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= +github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -502,8 +505,9 @@ github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFy github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/wabarc/archive.is v1.3.0 h1:H4hA1Wk8DXLpS7i4FAyoPb5Z6l6fQDdJoFoNqw9ei+U= github.com/wabarc/archive.is v1.3.0/go.mod h1:01mgwPSUip7WkigtaZypTTHSpv3NVbtWpKF0JoWVrAU= -github.com/wabarc/archive.org v1.2.0 h1:Tw3Zdfit7+K4NDcfvPUFugw4AvsuJjIXcFQvf9MBKt0= github.com/wabarc/archive.org v1.2.0/go.mod h1:yEmUMlNO2PPAxIvo/Hf/VxOrCS5SBwL2/vCW8pyTWjA= +github.com/wabarc/archive.org v1.2.1-0.20210708220121-cb9b83ff9896 h1:c3uD+IKXpNhtAHC2/fTt7R9dXnNhw1Q6sQrHUX3xo64= +github.com/wabarc/archive.org v1.2.1-0.20210708220121-cb9b83ff9896/go.mod h1:yEmUMlNO2PPAxIvo/Hf/VxOrCS5SBwL2/vCW8pyTWjA= github.com/wabarc/helper v0.0.0-20210127120855-10af37cc2616/go.mod h1:N9P4r7Rn46p4nkWtXV6ztN3p5ACVnp++bgfwjTqSxQ8= github.com/wabarc/helper v0.0.0-20210407153720-1bfe98b427fe/go.mod h1:TuTZtoiOu984UWOf7FfX58JllKMjq7FCz701kB5W88E= github.com/wabarc/helper v0.0.0-20210613000316-cc3df6340ab5/go.mod h1:TuTZtoiOu984UWOf7FfX58JllKMjq7FCz701kB5W88E= @@ -523,13 +527,12 @@ github.com/wabarc/obelisk v0.0.0-20210420023708-aac2bcc00a78 h1:iWcCLB7Ru5lurvN0 github.com/wabarc/obelisk v0.0.0-20210420023708-aac2bcc00a78/go.mod h1:OlGUo0utWqPMcej0HirsoK2+65Je/ZPFNwasF/O3KYM= github.com/wabarc/playback v0.0.0-20210706162327-6ba67b324cc8 h1:OrWbipdK/NCTzonvQ805WI6yjklwwef4QbBrmINuIrU= github.com/wabarc/playback v0.0.0-20210706162327-6ba67b324cc8/go.mod h1:or8QaM2wUqIX45GfmLbky8AZKgOQm78VueJpqY2TwXY= -github.com/wabarc/screenshot v1.2.1-0.20210706220510-48726ae5afed/go.mod h1:ARB6uZ4NUnDLFUMU0jTj7ovhmeuLVfg5Sr3+Zr8XoTw= -github.com/wabarc/screenshot v1.2.1-0.20210708041031-92addf723bba h1:GJngxHh019k2FzVFAe91pAEzH3Dc3G4SmZxBwqb9l6M= -github.com/wabarc/screenshot v1.2.1-0.20210708041031-92addf723bba/go.mod h1:lT2loRSha0/gQni5A5JAv807xaEOztrIzCPuTQIs9zs= +github.com/wabarc/screenshot v1.2.1-0.20210708225510-eb68213a95f1 h1:83Lk8O1bWxgrpbMnuDVo4HINHtt7KTlCeHDrtxJlePI= +github.com/wabarc/screenshot v1.2.1-0.20210708225510-eb68213a95f1/go.mod h1:lT2loRSha0/gQni5A5JAv807xaEOztrIzCPuTQIs9zs= github.com/wabarc/telebot v0.0.0-20210614085950-9479567e0e0a h1:RCrMXolMzoNxmN9Xx5lKSVkz0f9RFKg81WXPusMxYao= github.com/wabarc/telebot v0.0.0-20210614085950-9479567e0e0a/go.mod h1:BgaIIx50PSRS9pG59JH+geT82cfvoJU/IaI5TJdN3v8= -github.com/wabarc/telegra.ph v0.0.0-20210706221033-79350ef1df55 h1:k0ZNUfltT7/PCZvOMZVhXEQWapx9GzTmcap1Plc4Hkc= -github.com/wabarc/telegra.ph v0.0.0-20210706221033-79350ef1df55/go.mod h1:x3ETPKRID5yygk9nC1TKwRT6DGVx8X32NJZVZgQrv94= +github.com/wabarc/telegra.ph v0.0.0-20210708231234-c10dbc08962f h1:NpVwSn6ZrGAiNuXcvO+kInfC7iTPEWjSSk9nQQYfAoY= +github.com/wabarc/telegra.ph v0.0.0-20210708231234-c10dbc08962f/go.mod h1:AyxUR+ZcDMLWktKjtg3uKasYD9HAdWCWycMn0oP8BqE= github.com/wabarc/warcraft v0.1.1-0.20210707001544-e897dbede7c3 h1:P9KKKeXbGdvzJoEEMQ2M9DlusYdS/9hzimS0+rVYrJY= github.com/wabarc/warcraft v0.1.1-0.20210707001544-e897dbede7c3/go.mod h1:/BbCwReBjlqHRaw8Yh+7sfAicOesiMYNhiFpuL1x8Rc= github.com/wabarc/wbipfs v0.2.0 h1:TksxONxL/LrBGZ6TTcWD4p+FAzuQPfLQyCL7K64isW8= @@ -578,8 +581,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=