mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 20:02:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lil webfingy fix (#106)

Browse source 
* lil webfingy fix

* return requested content type from fede requests
This commit is contained in:
Tobi Smethurst 2021-07-21 17:46:59 +02:00 • committed by GitHub
commit 113186ce4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/api/s2s/user/publickeyget.go
View file

@ -2,6 +2,8 @@ package user
import (
"context"
"encoding/json"
"fmt"
"net/http"
"github.com/gin-gonic/gin"
@ -48,5 +50,13 @@ func (m *Module) PublicKeyGETHandler(c *gin.Context) {
return
}
c.JSON(http.StatusOK, user)
b, mErr := json.Marshal(user)
if mErr != nil {
err := fmt.Errorf("could not marshal json: %s", mErr)
l.Error(err)
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
c.Data(http.StatusOK, format, b)
}