From 5d340cd1aba8e059f294194305d2215f839a6ba2 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Sun, 14 Apr 2019 10:06:26 -0400
Subject: [PATCH] rework deliveration to prepare for retries

---
 activity.go | 69 ++++++++++++++++++++++++++---------------------------
 fun.go      | 30 +++++++++++++++--------
 honk.go     |  4 ++--
 3 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/activity.go b/activity.go
index a8bbd8e..1b76f82 100644
--- a/activity.go
+++ b/activity.go
@@ -74,15 +74,19 @@ func friendorfoe(ct string) bool {
 }
 
 func PostJunk(keyname string, key *rsa.PrivateKey, url string, j map[string]interface{}) error {
-	client := http.DefaultClient
 	var buf bytes.Buffer
 	WriteJunk(&buf, j)
-	req, err := http.NewRequest("POST", url, &buf)
+	return PostMsg(keyname, key, url, buf.Bytes())
+}
+
+func PostMsg(keyname string, key *rsa.PrivateKey, url string, msg []byte) error {
+	client := http.DefaultClient
+	req, err := http.NewRequest("POST", url, bytes.NewReader(msg))
 	if err != nil {
 		return err
 	}
 	req.Header.Set("Content-Type", theonetruename)
-	zig(keyname, key, req, buf.Bytes())
+	zig(keyname, key, req, msg)
 	resp, err := client.Do(req)
 	if err != nil {
 		return err
@@ -464,7 +468,7 @@ func rubadubdub(user *WhatAbout, req map[string]interface{}) {
 		log.Printf("can't get dub box: %s", err)
 		return
 	}
-	keyname, key := ziggy(user)
+	keyname, key := ziggy(user.Name)
 	err = PostJunk(keyname, key, inbox, j)
 	if err != nil {
 		log.Printf("can't rub a dub: %s", err)
@@ -489,7 +493,7 @@ func subsub(user *WhatAbout, xid string) {
 		return
 	}
 	WriteJunk(os.Stdout, j)
-	keyname, key := ziggy(user)
+	keyname, key := ziggy(user.Name)
 	err = PostJunk(keyname, key, inbox, j)
 	if err != nil {
 		log.Printf("failed to subsub: %s", err)
@@ -576,43 +580,38 @@ func jonkjonk(user *WhatAbout, h *Honk) (map[string]interface{}, map[string]inte
 	return j, jo
 }
 
+func deliverate(username string, rcpt string, msg []byte) {
+	keyname, key := ziggy(username)
+	inbox, _, err := getboxes(rcpt)
+	if err != nil {
+		log.Printf("error getting inbox %s: %s", rcpt, err)
+		return
+	}
+	err = PostMsg(keyname, key, inbox, msg)
+	if err != nil {
+		log.Printf("failed to post json to %s: %s", inbox, err)
+	}
+}
+
 func honkworldwide(user *WhatAbout, honk *Honk) {
-	aud := append([]string{}, honk.Audience...)
-	for i, a := range aud {
-		if a == thewholeworld || a == user.URL {
-			aud[i] = ""
+	rcpts := make(map[string]bool)
+	for _, a := range honk.Audience {
+		if a != thewholeworld && a != user.URL {
+			rcpts[a] = true
 		}
 	}
-	keyname, key := ziggy(user)
 	jonk, _ := jonkjonk(user, honk)
 	jonk["@context"] = itiswhatitis
+	var buf bytes.Buffer
+	WriteJunk(&buf, jonk)
+	msg := buf.Bytes()
 	for _, f := range getdubs(user.ID) {
-		inbox, _, err := getboxes(f.XID)
-		if err != nil {
-			log.Printf("error getting inbox %s: %s", f.XID, err)
-			continue
-		}
-		err = PostJunk(keyname, key, inbox, jonk)
-		if err != nil {
-			log.Printf("failed to post json to %s: %s", inbox, err)
-		}
-		for i, a := range aud {
-			if a == f.XID {
-				aud[i] = ""
-			}
-		}
+		deliverate(user.Name, f.XID, msg)
+		delete(rcpts, f.XID)
 	}
-	for _, a := range aud {
-		if a != "" && !strings.HasSuffix(a, "/followers") {
-			inbox, _, err := getboxes(a)
-			if err != nil {
-				log.Printf("error getting inbox %s: %s", a, err)
-				continue
-			}
-			err = PostJunk(keyname, key, inbox, jonk)
-			if err != nil {
-				log.Printf("failed to post json to %s: %s", inbox, err)
-			}
+	for a := range rcpts {
+		if !strings.HasSuffix(a, "/followers") {
+			deliverate(user.Name, a, msg)
 		}
 	}
 }
diff --git a/fun.go b/fun.go
index 8d18662..1d579b9 100644
--- a/fun.go
+++ b/fun.go
@@ -25,6 +25,7 @@ import (
 	"log"
 	"regexp"
 	"strings"
+	"sync"
 )
 
 func reverbolate(honks []*Honk) {
@@ -217,17 +218,26 @@ func oneofakind(a []string) []string {
 	return x
 }
 
-func ziggy(user *WhatAbout) (keyname string, key *rsa.PrivateKey) {
-	db := opendatabase()
-	row := db.QueryRow("select seckey from users where userid = ?", user.ID)
-	var data string
-	row.Scan(&data)
-	var err error
-	key, _, err = pez(data)
-	if err != nil {
-		log.Printf("error loading %s seckey: %s", user.Name, err)
+var ziggies = make(map[string]*rsa.PrivateKey)
+var ziggylock sync.Mutex
+
+func ziggy(username string) (keyname string, key *rsa.PrivateKey) {
+	ziggylock.Lock()
+	defer ziggylock.Unlock()
+	key = ziggies[username]
+	if key == nil {
+		db := opendatabase()
+		row := db.QueryRow("select seckey from users where username = ?", username)
+		var data string
+		row.Scan(&data)
+		var err error
+		key, _, err = pez(data)
+		if err != nil {
+			log.Printf("error loading %s seckey: %s", username, err)
+			return
+		}
 	}
-	keyname = user.URL + "#key"
+	keyname = fmt.Sprintf("https://%s/u/%s#key", serverName, username)
 	return
 }
 
diff --git a/honk.go b/honk.go
index 2d6f892..82f4e37 100644
--- a/honk.go
+++ b/honk.go
@@ -233,7 +233,7 @@ func ping(user *WhatAbout, who string) {
 	j["id"] = user.URL + "/ping/" + xfiltrate()
 	j["actor"] = user.URL
 	j["to"] = who
-	keyname, key := ziggy(user)
+	keyname, key := ziggy(user.Name)
 	err = PostJunk(keyname, key, inbox, j)
 	if err != nil {
 		log.Printf("can't send ping: %s", err)
@@ -255,7 +255,7 @@ func pong(user *WhatAbout, who string, obj string) {
 	j["actor"] = user.URL
 	j["to"] = who
 	j["object"] = obj
-	keyname, key := ziggy(user)
+	keyname, key := ziggy(user.Name)
 	err = PostJunk(keyname, key, inbox, j)
 	if err != nil {
 		log.Printf("can't send pong: %s", err)