mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 04:53:36 +00:00
webhooks: Migrate most integrations to use check_send_webhook_message.
This commit migrates all of our webhooks to use
check_send_webhook_message, except the following:
beeminder: Rishi wanted to wait on this one.
teamcity: This one is slightly more work.
yo: This one is PM-only. I am still trying to decide whether we
should have a force_private argument or something in
check_send_webhook_message.
facebook: No point in migrating this, will be removed as part of
#8433.
slack: Slightly more work too with the `channel_to_topics` feature.
Warrants a longer discussion.
This commit is contained in:
@@ -7,9 +7,9 @@ from django.utils.translation import ugettext as _
|
||||
import logging
|
||||
|
||||
from zerver.decorator import api_key_only_webhook_view
|
||||
from zerver.lib.actions import check_send_stream_message
|
||||
from zerver.lib.request import REQ, has_request_variables
|
||||
from zerver.lib.response import json_error, json_success
|
||||
from zerver.lib.webhooks.common import check_send_webhook_message
|
||||
from zerver.models import UserProfile
|
||||
|
||||
def ticket_started_body(payload: Dict[str, Any]) -> Text:
|
||||
@@ -78,9 +78,7 @@ def note_added_body(payload: Dict[str, Any]) -> Text:
|
||||
@api_key_only_webhook_view('Groove')
|
||||
@has_request_variables
|
||||
def api_groove_webhook(request: HttpRequest, user_profile: UserProfile,
|
||||
payload: Dict[str, Any]=REQ(argument_type='body'),
|
||||
stream: Text=REQ(default='groove'),
|
||||
topic: Optional[Text]=REQ(default='notifications')) -> HttpResponse:
|
||||
payload: Dict[str, Any]=REQ(argument_type='body')) -> HttpResponse:
|
||||
try:
|
||||
# The event identifier is stored in the X_GROOVE_EVENT header.
|
||||
event = request.META['X_GROOVE_EVENT']
|
||||
@@ -96,7 +94,8 @@ def api_groove_webhook(request: HttpRequest, user_profile: UserProfile,
|
||||
logging.error('Required key not found : ' + e.args[0])
|
||||
return json_error(_('Missing required data'))
|
||||
if body is not None:
|
||||
check_send_stream_message(user_profile, request.client, stream, topic, body)
|
||||
topic = 'notifications'
|
||||
check_send_webhook_message(request, user_profile, topic, body)
|
||||
|
||||
return json_success()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user