[MM-16232] ID loaded push notifications (#13137)
* Update BuildPushNotificationMessage (#12974) * Update BuildPushNotificationMessage * Included Category, Version, and Type * Remove unnecessary function args * [MM-16232] Build and return fetched notification (#13085) * Build and return fetched notification * Remove check on PushNotificationContents * Ran i18n-extract * Get UserId from session * Re-add ReturnStatusOK * Remove UserId from PushNotificationAck * Always include channel name * [MM-16232] Return after writing response and add default message (#13127) * Return after writing response and add default message * Include channel ID as well * Localize default message * Fix i18n
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
2571d97723
Коммит
d44d563ef3
@@ -48,6 +48,7 @@ const (
|
||||
GENERIC_NOTIFICATION = "generic"
|
||||
GENERIC_NOTIFICATION_SERVER = "https://push-test.mattermost.com"
|
||||
FULL_NOTIFICATION = "full"
|
||||
ID_LOADED_NOTIFICATION = "id_loaded"
|
||||
|
||||
DIRECT_MESSAGE_ANY = "any"
|
||||
DIRECT_MESSAGE_TEAM = "team"
|
||||
|
||||
@@ -15,9 +15,10 @@ const (
|
||||
PUSH_NOTIFY_APPLE_REACT_NATIVE = "apple_rn"
|
||||
PUSH_NOTIFY_ANDROID_REACT_NATIVE = "android_rn"
|
||||
|
||||
PUSH_TYPE_MESSAGE = "message"
|
||||
PUSH_TYPE_CLEAR = "clear"
|
||||
PUSH_MESSAGE_V2 = "v2"
|
||||
PUSH_TYPE_ID_LOADED = "id_loaded"
|
||||
PUSH_TYPE_MESSAGE = "message"
|
||||
PUSH_TYPE_CLEAR = "clear"
|
||||
PUSH_MESSAGE_V2 = "v2"
|
||||
|
||||
// The category is set to handle a set of interactive Actions
|
||||
// with the push notifications
|
||||
@@ -36,6 +37,7 @@ type PushNotificationAck struct {
|
||||
ClientReceivedAt int64 `json:"received_at"`
|
||||
ClientPlatform string `json:"platform"`
|
||||
NotificationType string `json:"type"`
|
||||
PostId string `json:"post_id,omitempty"`
|
||||
}
|
||||
|
||||
type PushNotification struct {
|
||||
@@ -43,23 +45,23 @@ type PushNotification struct {
|
||||
Platform string `json:"platform"`
|
||||
ServerId string `json:"server_id"`
|
||||
DeviceId string `json:"device_id"`
|
||||
Category string `json:"category"`
|
||||
Sound string `json:"sound"`
|
||||
Message string `json:"message"`
|
||||
Badge int `json:"badge"`
|
||||
ContentAvailable int `json:"cont_ava"`
|
||||
TeamId string `json:"team_id"`
|
||||
ChannelId string `json:"channel_id"`
|
||||
PostId string `json:"post_id"`
|
||||
RootId string `json:"root_id"`
|
||||
ChannelName string `json:"channel_name"`
|
||||
Type string `json:"type"`
|
||||
SenderId string `json:"sender_id"`
|
||||
SenderName string `json:"sender_name"`
|
||||
OverrideUsername string `json:"override_username"`
|
||||
OverrideIconUrl string `json:"override_icon_url"`
|
||||
FromWebhook string `json:"from_webhook"`
|
||||
Version string `json:"version"`
|
||||
Category string `json:"category,omitempty"`
|
||||
Sound string `json:"sound,omitempty"`
|
||||
Message string `json:"message,omitempty"`
|
||||
Badge int `json:"badge,omitempty"`
|
||||
ContentAvailable int `json:"cont_ava,omitempty"`
|
||||
TeamId string `json:"team_id,omitempty"`
|
||||
ChannelId string `json:"channel_id,omitempty"`
|
||||
RootId string `json:"root_id,omitempty"`
|
||||
ChannelName string `json:"channel_name,omitempty"`
|
||||
Type string `json:"type,omitempty"`
|
||||
SenderId string `json:"sender_id,omitempty"`
|
||||
SenderName string `json:"sender_name,omitempty"`
|
||||
OverrideUsername string `json:"override_username,omitempty"`
|
||||
OverrideIconUrl string `json:"override_icon_url,omitempty"`
|
||||
FromWebhook string `json:"from_webhook,omitempty"`
|
||||
Version string `json:"version,omitempty"`
|
||||
}
|
||||
|
||||
func (me *PushNotification) ToJson() string {
|
||||
|
||||
Ссылка в новой задаче
Block a user