diff options
Diffstat (limited to 'internal/federation/federatingdb/accept.go')
| -rw-r--r-- | internal/federation/federatingdb/accept.go | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go index 571e62aed..0592e6b9b 100644 --- a/internal/federation/federatingdb/accept.go +++ b/internal/federation/federatingdb/accept.go @@ -22,7 +22,6 @@ import ( "errors" "net/url" - "codeberg.org/gruf/go-logger/v2/level" "github.com/superseriousbusiness/activity/streams/vocab" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/db" @@ -46,15 +45,7 @@ func (f *federatingDB) GetAccept( } func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsAccept) error { - if log.Level() >= level.DEBUG { - i, err := marshalItem(accept) - if err != nil { - return err - } - l := log.WithContext(ctx). - WithField("accept", i) - l.Debug("entering Accept") - } + log.DebugKV(ctx, "accept", serialize{accept}) activityContext := getActivityContext(ctx) if activityContext.internal { @@ -81,10 +72,9 @@ func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsA // handling the ones we know how to handle. for _, object := range ap.ExtractObjects(accept) { if asType := object.GetType(); asType != nil { - // Check and handle any - // vocab.Type objects. - // nolint:gocritic - switch asType.GetTypeName() { + + // Check and handle any vocab.Type objects. + switch name := asType.GetTypeName(); name { // ACCEPT FOLLOW case ap.ActivityFollow: @@ -96,6 +86,10 @@ func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsA ); err != nil { return err } + + // UNHANDLED + default: + log.Debugf(ctx, "unhandled object type: %s", name) } } else if object.IsIRI() { @@ -137,6 +131,10 @@ func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsA ); err != nil { return err } + + // UNHANDLED + default: + log.Debugf(ctx, "unhandled iri type: %s", objIRI) } } } |