Ensure things are json marshalable

Author: zeripath

models/issue.go

@@ -47,7 +47,7 @@ type Issue struct {
 	IsClosed         bool         `xorm:"INDEX"`
 	IsRead           bool         `xorm:"-"`
 	IsPull           bool         `xorm:"INDEX"` // Indicates whether is a pull request or not.
-	PullRequest      *PullRequest `xorm:"-"`
+	PullRequest      *PullRequest `xorm:"-" json:"-"`
 	NumComments      int
 	Ref              string
 

models/repo_unit.go

@@ -6,6 +6,8 @@ package models
 
 import (
 	"encoding/json"
+	"fmt"
+	"reflect"
 
 	"code.gitea.io/gitea/modules/timeutil"
 
@@ -169,6 +171,57 @@ func (r *RepoUnit) ExternalTrackerConfig() *ExternalTrackerConfig {
 	return r.Config.(*ExternalTrackerConfig)
 }
 
+// MarshalJSON implements json.Marshaler
+func (r *RepoUnit) MarshalJSON() ([]byte, error) {
+	tmp := map[string]interface{}{}
+	tmp["ID"] = r.ID
+	tmp["RepoID"] = r.RepoID
+	var err error
+	tmp["Config"], err = r.Config.ToDB()
+	if err != nil {
+		return nil, err
+	}
+	tmp["CreatedUnix"] = r.CreatedUnix
+	bs, err := json.Marshal(tmp)
+	return bs, err
+}
+
+// UnmarshalJSON implements json.UnMarshaler
+func (r *RepoUnit) UnmarshalJSON(bs []byte) (err error) {
+	tmp := struct {
+		ID          int64
+		RepoID      int64
+		Type        UnitType
+		Config      []byte
+		CreatedUnix timeutil.TimeStamp
+	}{}
+	err = json.Unmarshal(bs, &tmp)
+	if err != nil {
+		return err
+	}
+
+	r.ID = tmp.ID
+	r.RepoID = tmp.RepoID
+	r.Type = tmp.Type
+	if r.Type != 0 {
+		defer func() {
+			panicked := recover()
+			if panicked == nil {
+				return
+			}
+			// Panicing is not very nice...
+			err = fmt.Errorf("%v", panicked)
+			r.Config = new(UnitConfig)
+		}()
+		typeInt64 := int64(r.Type)
+		typeInterface := reflect.ValueOf(typeInt64).Interface()
+		r.BeforeSet("type", xorm.Cell(&typeInterface))
+		return json.Unmarshal(tmp.Config, &(r.Config))
+	}
+	r.Config = new(UnitConfig)
+	return nil
+}
+
 func getUnitsByRepoID(e Engine, repoID int64) (units []*RepoUnit, err error) {
 	var tmpUnits []*RepoUnit
 	if err := e.Where("repo_id = ?", repoID).Find(&tmpUnits); err != nil {

models/user.go

@@ -110,9 +110,9 @@ type User struct {
 	LoginSource int64 `xorm:"NOT NULL DEFAULT 0"`
 	LoginName   string
 	Type        UserType
-	OwnedOrgs   []*User       `xorm:"-"`
-	Orgs        []*User       `xorm:"-"`
-	Repos       []*Repository `xorm:"-"`
+	OwnedOrgs   []*User       `xorm:"-" json:"-"`
+	Orgs        []*User       `xorm:"-" json:"-"`
+	Repos       []*Repository `xorm:"-" json:"-"`
 	Location    string
 	Website     string
 	Rands       string `xorm:"VARCHAR(10)"`
@@ -152,9 +152,9 @@ type User struct {
 	// For organization
 	NumTeams                  int
 	NumMembers                int
-	Teams                     []*Team             `xorm:"-"`
-	Members                   UserList            `xorm:"-"`
-	MembersIsPublic           map[int64]bool      `xorm:"-"`
+	Teams                     []*Team             `xorm:"-" json:"-"`
+	Members                   UserList            `xorm:"-" json:"-"`
+	MembersIsPublic           map[int64]bool      `xorm:"-" json:"-"`
 	Visibility                structs.VisibleType `xorm:"NOT NULL DEFAULT 0"`
 	RepoAdminChangeTeamAccess bool                `xorm:"NOT NULL DEFAULT false"`
 

modules/convert/pull.go

@@ -26,6 +26,10 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
 		err        error
 	)
 
+	if pr.Issue.PullRequest == nil {
+		pr.Issue.PullRequest = pr
+	}
+
 	if err = pr.Issue.LoadRepo(); err != nil {
 		log.Error("pr.Issue.LoadRepo[%d]: %v", pr.ID, err)
 		return nil

routers/api/v1/repo/issue_comment.go

@@ -413,6 +413,8 @@ func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
 		ctx.Error(http.StatusInternalServerError, "UpdateComment", err)
 		return
 	}
+	_ = comment.LoadAssigneeUser()
+	_ = comment.LoadPoster()
 
 	ctx.JSON(http.StatusOK, comment.APIFormat())
 }