summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-11-16 19:15:57 -0800
committerCorey Hulen <corey@hulen.com>2015-11-16 19:15:57 -0800
commit0dd9f7977ef9beb1144e20464494f7ed485caaef (patch)
tree05463632f37765ad94b7c642de37710c88a00cc8
parentfd74098264e3ff84f3cdff2c79c323468c6500b6 (diff)
parentefbd1c4214894ba3d25ede1630a66befc7c672f3 (diff)
downloadchat-0dd9f7977ef9beb1144e20464494f7ed485caaef.tar.gz
chat-0dd9f7977ef9beb1144e20464494f7ed485caaef.tar.bz2
chat-0dd9f7977ef9beb1144e20464494f7ed485caaef.zip
Merge pull request #1449 from mattermost/PLT-901
PLT-901 partial fix for iOS, adding device type
-rw-r--r--api/post.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/api/post.go b/api/post.go
index ef70e1336..0860fd299 100644
--- a/api/post.go
+++ b/api/post.go
@@ -544,11 +544,10 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team,
alreadySeen := make(map[string]string)
for _, session := range sessions {
- if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" {
-
+ if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" && strings.HasPrefix(session.DeviceId, "apple:") {
alreadySeen[session.DeviceId] = session.DeviceId
- utils.SendAppleNotifyAndForget(session.DeviceId, subjectPage.Render(), 1)
+ utils.SendAppleNotifyAndForget(strings.TrimPrefix(session.DeviceId, "apple:"), subjectPage.Render(), 1)
}
}
}