4 files changed, 23 insertions, 24 deletions
diff --git a/internal/visibility/statusboostable.go b/internal/visibility/statusboostable.go
index 9eed9e3e9..60699875d 100644
--- a/internal/visibility/statusboostable.go
+++ b/internal/visibility/statusboostable.go
@@ -23,15 +23,11 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
 func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) {
-	l := logrus.WithFields(logrus.Fields{
-		"func": "StatusBoostable",
-	})
-
 	// if the status isn't visible, it certainly isn't boostable
 	visible, err := f.StatusVisible(ctx, targetStatus, requestingAccount)
 	if err != nil {
@@ -43,23 +39,23 @@ func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Sta
 
 	// direct messages are never boostable, even if they're visible
 	if targetStatus.Visibility == gtsmodel.VisibilityDirect {
-		l.Trace("status is not boostable because it is a DM")
+		log.Trace("status is not boostable because it is a DM")
 		return false, nil
 	}
 
 	// the original account should always be able to boost its own non-DM statuses
 	if requestingAccount.ID == targetStatus.Account.ID {
-		l.Trace("status is boostable because author is booster")
+		log.Trace("status is boostable because author is booster")
 		return true, nil
 	}
 
 	// if status is followers-only and not the author's, it is not boostable
 	if targetStatus.Visibility == gtsmodel.VisibilityFollowersOnly {
-		l.Trace("status not boostable because it is followers-only")
+		log.Trace("status not boostable because it is followers-only")
 		return false, nil
 	}
 
 	// otherwise, status is as boostable as it says it is
-	l.Trace("defaulting to status.boostable value")
+	log.Trace("defaulting to status.boostable value")
 	return targetStatus.Boostable, nil
 }
diff --git a/internal/visibility/statushometimelineable.go b/internal/visibility/statushometimelineable.go
index af871bcaa..bd3c90b4d 100644
--- a/internal/visibility/statushometimelineable.go
+++ b/internal/visibility/statushometimelineable.go
@@ -22,15 +22,16 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
+	"codeberg.org/gruf/go-kv"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
 func (f *filter) StatusHometimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) {
-	l := logrus.WithFields(logrus.Fields{
-		"func":     "StatusHometimelineable",
-		"statusID": targetStatus.ID,
-	})
+	l := log.WithFields(kv.Fields{
+
+		{"statusID", targetStatus.ID},
+	}...)
 
 	// status owner should always be able to see their own status in their timeline so we can return early if this is the case
 	if targetStatus.AccountID == timelineOwnerAccount.ID {
diff --git a/internal/visibility/statuspublictimelineable.go b/internal/visibility/statuspublictimelineable.go
index 9991a9c3a..848842225 100644
--- a/internal/visibility/statuspublictimelineable.go
+++ b/internal/visibility/statuspublictimelineable.go
@@ -22,15 +22,16 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
+	"codeberg.org/gruf/go-kv"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
 func (f *filter) StatusPublictimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) {
-	l := logrus.WithFields(logrus.Fields{
-		"func":     "StatusPublictimelineable",
-		"statusID": targetStatus.ID,
-	})
+	l := log.WithFields(kv.Fields{
+
+		{"statusID", targetStatus.ID},
+	}...)
 
 	// Don't timeline boosted statuses
 	if targetStatus.BoostOfID != "" {
diff --git a/internal/visibility/statusvisible.go b/internal/visibility/statusvisible.go
index 3d179eccd..fc8bfeaaa 100644
--- a/internal/visibility/statusvisible.go
+++ b/internal/visibility/statusvisible.go
@@ -22,18 +22,19 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
+	"codeberg.org/gruf/go-kv"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
 func (f *filter) StatusVisible(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) {
 	const getBoosted = true
 
-	l := logrus.WithFields(logrus.Fields{
-		"func":     "StatusVisible",
-		"statusID": targetStatus.ID,
-	})
+	l := log.WithFields(kv.Fields{
+
+		{"statusID", targetStatus.ID},
+	}...)
 
 	// Fetch any relevant accounts for the target status
 	relevantAccounts, err := f.relevantAccounts(ctx, targetStatus, getBoosted)