Using FedBOX as storage backend through C2S ActivityPub

.build.yml

@@ -24,9 +24,9 @@ tasks:
       set +x
       cd littr.go
       make all
-  - tests: |
-      set +x
-      set -a
-      source ~/.env.test
-      cd littr.go
-      make test
+#  - tests: |
+#      set +x
+#      set -a
+#      source ~/.env.test
+#      cd littr.go
+#      make test

Makefile

@@ -22,47 +22,23 @@ endif
 BUILD := $(GO) build $(BUILDFLAGS)
 TEST := $(GO) test $(BUILDFLAGS)
 
-.PHONY: all cli run clean images test
+.PHONY: all run clean images test
 
-all: app cli
+all: app
 
 app: bin/app
 bin/app: go.mod main.go $(APPSOURCES)
 	$(BUILD) -tags $(ENV) -o $@ ./main.go
 
-bootstrap: bin/bootstrap
-bin/bootstrap: go.mod cli/bootstrap/main.go $(APPSOURCES)
-	$(BUILD) -tags $(ENV) -o $@ cli/bootstrap/main.go
-
-votes: bin/votes
-bin/votes: go.mod cli/votes/main.go $(APPSOURCES)
-	$(BUILD) -tags $(ENV) -o $@ cli/votes/main.go
-
-keys: bin/keys
-bin/keys: go.mod cli/keys/main.go $(APPSOURCES)
-	$(BUILD) -tags $(ENV) -o $@ cli/keys/main.go
-
-poach: bin/poach
-bin/poach: go.mod cli/poach/main.go $(APPSOURCES)
-	$(BUILD) -tags $(ENV) -o $@ cli/poach/main.go
-
-fetcher: bin/fetcher
-bin/fetcher: go.mod cli/fetcher/main.go $(APPSOURCES)
-	$(BUILD) -tags $(ENV) -o $@ cli/fetcher/main.go
-
-cli: bootstrap votes keys
-
 run: app
 	@./bin/app
 
 clean:
 	-$(RM) bin/*
 	$(MAKE) -C docker $@
-	$(MAKE) -C tests $@
 
 images:
 	$(MAKE) -C docker $@
 
 test: app
-	$(TEST) ./{app,cli,internal}/...
-	$(MAKE) -C tests $@
+	$(TEST) ./{app,internal}/...

activitypub/activitypub.go

@@ -0,0 +1,180 @@
+package activitypub
+
+import (
+	"github.com/buger/jsonparser"
+	ap "github.com/go-ap/activitypub"
+	as "github.com/go-ap/activitystreams"
+	"github.com/go-ap/auth"
+	"github.com/go-ap/errors"
+)
+
+// Actor it should be identical to:
+//    github.com/go-ap/activitypub/actors.go#actor
+// We need it here in order to be able to add to it our Score property
+type Actor struct {
+	auth.Person
+	// Score is our own custom property for which we needed to extend the existing AP one
+	Score int `jsonld:"score"`
+}
+
+// Object it should be identical to:
+//    github.com/go-ap/activitypub/objects.go#Object
+// We need it here in order to be able to add to it our Score property
+type Object struct {
+	ap.Object
+	Score int `jsonld:"score"`
+}
+
+// GetID returns the ObjectID pointer of current Actor instance
+func (a Actor) GetID() *as.ObjectID {
+	id := a.ID
+	return &id
+}
+func (a Actor) GetType() as.ActivityVocabularyType {
+	return a.Type
+}
+func (a Actor) GetLink() as.IRI {
+	return as.IRI(a.ID)
+}
+func (a Actor) IsLink() bool {
+	return false
+}
+
+func (a Actor) IsObject() bool {
+	return true
+}
+
+// GetID returns the ObjectID pointer of current Object instance
+func (a Object) GetID() *as.ObjectID {
+	id := as.ObjectID(a.ID)
+	return &id
+}
+
+// GetLink returns the IRI of the Object object
+func (a Object) GetLink() as.IRI {
+	return as.IRI(a.ID)
+}
+
+// GetType returns the current Object object's type
+func (a Object) GetType() as.ActivityVocabularyType {
+	return a.Type
+}
+
+// IsLink returns false for an Object object
+func (a Object) IsLink() bool {
+	return false
+}
+
+// IsObject returns true for an Object object
+func (a Object) IsObject() bool {
+	return true
+}
+
+// UnmarshalJSON tries to load json data to Object object
+func (a *Object) UnmarshalJSON(data []byte) error {
+	ob := ap.Object{}
+	err := ob.UnmarshalJSON(data)
+	if err != nil {
+		return err
+	}
+
+	a.Object = ob
+	if score, err := jsonparser.GetInt(data, "score"); err == nil {
+		a.Score = int(score)
+	}
+
+	return nil
+}
+
+// UnmarshalJSON tries to load json data to Actor object
+func (a *Actor) UnmarshalJSON(data []byte) error {
+	p := auth.Person{}
+	if err := p.UnmarshalJSON(data); err != nil {
+		return err
+	}
+
+	a.Person = p
+	if score, err := jsonparser.GetInt(data, "score"); err == nil {
+		a.Score = int(score)
+	}
+
+	return nil
+}
+
+// JSONGetItemByType
+func JSONGetItemByType(typ as.ActivityVocabularyType) (as.Item, error) {
+	if as.ActorTypes.Contains(typ) {
+		act := &Actor{}
+		act.Type = typ
+		return act, nil
+	} else if as.ObjectTypes.Contains(typ) {
+		ob := &Object{}
+		ob.Type = typ
+		return ob, nil
+	}
+	return as.JSONGetItemByType(typ)
+}
+
+// ToObject
+func ToObject(it as.Item) (*Object, error) {
+	switch i := it.(type) {
+	case *Object:
+		return i, nil
+	case Object:
+		return &i, nil
+	default:
+		ob, err := as.ToObject(it)
+		if err != nil {
+			return nil, err
+		}
+		return &Object{
+			Object: ap.Object{
+				Parent: *ob,
+			},
+		}, nil
+	}
+	return nil, errors.Newf("unable to convert object")
+}
+
+type withObjectFn func(*Object) error
+
+// OnObject
+func OnObject(it as.Item, fn withObjectFn) error {
+	ob, err := ToObject(it)
+	if err != nil {
+		return err
+	}
+	return fn(ob)
+}
+
+// ToActor
+func ToActor(it as.Item) (*Actor, error) {
+	switch i := it.(type) {
+	case *Actor:
+		return i, nil
+	case Actor:
+		return &i, nil
+	default:
+		pers, err := ap.ToPerson(it)
+		if err != nil {
+			return nil, err
+		}
+		return &Actor{
+			Person: auth.Person{
+				Person: *pers,
+			},
+		}, nil
+	}
+	return nil, errors.Newf("unable to convert object")
+}
+
+type withPersonFn func(*Actor) error
+
+// OnActor
+func OnActor(it as.Item, fn withPersonFn) error {
+	ob, err := ToActor(it)
+	if err != nil {
+		return err
+	}
+	return fn(ob)
+}

app/accounts.go

@@ -1,10 +1,12 @@
 package app
 
 import (
+	"bytes"
 	"fmt"
+	"github.com/pborman/uuid"
 	"time"
 
-	"github.com/mariusor/littr.go/internal/errors"
+	"github.com/go-ap/errors"
 )
 
 type SSHKey struct {
@@ -51,7 +53,7 @@ type AccountCollection []Account
 type Account struct {
 	Email     string           `json:"email,omitempty"`
 	Hash      Hash             `json:"hash,omitempty"`
-	Score     int64            `json:"score,omitempty"`
+	Score     int              `json:"score,omitempty"`
 	Handle    string           `json:"handle,omitempty"`
 	CreatedAt time.Time        `json:"-"`
 	UpdatedAt time.Time        `json:"-"`
@@ -61,7 +63,7 @@ type Account struct {
 }
 
 // Hash is a local type for string, it should hold a [32]byte array actually
-type Hash string
+type Hash uuid.UUID
 
 // String returns the hash as a string
 func (h Hash) String() string {
@@ -70,9 +72,9 @@ func (h Hash) String() string {
 
 // Short returns a minimal valuable string value
 func (h Hash) Short() string {
-	if len(h) > 10 {
-		return string(h[0:10])
-	}
+	//if len(h) > 10 {
+	//	return string(h[0:10])
+	//}
 	return string(h)
 }
 
@@ -127,7 +129,7 @@ func (a Account) VotedOn(i Item) *Vote {
 		if v.Item == nil {
 			continue
 		}
-		if v.Item.Hash == i.Hash {
+		if bytes.Equal(v.Item.Hash, i.Hash) {
 			return &v
 		}
 	}
@@ -143,14 +145,19 @@ func (a Account) GetLink() string {
 
 // IsLogged should show if current user was loaded from a session
 func (a Account) IsLogged() bool {
-	return !a.CreatedAt.IsZero() || a.Hash != AnonymousHash
+	return !a.CreatedAt.IsZero() || !bytes.Equal(a.Hash, AnonymousHash)
 }
 
 // HasIcon
 func (a Account) HasIcon() bool {
 	return a.HasMetadata() && len(a.Metadata.Icon.URI) > 0
 }
 
+// Deleted
+func (a Account) Deleted() bool {
+	return (a.Flags & FlagsDeleted) == FlagsDeleted
+}
+
 // First
 func (a AccountCollection) First() (*Account, error) {
 	for _, act := range a {