4 files changed, 10 insertions, 7 deletions
diff --git a/internal/visibility/statusboostable.go b/internal/visibility/statusboostable.go
index c463ee372..ec6839d42 100644
--- a/internal/visibility/statusboostable.go
+++ b/internal/visibility/statusboostable.go
@@ -39,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 {
-		log.Trace("status is not boostable because it is a DM")
+		log.Trace(ctx, "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 {
-		log.Trace("status is boostable because author is booster")
+		log.Trace(ctx, "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 {
-		log.Trace("status not boostable because it is followers-only")
+		log.Trace(ctx, "status not boostable because it is followers-only")
 		return false, nil
 	}
 
 	// otherwise, status is as boostable as it says it is
-	log.Trace("defaulting to status.boostable value")
+	log.Trace(ctx, "defaulting to status.boostable value")
 	return *targetStatus.Boostable, nil
 }
diff --git a/internal/visibility/statushometimelineable.go b/internal/visibility/statushometimelineable.go
index 19a39aa51..b2fbecd85 100644
--- a/internal/visibility/statushometimelineable.go
+++ b/internal/visibility/statushometimelineable.go
@@ -30,7 +30,8 @@ import (
 )
 
 func (f *filter) StatusHometimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) {
-	l := log.WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)
+	l := log.WithContext(ctx).
+		WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)
 
 	// don't timeline statuses more than 5 min in the future
 	maxID, err := id.NewULIDFromTime(time.Now().Add(5 * time.Minute))
diff --git a/internal/visibility/statuspublictimelineable.go b/internal/visibility/statuspublictimelineable.go
index 113249fe1..05a94bf8e 100644
--- a/internal/visibility/statuspublictimelineable.go
+++ b/internal/visibility/statuspublictimelineable.go
@@ -30,7 +30,8 @@ import (
 )
 
 func (f *filter) StatusPublictimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) {
-	l := log.WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)
+	l := log.WithContext(ctx).
+		WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)
 
 	// don't timeline statuses more than 5 min in the future
 	maxID, err := id.NewULIDFromTime(time.Now().Add(5 * time.Minute))
diff --git a/internal/visibility/statusvisible.go b/internal/visibility/statusvisible.go
index 002db1119..2f89727ee 100644
--- a/internal/visibility/statusvisible.go
+++ b/internal/visibility/statusvisible.go
@@ -29,7 +29,8 @@ import (
 )
 
 func (f *filter) StatusVisible(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) {
-	l := log.WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)
+	l := log.WithContext(ctx).
+		WithFields(kv.Fields{{"statusID", targetStatus.ID}}...)
 
 	// Fetch any relevant accounts for the target status
 	const getBoosted = true