diff --git a/actor.go b/actor.go index ddeeb22..b6dd9d4 100644 --- a/actor.go +++ b/actor.go @@ -299,9 +299,9 @@ func (a *Actor) whoAmI() string { self["followers"] = baseURL + a.Name + "/peers/followers" self["following"] = baseURL + a.Name + "/peers/following" self["publicKey"] = map[string]string{ - "id" : baseURL + a.Name + "#main-key", - "owner" : baseURL + a.Name, - "publicKeyPem" : strings.ReplaceAll(a.publicKeyPem, "\n", "\\n"), + "id": baseURL + a.Name + "#main-key", + "owner": baseURL + a.Name, + "publicKeyPem": a.publicKeyPem, } selfString, _ := json.Marshal(self) return string(selfString) diff --git a/http.go b/http.go index 1126343..be750c8 100644 --- a/http.go +++ b/http.go @@ -241,7 +241,7 @@ func Serve(actors map[string]Actor) { // pixelfed doesn't return the original follow thus the id is wrong so we // need to just check if we requested this actor if _, ok := actor.requested[acceptor]; !ok { - log.Info("We never requested this follow, ignoring the Accept") + log.Info("We never requested this follow from " + acceptor +", ignoring the Accept") return } // if pixelfed fixes https://github.com/pixelfed/pixelfed/issues/1710 we should uncomment diff --git a/util.go b/util.go index a694a42..fc9be80 100644 --- a/util.go +++ b/util.go @@ -19,7 +19,8 @@ import ( func isSuccess(code int) bool { return code == http.StatusOK || code == http.StatusCreated || - code == http.StatusAccepted + code == http.StatusAccepted || + code == http.StatusNoContent } //PrettyPrint maps