Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

management: Use self.get_user in convert_bot_to_outgoing_webhook.

This commit is contained in:
Vishnu Ks 2017-08-08 14:38:00 +00:00 committed by Tim Abbott
parent d1bece2ec2
commit f0bb11ef40
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zerver/management/commands/convert_bot_to_outgoing_webhook.py
View File

@ -4,21 +4,16 @@ from __future__ import print_function
from typing import Any from typing import Any
from argparse import ArgumentParser from argparse import ArgumentParser
from django.core.management.base import BaseCommand
from zerver.lib.actions import do_rename_stream from zerver.lib.management import ZulipBaseCommand
from zerver.lib.str_utils import force_text from zerver.models import Service, UserProfile
from zerver.models import Realm, Service, UserProfile, get_realm
import sys class Command(ZulipBaseCommand):
class Command(BaseCommand):
help = """Given an existing bot, converts it into an outgoing webhook bot.""" help = """Given an existing bot, converts it into an outgoing webhook bot."""
def add_arguments(self, parser): def add_arguments(self, parser):
# type: (ArgumentParser) -> None # type: (ArgumentParser) -> None
parser.add_argument('string_id', metavar='<string_id>', type=str, self.add_realm_args(parser)
help='subdomain or string_id of bot')
parser.add_argument('bot_email', metavar='<bot_email>', type=str, parser.add_argument('bot_email', metavar='<bot_email>', type=str,
help='email of bot') help='email of bot')
parser.add_argument('service_name', metavar='<service_name>', type=str, parser.add_argument('service_name', metavar='<service_name>', type=str,
@ -31,16 +26,10 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
# type: (*Any, **str) -> None # type: (*Any, **str) -> None
string_id = options['string_id']
bot_email = options['bot_email'] bot_email = options['bot_email']
service_name = options['service_name'] service_name = options['service_name']
base_url = options['base_url'] base_url = options['base_url']
realm = self.get_realm(options)
encoding = sys.getfilesystemencoding()
realm = get_realm(force_text(string_id, encoding))
if realm is None:
print('Unknown subdomain or string_id %s' % (string_id,))
exit(1)
if not bot_email: if not bot_email:
print('Email of existing bot must be provided') print('Email of existing bot must be provided')
@ -55,10 +44,7 @@ class Command(BaseCommand):
exit(1) exit(1)
# TODO: Normalize email? # TODO: Normalize email?
bot_profile = UserProfile.objects.get(email=bot_email) bot_profile = self.get_user(email=bot_email, realm=realm)
if not bot_profile:
print('User %s does not exist' % (bot_email,))
exit(1)
if not bot_profile.is_bot: if not bot_profile.is_bot:
print('User %s is not a bot' % (bot_email,)) print('User %s is not a bot' % (bot_email,))
exit(1) exit(1)