diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2018-02-02 14:46:49 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-02-02 11:46:49 -0800 |
| commit | 70ad8abdcdb8f2fd3203a4962f5fc4041fa97100 (patch) | |
| tree | bd91f0a32e0583a3686e10d5d59a44b29d2a813e /app/notification.go | |
| parent | 07902b4c91ac80042df5585e25ce60a5078016bd (diff) | |
| download | chat-70ad8abdcdb8f2fd3203a4962f5fc4041fa97100.tar.gz chat-70ad8abdcdb8f2fd3203a4962f5fc4041fa97100.tar.bz2 chat-70ad8abdcdb8f2fd3203a4962f5fc4041fa97100.zip | |
Fix panic when invalid types used in post props (#8191)
Diffstat (limited to 'app/notification.go')
| -rw-r--r-- | app/notification.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/notification.go b/app/notification.go index 7223fb3aa..19f7894c5 100644 --- a/app/notification.go +++ b/app/notification.go @@ -584,16 +584,16 @@ func (a *App) sendPushNotification(post *model.Post, user *model.User, channel * msg.ChannelName = channel.Name msg.SenderId = post.UserId - if ou, ok := post.Props["override_username"]; ok && ou != nil { - msg.OverrideUsername = ou.(string) + if ou, ok := post.Props["override_username"].(string); ok { + msg.OverrideUsername = ou } - if oi, ok := post.Props["override_icon_url"]; ok && oi != nil { - msg.OverrideIconUrl = oi.(string) + if oi, ok := post.Props["override_icon_url"].(string); ok { + msg.OverrideIconUrl = oi } - if fw, ok := post.Props["from_webhook"]; ok && fw != nil { - msg.FromWebhook = fw.(string) + if fw, ok := post.Props["from_webhook"].(string); ok { + msg.FromWebhook = fw } if *a.Config().EmailSettings.PushNotificationContents == model.FULL_NOTIFICATION { |