NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-08 18:04:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

revise NewForgeLike

Browse source 
Also added new test, which still fails since time.Now() does not match
This commit is contained in:
Clemens 2024-03-27 16:20:33 +01:00
parent 911e916a4f
commit 97b5e0da91
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/forgefed/activity.go
View file

@ -6,7 +6,6 @@ package forgefed
import (
"time"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/validation"
ap "github.com/go-ap/activitypub"
@ -19,17 +18,12 @@ type ForgeLike struct {
ap.Activity
}
// TODO: Use explicit values instead of ctx !!
func NewForgeLike(actorIRI string, objectIRI string) (ForgeLike, error) {
result := ForgeLike{}
result.Type = ap.LikeType
// ToDo: Would validating the source by Actor.Type field make sense?
object := new(ap.Object)
object.ID = ap.IRI(objectIRI)
result.Actor = ap.ActorNew(ap.IRI(actorIRI), "ForgejoUser") // Thats us, a User
result.Object = object // Thats them, a Repository
log.Info("Object is: %v", object)
result.Actor = ap.IRI(actorIRI) // Thats us, a User
result.Object = ap.IRI(objectIRI) // Thats them, a Repository
result.StartTime = time.Now()
if valid, err := validation.IsValid(result); !valid {
return ForgeLike{}, err

24
models/forgefed/activity_test.go
View file

@ -12,6 +12,30 @@ import (
ap "github.com/go-ap/activitypub"
)
// TODO: fix this test. mock time.Now?
func Test_NewForgeLike(t *testing.T) {
actorIRI := "https://repo.prod.meissa.de/api/v1/activitypub/user-id/1"
objectIRI := "https://codeberg.org/api/v1/activitypub/repository-id/1"
want := []byte(`{"type":"Like","actor":"https://repo.prod.meissa.de/api/v1/activitypub/user-id/1","object":"https://codeberg.org/api/v1/activitypub/repository-id/1"}`)
sut, err := NewForgeLike(actorIRI, objectIRI)
if err != nil {
t.Errorf("unexpected error: %v\n", err)
}
if valid, _ := validation.IsValid(sut); !valid {
t.Errorf("sut expected to be valid: %v\n", sut.Validate())
}
got, err := sut.MarshalJSON()
if err != nil {
t.Errorf("MarshalJSON() error = \"%v\"", err)
return
}
if !reflect.DeepEqual(got, want) {
t.Errorf("MarshalJSON() got = %q, want %q", got, want)
}
}
func Test_StarMarshalJSON(t *testing.T) {
type testPair struct {
item ForgeLike