diff --git a/README.md b/README.md index 2d457c164..3d15f9bb8 100644 --- a/README.md +++ b/README.md @@ -434,7 +434,7 @@ The following open source libraries, frameworks, and tools are used by GoToSocia - [stretchr/testify](https://github.com/stretchr/testify); test framework. [MIT License](https://spdx.org/licenses/MIT.html). - superseriousbusiness: - [superseriousbusiness/activity](https://codeberg.org/superseriousbusiness/activity) forked from [go-fed/activity](https://github.com/go-fed/activity); Golang ActivityPub/ActivityStreams library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html). - - [superseriousbusiness/exif-terminator](https://codeberg.org/superseriousbusiness/exif-terminator); EXIF data removal. [GNU AGPL v3 LICENSE](https://spdx.org/licenses/AGPL-3.0-or-later.html). + - [superseriousbusiness/exif-terminator](https://code.superseriousbusiness.org/exif-terminator); EXIF data removal. [GNU AGPL v3 LICENSE](https://spdx.org/licenses/AGPL-3.0-or-later.html). - [superseriousbusiness/httpsig](https://code.superseriousbusiness.org/httpsig) forked from [go-fed/httpsig](https://github.com/go-fed/httpsig); secure HTTP signature library. [BSD-3-Clause License](https://spdx.org/licenses/BSD-3-Clause.html). - [superseriousbusiness/oauth2](https://codeberg.org/superseriousbusiness/oauth2) forked from [go-oauth2/oauth2](https://github.com/go-oauth2/oauth2); OAuth server framework and token handling. [MIT License](https://spdx.org/licenses/MIT.html). - [temoto/robotstxt](https://github.com/temoto/robotstxt); robots.txt parsing. [MIT License](https://spdx.org/licenses/MIT.html). diff --git a/go.mod b/go.mod index 460be3406..70c4850bb 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ replace github.com/go-swagger/go-swagger => codeberg.org/superseriousbusiness/go replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.0-concurrency-workaround require ( + code.superseriousbusiness.org/exif-terminator v0.11.0 code.superseriousbusiness.org/httpsig v1.4.0 codeberg.org/gruf/go-bytes v1.0.2 codeberg.org/gruf/go-bytesize v1.0.3 @@ -30,7 +31,6 @@ require ( codeberg.org/gruf/go-storage v0.2.0 codeberg.org/gruf/go-structr v0.9.6 codeberg.org/superseriousbusiness/activity v1.14.0 - codeberg.org/superseriousbusiness/exif-terminator v0.10.0 codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB github.com/DmitriyVTitov/size v1.5.0 github.com/KimMachineGun/automemlimit v0.7.1 @@ -96,11 +96,11 @@ require ( ) require ( + code.superseriousbusiness.org/go-jpeg-image-structure/v2 v2.3.0 // indirect + code.superseriousbusiness.org/go-png-image-structure/v2 v2.3.0 // indirect codeberg.org/gruf/go-fastpath/v2 v2.0.0 // indirect codeberg.org/gruf/go-mangler v1.4.4 // indirect codeberg.org/gruf/go-maps v1.0.4 // indirect - codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 v2.1.0-SSB // indirect - codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect diff --git a/go.sum b/go.sum index 8b311d7ae..3b53f910b 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,9 @@ +code.superseriousbusiness.org/exif-terminator v0.11.0 h1:Hof0MCcsa+1fS17gf86fTTZ8AQnMY9h9kzcc+2C6mVg= +code.superseriousbusiness.org/exif-terminator v0.11.0/go.mod h1:9sutT1axa/kSdlPLlRFjCNKmyo/KNx8eX3XZvWBlAEY= +code.superseriousbusiness.org/go-jpeg-image-structure/v2 v2.3.0 h1:r9uq8StaSHYKJ8DklR9Xy+E9c40G1Z8yj5TRGi8L6+4= +code.superseriousbusiness.org/go-jpeg-image-structure/v2 v2.3.0/go.mod h1:IK1OlR6APjVB3E9tuYGvf0qXMrwP+TrzcHS5rf4wffQ= +code.superseriousbusiness.org/go-png-image-structure/v2 v2.3.0 h1:I512jiIeXDC4//2BeSPrRM2ZS4wpBKUaPeTPxakMNGA= +code.superseriousbusiness.org/go-png-image-structure/v2 v2.3.0/go.mod h1:SNHomXNW88o1pFfLHpD4KsCZLfcr4z5dm+xcX5SV10A= code.superseriousbusiness.org/httpsig v1.4.0 h1:g9+KQMoTG0oR0II5gYb5pVVdNjbc7CiiuqK8vcZjeQg= code.superseriousbusiness.org/httpsig v1.4.0/go.mod h1:i2AKpj/WbA/o/UTvia9TAREzt0jP1AH3T1Uxjyhdzlw= codeberg.org/gruf/go-bytes v1.0.2 h1:malqE42Ni+h1nnYWBUAJaDDtEzF4aeN4uPN8DfMNNvo= @@ -44,12 +50,6 @@ codeberg.org/gruf/go-structr v0.9.6 h1:FSbJ1A0ubTQB82rC0K4o6qyiqrDGH1t9ivttm8Zy6 codeberg.org/gruf/go-structr v0.9.6/go.mod h1:9k5hYztZ4PsBS+m1v5hUTeFiVUBTLF5VA7d9cd1OEMs= codeberg.org/superseriousbusiness/activity v1.14.0 h1:z+jBjAIane9+Oqu6vO+tNvvNoji+OLU8KYDJ+R+ih+I= codeberg.org/superseriousbusiness/activity v1.14.0/go.mod h1:enxU1Lva4OcK6b/NBXscoHSEgEMsKJvdHrQFifQxp4o= -codeberg.org/superseriousbusiness/exif-terminator v0.10.0 h1:FiLX/AK07tzceS36I+kOP2aEH+aytjPSIlFoYePMEyg= -codeberg.org/superseriousbusiness/exif-terminator v0.10.0/go.mod h1:c/mCytx/+fisOZeVXtjCpXld/SeZb3VsD1vj3oPAihA= -codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 v2.1.0-SSB h1:v2shEkOPgydTL0n44EFPsDT9dsEP7KRG85aPnojCYkI= -codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 v2.1.0-SSB/go.mod h1:Ba/VzIqzDHqqKk5jg+7uFpUsHmdDOsuWLodbamD80jU= -codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB h1:Lqi70gvqNuHyik0gUNrBwElvFUP7A3W1FYLVV5lUmbQ= -codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB/go.mod h1:99rP8gsZoCSUj+/lLdpV9+i86ujLdKSoUjvuxbgvN4M= codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix h1:+JvBZqsQfdT+ROnk2DkvXsKQ9QBorKKKBk5fBqw62I8= codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/HoaZJ5edupq7po= codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB h1:UAFZKgUaeQEoHDmawh9DWXFopJnADfkiDo/CLAtWISc= diff --git a/internal/media/metadata.go b/internal/media/metadata.go index e8eb32c0d..458ad00e2 100644 --- a/internal/media/metadata.go +++ b/internal/media/metadata.go @@ -22,7 +22,7 @@ import ( "os" "strings" - terminator "codeberg.org/superseriousbusiness/exif-terminator" + terminator "code.superseriousbusiness.org/exif-terminator" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/log" ) diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/LICENSE b/vendor/code.superseriousbusiness.org/exif-terminator/LICENSE similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/LICENSE rename to vendor/code.superseriousbusiness.org/exif-terminator/LICENSE diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md b/vendor/code.superseriousbusiness.org/exif-terminator/README.md similarity index 83% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md rename to vendor/code.superseriousbusiness.org/exif-terminator/README.md index ddb97fbb6..245bb9187 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md +++ b/vendor/code.superseriousbusiness.org/exif-terminator/README.md @@ -66,7 +66,7 @@ import ( "io" "os" - terminator "codeberg.org/superseriousbusiness/exif-terminator" + terminator "code.superseriousbusiness.org/exif-terminator" ) func main() { @@ -77,14 +77,8 @@ func main() { } defer sloth.Close() - // get the length of the file - stat, err := sloth.Stat() - if err != nil { - panic(err) - } - // terminate! - out, err := terminator.Terminate(sloth, int(stat.Size()), "jpeg") + out, err := terminator.Terminate(sloth, "jpeg") if err != nil { panic(err) } @@ -106,11 +100,11 @@ func main() { ### Libraries -`exif-terminator` borrows heavily from the two [`dsoprea`](https://github.com/dsoprea) libraries credited below. In fact, it's basically a hack on top of those libraries. Thanks `dsoprea`! +`exif-terminator` borrows heavily from the [`dsoprea`](https://github.com/dsoprea) libraries credited below. In fact, it's basically a hack on top of those libraries. Thanks `dsoprea`! +- [superseriousbusiness/go-jpeg-image-structure](https://code.superseriousbusiness.org/go-jpeg-image-structure): jpeg structure parsing. [MIT License](https://spdx.org/licenses/MIT.html). Forked from [dsoprea/go-jpeg-image-structure](https://github.com/dsoprea/go-jpeg-image-structure): jpeg structure parsing. [MIT License](https://spdx.org/licenses/MIT.html). +- [superseriousbusiness/go-png-image-structure](https://code.superseriousbusiness.org/go-png-image-structure): png structure parsing. Forked from [dsoprea/go-png-image-structure](https://github.com/dsoprea/go-png-image-structure): png structure parsing. [MIT License](https://spdx.org/licenses/MIT.html). - [dsoprea/go-exif](https://github.com/dsoprea/go-exif): exif header reconstruction. [MIT License](https://spdx.org/licenses/MIT.html). -- [dsoprea/go-jpeg-image-structure](https://github.com/dsoprea/go-jpeg-image-structure): jpeg structure parsing. [MIT License](https://spdx.org/licenses/MIT.html). -- [dsoprea/go-png-image-structure](https://github.com/dsoprea/go-png-image-structure): png structure parsing. [MIT License](https://spdx.org/licenses/MIT.html). - [stretchr/testify](https://github.com/stretchr/testify); test framework. [MIT License](https://spdx.org/licenses/MIT.html). ## License @@ -119,4 +113,4 @@ func main() { `exif-terminator` is free software, licensed under the [GNU AGPL v3 LICENSE](LICENSE). -Copyright (C) 2022-2024 SuperSeriousBusiness. +Copyright (C) 2022-2025 SuperSeriousBusiness. diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/exif.go b/vendor/code.superseriousbusiness.org/exif-terminator/exif.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/exif.go rename to vendor/code.superseriousbusiness.org/exif-terminator/exif.go diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go b/vendor/code.superseriousbusiness.org/exif-terminator/jpeg.go similarity index 97% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go rename to vendor/code.superseriousbusiness.org/exif-terminator/jpeg.go index 25b21e3c5..fa61deb27 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go +++ b/vendor/code.superseriousbusiness.org/exif-terminator/jpeg.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - jpegstructure "codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2" + jpegstructure "code.superseriousbusiness.org/go-jpeg-image-structure/v2" ) var markerLen = map[byte]int{ diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go b/vendor/code.superseriousbusiness.org/exif-terminator/png.go similarity index 96% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go rename to vendor/code.superseriousbusiness.org/exif-terminator/png.go index a8245271c..6798e2b7d 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go +++ b/vendor/code.superseriousbusiness.org/exif-terminator/png.go @@ -21,7 +21,7 @@ package terminator import ( "io" - pngstructure "codeberg.org/superseriousbusiness/go-png-image-structure/v2" + pngstructure "code.superseriousbusiness.org/go-png-image-structure/v2" ) type pngVisitor struct { diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go b/vendor/code.superseriousbusiness.org/exif-terminator/terminator.go similarity index 96% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go rename to vendor/code.superseriousbusiness.org/exif-terminator/terminator.go index 8e4976631..1ef7ddf06 100644 --- a/vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go +++ b/vendor/code.superseriousbusiness.org/exif-terminator/terminator.go @@ -25,8 +25,8 @@ import ( "fmt" "io" - jpegstructure "codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2" - pngstructure "codeberg.org/superseriousbusiness/go-png-image-structure/v2" + jpegstructure "code.superseriousbusiness.org/go-jpeg-image-structure/v2" + pngstructure "code.superseriousbusiness.org/go-png-image-structure/v2" ) func Terminate(in io.Reader, mediaType string) (io.Reader, error) { diff --git a/vendor/codeberg.org/superseriousbusiness/exif-terminator/webp.go b/vendor/code.superseriousbusiness.org/exif-terminator/webp.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/exif-terminator/webp.go rename to vendor/code.superseriousbusiness.org/exif-terminator/webp.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/.MODULE_ROOT similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/.MODULE_ROOT diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/LICENSE similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/LICENSE diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/README.md b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/README.md similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/README.md rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/README.md diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/markers.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/markers.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/markers.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/markers.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/media_parser.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/media_parser.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/segment.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/segment.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/segment_list.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/segment_list.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/splitter.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/splitter.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/testing_common.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/testing_common.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/utility.go b/vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/utility.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2/utility.go rename to vendor/code.superseriousbusiness.org/go-jpeg-image-structure/v2/utility.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/.MODULE_ROOT similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/.MODULE_ROOT diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/LICENSE b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/LICENSE similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/LICENSE rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/LICENSE diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/chunk_decoder.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/chunk_decoder.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/media_parser.go b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/media_parser.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/media_parser.go rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/media_parser.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/png.go b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/png.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/png.go rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/png.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/testing_common.go b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/testing_common.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/testing_common.go rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/testing_common.go diff --git a/vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/utility.go b/vendor/code.superseriousbusiness.org/go-png-image-structure/v2/utility.go similarity index 100% rename from vendor/codeberg.org/superseriousbusiness/go-png-image-structure/v2/utility.go rename to vendor/code.superseriousbusiness.org/go-png-image-structure/v2/utility.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 1e5c31e8d..a2acc8ed2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,12 @@ +# code.superseriousbusiness.org/exif-terminator v0.11.0 +## explicit; go 1.23 +code.superseriousbusiness.org/exif-terminator +# code.superseriousbusiness.org/go-jpeg-image-structure/v2 v2.3.0 +## explicit; go 1.17 +code.superseriousbusiness.org/go-jpeg-image-structure/v2 +# code.superseriousbusiness.org/go-png-image-structure/v2 v2.3.0 +## explicit; go 1.12 +code.superseriousbusiness.org/go-png-image-structure/v2 # code.superseriousbusiness.org/httpsig v1.4.0 ## explicit; go 1.21 code.superseriousbusiness.org/httpsig @@ -266,15 +275,6 @@ codeberg.org/superseriousbusiness/activity/streams/values/rfc2045 codeberg.org/superseriousbusiness/activity/streams/values/rfc5988 codeberg.org/superseriousbusiness/activity/streams/values/string codeberg.org/superseriousbusiness/activity/streams/vocab -# codeberg.org/superseriousbusiness/exif-terminator v0.10.0 -## explicit; go 1.21 -codeberg.org/superseriousbusiness/exif-terminator -# codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 v2.1.0-SSB -## explicit; go 1.17 -codeberg.org/superseriousbusiness/go-jpeg-image-structure/v2 -# codeberg.org/superseriousbusiness/go-png-image-structure/v2 v2.1.0-SSB -## explicit; go 1.12 -codeberg.org/superseriousbusiness/go-png-image-structure/v2 # codeberg.org/superseriousbusiness/oauth2/v4 v4.7.0-SSB ## explicit; go 1.23.0 codeberg.org/superseriousbusiness/oauth2/v4