3 files changed, 62 insertions, 11 deletions

diff --git a/internal/typeutils/frontendtointernal.go b/internal/typeutils/frontendtointernal.go
index daf64a0d2..530a184d0 100644
--- a/internal/typeutils/frontendtointernal.go
+++ b/internal/typeutils/frontendtointernal.go
@@ -227,15 +227,15 @@ func APIInteractionPolicyToInteractionPolicy(
 	}
 
 	return &gtsmodel.InteractionPolicy{
-		CanLike: gtsmodel.PolicyRules{
+		CanLike: &gtsmodel.PolicyRules{
 			Always:       canLikeAlways,
 			WithApproval: canLikeWithApproval,
 		},
-		CanReply: gtsmodel.PolicyRules{
+		CanReply: &gtsmodel.PolicyRules{
 			Always:       canReplyAlways,
 			WithApproval: canReplyWithApproval,
 		},
-		CanAnnounce: gtsmodel.PolicyRules{
+		CanAnnounce: &gtsmodel.PolicyRules{
 			Always:       canAnnounceAlways,
 			WithApproval: canAnnounceWithApproval,
 		},
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go
index f21bef83f..678b23ca5 100644
--- a/internal/typeutils/internaltoas.go
+++ b/internal/typeutils/internaltoas.go
@@ -1894,6 +1894,19 @@ func (c *Converter) InteractionPolicyToASInteractionPolicy(
 	policy := streams.NewGoToSocialInteractionPolicy()
 
 	/*
+		Implementation note for the below:
+		While it's possible for remote instances to set
+		sub-policies like canLike, canReply, etc to null
+		values, or omit them entirely, GtS always falls
+		back to default non-nil sub-policies when storing
+		policies created for local statuses. Therefore,
+		since we only ever serialize our *own* statuses
+		to AS format using this function, it's safe to
+		assume that the values will always be set, rather
+		than checking for nil ptrs.
+	*/
+
+	/*
 		CAN LIKE
 	*/
 
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index ffd971040..311835168 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -2867,7 +2867,10 @@ func (c *Converter) ThemesToAPIThemes(themes []*gtsmodel.Theme) []apimodel.Theme
 // into an apimodel interaction policy.
 //
 // Provided status can be nil to convert a
-// policy without a particular status in mind.
+// policy without a particular status in mind,
+// but ***if status is nil then sub-policies
+// CanLike, CanReply, and CanAnnounce on
+// the given policy must *not* be nil.***
 //
 // RequestingAccount can also be nil for
 // unauthorized requests (web, public api etc).
@@ -2877,19 +2880,54 @@ func (c *Converter) InteractionPolicyToAPIInteractionPolicy(
 	status *gtsmodel.Status,
 	requester *gtsmodel.Account,
 ) (*apimodel.InteractionPolicy, error) {
-	apiPolicy := &apimodel.InteractionPolicy{
-		CanFavourite: apimodel.PolicyRules{
+	apiPolicy := new(apimodel.InteractionPolicy)
+
+	// gtsmodel CanLike -> apimodel CanFavourite
+	if policy.CanLike != nil {
+		// Use the set CanLike value.
+		apiPolicy.CanFavourite = apimodel.PolicyRules{
 			Always:       policyValsToAPIPolicyVals(policy.CanLike.Always),
 			WithApproval: policyValsToAPIPolicyVals(policy.CanLike.WithApproval),
-		},
-		CanReply: apimodel.PolicyRules{
+		}
+	} else {
+		// Use default CanLike value for this vis.
+		pCanLike := gtsmodel.DefaultCanLikeFor(status.Visibility)
+		apiPolicy.CanFavourite = apimodel.PolicyRules{
+			Always:       policyValsToAPIPolicyVals(pCanLike.Always),
+			WithApproval: policyValsToAPIPolicyVals(pCanLike.WithApproval),
+		}
+	}
+
+	// gtsmodel CanReply -> apimodel CanReply
+	if policy.CanReply != nil {
+		// Use the set CanReply value.
+		apiPolicy.CanReply = apimodel.PolicyRules{
 			Always:       policyValsToAPIPolicyVals(policy.CanReply.Always),
 			WithApproval: policyValsToAPIPolicyVals(policy.CanReply.WithApproval),
-		},
-		CanReblog: apimodel.PolicyRules{
+		}
+	} else {
+		// Use default CanReply value for this vis.
+		pCanReply := gtsmodel.DefaultCanReplyFor(status.Visibility)
+		apiPolicy.CanReply = apimodel.PolicyRules{
+			Always:       policyValsToAPIPolicyVals(pCanReply.Always),
+			WithApproval: policyValsToAPIPolicyVals(pCanReply.WithApproval),
+		}
+	}
+
+	// gtsmodel CanAnnounce -> apimodel CanReblog
+	if policy.CanAnnounce != nil {
+		// Use the set CanAnnounce value.
+		apiPolicy.CanReblog = apimodel.PolicyRules{
 			Always:       policyValsToAPIPolicyVals(policy.CanAnnounce.Always),
 			WithApproval: policyValsToAPIPolicyVals(policy.CanAnnounce.WithApproval),
-		},
+		}
+	} else {
+		// Use default CanAnnounce value for this vis.
+		pCanAnnounce := gtsmodel.DefaultCanAnnounceFor(status.Visibility)
+		apiPolicy.CanReblog = apimodel.PolicyRules{
+			Always:       policyValsToAPIPolicyVals(pCanAnnounce.Always),
+			WithApproval: policyValsToAPIPolicyVals(pCanAnnounce.WithApproval),
+		}
 	}
 
 	if status == nil || requester == nil {