aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Wang2022-03-19 09:14:08 -0500
committerAnthony Wang2022-03-19 09:14:08 -0500
commitf9e33d97cccf4de527567e93ff19a3d9d2223abb (patch)
tree66e879ea4966b378c376c1a5ad0340a33e5b80c6
parentb480c52f602fe0234089e0bb80292ecc8c1db3fd (diff)
Run make fmt and make generate-swagger
Signed-off-by: Anthony Wang <ta180m@pm.me>
-rw-r--r--modules/activitypub/client.go1
-rw-r--r--modules/activitypub/client_test.go3
-rw-r--r--modules/activitypub/clock.go1
-rw-r--r--modules/activitypub/hack_16834_test.go4
-rw-r--r--routers/api/v1/activitypub/person.go1
-rw-r--r--routers/api/v1/activitypub/reqsignature.go1
-rw-r--r--templates/swagger/v1_json.tmpl1
7 files changed, 10 insertions, 2 deletions
diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go
index bb969f2c3..fc87c32f4 100644
--- a/modules/activitypub/client.go
+++ b/modules/activitypub/client.go
@@ -14,6 +14,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/setting"
+
"github.com/go-fed/activity/pub"
"github.com/go-fed/httpsig"
)
diff --git a/modules/activitypub/client_test.go b/modules/activitypub/client_test.go
index 095cd4308..b93ef5ac9 100644
--- a/modules/activitypub/client_test.go
+++ b/modules/activitypub/client_test.go
@@ -12,11 +12,12 @@ import (
"regexp"
"testing"
- _ "code.gitea.io/gitea/models" // https://discourse.gitea.io/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/setting"
+ _ "code.gitea.io/gitea/models" // https://discourse.gitea.io/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4
+
"github.com/stretchr/testify/assert"
)
diff --git a/modules/activitypub/clock.go b/modules/activitypub/clock.go
index d697c62d9..fff6c17c3 100644
--- a/modules/activitypub/clock.go
+++ b/modules/activitypub/clock.go
@@ -8,6 +8,7 @@ import (
"time"
"code.gitea.io/gitea/modules/setting"
+
"github.com/go-fed/activity/pub"
)
diff --git a/modules/activitypub/hack_16834_test.go b/modules/activitypub/hack_16834_test.go
index c1638f6f0..76892a410 100644
--- a/modules/activitypub/hack_16834_test.go
+++ b/modules/activitypub/hack_16834_test.go
@@ -7,9 +7,11 @@ package activitypub
import (
"testing"
- _ "code.gitea.io/gitea/models" // https://discourse.gitea.io/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
+
+ _ "code.gitea.io/gitea/models" // https://discourse.gitea.io/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4
+
"github.com/stretchr/testify/assert"
)
diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go
index 3bb54f779..6218286f7 100644
--- a/routers/api/v1/activitypub/person.go
+++ b/routers/api/v1/activitypub/person.go
@@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers/api/v1/user"
+
"github.com/go-fed/activity/streams"
)
diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go
index a7b1d23d9..7be505d8e 100644
--- a/routers/api/v1/activitypub/reqsignature.go
+++ b/routers/api/v1/activitypub/reqsignature.go
@@ -18,6 +18,7 @@ import (
gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/setting"
+
"github.com/go-fed/activity/pub"
"github.com/go-fed/activity/streams"
"github.com/go-fed/activity/streams/vocab"
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 390441cde..c068612f5 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -12753,6 +12753,7 @@
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
"ActivityPub": {
+ "description": "ActivityPub type",
"type": "object",
"properties": {
"@context": {