From 7058ecd1d0348d70578e382ad0ae98bf474b8685 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 10:45:25 -0400 Subject: [PATCH 1/7] clean up the dust --- toys/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/toys/Makefile b/toys/Makefile index c1281c5..eed6d08 100644 --- a/toys/Makefile +++ b/toys/Makefile @@ -1,5 +1,5 @@ -PROGS=autobonker gettoken saytheday sprayandpray wonkawonk youvegothonks +PROGS=autobonker gettoken saytheday sprayandpray youvegothonks all: $(PROGS) @@ -18,8 +18,5 @@ saytheday: 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 From 4f8a33eb2b70002a59ebed04f9ddc4b9a9bbde5c Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 10:45:51 -0400 Subject: [PATCH 2/7] 0.9.9 release --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 328b75c..9de141d 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -1,6 +1,6 @@ changelog -=== next +=== 0.9.9 Eat the Bugs + Some fixes for image descriptions. From deec5234373dfb08a7be69d36ee0b932ba768983 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 10:46:01 -0400 Subject: [PATCH 3/7] Added tag v0.9.9 for changeset 4b8cf31560b7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8b94a7b..25f1a04 100644 --- a/.hgtags +++ b/.hgtags @@ -36,3 +36,4 @@ dac64bc6a93cedeb6ae618cba8f8647af96d2ece v0.9.3 6a522536238fe25b6d048543f52ed406ccf720b2 v0.9.6 bc1bcfb9c0cc86b3c63325b07e13a36b9d4500f0 v0.9.7 916cefdc24363b6e7e193dbde82632c17f58adfd v0.9.8 +4b8cf31560b7d1e1696af109b158766c4ce823ab v0.9.9 From ae8d1909d8b939416f7d10a24251b11694a0931e Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 14:24:15 -0400 Subject: [PATCH 4/7] use the right variable --- web.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web.go b/web.go index fefc55c..197cd88 100644 --- a/web.go +++ b/web.go @@ -1954,7 +1954,8 @@ func submithonker(w http.ResponseWriter, r *http.Request) *Honker { 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 @@ -1962,7 +1963,7 @@ func submithonker(w http.ResponseWriter, r *http.Request) *Honker { if flavor == "presub" { followyou(user, honkerid, false) } - h.ID = id + h.ID = honkerid return h } From 2a8f20feff92dd9a1d9102d9d26a60c93ca081bf Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 14:28:29 -0400 Subject: [PATCH 5/7] quiet a log error --- activity.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/activity.go b/activity.go index 64e1ae9..dd78352 100644 --- a/activity.go +++ b/activity.go @@ -1908,14 +1908,17 @@ func followyou(user *WhatAbout, honkerid int64, sync bool) { } 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) _, err = db.Exec("update honkers set flavor = ? where honkerid = ?", "unsub", honkerid) if err != nil { From 67c2d983bdb6fbd70cb37a29b0bdc6b679f01382 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 14:29:22 -0400 Subject: [PATCH 6/7] that should do it --- docs/changelog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 9de141d..5fbf39c 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -1,5 +1,9 @@ changelog +=== 0.9.91 One More Time + ++ Swallow a follow bug. + === 0.9.9 Eat the Bugs + Some fixes for image descriptions. From 9e43ccbb88a7f2a12de827ea4ebc369471793106 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 17 Mar 2023 14:29:34 -0400 Subject: [PATCH 7/7] Added tag v0.9.91 for changeset d7c3a01e7aae --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 25f1a04..8f08ce3 100644 --- a/.hgtags +++ b/.hgtags @@ -37,3 +37,4 @@ dac64bc6a93cedeb6ae618cba8f8647af96d2ece v0.9.3 bc1bcfb9c0cc86b3c63325b07e13a36b9d4500f0 v0.9.7 916cefdc24363b6e7e193dbde82632c17f58adfd v0.9.8 4b8cf31560b7d1e1696af109b158766c4ce823ab v0.9.9 +d7c3a01e7aaef67c40920bbc4e8507350fc33e31 v0.9.91