[manual] Use api.zulip.com to access the Humbug API.

This needs to be deployed after the nginx configuration is deployed.

(imported from commit 167a3d9d27595d40883bb400ebcc44c4ad9b6a2f)

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,

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:

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)

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"
 

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"
+            self.base_url = "https://api.zulip.com"
-        if self.base_url != "https://api.humbughq.com" and not self.base_url.endswith("/api"):
+        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 += "/"

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"

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"
+      return base_url + "/v1/" + method
-      if (domain != "") {
-        url = domain + "." + url
-      }
-      return "https://" + url + "/api/v1/" + method
     }
 }

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"

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"

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",