diff --git a/bots/check-mirroring b/bots/check-mirroring index e3530bd..79331dd 100755 --- a/bots/check-mirroring +++ b/bots/check-mirroring @@ -15,7 +15,7 @@ parser.add_option('--verbose', action='store_true') parser.add_option('--site', dest='site', - default="https://api.humbughq.com", + default="https://api.zulip.com", action='store') parser.add_option('--sharded', default=False, diff --git a/bots/feedback-bot b/bots/feedback-bot index a675060..0d003bc 100755 --- a/bots/feedback-bot +++ b/bots/feedback-bot @@ -36,12 +36,12 @@ prod_client = humbug.Client( email="feedback@zulip.com", api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", verbose=True, - site="https://api.humbughq.com") + site="https://api.zulip.com") staging_client = humbug.Client( email="feedback@zulip.com", api_key="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", verbose=True, - site="https://staging.humbughq.com/api") + site="https://staging.zulip.com/api") def forward_message(message): if message["type"] != "private" or len(message["display_recipient"]) != 2: diff --git a/bots/zephyr_mirror_backend.py b/bots/zephyr_mirror_backend.py index 33ce2d2..d7c2834 100755 --- a/bots/zephyr_mirror_backend.py +++ b/bots/zephyr_mirror_backend.py @@ -70,7 +70,7 @@ class RandomExponentialBackoff(CountingBackoff): print message time.sleep(delay) -DEFAULT_SITE = "https://api.humbughq.com" +DEFAULT_SITE = "https://api.zulip.com" class States: Startup, HumbugToZephyr, ZephyrToHumbug, ChildSending = range(4) diff --git a/examples/curl-examples b/examples/curl-examples index 033c0b6..1feaf84 100755 --- a/examples/curl-examples +++ b/examples/curl-examples @@ -1,13 +1,13 @@ #!/bin/sh # Two quick API tests using curl -curl https://api.humbughq.com/v1/send_message \ +curl https://api.zulip.com/v1/send_message \ -d "api-key=BOT_API_KEY" \ -d "email=BOT_EMAIL" \ -d "type=private" -d "content=test" \ -d "to=RECIPIENT_EMAIL" -curl https://api.humbughq.com/v1/get_messages \ +curl https://api.zulip.com/v1/get_messages \ -d "api-key=BOT_API_KEY" \ -d "email=BOT_EMAIL" diff --git a/humbug/__init__.py b/humbug/__init__.py index 7c2f5b7..1b0750e 100644 --- a/humbug/__init__.py +++ b/humbug/__init__.py @@ -94,8 +94,8 @@ class Client(object): site = "https://" + site self.base_url = site else: - self.base_url = "https://api.humbughq.com" - if self.base_url != "https://api.humbughq.com" and not self.base_url.endswith("/api"): + self.base_url = "https://api.zulip.com" + if self.base_url != "https://api.zulip.com" and not self.base_url.endswith("/api"): self.base_url += "/api" if not self.base_url.endswith("/"): self.base_url += "/" diff --git a/integrations/git/humbug_git_config.py b/integrations/git/humbug_git_config.py index 6d5517c..552da7a 100644 --- a/integrations/git/humbug_git_config.py +++ b/integrations/git/humbug_git_config.py @@ -54,4 +54,4 @@ def commit_notice_destination(repo, branch, commit): HUMBUG_API_PATH = None # This should not need to change unless you have a custom Humbug subdomain. -HUMBUG_SITE = "https://api.humbughq.com" +HUMBUG_SITE = "https://api.zulip.com" diff --git a/integrations/jira/org/humbug/jira/HumbugListener.groovy b/integrations/jira/org/humbug/jira/HumbugListener.groovy index c1e440f..24d9724 100644 --- a/integrations/jira/org/humbug/jira/HumbugListener.groovy +++ b/integrations/jira/org/humbug/jira/HumbugListener.groovy @@ -32,7 +32,7 @@ class HumbugListener extends AbstractIssueEventListener { String issueBaseUrl = "https://jira.COMPANY.com/browse/" // Your humbug domain, only change if you have a custom one - String domain = "" + String base_url = "https://api.zulip.com" @Override void workflowEvent(IssueEvent event) { @@ -142,10 +142,6 @@ class HumbugListener extends AbstractIssueEventListener { } String humbugUrl(method) { - String url = "humbughq.com" - if (domain != "") { - url = domain + "." + url - } - return "https://" + url + "/api/v1/" + method + return base_url + "/v1/" + method } } diff --git a/integrations/svn/humbug_svn_config.py b/integrations/svn/humbug_svn_config.py index 814ae94..4cedcac 100644 --- a/integrations/svn/humbug_svn_config.py +++ b/integrations/svn/humbug_svn_config.py @@ -54,4 +54,4 @@ def commit_notice_destination(path, commit): HUMBUG_API_PATH = None # This should not need to change unless you have a custom Humbug subdomain. -HUMBUG_SITE = "https://api.humbughq.com" +HUMBUG_SITE = "https://api.zulip.com" diff --git a/integrations/trac/humbug_trac_config.py b/integrations/trac/humbug_trac_config.py index af646f1..06cca4f 100644 --- a/integrations/trac/humbug_trac_config.py +++ b/integrations/trac/humbug_trac_config.py @@ -49,4 +49,4 @@ TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", HUMBUG_API_PATH = None # This should not need to change unless you have a custom Humbug subdomain. -HUMBUG_SITE = "https://api.humbughq.com" +HUMBUG_SITE = "https://api.zulip.com" diff --git a/setup.py b/setup.py index 70be8e4..d38fae4 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup(name='humbug', 'License :: OSI Approved :: MIT License', 'Topic :: Communications :: Chat', ], - url='https://humbughq.com/dist/api/', + url='https://www.zulip.com/dist/api/', packages=['humbug'], data_files=[('share/humbug/examples', ["examples/humbugrc", "examples/send-message", "examples/subscribe", "examples/get-public-streams", "examples/unsubscribe",