Omit most fill-ins from FURBALL declarations

dharmab · Dec 19, 2024 · 25fc46d · 25fc46d
1 parent a5d14a8
commit 25fc46d
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/pkg/composer/group.go b/pkg/composer/group.go
@@ -84,16 +84,20 @@ func (c *Composer) composeGroup(group brevity.Group) (response NaturalLanguageRe
 
 	// Fill-in information
 
-	// Heavy and number of contacts
-	if group.Heavy() {
-		response.WriteBoth(", heavy")
-	}
-	contacts := c.composeContacts(group.Contacts())
-	response.WriteResponse(contacts)
+	isFurball := group.Declaration() == brevity.Furball
+
+	if !isFurball {
+		// Heavy and number of contacts
+		if group.Heavy() {
+			response.WriteBoth(", heavy")
+		}
+		contacts := c.composeContacts(group.Contacts())
+		response.WriteResponse(contacts)
 
-	if !group.High() {
-		if len(stacks) > 1 {
-			response.WriteBoth(", " + c.composeAltitudeFillIns(stacks))
+		if !group.High() {
+			if len(stacks) > 1 {
+				response.WriteBoth(", " + c.composeAltitudeFillIns(stacks))
+			}
 		}
 	}
 
@@ -103,16 +107,18 @@ func (c *Composer) composeGroup(group brevity.Group) (response NaturalLanguageRe
 		response.WriteBoth(strings.Join(group.Platforms(), ", "))
 	}
 
-	// High
-	if group.High() {
-		response.WriteBoth(", high")
-	}
+	if !isFurball {
+		// High
+		if group.High() {
+			response.WriteBoth(", high")
+		}
 
-	// Fast or very fast
-	if group.Fast() {
-		response.WriteBoth(", fast")
-	} else if group.VeryFast() {
-		response.WriteBoth(", very fast")
+		// Fast or very fast
+		if group.Fast() {
+			response.WriteBoth(", fast")
+		} else if group.VeryFast() {
+			response.WriteBoth(", very fast")
+		}
 	}
 
 	response.WriteBoth(".")