mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-27 08:41:57 -06:00
f05ce478f0
* Add Pushserver component with Pushers API Co-authored-by: Tommie Gannert <tommie@gannert.se> Co-authored-by: Dan Peleg <dan@globekeeper.com> * Wire Pushserver component Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com> * Add PushGatewayClient. The full event format is required for Sytest. * Add a pushrules module. * Change user API account creation to use the new pushrules module's defaults. Introduces "scope" as required by client API, and some small field tweaks to make some 61push Sytests pass. * Add push rules query/put API in Pushserver. This manipulates account data over User API, and fires sync messages for changes. Those sync messages should, according to an existing TODO in clientapi, be moved to userapi. Forks clientapi/producers/syncapi.go to pushserver/ for later extension. * Add clientapi routes for push rules to Pushserver. A cleanup would be to move more of the name-splitting logic into pushrules.go, to depollute routing.go. * Output rooms.join.unread_notifications in /sync. This is the read-side. Pushserver will be the write-side. * Implement pushserver/storage for notifications. * Use PushGatewayClient and the pushrules module in Pushserver's room consumer. * Use one goroutine per user to avoid locking up the entire server for one bad push gateway. * Split pushing by format. * Send one device per push. Sytest does not support coalescing multiple devices into one push. Matches Synapse. Either we change Sytest, or remove the group-by-url-and-format logic. * Write OutputNotificationData from push server. Sync API is already the consumer. * Implement read receipt consumers in Pushserver. Supports m.read and m.fully_read receipts. * Add clientapi route for /unstable/notifications. * Rename to UpsertPusher for clarity and handle pusher update * Fix linter errors * Ignore body.Close() error check * Fix push server internal http wiring * Add 40 newly passing 61push tests to whitelist * Add next 12 newly passing 61push tests to whitelist * Send notification data before notifying users in EDU server consumer * NATS JetStream * Goodbye sarama * Fix `NewStreamTokenFromString` * Consume on the correct topic for the roomserver * Don't panic, NAK instead * Move push notifications into the User API * Don't set null values since that apparently causes Element upsetti * Also set omitempty on conditions * Fix bug so that we don't override the push rules unnecessarily * Tweak defaults * Update defaults * More tweaks * Move `/notifications` onto `r0`/`v3` mux * User API will consume events and read/fully read markers from the sync API with stream positions, instead of consuming directly Co-authored-by: Piotr Kozimor <p1996k@gmail.com> Co-authored-by: Tommie Gannert <tommie@gannert.se> Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
103 lines
2.5 KiB
Go
103 lines
2.5 KiB
Go
package pushrules
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
)
|
|
|
|
// An Action is (part of) an outcome of a rule. There are
|
|
// (unofficially) terminal actions, and modifier actions.
|
|
type Action struct {
|
|
// Kind is the type of action. Has custom encoding in JSON.
|
|
Kind ActionKind `json:"-"`
|
|
|
|
// Tweak is the property to tweak. Has custom encoding in JSON.
|
|
Tweak TweakKey `json:"-"`
|
|
|
|
// Value is some value interpreted according to Kind and Tweak.
|
|
Value interface{} `json:"value"`
|
|
}
|
|
|
|
func (a *Action) MarshalJSON() ([]byte, error) {
|
|
if a.Tweak == UnknownTweak && a.Value == nil {
|
|
return json.Marshal(a.Kind)
|
|
}
|
|
|
|
if a.Kind != SetTweakAction {
|
|
return nil, fmt.Errorf("only set_tweak actions may have a value, but got kind %q", a.Kind)
|
|
}
|
|
|
|
m := map[string]interface{}{
|
|
string(a.Kind): a.Tweak,
|
|
}
|
|
if a.Value != nil {
|
|
m["value"] = a.Value
|
|
}
|
|
|
|
return json.Marshal(m)
|
|
}
|
|
|
|
func (a *Action) UnmarshalJSON(bs []byte) error {
|
|
if bytes.HasPrefix(bs, []byte("\"")) {
|
|
return json.Unmarshal(bs, &a.Kind)
|
|
}
|
|
|
|
var raw struct {
|
|
SetTweak TweakKey `json:"set_tweak"`
|
|
Value interface{} `json:"value"`
|
|
}
|
|
if err := json.Unmarshal(bs, &raw); err != nil {
|
|
return err
|
|
}
|
|
if raw.SetTweak == UnknownTweak {
|
|
return fmt.Errorf("got unknown action JSON: %s", string(bs))
|
|
}
|
|
a.Kind = SetTweakAction
|
|
a.Tweak = raw.SetTweak
|
|
if raw.Value != nil {
|
|
a.Value = raw.Value
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// ActionKind is the primary discriminator for actions.
|
|
type ActionKind string
|
|
|
|
const (
|
|
UnknownAction ActionKind = ""
|
|
|
|
// NotifyAction indicates the clients should show a notification.
|
|
NotifyAction ActionKind = "notify"
|
|
|
|
// DontNotifyAction indicates the clients should not show a notification.
|
|
DontNotifyAction ActionKind = "dont_notify"
|
|
|
|
// CoalesceAction tells the clients to show a notification, and
|
|
// tells both servers and clients that multiple events can be
|
|
// coalesced into a single notification. The behaviour is
|
|
// implementation-specific.
|
|
CoalesceAction ActionKind = "coalesce"
|
|
|
|
// SetTweakAction uses the Tweak and Value fields to add a
|
|
// tweak. Multiple SetTweakAction can be provided in a rule,
|
|
// combined with NotifyAction or CoalesceAction.
|
|
SetTweakAction ActionKind = "set_tweak"
|
|
)
|
|
|
|
// A TweakKey describes a property to be modified/tweaked for events
|
|
// that match the rule.
|
|
type TweakKey string
|
|
|
|
const (
|
|
UnknownTweak TweakKey = ""
|
|
|
|
// SoundTweak describes which sound to play. Using "default" means
|
|
// "enable sound".
|
|
SoundTweak TweakKey = "sound"
|
|
|
|
// HighlightTweak asks the clients to highlight the conversation.
|
|
HighlightTweak TweakKey = "highlight"
|
|
)
|