From d62486db27fc8254d3ed8c15630fd5ac1aeaebdd Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Wed, 18 Sep 2019 14:02:49 -0400
Subject: [PATCH] fix memes

---
 activity.go | 1 +
 fun.go      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/activity.go b/activity.go
index e57042d..a11a6ef 100644
--- a/activity.go
+++ b/activity.go
@@ -844,6 +844,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 			jo["directMessage"] = true
 		}
 		translate(h)
+		h.Noise = re_memes.ReplaceAllString(h.Noise, "")
 		jo["summary"] = h.Precis
 		jo["content"] = ontologize(mentionize(h.Noise))
 		if strings.HasPrefix(h.Precis, "DZ:") {
diff --git a/fun.go b/fun.go
index 7db5945..1cb47f6 100644
--- a/fun.go
+++ b/fun.go
@@ -45,6 +45,7 @@ func reverbolate(userid int64, honks []*Honk) {
 			h.Style += " limited"
 		}
 		translate(h)
+		h.Noise = re_memes.ReplaceAllString(h.Noise, "")
 		if h.Whofore == 2 || h.Whofore == 3 {
 			h.URL = h.XID
 			if h.What != "bonked" {
@@ -121,7 +122,6 @@ func translate(honk *Honk) {
 	noise = strings.TrimSpace(noise)
 	noise = quickrename(noise, honk.UserID)
 	noise = obfusbreak(noise)
-	noise = re_memes.ReplaceAllString(noise, "")
 
 	honk.Noise = noise
 	honk.Onts = oneofakind(ontologies(honk.Noise))
@@ -277,7 +277,7 @@ func memetize(honk *Honk) {
 		fd.Close()
 
 		url := fmt.Sprintf("https://%s/meme/%s", serverName, name)
-		res, err := stmtSaveFile.Exec("", name, url, ct, 0, "")
+		res, err := stmtSaveFile.Exec("", name, name, url, ct, 0, "")
 		if err != nil {
 			log.Printf("error saving meme: %s", err)
 			return x