mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

unnamed return (#8170)

Просмотр исходного кода
Этот коммит содержится в:
Chris
2018-01-30 17:23:00 -06:00
коммит произвёл Corey Hulen
родитель ac2e42a480
Коммит 0c8968fb8d
62 изменённых файлов: 430 добавлений и 1235 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

38
model/access.go
Просмотреть файл

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

28
model/analytics_row.go
Просмотреть файл

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

19
model/audit.go
Просмотреть файл

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

9
model/audits.go
Просмотреть файл

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

38
model/authorize.go
Просмотреть файл

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

38
model/channel.go
Просмотреть файл

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

19
model/channel_count.go
Просмотреть файл

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

19
model/channel_data.go
Просмотреть файл

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

20
model/channel_list.go
Просмотреть файл

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

49
model/channel_member.go
Просмотреть файл

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

19
model/channel_search.go
Просмотреть файл

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

19
model/channel_stats.go
Просмотреть файл

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

38
model/channel_view.go
Просмотреть файл

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

26
model/cluster_info.go
Просмотреть файл

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

1
model/cluster_info_test.go
Просмотреть файл

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

19
model/cluster_message.go
Просмотреть файл

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

19
model/cluster_stats.go
Просмотреть файл

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

36
model/command.go
Просмотреть файл

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

19
model/command_args.go
Просмотреть файл

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

8
model/command_response.go
Просмотреть файл

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

28
model/compliance.go
Просмотреть файл

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

19
model/config.go
Просмотреть файл

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

19
model/data_retention_policy.go
Просмотреть файл

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

36
model/emoji.go
Просмотреть файл

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

19
model/emoji_search.go
Просмотреть файл

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

19
model/file.go
Просмотреть файл

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

16
model/file_info.go
Просмотреть файл

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

36
model/incoming_webhook.go
Просмотреть файл

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

19
model/initial_load.go
Просмотреть файл

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

21
model/job.go
Просмотреть файл

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

19
model/license.go
Просмотреть файл

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

36
model/manifest.go
Просмотреть файл

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

19
model/mfa_secret.go
Просмотреть файл

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

53
model/oauth.go
Просмотреть файл

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

63
model/outgoing_webhook.go
Просмотреть файл

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

19
model/plugins_response.go
Просмотреть файл

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

19
model/post.go
Просмотреть файл

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

11
model/post_list.go
Просмотреть файл

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

19
model/preference.go
Просмотреть файл

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

8
model/preferences.go
Просмотреть файл

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

19
model/push_notification.go
Просмотреть файл

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

7
model/push_response.go
Просмотреть файл

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

14
model/reaction.go
Просмотреть файл

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

19
model/saml.go
Просмотреть файл

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

8
model/search_params.go
Просмотреть файл

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

28
model/security_bulletin.go
Просмотреть файл

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

28
model/session.go
Просмотреть файл

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

36
model/status.go
Просмотреть файл

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

19
model/suggest_command.go
Просмотреть файл

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

19
model/switch_request.go
Просмотреть файл

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

19
model/system.go
Просмотреть файл

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

72
model/team.go
Просмотреть файл

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

56
model/team_member.go
Просмотреть файл

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

19
model/team_stats.go
Просмотреть файл

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

91
model/user.go
Просмотреть файл

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

36
model/user_access_token.go
Просмотреть файл

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

46
model/user_autocomplete.go
Просмотреть файл

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

19
model/user_search.go
Просмотреть файл

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

44
model/utils.go
Просмотреть файл

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

30
model/webrtc.go
Просмотреть файл

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

38
model/websocket_message.go
Просмотреть файл

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

19
model/websocket_request.go
Просмотреть файл

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