From d6cc646200efd7b692c284cd9b9a7eebcf6fa514 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Sun, 28 Jul 2019 20:01:12 -0400
Subject: [PATCH] a little more type safety with less interface

---
 activity.go | 4 ++--
 honk.go     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/activity.go b/activity.go
index 3d100b2..959d546 100644
--- a/activity.go
+++ b/activity.go
@@ -785,7 +785,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 			jo["sensitive"] = true
 		}
 
-		var tags []interface{}
+		var tags []junk.Junk
 		g := bunchofgrapes(h.Noise)
 		for _, m := range g {
 			t := junk.New()
@@ -817,7 +817,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) {
 		if len(tags) > 0 {
 			jo["tag"] = tags
 		}
-		var atts []interface{}
+		var atts []junk.Junk
 		for _, d := range h.Donks {
 			if re_emus.MatchString(d.Name) {
 				continue
diff --git a/honk.go b/honk.go
index c2dddb9..0f455fa 100644
--- a/honk.go
+++ b/honk.go
@@ -499,7 +499,7 @@ func outbox(w http.ResponseWriter, r *http.Request) {
 
 	honks := gethonksbyuser(name, false)
 
-	var jonks []map[string]interface{}
+	var jonks []junk.Junk
 	for _, h := range honks {
 		j, _ := jonkjonk(user, h)
 		jonks = append(jonks, j)
@@ -532,7 +532,7 @@ func emptiness(w http.ResponseWriter, r *http.Request) {
 	j["id"] = user.URL + colname
 	j["type"] = "OrderedCollection"
 	j["totalItems"] = 0
-	j["orderedItems"] = []interface{}{}
+	j["orderedItems"] = []junk.Junk{}
 
 	w.Header().Set("Content-Type", theonetruename)
 	j.Write(w)
@@ -1350,7 +1350,7 @@ func fingerlicker(w http.ResponseWriter, r *http.Request) {
 	j := junk.New()
 	j["subject"] = fmt.Sprintf("acct:%s@%s", user.Name, serverName)
 	j["aliases"] = []string{user.URL}
-	var links []map[string]interface{}
+	var links []junk.Junk
 	l := junk.New()
 	l["rel"] = "self"
 	l["type"] = `application/activity+json`