From d3fef9159464763aba7979ee0290fd1321c1f1b0 Mon Sep 17 00:00:00 2001 From: Charles Iliya Krempeaux Date: Thu, 1 Aug 2024 15:29:50 -0700 Subject: [PATCH] "sourcecode.social/reiver/go-opt" -> "github.com/reiver/go-opt" --- ent/account.go | 2 +- ent/account_marshaljson_test.go | 2 +- ent/admn/account.go | 2 +- ent/admn/account_marshaljson_test.go | 2 +- ent/admn/dimension.go | 2 +- ent/admn/dimensiondata.go | 2 +- ent/admn/dimensiondata_marshaljson_test.go | 2 +- ent/admn/ip.go | 2 +- ent/application.go | 2 +- ent/application_marshaljson_test.go | 2 +- ent/customemoji.go | 2 +- ent/customemoji_marshaljson_test.go | 2 +- ent/field.go | 2 +- ent/mediaattachment.go | 2 +- ent/mention.go | 2 +- ent/notification.go | 2 +- ent/poll.go | 2 +- ent/polloption.go | 2 +- ent/previewcard.go | 2 +- ent/previewcardhistory.go | 2 +- ent/report.go | 2 +- ent/report_marshaljson_test.go | 2 +- ent/role.go | 2 +- ent/role_unmarshaljson_test.go | 2 +- ent/status.go | 2 +- ent/tag.go | 2 +- error.go | 2 +- go.mod | 4 +++- go.sum | 6 ++++-- 29 files changed, 34 insertions(+), 30 deletions(-) diff --git a/ent/account.go b/ent/account.go index e6a77da..2e76e82 100644 --- a/ent/account.go +++ b/ent/account.go @@ -5,7 +5,7 @@ import ( "sourcecode.social/reiver/go-erorr" "sourcecode.social/reiver/go-nul" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-jsonint" ) diff --git a/ent/account_marshaljson_test.go b/ent/account_marshaljson_test.go index 2ac5af5..d96f8ad 100644 --- a/ent/account_marshaljson_test.go +++ b/ent/account_marshaljson_test.go @@ -7,7 +7,7 @@ import ( "sourcecode.social/reiver/go-jsonint" "sourcecode.social/reiver/go-nul" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "github.com/reiver/go-mstdn/ent" ) diff --git a/ent/admn/account.go b/ent/admn/account.go index 3bd45bd..f1ff710 100644 --- a/ent/admn/account.go +++ b/ent/admn/account.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-erorr" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" "github.com/reiver/go-mstdn/ent" diff --git a/ent/admn/account_marshaljson_test.go b/ent/admn/account_marshaljson_test.go index d2973ce..e882c6d 100644 --- a/ent/admn/account_marshaljson_test.go +++ b/ent/admn/account_marshaljson_test.go @@ -7,7 +7,7 @@ import ( "sourcecode.social/reiver/go-jsonint" "sourcecode.social/reiver/go-nul" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "github.com/reiver/go-mstdn/ent" "github.com/reiver/go-mstdn/ent/admn" diff --git a/ent/admn/dimension.go b/ent/admn/dimension.go index 824ec24..4dff836 100644 --- a/ent/admn/dimension.go +++ b/ent/admn/dimension.go @@ -1,7 +1,7 @@ package admn import ( - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // Dimension represents a Mastodon API "Admin::Dimension". diff --git a/ent/admn/dimensiondata.go b/ent/admn/dimensiondata.go index e3c31f6..9f7da0c 100644 --- a/ent/admn/dimensiondata.go +++ b/ent/admn/dimensiondata.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-erorr" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) var _ json.Marshaler = DimensionData{} diff --git a/ent/admn/dimensiondata_marshaljson_test.go b/ent/admn/dimensiondata_marshaljson_test.go index b28770c..f8d6166 100644 --- a/ent/admn/dimensiondata_marshaljson_test.go +++ b/ent/admn/dimensiondata_marshaljson_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "github.com/reiver/go-mstdn/ent/admn" ) diff --git a/ent/admn/ip.go b/ent/admn/ip.go index f299b72..2b68502 100644 --- a/ent/admn/ip.go +++ b/ent/admn/ip.go @@ -1,7 +1,7 @@ package admn import ( - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // IP represents a Mastodon API "Admin::Ip". diff --git a/ent/application.go b/ent/application.go index 13a1674..a89bfb9 100644 --- a/ent/application.go +++ b/ent/application.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-erorr" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/application_marshaljson_test.go b/ent/application_marshaljson_test.go index cff783a..e026f8a 100644 --- a/ent/application_marshaljson_test.go +++ b/ent/application_marshaljson_test.go @@ -7,7 +7,7 @@ import ( "sourcecode.social/reiver/go-jsonpp" "sourcecode.social/reiver/go-nul" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "github.com/reiver/go-mstdn/ent" ) diff --git a/ent/customemoji.go b/ent/customemoji.go index 97c845c..faaf168 100644 --- a/ent/customemoji.go +++ b/ent/customemoji.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-erorr" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) var _ json.Marshaler = CustomEmoji{} diff --git a/ent/customemoji_marshaljson_test.go b/ent/customemoji_marshaljson_test.go index 3b6ad06..2a40a2b 100644 --- a/ent/customemoji_marshaljson_test.go +++ b/ent/customemoji_marshaljson_test.go @@ -6,7 +6,7 @@ import ( "bytes" "encoding/json" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) func TestCustomEmoji_MarshalJSON(t *testing.T) { diff --git a/ent/field.go b/ent/field.go index 4fe88c1..d5a0c1d 100644 --- a/ent/field.go +++ b/ent/field.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-erorr" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/mediaattachment.go b/ent/mediaattachment.go index ebf1327..3f613e6 100644 --- a/ent/mediaattachment.go +++ b/ent/mediaattachment.go @@ -3,7 +3,7 @@ package ent import ( "encoding/json" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/mention.go b/ent/mention.go index 21042d8..014ae90 100644 --- a/ent/mention.go +++ b/ent/mention.go @@ -1,7 +1,7 @@ package ent import ( - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // See: diff --git a/ent/notification.go b/ent/notification.go index 60f7233..704c98b 100644 --- a/ent/notification.go +++ b/ent/notification.go @@ -1,7 +1,7 @@ package ent import ( - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // Notification represents a Mastodon API "Notification". diff --git a/ent/poll.go b/ent/poll.go index faf19ed..d2d362c 100644 --- a/ent/poll.go +++ b/ent/poll.go @@ -2,7 +2,7 @@ package ent import ( "sourcecode.social/reiver/go-jsonint" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/polloption.go b/ent/polloption.go index 0c1fad2..dbd470d 100644 --- a/ent/polloption.go +++ b/ent/polloption.go @@ -2,7 +2,7 @@ package ent import ( "sourcecode.social/reiver/go-jsonint" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/previewcard.go b/ent/previewcard.go index da2b002..63302cf 100644 --- a/ent/previewcard.go +++ b/ent/previewcard.go @@ -2,7 +2,7 @@ package ent import ( "sourcecode.social/reiver/go-jsonint" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/previewcardhistory.go b/ent/previewcardhistory.go index 7abdfd1..db1ab63 100644 --- a/ent/previewcardhistory.go +++ b/ent/previewcardhistory.go @@ -1,7 +1,7 @@ package ent import ( - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // See: diff --git a/ent/report.go b/ent/report.go index 7f093d1..47108cb 100644 --- a/ent/report.go +++ b/ent/report.go @@ -3,7 +3,7 @@ package ent import ( "sourcecode.social/reiver/go-jsonstr" "sourcecode.social/reiver/go-nul" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // Report represents a Mastodon API "Report". diff --git a/ent/report_marshaljson_test.go b/ent/report_marshaljson_test.go index bd55c5b..85ceb13 100644 --- a/ent/report_marshaljson_test.go +++ b/ent/report_marshaljson_test.go @@ -9,7 +9,7 @@ import ( "sourcecode.social/reiver/go-jsonpp" "sourcecode.social/reiver/go-jsonstr" "sourcecode.social/reiver/go-nul" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "github.com/reiver/go-mstdn/ent" ) diff --git a/ent/role.go b/ent/role.go index f27882a..a413065 100644 --- a/ent/role.go +++ b/ent/role.go @@ -3,7 +3,7 @@ package ent import ( "encoding/json" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-jsonint" ) diff --git a/ent/role_unmarshaljson_test.go b/ent/role_unmarshaljson_test.go index a01c00b..b98fe9c 100644 --- a/ent/role_unmarshaljson_test.go +++ b/ent/role_unmarshaljson_test.go @@ -6,7 +6,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-jsonint" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "github.com/reiver/go-mstdn/ent" ) diff --git a/ent/status.go b/ent/status.go index e180d23..9491119 100644 --- a/ent/status.go +++ b/ent/status.go @@ -4,7 +4,7 @@ import ( "encoding/json" "sourcecode.social/reiver/go-jsonint" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" "sourcecode.social/reiver/go-nul" ) diff --git a/ent/tag.go b/ent/tag.go index b6c9773..a04e751 100644 --- a/ent/tag.go +++ b/ent/tag.go @@ -1,7 +1,7 @@ package ent import ( - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) // Tag represents a Mastodon API "Tag". diff --git a/error.go b/error.go index 004dd4c..0603f94 100644 --- a/error.go +++ b/error.go @@ -6,7 +6,7 @@ import ( "io" "net/http" - "sourcecode.social/reiver/go-opt" + "github.com/reiver/go-opt" ) func errorJSON(writer io.Writer, statusCode int, msg ...interface{}) { diff --git a/go.mod b/go.mod index a44051d..bca0507 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,13 @@ module github.com/reiver/go-mstdn go 1.20 require ( + github.com/reiver/go-opt v0.0.0-20240704165441-4ce81358adfc sourcecode.social/reiver/go-erorr v0.0.0-20230922202459-231149d185a1 sourcecode.social/reiver/go-jsonint v0.0.0-20230924212905-09e0626e3dd8 sourcecode.social/reiver/go-jsonpp v0.0.0-20230927044614-2bd26d25b35e sourcecode.social/reiver/go-jsonstr v0.0.0-20230927032837-cca9187c9798 sourcecode.social/reiver/go-nul v0.0.0-20230927004815-8a8eeb3194fa - sourcecode.social/reiver/go-opt v0.0.0-20230927004316-272fd8451811 sourcecode.social/reiver/go-pathmatch v0.0.0-20231001044920-1772a36eb6bd ) + +require github.com/reiver/go-erorr v0.0.0-20240704145350-0485e21eaa82 // indirect diff --git a/go.sum b/go.sum index b3eac79..cc9372e 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,8 @@ github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= +github.com/reiver/go-erorr v0.0.0-20240704145350-0485e21eaa82 h1:xxt7qL+7ZfRysXWXU2MpULOg/zWe5P+Fmw9VyUFCmZE= +github.com/reiver/go-erorr v0.0.0-20240704145350-0485e21eaa82/go.mod h1:F0HbBf+Ak2ZlE8YkDW4Y+KxaUmT0KaaIJK6CXY3cJxE= +github.com/reiver/go-opt v0.0.0-20240704165441-4ce81358adfc h1:9ARo75fNaZDaGy6zzTrCnJWtkDMNigM7uMRRK8sUERM= +github.com/reiver/go-opt v0.0.0-20240704165441-4ce81358adfc/go.mod h1:Yu6dFKh0IZ0evP9U5QiBlxBa5BhlBzGEn7EZ1kP/pkA= sourcecode.social/reiver/go-erorr v0.0.0-20230922202459-231149d185a1 h1:wpnz4JicQBLWrgGphYBls7DysIFCcnWgDz/vce/sY8E= sourcecode.social/reiver/go-erorr v0.0.0-20230922202459-231149d185a1/go.mod h1:NFtd7fzEf0r6A6R7JXYZfayRhPaJy0zt/18VWoLzrxA= sourcecode.social/reiver/go-jsonint v0.0.0-20230924212905-09e0626e3dd8 h1:Qf3OP8Z89a6t4M6qwF7q4+DYhU93rPFPJ1sl+bxesME= @@ -9,7 +13,5 @@ sourcecode.social/reiver/go-jsonstr v0.0.0-20230927032837-cca9187c9798 h1:yznt9j sourcecode.social/reiver/go-jsonstr v0.0.0-20230927032837-cca9187c9798/go.mod h1:K97qQnuRcjjh2OjhT2BzliIZMm8hLp4qIx8arkV/tnU= sourcecode.social/reiver/go-nul v0.0.0-20230927004815-8a8eeb3194fa h1:ws1aQ5mMDvBbKEEk0UulTN4Mmszcs6pn4CgMcTLVkv0= sourcecode.social/reiver/go-nul v0.0.0-20230927004815-8a8eeb3194fa/go.mod h1:4WTJneAzve27LLCE8+HRpFUIjuB3hgvZkNtlS43xbKw= -sourcecode.social/reiver/go-opt v0.0.0-20230927004316-272fd8451811 h1:T3ft05KUJpzkimaJXiNSpBkYJoRmyinvtrq8MbrfrFQ= -sourcecode.social/reiver/go-opt v0.0.0-20230927004316-272fd8451811/go.mod h1:O6WKM2UcKkheRT/dA6A2b1tW0m+WenSbxdcXE+idxzI= sourcecode.social/reiver/go-pathmatch v0.0.0-20231001044920-1772a36eb6bd h1:6MIrZc2s6m4SaHnP2Aza6Cg4kMBiwpi+8mKdO9sjfhw= sourcecode.social/reiver/go-pathmatch v0.0.0-20231001044920-1772a36eb6bd/go.mod h1:mw0k5AKQBwJ75SIP6sm9HWCSkEVxqn9UlHDH+MR8pjo=