Fix lint errors

This commit is contained in:
Anthony Wang 2023-01-12 21:48:05 +00:00
parent 7853231ea1
commit 72247b8d49
No known key found for this signature in database
GPG Key ID: 42A5B952E6DD8D38
25 changed files with 32 additions and 31 deletions

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package forgefed package forgefed

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,11 +1,10 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub
import ( import (
"context" "context"
"encoding/json"
"errors" "errors"
"net/url" "net/url"
"strconv" "strconv"
@ -16,6 +15,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/forgefed"
"code.gitea.io/gitea/modules/json"
repo_module "code.gitea.io/gitea/modules/repository" repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/activitypub" "code.gitea.io/gitea/services/activitypub"
@ -27,7 +27,6 @@ import (
ap "github.com/go-ap/activitypub" ap "github.com/go-ap/activitypub"
) )
// Create a new federated user from a Person object // Create a new federated user from a Person object
func createPerson(ctx context.Context, person *ap.Person) error { func createPerson(ctx context.Context, person *ap.Person) error {
_, err := user_model.GetUserByIRI(ctx, person.GetLink().String()) _, err := user_model.GetUserByIRI(ctx, person.GetLink().String())
@ -94,7 +93,7 @@ func createPerson(ctx context.Context, person *ap.Person) error {
if err != nil { if err != nil {
return err return err
} }
if person.Icon != nil { if person.Icon != nil {
// Fetch and save user icon // Fetch and save user icon
icon, err := ap.ToObject(person.Icon) icon, err := ap.ToObject(person.Icon)

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub
@ -26,6 +26,5 @@ func delete(ctx context.Context, delete ap.Delete) error {
if err != nil { if err != nil {
return err return err
} }
user_service.DeleteUser(ctx, objectUser, true) return user_service.DeleteUser(ctx, objectUser, true)
return nil
} }

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub
@ -140,7 +140,7 @@ func PersonInbox(ctx *context.APIContext) {
}) })
case ap.DeleteType: case ap.DeleteType:
// Deleting a user // Deleting a user
delete(ctx, activity) err = delete(ctx, activity)
default: default:
err = fmt.Errorf("unsupported ActivityStreams activity type: %s", activity.GetType()) err = fmt.Errorf("unsupported ActivityStreams activity type: %s", activity.GetType())
} }

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,4 @@
// Copyright 2022 The Gitea Authors. All rights reserved. // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package activitypub package activitypub

View File

@ -1,4 +1,7 @@
package activitypub; // Copyright 2023 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package activitypub
type WebfingerJRD struct { type WebfingerJRD struct {
Subject string `json:"subject,omitempty"` Subject string `json:"subject,omitempty"`