From 87104be77402ae6c353ef849cf044700a1ec6bcb Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Tue, 18 Feb 2020 12:50:19 -0500
Subject: [PATCH] consolidate dumpactivity

---
 activity.go | 16 ++++++++++++----
 web.go      |  9 ++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/activity.go b/activity.go
index 1418582..d0a05da 100644
--- a/activity.go
+++ b/activity.go
@@ -585,10 +585,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
 			what = "event"
 		default:
 			log.Printf("unknown activity: %s", what)
-			fd, _ := os.OpenFile("savedinbox.json", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-			item.Write(fd)
-			io.WriteString(fd, "\n")
-			fd.Close()
+			dumpactivity(item)
 			return nil
 		}
 
@@ -904,6 +901,17 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk {
 	return xonkxonkfn(item, origin)
 }
 
+func dumpactivity(item junk.Junk) {
+	fd, err := os.OpenFile("savedinbox.json", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	if err != nil {
+		log.Printf("error opening inbox! %s", err)
+		return
+	}
+	defer fd.Close()
+	item.Write(fd)
+	io.WriteString(fd, "\n")
+}
+
 func rubadubdub(user *WhatAbout, req junk.Junk) {
 	xid, _ := req.GetString("id")
 	actor, _ := req.GetString("actor")
diff --git a/web.go b/web.go
index a7c077a..0c5dbc0 100644
--- a/web.go
+++ b/web.go
@@ -422,11 +422,7 @@ func inbox(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 		log.Printf("unknown Update activity")
-		fd, _ := os.OpenFile("savedinbox.json", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-		j.Write(fd)
-		io.WriteString(fd, "\n")
-		fd.Close()
-
+		dumpactivity(j)
 	case "Undo":
 		obj, ok := j.GetMap("object")
 		if !ok {
@@ -553,6 +549,9 @@ func serverinbox(w http.ResponseWriter, r *http.Request) {
 			log.Printf("error updating honker: %s", err)
 			return
 		}
+	default:
+		log.Printf("unhandled server activity: %s", what)
+		dumpactivity(j)
 	}
 }