make fmt

Changes

5 changed files (+14/-14)

• modules/activitypub/follow.go
  • @@ -36,12 +36,12 @@ objectUser, err := user_model.GetUserByName(ctx, objectName)
    if err != nil { log.Warn("Couldn't find object", err) } - + user_model.FollowUser(actorUser.ID, objectUser.ID) accept := ap.AcceptNew(objectIRI, activity) accept.Actor = ap.Person{ID: objectIRI} - accept.To = ap.ItemCollection{ap.IRI(actorIRI.String()+"/inbox")} - + accept.To = ap.ItemCollection{ap.IRI(actorIRI.String() + "/inbox")} + Send(objectUser, accept) }
• modules/activitypub/send.go
  • @@ -47,4 +47,4 @@ for _, to := range activity.To {
    client, _ := NewClient(user, setting.AppURL+"api/v1/activitypub/user/"+user.Name+"#main-key") client.Post(body, to.GetID().String()) } - } + }
• modules/activitypub/user.go
  • @@ -12,11 +12,11 @@ ap "github.com/go-ap/activitypub"
    ) func FederatedUserNew(name string, IRI ap.IRI) error { - user := &user_model.User{ + user := &user_model.User{ Name: name, Email: name, LoginType: auth.Federated, - Website: IRI.String(), + Website: IRI.String(), } return user_model.CreateUser(user) - } + }
• routers/api/v1/activitypub/person.go
  • @@ -60,13 +60,13 @@ if err != nil {
    ctx.Error(http.StatusInternalServerError, "Set PreferredUsername", err) return } - + person.URL = ap.IRI(setting.AppURL + username) person.Icon = ap.Image{ - Type: ap.ImageType, + Type: ap.ImageType, MediaType: "image/png", - URL: ap.IRI(user.AvatarLink()), + URL: ap.IRI(user.AvatarLink()), } person.Inbox = nil
  • @@ -201,13 +201,13 @@ if user == nil {
    return } link := strings.TrimSuffix(setting.AppURL, "/") + strings.TrimSuffix(ctx.Req.URL.EscapedPath(), "/") - + users, err := user_model.GetUserFollowing(user, utils.GetListOptions(ctx)) if err != nil { ctx.Error(http.StatusInternalServerError, "GetUserFollowing", err) return } - + following := ap.OrderedCollectionNew(ap.IRI(link)) following.TotalItems = uint(len(users))
• routers/api/v1/activitypub/response.go
  • @@ -19,10 +19,10 @@ if err != nil {
    ctx.Error(http.StatusInternalServerError, "Unmarshall", err) } - jsonmap["@context"] = []string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"} + jsonmap["@context"] = []string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"} ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType) ctx.Resp.WriteHeader(http.StatusOK) binary, _ = json.Marshal(jsonmap) ctx.Resp.Write(binary) - } + }