M activity.go → activity.go

@@ -1932,12 +1932,15 @@
 }
 func unfollowyou(user *WhatAbout, honkerid int64, sync bool) {
 	db := opendatabase()
-	row := db.QueryRow("select xid, owner, folxid from honkers where honkerid = ? and userid = ? and flavor in ('sub')",
+	row := db.QueryRow("select xid, owner, folxid, flavor from honkers where honkerid = ? and userid = ? and flavor in ('unsub', 'peep', 'presub', 'sub')",
 		honkerid, user.ID)
-	var url, owner, folxid string
-	err := row.Scan(&url, &owner, &folxid)
+	var url, owner, folxid, flavor string
+	err := row.Scan(&url, &owner, &folxid, &flavor)
 	if err != nil {
 		elog.Printf("can't get honker xid: %s", err)
+		return
+	}
+	if flavor == "peep" {
 		return
 	}
 	ilog.Printf("unsubscribing from %s", url)

M docs/changelog.txt → docs/changelog.txt

@@ -1,6 +1,10 @@
 changelog
 
-=== next
+=== 0.9.91 One More Time
+
++ Swallow a follow bug.
+
+=== 0.9.9 Eat the Bugs
 
 + Some fixes for image descriptions.
 

M toys/Makefile → toys/Makefile

@@ -1,5 +1,5 @@
 
-PROGS=autobonker gettoken saytheday sprayandpray wonkawonk youvegothonks
+PROGS=autobonker gettoken saytheday sprayandpray youvegothonks
 
 all: $(PROGS)
 
@@ -17,9 +17,6 @@ go build saytheday.go
 
 sprayandpray: sprayandpray.go
 	go build sprayandpray.go
-
-wonkawonk: wonkawonk.go fetch.go
-	go build wonkawonk.go fetch.go
 
 youvegothonks: youvegothonks.go
 	go build youvegothonks.go

M web.go → web.go

@@ -1964,7 +1964,8 @@ if peep == "peep" {
 		flavor = "peep"
 	}
 
-	id, err := savehonker(user, url, name, flavor, combos, mj)
+	var err error
+	honkerid, err = savehonker(user, url, name, flavor, combos, mj)
 	if err != nil {
 		http.Error(w, "had some trouble with that: "+err.Error(), http.StatusInternalServerError)
 		return nil
@@ -1972,7 +1973,7 @@ }
 	if flavor == "presub" {
 		followyou(user, honkerid, false)
 	}
-	h.ID = id
+	h.ID = honkerid
 	return h
 }