diff options
| author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
| commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
| tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /model/search_params.go | |
| parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
| parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
| download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'model/search_params.go')
| -rw-r--r-- | model/search_params.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/model/search_params.go b/model/search_params.go index 2feea8da1..1692b3aaf 100644 --- a/model/search_params.go +++ b/model/search_params.go @@ -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"} |