IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

unnamed return (#8170)

Browse Source
This commit is contained in:
Chris
2018-01-30 17:23:00 -06:00
committed by Corey Hulen
parent ac2e42a480
commit 0c8968fb8d
62 changed files with 430 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
model/access.go
View File

@@ -74,41 +74,23 @@ func (me *AccessData) IsExpired() bool {
}
func (ad *AccessData) ToJson() string {
b, err := json.Marshal(ad)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(ad)
return string(b)
}
func AccessDataFromJson(data io.Reader) *AccessData {
decoder := json.NewDecoder(data)
var ad AccessData
err := decoder.Decode(&ad)
if err == nil {
return &ad
} else {
return nil
}
var ad *AccessData
json.NewDecoder(data).Decode(&ad)
return ad
}
func (ar *AccessResponse) ToJson() string {
b, err := json.Marshal(ar)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(ar)
return string(b)
}
func AccessResponseFromJson(data io.Reader) *AccessResponse {
decoder := json.NewDecoder(data)
var ar AccessResponse
err := decoder.Decode(&ar)
if err == nil {
return &ar
} else {
return nil
}
var ar *AccessResponse
json.NewDecoder(data).Decode(&ar)
return ar
}

28
model/analytics_row.go
View File

@@ -16,23 +16,14 @@ type AnalyticsRow struct {
type AnalyticsRows []*AnalyticsRow
func (me *AnalyticsRow) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func AnalyticsRowFromJson(data io.Reader) *AnalyticsRow {
decoder := json.NewDecoder(data)
var me AnalyticsRow
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *AnalyticsRow
json.NewDecoder(data).Decode(&me)
return me
}
func (me AnalyticsRows) ToJson() string {
@@ -44,12 +35,7 @@ func (me AnalyticsRows) ToJson() string {
}
func AnalyticsRowsFromJson(data io.Reader) AnalyticsRows {
decoder := json.NewDecoder(data)
var me AnalyticsRows
err := decoder.Decode(&me)
if err == nil {
return me
} else {
return nil
}
json.NewDecoder(data).Decode(&me)
return me
}

19
model/audit.go
View File

@@ -19,21 +19,12 @@ type Audit struct {
}
func (o *Audit) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func AuditFromJson(data io.Reader) *Audit {
decoder := json.NewDecoder(data)
var o Audit
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Audit
json.NewDecoder(data).Decode(&o)
return o
}

9
model/audits.go
View File

@@ -28,12 +28,7 @@ func (o Audits) ToJson() string {
}
func AuditsFromJson(data io.Reader) Audits {
decoder := json.NewDecoder(data)
var o Audits
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}

38
model/authorize.go
View File

@@ -115,43 +115,25 @@ func (ad *AuthData) PreSave() {
}
func (ad *AuthData) ToJson() string {
b, err := json.Marshal(ad)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(ad)
return string(b)
}
func AuthDataFromJson(data io.Reader) *AuthData {
decoder := json.NewDecoder(data)
var ad AuthData
err := decoder.Decode(&ad)
if err == nil {
return &ad
} else {
return nil
}
var ad *AuthData
json.NewDecoder(data).Decode(&ad)
return ad
}
func (ar *AuthorizeRequest) ToJson() string {
b, err := json.Marshal(ar)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(ar)
return string(b)
}
func AuthorizeRequestFromJson(data io.Reader) *AuthorizeRequest {
decoder := json.NewDecoder(data)
var ar AuthorizeRequest
err := decoder.Decode(&ar)
if err == nil {
return &ar
} else {
return nil
}
var ar *AuthorizeRequest
json.NewDecoder(data).Decode(&ar)
return ar
}
func (ad *AuthData) IsExpired() bool {

38
model/channel.go
View File

@@ -61,43 +61,25 @@ func (o *Channel) DeepCopy() *Channel {
}
func (o *Channel) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func (o *ChannelPatch) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelFromJson(data io.Reader) *Channel {
decoder := json.NewDecoder(data)
var o Channel
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Channel
json.NewDecoder(data).Decode(&o)
return o
}
func ChannelPatchFromJson(data io.Reader) *ChannelPatch {
decoder := json.NewDecoder(data)
var o ChannelPatch
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelPatch
json.NewDecoder(data).Decode(&o)
return o
}
func (o *Channel) Etag() string {

19
model/channel_count.go
View File

@@ -43,21 +43,12 @@ func (o *ChannelCounts) Etag() string {
}
func (o *ChannelCounts) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelCountsFromJson(data io.Reader) *ChannelCounts {
decoder := json.NewDecoder(data)
var o ChannelCounts
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelCounts
json.NewDecoder(data).Decode(&o)
return o
}

19
model/channel_data.go
View File

@@ -23,21 +23,12 @@ func (o *ChannelData) Etag() string {
}
func (o *ChannelData) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelDataFromJson(data io.Reader) *ChannelData {
decoder := json.NewDecoder(data)
var o ChannelData
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelData
json.NewDecoder(data).Decode(&o)
return o
}

20
model/channel_list.go
View File

@@ -41,23 +41,13 @@ func (o *ChannelList) Etag() string {
}
func ChannelListFromJson(data io.Reader) *ChannelList {
decoder := json.NewDecoder(data)
var o ChannelList
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelList
json.NewDecoder(data).Decode(&o)
return o
}
func ChannelSliceFromJson(data io.Reader) []*Channel {
decoder := json.NewDecoder(data)
var o []*Channel
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}

49
model/channel_member.go
View File

@@ -49,54 +49,31 @@ func (o *ChannelMembers) ToJson() string {
}
func (o *ChannelUnread) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelMembersFromJson(data io.Reader) *ChannelMembers {
decoder := json.NewDecoder(data)
var o ChannelMembers
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelMembers
json.NewDecoder(data).Decode(&o)
return o
}
func ChannelUnreadFromJson(data io.Reader) *ChannelUnread {
decoder := json.NewDecoder(data)
var o ChannelUnread
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelUnread
json.NewDecoder(data).Decode(&o)
return o
}
func (o *ChannelMember) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelMemberFromJson(data io.Reader) *ChannelMember {
decoder := json.NewDecoder(data)
var o ChannelMember
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelMember
json.NewDecoder(data).Decode(&o)
return o
}
func (o *ChannelMember) IsValid() *AppError {

19
model/channel_search.go
View File

@@ -14,22 +14,13 @@ type ChannelSearch struct {
// ToJson convert a Channel to a json string
func (c *ChannelSearch) ToJson() string {
b, err := json.Marshal(c)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(c)
return string(b)
}
// ChannelSearchFromJson will decode the input and return a Channel
func ChannelSearchFromJson(data io.Reader) *ChannelSearch {
decoder := json.NewDecoder(data)
var cs ChannelSearch
err := decoder.Decode(&cs)
if err == nil {
return &cs
} else {
return nil
}
var cs *ChannelSearch
json.NewDecoder(data).Decode(&cs)
return cs
}

19
model/channel_stats.go
View File

@@ -14,21 +14,12 @@ type ChannelStats struct {
}
func (o *ChannelStats) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelStatsFromJson(data io.Reader) *ChannelStats {
decoder := json.NewDecoder(data)
var o ChannelStats
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelStats
json.NewDecoder(data).Decode(&o)
return o
}

38
model/channel_view.go
View File

@@ -14,23 +14,14 @@ type ChannelView struct {
}
func (o *ChannelView) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelViewFromJson(data io.Reader) *ChannelView {
decoder := json.NewDecoder(data)
var o ChannelView
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelView
json.NewDecoder(data).Decode(&o)
return o
}
type ChannelViewResponse struct {
@@ -39,21 +30,12 @@ type ChannelViewResponse struct {
}
func (o *ChannelViewResponse) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ChannelViewResponseFromJson(data io.Reader) *ChannelViewResponse {
decoder := json.NewDecoder(data)
var o ChannelViewResponse
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ChannelViewResponse
json.NewDecoder(data).Decode(&o)
return o
}

26
model/cluster_info.go
View File

@@ -18,12 +18,8 @@ type ClusterInfo struct {
}
func (me *ClusterInfo) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func (me *ClusterInfo) Copy() *ClusterInfo {
@@ -32,22 +28,14 @@ func (me *ClusterInfo) Copy() *ClusterInfo {
}
func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
decoder := json.NewDecoder(data)
var me ClusterInfo
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *ClusterInfo
json.NewDecoder(data).Decode(&me)
return me
}
func ClusterInfosToJson(objmap []*ClusterInfo) string {
if b, err := json.Marshal(objmap); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(objmap)
return string(b)
}
func ClusterInfosFromJson(data io.Reader) []*ClusterInfo {

1
model/cluster_info_test.go
View File

@@ -28,5 +28,4 @@ func TestClusterInfosJson(t *testing.T) {
if clusterInfos[0].IpAddress != result[0].IpAddress {
t.Fatal("Ids do not match")
}
}

19
model/cluster_message.go
View File

@@ -35,21 +35,12 @@ type ClusterMessage struct {
}
func (o *ClusterMessage) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ClusterMessageFromJson(data io.Reader) *ClusterMessage {
decoder := json.NewDecoder(data)
var o ClusterMessage
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *ClusterMessage
json.NewDecoder(data).Decode(&o)
return o
}

19
model/cluster_stats.go
View File

@@ -16,21 +16,12 @@ type ClusterStats struct {
}
func (me *ClusterStats) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func ClusterStatsFromJson(data io.Reader) *ClusterStats {
decoder := json.NewDecoder(data)
var me ClusterStats
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *ClusterStats
json.NewDecoder(data).Decode(&me)
return me
}

36
model/command.go
View File

@@ -38,43 +38,25 @@ type Command struct {
}
func (o *Command) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func CommandFromJson(data io.Reader) *Command {
decoder := json.NewDecoder(data)
var o Command
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Command
json.NewDecoder(data).Decode(&o)
return o
}
func CommandListToJson(l []*Command) string {
b, err := json.Marshal(l)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(l)
return string(b)
}
func CommandListFromJson(data io.Reader) []*Command {
decoder := json.NewDecoder(data)
var o []*Command
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}
func (o *Command) IsValid() *AppError {

19
model/command_args.go
View File

@@ -23,21 +23,12 @@ type CommandArgs struct {
}
func (o *CommandArgs) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func CommandArgsFromJson(data io.Reader) *CommandArgs {
decoder := json.NewDecoder(data)
var o CommandArgs
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *CommandArgs
json.NewDecoder(data).Decode(&o)
return o
}

8
model/command_response.go
View File

@@ -27,12 +27,8 @@ type CommandResponse struct {
}
func (o *CommandResponse) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func CommandResponseFromHTTPBody(contentType string, body io.Reader) *CommandResponse {

28
model/compliance.go
View File

@@ -38,12 +38,8 @@ type Compliance struct {
type Compliances []Compliance
func (o *Compliance) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func (me *Compliance) PreSave() {
@@ -103,14 +99,9 @@ func (me *Compliance) IsValid() *AppError {
}
func ComplianceFromJson(data io.Reader) *Compliance {
decoder := json.NewDecoder(data)
var o Compliance
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Compliance
json.NewDecoder(data).Decode(&o)
return o
}
func (o Compliances) ToJson() string {
@@ -122,12 +113,7 @@ func (o Compliances) ToJson() string {
}
func CompliancesFromJson(data io.Reader) Compliances {
decoder := json.NewDecoder(data)
var o Compliances
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}

19
model/config.go
View File

@@ -1681,12 +1681,8 @@ func (o *Config) Clone() *Config {
}
func (o *Config) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func (o *Config) GetSSOService(service string) *SSOSettings {
@@ -1703,14 +1699,9 @@ func (o *Config) GetSSOService(service string) *SSOSettings {
}
func ConfigFromJson(data io.Reader) *Config {
decoder := json.NewDecoder(data)
var o Config
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Config
json.NewDecoder(data).Decode(&o)
return o
}
func (o *Config) SetDefaults() {

19
model/data_retention_policy.go
View File

@@ -16,21 +16,12 @@ type DataRetentionPolicy struct {
}
func (me *DataRetentionPolicy) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func DataRetentionPolicyFromJson(data io.Reader) *DataRetentionPolicy {
decoder := json.NewDecoder(data)
var me DataRetentionPolicy
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *DataRetentionPolicy
json.NewDecoder(data).Decode(&me)
return me
}

36
model/emoji.go
View File

@@ -61,41 +61,23 @@ func (emoji *Emoji) PreUpdate() {
}
func (emoji *Emoji) ToJson() string {
b, err := json.Marshal(emoji)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(emoji)
return string(b)
}
func EmojiFromJson(data io.Reader) *Emoji {
decoder := json.NewDecoder(data)
var emoji Emoji
err := decoder.Decode(&emoji)
if err == nil {
return &emoji
} else {
return nil
}
var emoji *Emoji
json.NewDecoder(data).Decode(&emoji)
return emoji
}
func EmojiListToJson(emojiList []*Emoji) string {
b, err := json.Marshal(emojiList)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(emojiList)
return string(b)
}
func EmojiListFromJson(data io.Reader) []*Emoji {
decoder := json.NewDecoder(data)
var emojiList []*Emoji
err := decoder.Decode(&emojiList)
if err == nil {
return emojiList
} else {
return nil
}
json.NewDecoder(data).Decode(&emojiList)
return emojiList
}

19
model/emoji_search.go
View File

@@ -14,21 +14,12 @@ type EmojiSearch struct {
}
func (es *EmojiSearch) ToJson() string {
b, err := json.Marshal(es)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(es)
return string(b)
}
func EmojiSearchFromJson(data io.Reader) *EmojiSearch {
decoder := json.NewDecoder(data)
var es EmojiSearch
err := decoder.Decode(&es)
if err == nil {
return &es
} else {
return nil
}
var es *EmojiSearch
json.NewDecoder(data).Decode(&es)
return es
}

19
model/file.go
View File

@@ -23,21 +23,12 @@ type FileUploadResponse struct {
}
func FileUploadResponseFromJson(data io.Reader) *FileUploadResponse {
decoder := json.NewDecoder(data)
var o FileUploadResponse
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *FileUploadResponse
json.NewDecoder(data).Decode(&o)
return o
}
func (o *FileUploadResponse) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}

16
model/file_info.go
View File

@@ -35,12 +35,8 @@ type FileInfo struct {
}
func (info *FileInfo) ToJson() string {
b, err := json.Marshal(info)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(info)
return string(b)
}
func FileInfoFromJson(data io.Reader) *FileInfo {
@@ -55,12 +51,8 @@ func FileInfoFromJson(data io.Reader) *FileInfo {
}
func FileInfosToJson(infos []*FileInfo) string {
b, err := json.Marshal(infos)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(infos)
return string(b)
}
func FileInfosFromJson(data io.Reader) []*FileInfo {

36
model/incoming_webhook.go
View File

@@ -40,43 +40,25 @@ type IncomingWebhookRequest struct {
}
func (o *IncomingWebhook) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func IncomingWebhookFromJson(data io.Reader) *IncomingWebhook {
decoder := json.NewDecoder(data)
var o IncomingWebhook
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *IncomingWebhook
json.NewDecoder(data).Decode(&o)
return o
}
func IncomingWebhookListToJson(l []*IncomingWebhook) string {
b, err := json.Marshal(l)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(l)
return string(b)
}
func IncomingWebhookListFromJson(data io.Reader) []*IncomingWebhook {
decoder := json.NewDecoder(data)
var o []*IncomingWebhook
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}
func (o *IncomingWebhook) IsValid() *AppError {

19
model/initial_load.go
View File

@@ -19,21 +19,12 @@ type InitialLoad struct {
}
func (me *InitialLoad) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func InitialLoadFromJson(data io.Reader) *InitialLoad {
decoder := json.NewDecoder(data)
var o InitialLoad
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *InitialLoad
json.NewDecoder(data).Decode(&o)
return o
}

21
model/job.go
View File

@@ -71,11 +71,8 @@ func (j *Job) IsValid() *AppError {
}
func (js *Job) ToJson() string {
if b, err := json.Marshal(js); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(js)
return string(b)
}
func JobFromJson(data io.Reader) *Job {
@@ -88,11 +85,8 @@ func JobFromJson(data io.Reader) *Job {
}
func JobsToJson(jobs []*Job) string {
if b, err := json.Marshal(jobs); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(jobs)
return string(b)
}
func JobsFromJson(data io.Reader) []*Job {
@@ -105,11 +99,8 @@ func JobsFromJson(data io.Reader) []*Job {
}
func (js *Job) DataToJson() string {
if b, err := json.Marshal(js.Data); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(js.Data)
return string(b)
}
type Worker interface {

19
model/license.go
View File

@@ -169,23 +169,14 @@ func (l *License) IsStarted() bool {
}
func (l *License) ToJson() string {
b, err := json.Marshal(l)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(l)
return string(b)
}
func LicenseFromJson(data io.Reader) *License {
decoder := json.NewDecoder(data)
var o License
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *License
json.NewDecoder(data).Decode(&o)
return o
}
func (lr *LicenseRecord) IsValid() *AppError {

36
model/manifest.go
View File

@@ -142,43 +142,25 @@ type ManifestWebapp struct {
}
func (m *Manifest) ToJson() string {
b, err := json.Marshal(m)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(m)
return string(b)
}
func ManifestListToJson(m []*Manifest) string {
b, err := json.Marshal(m)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(m)
return string(b)
}
func ManifestFromJson(data io.Reader) *Manifest {
decoder := json.NewDecoder(data)
var m Manifest
err := decoder.Decode(&m)
if err == nil {
return &m
} else {
return nil
}
var m *Manifest
json.NewDecoder(data).Decode(&m)
return m
}
func ManifestListFromJson(data io.Reader) []*Manifest {
decoder := json.NewDecoder(data)
var manifests []*Manifest
err := decoder.Decode(&manifests)
if err == nil {
return manifests
} else {
return nil
}
json.NewDecoder(data).Decode(&manifests)
return manifests
}
func (m *Manifest) HasClient() bool {

19
model/mfa_secret.go
View File

@@ -14,21 +14,12 @@ type MfaSecret struct {
}
func (me *MfaSecret) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func MfaSecretFromJson(data io.Reader) *MfaSecret {
decoder := json.NewDecoder(data)
var me MfaSecret
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *MfaSecret
json.NewDecoder(data).Decode(&me)
return me
}

53
model/oauth.go
View File

@@ -110,12 +110,8 @@ func (a *OAuthApp) PreUpdate() {
// ToJson convert a User to a json string
func (a *OAuthApp) ToJson() string {
b, err := json.Marshal(a)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(a)
return string(b)
}
// Generate a valid strong etag so the browser can cache the results
@@ -140,52 +136,29 @@ func (a *OAuthApp) IsValidRedirectURL(url string) bool {
// OAuthAppFromJson will decode the input and return a User
func OAuthAppFromJson(data io.Reader) *OAuthApp {
decoder := json.NewDecoder(data)
var app OAuthApp
err := decoder.Decode(&app)
if err == nil {
return &app
} else {
return nil
}
var app *OAuthApp
json.NewDecoder(data).Decode(&app)
return app
}
func OAuthAppMapToJson(a map[string]*OAuthApp) string {
b, err := json.Marshal(a)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(a)
return string(b)
}
func OAuthAppMapFromJson(data io.Reader) map[string]*OAuthApp {
decoder := json.NewDecoder(data)
var apps map[string]*OAuthApp
err := decoder.Decode(&apps)
if err == nil {
return apps
} else {
return nil
}
json.NewDecoder(data).Decode(&apps)
return apps
}
func OAuthAppListToJson(l []*OAuthApp) string {
b, err := json.Marshal(l)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(l)
return string(b)
}
func OAuthAppListFromJson(data io.Reader) []*OAuthApp {
decoder := json.NewDecoder(data)
var o []*OAuthApp
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}

63
model/outgoing_webhook.go
View File

@@ -58,12 +58,8 @@ type OutgoingWebhookResponse struct {
const OUTGOING_HOOK_RESPONSE_TYPE_COMMENT = "comment"
func (o *OutgoingWebhookPayload) ToJSON() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func (o *OutgoingWebhookPayload) ToFormValues() string {
@@ -85,63 +81,36 @@ func (o *OutgoingWebhookPayload) ToFormValues() string {
}
func (o *OutgoingWebhook) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func OutgoingWebhookFromJson(data io.Reader) *OutgoingWebhook {
decoder := json.NewDecoder(data)
var o OutgoingWebhook
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *OutgoingWebhook
json.NewDecoder(data).Decode(&o)
return o
}
func OutgoingWebhookListToJson(l []*OutgoingWebhook) string {
b, err := json.Marshal(l)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(l)
return string(b)
}
func OutgoingWebhookListFromJson(data io.Reader) []*OutgoingWebhook {
decoder := json.NewDecoder(data)
var o []*OutgoingWebhook
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}
func (o *OutgoingWebhookResponse) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func OutgoingWebhookResponseFromJson(data io.Reader) *OutgoingWebhookResponse {
decoder := json.NewDecoder(data)
var o OutgoingWebhookResponse
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *OutgoingWebhookResponse
json.NewDecoder(data).Decode(&o)
return o
}
func (o *OutgoingWebhook) IsValid() *AppError {

19
model/plugins_response.go
View File

@@ -19,21 +19,12 @@ type PluginsResponse struct {
}
func (m *PluginsResponse) ToJson() string {
b, err := json.Marshal(m)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(m)
return string(b)
}
func PluginsResponseFromJson(data io.Reader) *PluginsResponse {
decoder := json.NewDecoder(data)
var m PluginsResponse
err := decoder.Decode(&m)
if err == nil {
return &m
} else {
return nil
}
var m *PluginsResponse
json.NewDecoder(data).Decode(&m)
return m
}

19
model/post.go
View File

@@ -130,14 +130,9 @@ func (o *Post) ToJson() string {
}
func PostFromJson(data io.Reader) *Post {
decoder := json.NewDecoder(data)
var o Post
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Post
json.NewDecoder(data).Decode(&o)
return o
}
func (o *Post) Etag() string {
@@ -349,12 +344,8 @@ func (o *Post) ChannelMentions() (names []string) {
}
func (r *PostActionIntegrationRequest) ToJson() string {
b, err := json.Marshal(r)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(r)
return string(b)
}
func (o *Post) Attachments() []*SlackAttachment {

11
model/post_list.go
View File

@@ -132,12 +132,7 @@ func (o *PostList) IsChannelId(channelId string) bool {
}
func PostListFromJson(data io.Reader) *PostList {
decoder := json.NewDecoder(data)
var o PostList
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *PostList
json.NewDecoder(data).Decode(&o)
return o
}

19
model/preference.go
View File

@@ -47,23 +47,14 @@ type Preference struct {
}
func (o *Preference) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func PreferenceFromJson(data io.Reader) *Preference {
decoder := json.NewDecoder(data)
var o Preference
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Preference
json.NewDecoder(data).Decode(&o)
return o
}
func (o *Preference) IsValid() *AppError {

8
model/preferences.go
View File

@@ -11,12 +11,8 @@ import (
type Preferences []Preference
func (o *Preferences) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func PreferencesFromJson(data io.Reader) (Preferences, error) {

19
model/push_notification.go
View File

@@ -47,12 +47,8 @@ type PushNotification struct {
}
func (me *PushNotification) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func (me *PushNotification) SetDeviceIdAndPlatform(deviceId string) {
@@ -66,12 +62,7 @@ func (me *PushNotification) SetDeviceIdAndPlatform(deviceId string) {
}
func PushNotificationFromJson(data io.Reader) *PushNotification {
decoder := json.NewDecoder(data)
var me PushNotification
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *PushNotification
json.NewDecoder(data).Decode(&me)
return me
}

7
model/push_response.go
View File

@@ -38,11 +38,8 @@ func NewErrorPushResponse(message string) PushResponse {
}
func (me *PushResponse) ToJson() string {
if b, err := json.Marshal(me); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func PushResponseFromJson(data io.Reader) PushResponse {

14
model/reaction.go
View File

@@ -18,11 +18,8 @@ type Reaction struct {
}
func (o *Reaction) ToJson() string {
if b, err := json.Marshal(o); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ReactionFromJson(data io.Reader) *Reaction {
@@ -36,11 +33,8 @@ func ReactionFromJson(data io.Reader) *Reaction {
}
func ReactionsToJson(o []*Reaction) string {
if b, err := json.Marshal(o); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func ReactionsFromJson(data io.Reader) []*Reaction {

19
model/saml.go
View File

@@ -29,21 +29,12 @@ type SamlCertificateStatus struct {
}
func (s *SamlCertificateStatus) ToJson() string {
b, err := json.Marshal(s)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(s)
return string(b)
}
func SamlCertificateStatusFromJson(data io.Reader) *SamlCertificateStatus {
decoder := json.NewDecoder(data)
var status SamlCertificateStatus
err := decoder.Decode(&status)
if err == nil {
return &status
} else {
return nil
}
var status *SamlCertificateStatus
json.NewDecoder(data).Decode(&status)
return status
}

8
model/search_params.go
View File

@@ -21,12 +21,8 @@ type SearchParams struct {
}
func (o *SearchParams) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
var searchFlags = [...]string{"from", "channel", "in"}

28
model/security_bulletin.go
View File

@@ -16,23 +16,14 @@ type SecurityBulletin struct {
type SecurityBulletins []SecurityBulletin
func (me *SecurityBulletin) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func SecurityBulletinFromJson(data io.Reader) *SecurityBulletin {
decoder := json.NewDecoder(data)
var o SecurityBulletin
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *SecurityBulletin
json.NewDecoder(data).Decode(&o)
return o
}
func (me SecurityBulletins) ToJson() string {
@@ -44,12 +35,7 @@ func (me SecurityBulletins) ToJson() string {
}
func SecurityBulletinsFromJson(data io.Reader) SecurityBulletins {
decoder := json.NewDecoder(data)
var o SecurityBulletins
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}

28
model/session.go
View File

@@ -43,23 +43,14 @@ func (me *Session) DeepCopy() *Session {
}
func (me *Session) ToJson() string {
b, err := json.Marshal(me)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(me)
return string(b)
}
func SessionFromJson(data io.Reader) *Session {
decoder := json.NewDecoder(data)
var me Session
err := decoder.Decode(&me)
if err == nil {
return &me
} else {
return nil
}
var me *Session
json.NewDecoder(data).Decode(&me)
return me
}
func (me *Session) PreSave() {
@@ -140,12 +131,7 @@ func SessionsToJson(o []*Session) string {
}
func SessionsFromJson(data io.Reader) []*Session {
decoder := json.NewDecoder(data)
var o []*Session
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}

36
model/status.go
View File

@@ -27,43 +27,25 @@ type Status struct {
}
func (o *Status) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func StatusFromJson(data io.Reader) *Status {
decoder := json.NewDecoder(data)
var o Status
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Status
json.NewDecoder(data).Decode(&o)
return o
}
func StatusListToJson(u []*Status) string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
func StatusListFromJson(data io.Reader) []*Status {
decoder := json.NewDecoder(data)
var statuses []*Status
err := decoder.Decode(&statuses)
if err == nil {
return statuses
} else {
return nil
}
json.NewDecoder(data).Decode(&statuses)
return statuses
}
func StatusMapToInterfaceMap(statusMap map[string]*Status) map[string]interface{} {

19
model/suggest_command.go
View File

@@ -14,21 +14,12 @@ type SuggestCommand struct {
}
func (o *SuggestCommand) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func SuggestCommandFromJson(data io.Reader) *SuggestCommand {
decoder := json.NewDecoder(data)
var o SuggestCommand
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *SuggestCommand
json.NewDecoder(data).Decode(&o)
return o
}

19
model/switch_request.go
View File

@@ -19,23 +19,14 @@ type SwitchRequest struct {
}
func (o *SwitchRequest) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func SwitchRequestFromJson(data io.Reader) *SwitchRequest {
decoder := json.NewDecoder(data)
var o SwitchRequest
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *SwitchRequest
json.NewDecoder(data).Decode(&o)
return o
}
func (o *SwitchRequest) EmailToOAuth() bool {

19
model/system.go
View File

@@ -22,21 +22,12 @@ type System struct {
}
func (o *System) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func SystemFromJson(data io.Reader) *System {
decoder := json.NewDecoder(data)
var o System
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *System
json.NewDecoder(data).Decode(&o)
return o
}

72
model/team.go
View File

@@ -54,14 +54,9 @@ type Invites struct {
}
func InvitesFromJson(data io.Reader) *Invites {
decoder := json.NewDecoder(data)
var o Invites
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Invites
json.NewDecoder(data).Decode(&o)
return o
}
func (o *Invites) ToEmailList() []string {
@@ -73,72 +68,41 @@ func (o *Invites) ToEmailList() []string {
}
func (o *Invites) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func (o *Team) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func TeamFromJson(data io.Reader) *Team {
decoder := json.NewDecoder(data)
var o Team
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *Team
json.NewDecoder(data).Decode(&o)
return o
}
func TeamMapToJson(u map[string]*Team) string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
func TeamMapFromJson(data io.Reader) map[string]*Team {
decoder := json.NewDecoder(data)
var teams map[string]*Team
err := decoder.Decode(&teams)
if err == nil {
return teams
} else {
return nil
}
json.NewDecoder(data).Decode(&teams)
return teams
}
func TeamListToJson(t []*Team) string {
b, err := json.Marshal(t)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(t)
return string(b)
}
func TeamListFromJson(data io.Reader) []*Team {
decoder := json.NewDecoder(data)
var teams []*Team
err := decoder.Decode(&teams)
if err == nil {
return teams
} else {
return nil
}
json.NewDecoder(data).Decode(&teams)
return teams
}
func (o *Team) Etag() string {

56
model/team_member.go
View File

@@ -24,43 +24,25 @@ type TeamUnread struct {
}
func (o *TeamMember) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func (o *TeamUnread) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func TeamMemberFromJson(data io.Reader) *TeamMember {
decoder := json.NewDecoder(data)
var o TeamMember
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *TeamMember
json.NewDecoder(data).Decode(&o)
return o
}
func TeamUnreadFromJson(data io.Reader) *TeamUnread {
decoder := json.NewDecoder(data)
var o TeamUnread
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *TeamUnread
json.NewDecoder(data).Decode(&o)
return o
}
func TeamMembersToJson(o []*TeamMember) string {
@@ -72,14 +54,9 @@ func TeamMembersToJson(o []*TeamMember) string {
}
func TeamMembersFromJson(data io.Reader) []*TeamMember {
decoder := json.NewDecoder(data)
var o []*TeamMember
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}
func TeamsUnreadToJson(o []*TeamUnread) string {
@@ -91,14 +68,9 @@ func TeamsUnreadToJson(o []*TeamUnread) string {
}
func TeamsUnreadFromJson(data io.Reader) []*TeamUnread {
decoder := json.NewDecoder(data)
var o []*TeamUnread
err := decoder.Decode(&o)
if err == nil {
return o
} else {
return nil
}
json.NewDecoder(data).Decode(&o)
return o
}
func (o *TeamMember) IsValid() *AppError {

19
model/team_stats.go
View File

@@ -15,21 +15,12 @@ type TeamStats struct {
}
func (o *TeamStats) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func TeamStatsFromJson(data io.Reader) *TeamStats {
decoder := json.NewDecoder(data)
var o TeamStats
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *TeamStats
json.NewDecoder(data).Decode(&o)
return o
}

91
model/user.go
View File

@@ -298,30 +298,18 @@ func (u *User) Patch(patch *UserPatch) {
// ToJson convert a User to a json string
func (u *User) ToJson() string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
func (u *UserPatch) ToJson() string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
func (u *UserAuth) ToJson() string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
// Generate a valid strong etag so the browser can cache the results
@@ -488,76 +476,43 @@ func (u *User) IsSAMLUser() bool {
// UserFromJson will decode the input and return a User
func UserFromJson(data io.Reader) *User {
decoder := json.NewDecoder(data)
var user User
err := decoder.Decode(&user)
if err == nil {
return &user
} else {
return nil
}
var user *User
json.NewDecoder(data).Decode(&user)
return user
}
func UserPatchFromJson(data io.Reader) *UserPatch {
decoder := json.NewDecoder(data)
var user UserPatch
err := decoder.Decode(&user)
if err == nil {
return &user
} else {
return nil
}
var user *UserPatch
json.NewDecoder(data).Decode(&user)
return user
}
func UserAuthFromJson(data io.Reader) *UserAuth {
decoder := json.NewDecoder(data)
var user UserAuth
err := decoder.Decode(&user)
if err == nil {
return &user
} else {
return nil
}
var user *UserAuth
json.NewDecoder(data).Decode(&user)
return user
}
func UserMapToJson(u map[string]*User) string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
func UserMapFromJson(data io.Reader) map[string]*User {
decoder := json.NewDecoder(data)
var users map[string]*User
err := decoder.Decode(&users)
if err == nil {
return users
} else {
return nil
}
json.NewDecoder(data).Decode(&users)
return users
}
func UserListToJson(u []*User) string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
func UserListFromJson(data io.Reader) []*User {
decoder := json.NewDecoder(data)
var users []*User
err := decoder.Decode(&users)
if err == nil {
return users
} else {
return nil
}
json.NewDecoder(data).Decode(&users)
return users
}
// HashPassword generates a hash using the bcrypt.GenerateFromPassword

36
model/user_access_token.go
View File

@@ -43,41 +43,23 @@ func (t *UserAccessToken) PreSave() {
}
func (t *UserAccessToken) ToJson() string {
b, err := json.Marshal(t)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(t)
return string(b)
}
func UserAccessTokenFromJson(data io.Reader) *UserAccessToken {
decoder := json.NewDecoder(data)
var t UserAccessToken
err := decoder.Decode(&t)
if err == nil {
return &t
} else {
return nil
}
var t *UserAccessToken
json.NewDecoder(data).Decode(&t)
return t
}
func UserAccessTokenListToJson(t []*UserAccessToken) string {
b, err := json.Marshal(t)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(t)
return string(b)
}
func UserAccessTokenListFromJson(data io.Reader) []*UserAccessToken {
decoder := json.NewDecoder(data)
var t []*UserAccessToken
err := decoder.Decode(&t)
if err == nil {
return t
} else {
return nil
}
json.NewDecoder(data).Decode(&t)
return t
}

46
model/user_autocomplete.go
View File

@@ -23,12 +23,8 @@ type UserAutocomplete struct {
}
func (o *UserAutocomplete) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete {
@@ -43,41 +39,23 @@ func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete {
}
func (o *UserAutocompleteInChannel) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func UserAutocompleteInChannelFromJson(data io.Reader) *UserAutocompleteInChannel {
decoder := json.NewDecoder(data)
var o UserAutocompleteInChannel
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *UserAutocompleteInChannel
json.NewDecoder(data).Decode(&o)
return o
}
func (o *UserAutocompleteInTeam) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func UserAutocompleteInTeamFromJson(data io.Reader) *UserAutocompleteInTeam {
decoder := json.NewDecoder(data)
var o UserAutocompleteInTeam
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *UserAutocompleteInTeam
json.NewDecoder(data).Decode(&o)
return o
}

19
model/user_search.go
View File

@@ -20,22 +20,13 @@ type UserSearch struct {
// ToJson convert a User to a json string
func (u *UserSearch) ToJson() string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(u)
return string(b)
}
// UserSearchFromJson will decode the input and return a User
func UserSearchFromJson(data io.Reader) *UserSearch {
decoder := json.NewDecoder(data)
var us UserSearch
err := decoder.Decode(&us)
if err == nil {
return &us
} else {
return nil
}
var us *UserSearch
json.NewDecoder(data).Decode(&us)
return us
}

44
model/utils.go
View File

@@ -79,12 +79,8 @@ func (er *AppError) SystemMessage(T goi18n.TranslateFunc) string {
}
func (er *AppError) ToJson() string {
b, err := json.Marshal(er)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(er)
return string(b)
}
// AppErrorFromJson will decode the input and return an AppError
@@ -152,20 +148,14 @@ func GetMillis() int64 {
// MapToJson converts a map to a json string
func MapToJson(objmap map[string]string) string {
if b, err := json.Marshal(objmap); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(objmap)
return string(b)
}
// MapToJson converts a map to a json string
func MapBoolToJson(objmap map[string]bool) string {
if b, err := json.Marshal(objmap); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(objmap)
return string(b)
}
// MapFromJson will decode the key/value pair map
@@ -193,11 +183,8 @@ func MapBoolFromJson(data io.Reader) map[string]bool {
}
func ArrayToJson(objmap []string) string {
if b, err := json.Marshal(objmap); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(objmap)
return string(b)
}
func ArrayFromJson(data io.Reader) []string {
@@ -229,11 +216,8 @@ func ArrayFromInterface(data interface{}) []string {
}
func StringInterfaceToJson(objmap map[string]interface{}) string {
if b, err := json.Marshal(objmap); err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(objmap)
return string(b)
}
func StringInterfaceFromJson(data io.Reader) map[string]interface{} {
@@ -248,12 +232,8 @@ func StringInterfaceFromJson(data io.Reader) map[string]interface{} {
}
func StringToJson(s string) string {
b, err := json.Marshal(s)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(s)
return string(b)
}
func StringFromJson(data io.Reader) string {

30
model/webrtc.go
View File

@@ -22,32 +22,18 @@ type GatewayResponse struct {
}
func GatewayResponseFromJson(data io.Reader) *GatewayResponse {
decoder := json.NewDecoder(data)
var o GatewayResponse
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *GatewayResponse
json.NewDecoder(data).Decode(&o)
return o
}
func (o *WebrtcInfoResponse) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func WebrtcInfoResponseFromJson(data io.Reader) *WebrtcInfoResponse {
decoder := json.NewDecoder(data)
var o WebrtcInfoResponse
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *WebrtcInfoResponse
json.NewDecoder(data).Decode(&o)
return o
}

38
model/websocket_message.go
View File

@@ -82,23 +82,14 @@ func (o *WebSocketEvent) EventType() string {
}
func (o *WebSocketEvent) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func WebSocketEventFromJson(data io.Reader) *WebSocketEvent {
decoder := json.NewDecoder(data)
var o WebSocketEvent
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *WebSocketEvent
json.NewDecoder(data).Decode(&o)
return o
}
type WebSocketResponse struct {
@@ -129,21 +120,12 @@ func (o *WebSocketResponse) EventType() string {
}
func (o *WebSocketResponse) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func WebSocketResponseFromJson(data io.Reader) *WebSocketResponse {
decoder := json.NewDecoder(data)
var o WebSocketResponse
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *WebSocketResponse
json.NewDecoder(data).Decode(&o)
return o
}

19
model/websocket_request.go
View File

@@ -23,21 +23,12 @@ type WebSocketRequest struct {
}
func (o *WebSocketRequest) ToJson() string {
b, err := json.Marshal(o)
if err != nil {
return ""
} else {
return string(b)
}
b, _ := json.Marshal(o)
return string(b)
}
func WebSocketRequestFromJson(data io.Reader) *WebSocketRequest {
decoder := json.NewDecoder(data)
var o WebSocketRequest
err := decoder.Decode(&o)
if err == nil {
return &o
} else {
return nil
}
var o *WebSocketRequest
json.NewDecoder(data).Decode(&o)
return o
}