mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-04 08:32:29 +00:00
Oops, bad merge: needed to change the base class of the rest servlets too.
This commit is contained in:
parent
03149ad23a
commit
20c47383dc
@ -269,8 +269,9 @@ class Pusher(object):
|
|||||||
def dispatch_push(self, p, tweaks):
|
def dispatch_push(self, p, tweaks):
|
||||||
"""
|
"""
|
||||||
Overridden by implementing classes to actually deliver the notification
|
Overridden by implementing classes to actually deliver the notification
|
||||||
:param p: The event to notify for as a single event from the event stream
|
Args:
|
||||||
:return: If the notification was delivered, an array containing any
|
p The event to notify for as a single event from the event stream
|
||||||
|
Returns: If the notification was delivered, an array containing any
|
||||||
pushkeys that were rejected by the push gateway.
|
pushkeys that were rejected by the push gateway.
|
||||||
False if the notification could not be delivered (ie.
|
False if the notification could not be delivered (ie.
|
||||||
should be retried).
|
should be retried).
|
||||||
|
@ -17,13 +17,13 @@ from twisted.internet import defer
|
|||||||
|
|
||||||
from synapse.api.errors import SynapseError, Codes, UnrecognizedRequestError, NotFoundError, \
|
from synapse.api.errors import SynapseError, Codes, UnrecognizedRequestError, NotFoundError, \
|
||||||
StoreError
|
StoreError
|
||||||
from base import RestServlet, client_path_pattern
|
from .base import ClientV1RestServlet, client_path_pattern
|
||||||
from synapse.storage.push_rule import InconsistentRuleException, RuleNotFoundException
|
from synapse.storage.push_rule import InconsistentRuleException, RuleNotFoundException
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
||||||
class PushRuleRestServlet(RestServlet):
|
class PushRuleRestServlet(ClientV1RestServlet):
|
||||||
PATTERN = client_path_pattern("/pushrules/.*$")
|
PATTERN = client_path_pattern("/pushrules/.*$")
|
||||||
PRIORITY_CLASS_MAP = {
|
PRIORITY_CLASS_MAP = {
|
||||||
'underride': 0,
|
'underride': 0,
|
||||||
|
@ -17,12 +17,12 @@ from twisted.internet import defer
|
|||||||
|
|
||||||
from synapse.api.errors import SynapseError, Codes
|
from synapse.api.errors import SynapseError, Codes
|
||||||
from synapse.push import PusherConfigException
|
from synapse.push import PusherConfigException
|
||||||
from base import RestServlet, client_path_pattern
|
from .base import ClientV1RestServlet, client_path_pattern
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
||||||
class PusherRestServlet(RestServlet):
|
class PusherRestServlet(ClientV1RestServlet):
|
||||||
PATTERN = client_path_pattern("/pushers/set$")
|
PATTERN = client_path_pattern("/pushers/set$")
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
Loading…
Reference in New Issue
Block a user