From 03e948fe3c00ca480bc528f8800fc3a9882b567c Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Tue, 27 Aug 2019 22:15:53 -0400
Subject: [PATCH] unbonking should work now

---
 activity.go        |  2 +-
 docs/changelog.txt |  2 ++
 fun.go             |  2 ++
 honk.go            | 17 +++++++++++++----
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/activity.go b/activity.go
index 9be6f90..fd09760 100644
--- a/activity.go
+++ b/activity.go
@@ -234,7 +234,7 @@ func savexonk(user *WhatAbout, x *Honk) {
 			if err != nil {
 				log.Printf("error eradicating: %s", err)
 			}
-			_, err = stmtZonkIt.Exec(user.ID, x.XID)
+			_, err = stmtZonkIt.Exec(xonk.ID)
 			if err != nil {
 				log.Printf("error eradicating: %s", err)
 			}
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1a62809..d1a5b08 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -2,6 +2,8 @@ changelog
 
 -- next
 
++ Unbonking.
+
 ++ Hashtags that work?
 
 + Dynamic refresh.
diff --git a/fun.go b/fun.go
index 365fc58..1e0435a 100644
--- a/fun.go
+++ b/fun.go
@@ -49,6 +49,8 @@ func reverbolate(userid int64, honks []*Honk) {
 			if h.What != "bonked" {
 				h.Noise = mentionize(h.Noise)
 				h.Noise = ontologize(h.Noise)
+			} else {
+				h.Flags |= flagIsBonked
 			}
 			h.Username, h.Handle = handles(h.Honker)
 		} else {
diff --git a/honk.go b/honk.go
index 7ddc927..b9b88f2 100644
--- a/honk.go
+++ b/honk.go
@@ -850,7 +850,7 @@ func getxonk(userid int64, xid string) *Honk {
 func getbonk(userid int64, xid string) *Honk {
 	h := new(Honk)
 	var dt, aud string
-	row := stmtOneXonk.QueryRow(userid, xid)
+	row := stmtOneBonk.QueryRow(userid, xid)
 	err := row.Scan(&h.ID, &h.UserID, &h.Username, &h.What, &h.Honker, &h.Oonker, &h.XID, &h.RID,
 		&dt, &h.URL, &aud, &h.Noise, &h.Precis, &h.Convoy, &h.Whofore, &h.Flags)
 	if err != nil {
@@ -1083,7 +1083,16 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
 	if wherefore == "unbonk" {
 		xonk := getbonk(userinfo.UserID, what)
 		if xonk != nil {
-			_, err := stmtClearFlags.Exec(flagIsBonked, xonk.ID)
+			_, err := stmtZonkDonks.Exec(xonk.ID)
+			if err != nil {
+				log.Printf("error zonking: %s", err)
+			}
+			_, err = stmtZonkIt.Exec(xonk.ID)
+			if err != nil {
+				log.Printf("error zonking: %s", err)
+			}
+			xonk = getxonk(userinfo.UserID, what)
+			_, err = stmtClearFlags.Exec(flagIsBonked, xonk.ID)
 			if err != nil {
 				log.Printf("error unbonking: %s", err)
 			}
@@ -1100,7 +1109,7 @@ func zonkit(w http.ResponseWriter, r *http.Request) {
 			if err != nil {
 				log.Printf("error zonking: %s", err)
 			}
-			_, err = stmtZonkIt.Exec(userinfo.UserID, what)
+			_, err = stmtZonkIt.Exec(xonk.ID)
 			if err != nil {
 				log.Printf("error zonking: %s", err)
 			}
@@ -1799,7 +1808,7 @@ func prepareStatements(db *sql.DB) {
 	stmtFileData = preparetodie(db, "select media, content from files where xid = ?")
 	stmtFindXonk = preparetodie(db, "select honkid from honks where userid = ? and xid = ?")
 	stmtSaveDonk = preparetodie(db, "insert into donks (honkid, fileid) values (?, ?)")
-	stmtZonkIt = preparetodie(db, "delete from honks where userid = ? and xid = ?")
+	stmtZonkIt = preparetodie(db, "delete from honks where honkid = ?")
 	stmtZonkDonks = preparetodie(db, "delete from donks where honkid = ?")
 	stmtFindFile = preparetodie(db, "select fileid from files where url = ? and local = 1")
 	stmtSaveFile = preparetodie(db, "insert into files (xid, name, url, media, local, content) values (?, ?, ?, ?, ?, ?)")