From b176ff51c4cb67e6ae1d1d707521b884e9e01bb0 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Mon, 25 Jan 2021 18:41:36 +0100
Subject: [PATCH] whoops

---
 cmd/server/main.go | 7 ++-----
 go.sum             | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index c3a0d84..c01554b 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -129,10 +129,7 @@ func runroomsrv() error {
 		roomsrv.WithAppKey(ak),
 		roomsrv.WithRepoPath(repoDir),
 		roomsrv.WithListenAddr(listenAddr),
-	}
-
-	if !flagDisableUNIXSock {
-		opts = append(opts, roomsrv.WithUNIXSocket())
+		roomsrv.WithUNIXSocket(!flagDisableUNIXSock),
 	}
 
 	if logToFile != "" {
@@ -184,7 +181,7 @@ func runroomsrv() error {
 		os.Exit(0)
 	}()
 
-	level.Info(log).Log("event", "serving", "ID", roomsrv.KeyPair.Feed.Ref(), "addr", listenAddr, "version", Version, "build", Build)
+	level.Info(log).Log("event", "serving", "ID", roomsrv.Whoami().Ref(), "addr", listenAddr, "version", Version, "build", Build)
 	for {
 		// Note: This is where the serving starts ;)
 		err = roomsrv.Network.Serve(ctx)
diff --git a/go.sum b/go.sum
index 253a340..75415bc 100644
--- a/go.sum
+++ b/go.sum
@@ -116,6 +116,7 @@ github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -379,6 +380,7 @@ golang.org/x/sys v0.0.0-20191007154456-ef33b2fb2c41/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=