1 files changed, 40 insertions, 20 deletions

diff --git a/internal/ap/extract.go b/internal/ap/extract.go
index 344e0fdb3..8dbb903a3 100644
--- a/internal/ap/extract.go
+++ b/internal/ap/extract.go
@@ -1113,6 +1113,9 @@ func ExtractVisibility(addressable Addressable, actorFollowersURI string) (gtsmo
 // Will be nil (default policy) for Statusables that have no policy
 // set on them, or have a null policy. In such a case, the caller
 // should assume the default policy for the status's visibility level.
+//
+// Sub-policies of the returned policy, eg., CanLike, CanReply, may
+// each be nil if they were not set on the interaction policy.
 func ExtractInteractionPolicy(
 	statusable Statusable,
 	owner *gtsmodel.Account,
@@ -1139,6 +1142,8 @@ func ExtractInteractionPolicy(
 		return nil
 	}
 
+	// There's a policy key/value
+	// set, extract sub-policies.
 	return &gtsmodel.InteractionPolicy{
 		CanLike:     extractCanLike(policy.GetGoToSocialCanLike(), owner),
 		CanReply:    extractCanReply(policy.GetGoToSocialCanReply(), owner),
@@ -1146,67 +1151,82 @@ func ExtractInteractionPolicy(
 	}
 }
 
+// Returns either a parsed CanLike sub-policy, or nil
+// if canLike is not set, ie., if this post is from an
+// instance that doesn't know / care about canLike.
 func extractCanLike(
 	prop vocab.GoToSocialCanLikeProperty,
 	owner *gtsmodel.Account,
-) gtsmodel.PolicyRules {
+) *gtsmodel.PolicyRules {
 	if prop == nil || prop.Len() != 1 {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
 	propIter := prop.At(0)
 	if !propIter.IsGoToSocialCanLike() {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
-	return extractPolicyRules(propIter.Get(), owner)
+	withRules := propIter.Get()
+	if withRules == nil {
+		return nil
+	}
+
+	return extractPolicyRules(withRules, owner)
 }
 
+// Returns either a parsed CanReply sub-policy, or nil
+// if canReply is not set, ie., if this post is from an
+// instance that doesn't know / care about canReply.
 func extractCanReply(
 	prop vocab.GoToSocialCanReplyProperty,
 	owner *gtsmodel.Account,
-) gtsmodel.PolicyRules {
+) *gtsmodel.PolicyRules {
 	if prop == nil || prop.Len() != 1 {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
 	propIter := prop.At(0)
 	if !propIter.IsGoToSocialCanReply() {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
-	return extractPolicyRules(propIter.Get(), owner)
+	withRules := propIter.Get()
+	if withRules == nil {
+		return nil
+	}
+
+	return extractPolicyRules(withRules, owner)
 }
 
+// Returns either a parsed CanAnnounce sub-policy, or nil
+// if canAnnounce is not set, ie., if this post is from an
+// instance that doesn't know / care about canAnnounce.
 func extractCanAnnounce(
 	prop vocab.GoToSocialCanAnnounceProperty,
 	owner *gtsmodel.Account,
-) gtsmodel.PolicyRules {
+) *gtsmodel.PolicyRules {
 	if prop == nil || prop.Len() != 1 {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
 	propIter := prop.At(0)
 	if !propIter.IsGoToSocialCanAnnounce() {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
 	withRules := propIter.Get()
 	if withRules == nil {
-		return gtsmodel.PolicyRules{}
+		return nil
 	}
 
-	return extractPolicyRules(propIter.Get(), owner)
+	return extractPolicyRules(withRules, owner)
 }
 
 func extractPolicyRules(
 	withRules WithPolicyRules,
 	owner *gtsmodel.Account,
-) gtsmodel.PolicyRules {
-	if withRules == nil {
-		return gtsmodel.PolicyRules{}
-	}
-
+) *gtsmodel.PolicyRules {
 	// Check for `automaticApproval` and
 	// `manualApproval` properties first.
 	var (
@@ -1216,7 +1236,7 @@ func extractPolicyRules(
 	if (automaticApproval != nil && automaticApproval.Len() != 0) ||
 		(manualApproval != nil && manualApproval.Len() != 0) {
 		// At least one is set, use these props.
-		return gtsmodel.PolicyRules{
+		return &gtsmodel.PolicyRules{
 			AutomaticApproval: extractPolicyValues(automaticApproval, owner),
 			ManualApproval:    extractPolicyValues(manualApproval, owner),
 		}
@@ -1226,7 +1246,7 @@ func extractPolicyRules(
 	// and `withApproval` properties.
 	//
 	// TODO: Remove this in GtS v0.21.0.
-	return gtsmodel.PolicyRules{
+	return &gtsmodel.PolicyRules{
 		AutomaticApproval: extractPolicyValues(withRules.GetGoToSocialAlways(), owner),
 		ManualApproval:    extractPolicyValues(withRules.GetGoToSocialApprovalRequired(), owner),
 	}