hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-01 22:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

✅ Test 1 Can fetch a user's pushers

Browse source
This commit is contained in:
Dan Peleg 2021-05-05 10:03:01 +03:00
parent c5247d390f
commit 092edee210
8 changed files with 74 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

33
clientapi/routing/pusher.go
View file

@ -15,6 +15,7 @@
package routing
import (
"encoding/json"
"net/http"
"github.com/matrix-org/dendrite/clientapi/httputil"
@ -27,25 +28,20 @@ import (
// https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-pushers
type pusherJSON struct {
PushKey string `json:"pushkey"`
Kind string `json:"kind"`
AppID string `json:"app_id"`
AppDisplayName string `json:"app_display_name"`
DeviceDisplayName string `json:"device_display_name"`
ProfileTag string `json:"profile_tag"`
Language string `json:"lang"`
Data pusherDataJSON `json:"data"`
PushKey string `json:"pushkey"`
Kind string `json:"kind"`
AppID string `json:"app_id"`
AppDisplayName string `json:"app_display_name"`
DeviceDisplayName string `json:"device_display_name"`
ProfileTag string `json:"profile_tag"`
Language string `json:"lang"`
Data map[string]json.RawMessage `json:"data"`
}
type pushersJSON struct {
Pushers []pusherJSON `json:"pushers"`
}
type pusherDataJSON struct {
URL string `json:"url"`
Format string `json:"format"`
}
// GetPushersByLocalpart handles /_matrix/client/r0/pushers
func GetPushersByLocalpart(
req *http.Request, userAPI userapi.UserInternalAPI, device *api.Device,
@ -63,7 +59,10 @@ func GetPushersByLocalpart(
Pushers: []pusherJSON{},
}
//data := map[string]json.RawMessage;
var data map[string]json.RawMessage
for _, pusher := range queryRes.Pushers {
json.Unmarshal([]byte(pusher.Data), &data)
res.Pushers = append(res.Pushers, pusherJSON{
PushKey: pusher.PushKey,
Kind: pusher.Kind,
@ -72,7 +71,7 @@ func GetPushersByLocalpart(
DeviceDisplayName: pusher.DeviceDisplayName,
ProfileTag: pusher.ProfileTag,
Language: pusher.Language,
Data: pusherDataJSON(pusher.Data),
Data: data,
})
}
@ -127,8 +126,7 @@ func SetPusherByLocalpart(
DeviceDisplayName: body.DeviceDisplayName,
ProfileTag: body.ProfileTag,
Language: body.Language,
URL: body.Data.URL,
Format: body.Data.Format,
Data: body.Data,
}, &pusherResponse)
if err != nil {
@ -164,8 +162,7 @@ func SetPusherByLocalpart(
DeviceDisplayName: body.DeviceDisplayName,
ProfileTag: body.ProfileTag,
Language: body.Language,
URL: body.Data.URL,
Format: body.Data.Format,
Data: body.Data,
}, &pusherResponse)
if err != nil {