mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-10-18 08:08:31 +00:00
e271c24100
Fix parts of issue https://codeberg.org/forgejo/forgejo/issues/8221 and PR https://codeberg.org/forgejo/forgejo/pulls/4767 - PostgreSQL - TestActivityPubPerson/SignedRequestValidation ``` --- FAIL: TestActivityPubPerson/SignedRequestValidation (5.01s) api_activitypub_person_test.go:51: Error Trace: /workspace/forgejo/forgejo/tests/integration/api_activitypub_person_test.go:51 Error: Received unexpected error: Get "http://127.0.0.1:3002/api/v1/activitypub/user-id/2": context deadline exceeded (Client.Timeout exceeded while awaiting headers) Test: TestActivityPubPerson/SignedRequestValidation testlogger.go:411: 2025/06/24 00:12:27 ...eb/routing/logger.go:102:func1() [I] router: completed GET /api/v1/activitypub/user-id/2 for 127.0.0.1:50456, 200 OK in 5032.2ms @ activitypub/person.go:21(activitypub.Person) ``` Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8274 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Michael Jerger <michael.jerger@meissa-gmbh.de> Co-committed-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
86 lines
2.4 KiB
Go
86 lines
2.4 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"context"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/modules/timeutil"
|
|
)
|
|
|
|
// Follow represents relations of user and their followers.
|
|
// TODO: We should unify Activity-pub-following and classical following (see models/user/user_repository.go#IsFollowingAp)
|
|
type Follow struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
UserID int64 `xorm:"UNIQUE(follow)"`
|
|
FollowID int64 `xorm:"UNIQUE(follow)"`
|
|
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
|
|
}
|
|
|
|
func init() {
|
|
db.RegisterModel(new(Follow))
|
|
}
|
|
|
|
// IsFollowing returns true if user is following followID.
|
|
func IsFollowing(ctx context.Context, userID, followID int64) bool {
|
|
has, _ := db.GetEngine(ctx).Get(&Follow{UserID: userID, FollowID: followID})
|
|
return has
|
|
}
|
|
|
|
// FollowUser marks someone be another's follower.
|
|
func FollowUser(ctx context.Context, userID, followID int64) (err error) {
|
|
if userID == followID || IsFollowing(ctx, userID, followID) {
|
|
return nil
|
|
}
|
|
|
|
if IsBlocked(ctx, userID, followID) || IsBlocked(ctx, followID, userID) {
|
|
return ErrBlockedByUser
|
|
}
|
|
|
|
dbCtx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
if err = db.Insert(dbCtx, &Follow{UserID: userID, FollowID: followID}); err != nil {
|
|
return err
|
|
}
|
|
|
|
if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_followers = num_followers + 1 WHERE id = ?", followID); err != nil {
|
|
return err
|
|
}
|
|
|
|
if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_following = num_following + 1 WHERE id = ?", userID); err != nil {
|
|
return err
|
|
}
|
|
return committer.Commit()
|
|
}
|
|
|
|
// UnfollowUser unmarks someone as another's follower.
|
|
func UnfollowUser(ctx context.Context, userID, followID int64) (err error) {
|
|
if userID == followID || !IsFollowing(ctx, userID, followID) {
|
|
return nil
|
|
}
|
|
|
|
dbCtx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
if _, err = db.DeleteByBean(dbCtx, &Follow{UserID: userID, FollowID: followID}); err != nil {
|
|
return err
|
|
}
|
|
|
|
if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_followers = num_followers - 1 WHERE id = ?", followID); err != nil {
|
|
return err
|
|
}
|
|
|
|
if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_following = num_following - 1 WHERE id = ?", userID); err != nil {
|
|
return err
|
|
}
|
|
return committer.Commit()
|
|
}
|