vbatts/ntfy
1
0
Fork 0
Code Pull requests Activity

Replace interface{}

Browse source
This commit is contained in:
Philipp Heckel 2022-10-01 16:31:48 -04:00
parent eaf3e83e72
commit 5014bba0b3
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/errors.go
View file

@ -23,7 +23,7 @@ func (e errHTTP) JSON() string {
return string(b)
}
func wrapErrHTTP(err *errHTTP, message string, args ...interface{}) *errHTTP {
func wrapErrHTTP(err *errHTTP, message string, args ...any) *errHTTP {
return &errHTTP{
Code: err.Code,
HTTPCode: err.HTTPCode,

4
server/server_firebase.go
View file

@ -217,7 +217,7 @@ func maybeTruncateFCMMessage(m *messaging.Message) *messaging.Message {
// We must set the Alert struct ("alert"), and we need to set MutableContent ("mutable-content"), so the Notification Service
// Extension in iOS can modify the message.
func createAPNSAlertConfig(m *message, data map[string]string) *messaging.APNSConfig {
apnsData := make(map[string]interface{})
apnsData := make(map[string]any)
for k, v := range data {
apnsData[k] = v
}
@ -241,7 +241,7 @@ func createAPNSAlertConfig(m *message, data map[string]string) *messaging.APNSCo
//
// See https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/pushing_background_updates_to_your_app
func createAPNSBackgroundConfig(data map[string]string) *messaging.APNSConfig {
apnsData := make(map[string]interface{})
apnsData := make(map[string]any)
for k, v := range data {
apnsData[k] = v
}

8
server/server_firebase_test.go
View file

@ -71,7 +71,7 @@ func TestToFirebaseMessage_Keepalive(t *testing.T) {
Aps: &messaging.Aps{
ContentAvailable: true,
},
CustomData: map[string]interface{}{
CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": m.Event,
@ -102,7 +102,7 @@ func TestToFirebaseMessage_Open(t *testing.T) {
Aps: &messaging.Aps{
ContentAvailable: true,
},
CustomData: map[string]interface{}{
CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": m.Event,
@ -166,7 +166,7 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
Body: "this is a message",
},
},
CustomData: map[string]interface{}{
CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": "message",
@ -242,7 +242,7 @@ func TestToFirebaseMessage_PollRequest(t *testing.T) {
Body: "New message",
},
},
CustomData: map[string]interface{}{
CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": "poll_request",