Fix lint errors

Changes

25 changed files (+42/-67)

• models/repo/repo.go
  • @@ -774,9 +774,9 @@ func FixNullArchivedRepository(ctx context.Context) (int64, error) {
    }) } - func (r *Repository) GetIRI() string { - if strings.Contains(r.OwnerName, "@") { - return r.OriginalURL + func (repo *Repository) GetIRI() string { + if strings.Contains(repo.OwnerName, "@") { + return repo.OriginalURL } - return setting.AppURL + "api/v1/activitypub/repo/" + r.OwnerName + "/" + r.Name + return setting.AppURL + "api/v1/activitypub/repo/" + repo.OwnerName + "/" + repo.Name }
• modules/forgefed/branch.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• modules/forgefed/commit.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• modules/forgefed/forgefed.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• modules/forgefed/push.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• modules/forgefed/repository.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• modules/forgefed/repository_test.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• modules/forgefed/ticket.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package forgefed
• routers/api/v1/activitypub/authorize_interaction.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/create.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/follow.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/note.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/repo.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/response.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/star.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• routers/api/v1/activitypub/ticket.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• services/activitypub/activities.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
  • @@ -13,34 +12,34 @@ import (
    ) // Create Follow activity - func Follow(actorUser, followUser *user_model.User) (follow *ap.Follow) { + func Follow(actorUser, followUser *user_model.User) *ap.Follow { object := ap.PersonNew(ap.IRI(followUser.LoginName)) - follow = ap.FollowNew("", object) + follow := ap.FollowNew("", object) follow.Actor = ap.PersonNew(ap.IRI(actorUser.GetIRI())) follow.To = ap.ItemCollection{ap.Item(ap.IRI(followUser.LoginName + "/inbox"))} - return + return follow } // Create Undo Follow activity - func Unfollow(actorUser, followUser *user_model.User) (unfollow *ap.Undo) { - unfollow = ap.UndoNew("", Follow(actorUser, followUser)) + func Unfollow(actorUser, followUser *user_model.User) *ap.Undo { + unfollow := ap.UndoNew("", Follow(actorUser, followUser)) unfollow.Actor = ap.PersonNew(ap.IRI(actorUser.GetIRI())) unfollow.To = ap.ItemCollection{ap.Item(ap.IRI(followUser.LoginName + "/inbox"))} - return + return unfollow } // Create Like activity - func Star(user *user_model.User, repo *repo_model.Repository) (like *ap.Like) { - like = ap.LikeNew("", forgefed.RepositoryNew(ap.IRI(repo.GetIRI()))) + func Star(user *user_model.User, repo *repo_model.Repository) *ap.Like { + like := ap.LikeNew("", forgefed.RepositoryNew(ap.IRI(repo.GetIRI()))) like.Actor = ap.PersonNew(ap.IRI(user.GetIRI())) like.To = ap.ItemCollection{ap.IRI(repo.GetIRI() + "/inbox")} - return + return like } // Create Undo Like activity - func Unstar(user *user_model.User, repo *repo_model.Repository) (unstar *ap.Undo) { - unstar = ap.UndoNew("", Star(user, repo)) - unstar.Actor = ap.PersonNew(ap.IRI(user.GetIRI())) - unstar.To = ap.ItemCollection{ap.IRI(repo.GetIRI() + "/inbox")} - return + func Unstar(user *user_model.User, repo *repo_model.Repository) *ap.Undo { + unlike := ap.UndoNew("", Star(user, repo)) + unlike.Actor = ap.PersonNew(ap.IRI(user.GetIRI())) + unlike.To = ap.ItemCollection{ap.IRI(repo.GetIRI() + "/inbox")} + return unlike }
• services/activitypub/create.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• services/activitypub/iri.go
  • @@ -1,7 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. - + // SPDX-License-Identifier: MIT package activitypub import (
• services/activitypub/objects.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• services/activitypub/transport.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package activitypub
• services/repository/activitypub.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package repository
• tests/integration/api_comment_attachment_test.go
  • @@ -1,6 +1,5 @@
    // Copyright 2021 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package integration
• tests/integration/api_issue_attachment_test.go
  • @@ -1,6 +1,5 @@
    // Copyright 2021 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package integration
• tests/integration/markup_external_test.go
  • @@ -1,6 +1,5 @@
    // Copyright 2022 The Gitea Authors. All rights reserved. - // Use of this source code is governed by a MIT-style - // license that can be found in the LICENSE file. + // SPDX-License-Identifier: MIT package integration