From e15d81638b791e742c3930421bf82ecda73bc315 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Thu, 1 Aug 2019 20:36:22 -0400
Subject: [PATCH] remove spicy peppers sensitivity

---
 activity.go        | 6 ------
 docs/changelog.txt | 2 ++
 docs/manual.txt    | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/activity.go b/activity.go
index f4c5a10..b6b1c29 100644
--- a/activity.go
+++ b/activity.go
@@ -25,7 +25,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -732,8 +731,6 @@ func subsub(user *WhatAbout, xid string) {
 	deliverate(0, user.Name, xid, msg)
 }
 
-var re_spicy = regexp.MustCompile("^(\U0001f336\ufe0f?){3,}")
-
 func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 	dt := h.Date.Format(time.RFC3339)
 	var jo junk.Junk
@@ -780,9 +777,6 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 		jo["content"] = mentionize(h.Noise)
 		if strings.HasPrefix(h.Precis, "DZ:") {
 			jo["sensitive"] = true
-		} else if peppers := re_spicy.FindString(h.Noise); peppers != "" {
-			jo["summary"] = peppers
-			jo["sensitive"] = true
 		}
 
 		var tags []junk.Junk
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2dcfcce..2253b44 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -2,6 +2,8 @@ changelog
 
 -- next
 
+- Remove sensitivity to spicy peppers.
+
 + Keep reply to setting during preview.
 
 + Increase max thread retrieval depth to 10.
diff --git a/docs/manual.txt b/docs/manual.txt
index 13eb5b8..b3179ce 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -21,9 +21,6 @@ The honk back button will prefill the forms for replies.
 A honk that begins with the danger zone indication, DZ:, will be marked
 sensitive, using the first line as a summary (spoiler text).
 
-Alternatively, a spicy honk that begins with three or more peppers (U+1F336)
-will be marked sensitive as well, with a subject line consisting of peppers.
-
 -- following
 
 In order to follow somebody, you need to enter one of two identifiers.