diff --git a/models/forgefed/activity.go b/models/forgefed/activity.go
index 6e315fe591..4016b71b38 100644
--- a/models/forgefed/activity.go
+++ b/models/forgefed/activity.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/validation"
+
 	ap "github.com/go-ap/activitypub"
 )
 
diff --git a/models/forgefed/activity_test.go b/models/forgefed/activity_test.go
index 982ed82eec..d4196cc972 100644
--- a/models/forgefed/activity_test.go
+++ b/models/forgefed/activity_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/modules/validation"
+
 	ap "github.com/go-ap/activitypub"
 )
 
diff --git a/models/forgefed/actor.go b/models/forgefed/actor.go
index cbc9648c63..28126fe2ce 100644
--- a/models/forgefed/actor.go
+++ b/models/forgefed/actor.go
@@ -8,10 +8,10 @@ import (
 	"net/url"
 	"strings"
 
-	ap "github.com/go-ap/activitypub"
-
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
 )
 
 // ----------------------------- ActorID --------------------------------------------
diff --git a/models/forgefed/actor_test.go b/models/forgefed/actor_test.go
index 0b34b816a9..da99534ff5 100644
--- a/models/forgefed/actor_test.go
+++ b/models/forgefed/actor_test.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	ap "github.com/go-ap/activitypub"
-
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
 )
 
 func TestNewPersonId(t *testing.T) {
diff --git a/modules/activitypub/client_test.go b/modules/activitypub/client_test.go
index 02c38d4908..b84d0ac158 100644
--- a/modules/activitypub/client_test.go
+++ b/modules/activitypub/client_test.go
@@ -18,8 +18,9 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	_ "github.com/mattn/go-sqlite3"
 	"github.com/stretchr/testify/assert"
+
+	_ "github.com/mattn/go-sqlite3"
 )
 
 /* ToDo: Set Up tests for http get requests
diff --git a/routers/api/v1/activitypub/repository.go b/routers/api/v1/activitypub/repository.go
index 42241ebffe..7077b3c853 100644
--- a/routers/api/v1/activitypub/repository.go
+++ b/routers/api/v1/activitypub/repository.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	forgefed_model "code.gitea.io/gitea/models/forgefed"
-
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/forgefed"
 	"code.gitea.io/gitea/modules/log"