diff options
| -rw-r--r-- | app/notification.go | 2 | ||||
| -rw-r--r-- | app/notification_test.go | 24 | ||||
| -rw-r--r-- | i18n/en.json | 4 |
3 files changed, 27 insertions, 3 deletions
diff --git a/app/notification.go b/app/notification.go index 83debe584..8d8e72cf9 100644 --- a/app/notification.go +++ b/app/notification.go @@ -656,7 +656,7 @@ func (a *App) getPushNotificationMessage(postMessage string, wasMentioned bool, } // If the post only has images then push an appropriate message - if len(message) == 0 && hasFiles { + if len(postMessage) == 0 && hasFiles { if channelType == model.CHANNEL_DIRECT { message = senderName + userLocale("api.post.send_notifications_and_forget.push_image_only_dm") } else { diff --git a/app/notification_test.go b/app/notification_test.go index 2b7b260c4..cc501fbd0 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -1345,6 +1345,30 @@ func TestGetPushNotificationMessage(t *testing.T) { ExpectedMessage: "user sent you a direct message", ExpectedCategory: model.CATEGORY_CAN_REPLY, }, + "only files, public channel": { + HasFiles: true, + ChannelType: model.CHANNEL_OPEN, + ExpectedMessage: "user uploaded one or more files in channel", + ExpectedCategory: model.CATEGORY_CAN_REPLY, + }, + "only files, private channel": { + HasFiles: true, + ChannelType: model.CHANNEL_PRIVATE, + ExpectedMessage: "user uploaded one or more files in channel", + ExpectedCategory: model.CATEGORY_CAN_REPLY, + }, + "only files, group message channel": { + HasFiles: true, + ChannelType: model.CHANNEL_GROUP, + ExpectedMessage: "user uploaded one or more files in channel", + ExpectedCategory: model.CATEGORY_CAN_REPLY, + }, + "only files, direct message channel": { + HasFiles: true, + ChannelType: model.CHANNEL_DIRECT, + ExpectedMessage: "user uploaded one or more files in a direct message", + ExpectedCategory: model.CATEGORY_CAN_REPLY, + }, } { t.Run(name, func(t *testing.T) { locale := tc.Locale diff --git a/i18n/en.json b/i18n/en.json index 4365a44fb..b31a6bd09 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1812,11 +1812,11 @@ }, { "id": "api.post.send_notifications_and_forget.push_image_only", - "translation": " Uploaded one or more files in " + "translation": " uploaded one or more files in " }, { "id": "api.post.send_notifications_and_forget.push_image_only_dm", - "translation": " Uploaded one or more files in a direct message" + "translation": " uploaded one or more files in a direct message" }, { "id": "api.post.send_notifications_and_forget.push_in", |