From 84aa6123450d3acf4958a07962089106aa40fd23 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sun, 5 May 2019 14:35:08 +0900 Subject: [PATCH] Use the image server --- go.mod | 11 ++++------- go.sum | 30 ++++++++++++++++-------------- layout/layout.pixy | 2 +- pages/upload/image-formats.go | 8 ++++++++ 4 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pages/upload/image-formats.go diff --git a/go.mod b/go.mod index ebd77b5a..7e506fc8 100644 --- a/go.mod +++ b/go.mod @@ -6,14 +6,14 @@ require ( cloud.google.com/go v0.38.0 // indirect github.com/OneOfOne/xxhash v1.2.5 github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect - github.com/aerogo/aero v1.1.4 + github.com/aerogo/aero v1.1.6 github.com/aerogo/api v0.1.5 github.com/aerogo/crawler v0.2.1 - github.com/aerogo/http v1.0.2 + github.com/aerogo/http v1.0.3 github.com/aerogo/layout v0.1.5 github.com/aerogo/log v0.1.3 github.com/aerogo/markdown v0.1.5 - github.com/aerogo/nano v0.1.6 + github.com/aerogo/nano v0.1.7 github.com/aerogo/pack v0.3.1 github.com/aerogo/pixy v1.2.1 // indirect github.com/aerogo/run v0.1.4 @@ -22,7 +22,7 @@ require ( github.com/aerogo/sitemap v0.1.1 github.com/akyoto/color v1.8.3 github.com/animenotifier/anilist v0.2.2 - github.com/animenotifier/arn v1.1.10 + github.com/animenotifier/arn v1.1.12 github.com/animenotifier/kitsu v0.2.2 github.com/animenotifier/mal v0.2.2 github.com/animenotifier/shoboi v0.2.2 @@ -48,10 +48,7 @@ require ( github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect github.com/stretchr/testify v1.3.0 - golang.org/x/image v0.0.0-20190501045829-6d32002ffd75 // indirect - golang.org/x/net v0.0.0-20190502183928-7f726cade0ab // indirect golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 // indirect golang.org/x/text v0.3.2 // indirect google.golang.org/appengine v1.5.0 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect diff --git a/go.sum b/go.sum index 3a93d882..dbe7648e 100644 --- a/go.sum +++ b/go.sum @@ -16,14 +16,14 @@ github.com/aerogo/aero v1.1.1 h1:EgFwiU87K3Zt+rhkrzx4+U412pMi5onRsDKhMOfJCpU= github.com/aerogo/aero v1.1.1/go.mod h1:GD7hyz4bLaDumYYNVJogq7ZjWZqmHpRPbkSl11MAhHI= github.com/aerogo/aero v1.1.2 h1:O01aVpwkMhtExRdK7ebibZlF6J2todKzrTNaB2SILlc= github.com/aerogo/aero v1.1.2/go.mod h1:2eeRN7zcyVq+wYNu3lnJBS7To5xDxKcJ89ay4GBchig= -github.com/aerogo/aero v1.1.3 h1:9Az49zHZD2nexxFL9mm3Mk3gHwZUEzlRIpm172uY9RY= -github.com/aerogo/aero v1.1.3/go.mod h1:SGduBZ3vGNUjMRIBuFdYMyitv8In5ow0pwYcHKrJxkc= -github.com/aerogo/aero v1.1.4 h1:yDPPiLl9ytDP9ds07JOGandrUUNpiF3KHUkWpI5wHlQ= -github.com/aerogo/aero v1.1.4/go.mod h1:SGduBZ3vGNUjMRIBuFdYMyitv8In5ow0pwYcHKrJxkc= +github.com/aerogo/aero v1.1.6 h1:WGRxjYJorWUlSsrtLq9xXiMlbeO3xSS+GKMyRhS2eRk= +github.com/aerogo/aero v1.1.6/go.mod h1:WAM3BRkVDU8Eid6wdOyVdCG5DZXLMmbUa+rVedKHx3E= github.com/aerogo/api v0.1.5 h1:P4HwoPvbSzHaTucSax0o8CDj4AMHNeJ0I55Ir3Y/rMI= github.com/aerogo/api v0.1.5/go.mod h1:SajJMM1q5ARitmCfPkKEFMJtozHbJo5AA+SLBRgozgU= github.com/aerogo/cluster v0.1.4 h1:mOTGqSicLyh9s7viVaniov6lCMLs6bTz/nkeJaEul+o= github.com/aerogo/cluster v0.1.4/go.mod h1:lsMuIQ2gNlA0xUD9PJTGohL4nsbqH5WYS8l5d1XPRN4= +github.com/aerogo/cluster v0.1.5 h1:mOYQmaYRsvIi1inaGLICmeJgCYycBxiHnjcTFLtC6kc= +github.com/aerogo/cluster v0.1.5/go.mod h1:uFZAv2XWV+/clNy0iciCIP2Ygndv8rC8QCX/RCO2R2g= github.com/aerogo/codetree v1.0.3/go.mod h1:MhElfskRtfAKGy5ukRIFcLTtHcSCwLRBjDAlsbuFts0= github.com/aerogo/codetree v1.1.2 h1:bEMemusgUdu1MSc2UxTu39AlLkAMyhVVE+toD5YvIng= github.com/aerogo/codetree v1.1.2/go.mod h1:MhElfskRtfAKGy5ukRIFcLTtHcSCwLRBjDAlsbuFts0= @@ -43,6 +43,8 @@ github.com/aerogo/http v1.0.1 h1:KTzYarhp5yougurxuAhJKFh3YvZ7R7CfaDVwJv5+xIs= github.com/aerogo/http v1.0.1/go.mod h1:B1igUmMLpE6KabMpc9reHCJJNUOJ2U/PR9s1fF3TpPQ= github.com/aerogo/http v1.0.2 h1:X2H/naJ00sLORT59I6g9r5Wjda1ViBYGauOjgDwDDHs= github.com/aerogo/http v1.0.2/go.mod h1:B1igUmMLpE6KabMpc9reHCJJNUOJ2U/PR9s1fF3TpPQ= +github.com/aerogo/http v1.0.3 h1:vf6A+Igme5OHQPaP3a00uPDS0oxsx3puMA23d1NsWDM= +github.com/aerogo/http v1.0.3/go.mod h1:B1igUmMLpE6KabMpc9reHCJJNUOJ2U/PR9s1fF3TpPQ= github.com/aerogo/layout v0.1.5 h1:cdEwBXwkwbx+ipC2trv0Ex4SABsvBZfSeQI5+SO0Idg= github.com/aerogo/layout v0.1.5/go.mod h1:/gZBjVCr6fZcHRoe33s00sS6d19qtO/yEV0xlUh9UoM= github.com/aerogo/linter-performance v1.0.0 h1:p+v7jfDHFXGzJ367iTdmKk2dKiqtz/TkHJMDRLWKFjs= @@ -57,6 +59,8 @@ github.com/aerogo/mirror v0.1.3 h1:813FatCdChOvgWen2EcZNnRfxAeo9zmu/TgDNOnsDx0= github.com/aerogo/mirror v0.1.3/go.mod h1:Un87Jq8RIRrb2bU1CxVToJjVZgSMLUQXxVLCXln4rUU= github.com/aerogo/nano v0.1.6 h1:FtWokAa8SZcm5kHlW10OkaUnqlFE4eQGvEfkiSBVsek= github.com/aerogo/nano v0.1.6/go.mod h1:NxWlxJWtm2s4gB4CcJGy5Lsofz1ZgvEGtv5dEQVNa94= +github.com/aerogo/nano v0.1.7 h1:usInw70W0/OPyUVML2qXi2kLr3K1dMzIyyG3iz5Ccak= +github.com/aerogo/nano v0.1.7/go.mod h1:tbR/fVGJb2rRFdPp9+D0INJgkhzQ+9XKefLTI11xNFU= github.com/aerogo/pack v0.3.1 h1:jXJmMAAKxW6vbqSS3HSggNlP+b8xVsWb/Zdu0KoTp3Q= github.com/aerogo/pack v0.3.1/go.mod h1:kJ7XtTxpadBd2JrQvfm53Euv6taHX9gFsdCsAFg0mEI= github.com/aerogo/packet v0.1.3 h1:8SrI9KLYQiGAcDElvWeXAKqnydSIBDw0H5+y4A1fZuM= @@ -101,20 +105,20 @@ github.com/akyoto/ignore v1.0.0 h1:78Pp37C7P+YgHSsJGu2OpITyxelY2W4CVRtYaWbSnrM= github.com/akyoto/ignore v1.0.0/go.mod h1:5I1uoQJobhW1ox8oKWBuR08o7R982nHbzY547jDT988= github.com/akyoto/ignore v1.0.1 h1:R8fgJLGKFNfKcAHYIbWEU/EF345ivRD822/iSZwZvD0= github.com/akyoto/ignore v1.0.1/go.mod h1:5I1uoQJobhW1ox8oKWBuR08o7R982nHbzY547jDT988= -github.com/akyoto/imageoutput v0.1.2 h1:AavZrHn6q1F1I1x5lN3L5cr2B3ba8tkSlw+OCxFt1og= -github.com/akyoto/imageoutput v0.1.2/go.mod h1:EaIs9+sW6veycPFj8j5S1Px3a5g1ZWYPEI+jZQ541RM= +github.com/akyoto/imageserver v0.3.1 h1:0Vmv2VIzwPTHcPodlnnL4c/X0/r446lE+Vb3c1bDus4= +github.com/akyoto/imageserver v0.3.1/go.mod h1:hgcpcjMEEOVqkRGjTw98/NgLminoie4R/XH+7OeY4HE= github.com/akyoto/webpush-go v0.1.1 h1:oQx87KF5uAKLArM0nOXG7Yy7PesrdlT8hDYcCM29TQA= github.com/akyoto/webpush-go v0.1.1/go.mod h1:DD2XwHePwpzsnzzPw9EifowMUvKUFhJ7FwRSBnbs+p8= github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/animenotifier/anilist v0.2.2 h1:zLL9KabDJx2a+yNT+b13ORWvKlLTsFL67hBKLXyImSI= github.com/animenotifier/anilist v0.2.2/go.mod h1:orL7qr/k64K2YEUYESjr1rhp6+0BXdJmiANxG3OV30U= -github.com/animenotifier/arn v1.1.10 h1:JKfOHlEqWv+kLqich46f55RzBvBI9MVheCkHYgSl19o= -github.com/animenotifier/arn v1.1.10/go.mod h1:g+CU4VlycjzRCVArVCp/8UMWGjYcMcB+1kjnPWvpsdI= +github.com/animenotifier/arn v1.1.12 h1:0lsZBtunKmLg6BBumbFLU/ozA+gGlCY7s45S7+jc8Jw= +github.com/animenotifier/arn v1.1.12/go.mod h1:OVvq5e+52m7ruISqaJz8imxeW8q1ujhVuEL/YhudHuQ= github.com/animenotifier/ffxiv v0.1.0 h1:N9gX5iUtD+g/KW4OjKIclS0y2WrL/+Ko9rGEFDaLf1w= github.com/animenotifier/ffxiv v0.1.0/go.mod h1:oBHhRzQAUv+dBe4qFJAFnTg7qv5Gl6QFHQphyJla74Q= -github.com/animenotifier/japanese v0.2.1 h1:O2Fui6+8pmdniQ+swSf+Yp276+iTrSTfvImPRclbFFU= -github.com/animenotifier/japanese v0.2.1/go.mod h1:HLrrnBE9ztkw9iMcVrm7DKaXydAq21UpZIp1MpKajQI= +github.com/animenotifier/japanese v0.2.2 h1:3+jJvwlA6K7ijFsVPA/coQlwQE3ca6PkNpNMBhYi9tc= +github.com/animenotifier/japanese v0.2.2/go.mod h1:HLrrnBE9ztkw9iMcVrm7DKaXydAq21UpZIp1MpKajQI= github.com/animenotifier/kitsu v0.2.2 h1:+OzzNO187GyUocn6vJMabxSNkTAz9DIqPQLMLDbqSDY= github.com/animenotifier/kitsu v0.2.2/go.mod h1:lyzQXPb0KRPX7fAhvkmGxvfdqnTjsd0R94nW0MKsUXY= github.com/animenotifier/mal v0.2.2 h1:pnqbC0ZlCngg48v0W1YnFrYDyJRgMSZvVPXCgPJ7rhY= @@ -258,8 +262,6 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/image v0.0.0-20190424155947-59b11bec70c7 h1:OIchhgIITCxOyycwe8n9adxV37/WqbetxrpXNm7oPqI= -golang.org/x/image v0.0.0-20190424155947-59b11bec70c7/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190501045829-6d32002ffd75 h1:TbGuee8sSq15Iguxu4deQ7+Bqq/d2rsQejGcEtADAMQ= golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -277,8 +279,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 h1:FP8hkuE6yUEaJnK7O2eTuejKWwW+Rhfj80dQ2JcKxCU= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190502183928-7f726cade0ab h1:9RfW3ktsOZxgo9YNbBAjq1FWzc/igwEcUzZz8IXgSbk= -golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c h1:uOCk1iQW6Vc18bnC13MfzScl+wdKBmM9Y9kU7Z83/lw= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA= diff --git a/layout/layout.pixy b/layout/layout.pixy index 9cd9e1ca..1de5b973 100644 --- a/layout/layout.pixy +++ b/layout/layout.pixy @@ -61,7 +61,7 @@ component Layout(app *aero.Application, ctx *aero.Context, user *arn.User, openG if user != nil #user(data-id=user.ID, data-pro=user.IsPro(), data-theme=user.Settings().Theme) - script(src="/scripts", importance="high") + script(src="/scripts", importance="high", crossorigin="anonymous") script(type="application/ld+json")!= organization component Content(content string) diff --git a/pages/upload/image-formats.go b/pages/upload/image-formats.go new file mode 100644 index 00000000..5f296831 --- /dev/null +++ b/pages/upload/image-formats.go @@ -0,0 +1,8 @@ +package upload + +// We need these to decode uploaded images. +import ( + _ "image/gif" + _ "image/jpeg" + _ "image/png" +)