mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	More miscellaneous humbughq.com=>zulip.com updates.
(imported from commit 9a3dbc4268f251c2c0b20d8b6a7e1dc672f1b385)
This commit is contained in:
		@@ -35,7 +35,7 @@ examples, which is especially useful if you are running several bots
 | 
			
		||||
which share a home directory.
 | 
			
		||||
 | 
			
		||||
You can obtain your Humbug API key, create bots, and manage bots all
 | 
			
		||||
from your Humbug [settings page](https://humbughq.com/#settings).
 | 
			
		||||
from your Humbug [settings page](https://zulip.com/#settings).
 | 
			
		||||
 | 
			
		||||
A typical simple bot sending API messages will look as follows:
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
        <dc:title>Humbug Hat</dc:title>
 | 
			
		||||
        <dc:creator>
 | 
			
		||||
          <cc:Agent>
 | 
			
		||||
            <dc:title>Luke Faraone <lfaraone@humbughq.com></dc:title>
 | 
			
		||||
            <dc:title>Luke Faraone <lfaraone@zulip.com></dc:title>
 | 
			
		||||
          </cc:Agent>
 | 
			
		||||
        </dc:creator>
 | 
			
		||||
        <dc:rights>
 | 
			
		||||
 
 | 
			
		||||
| 
		 Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB  | 
@@ -55,7 +55,7 @@
 | 
			
		||||
        <dc:title>Humbug Hat</dc:title>
 | 
			
		||||
        <dc:creator>
 | 
			
		||||
          <cc:Agent>
 | 
			
		||||
            <dc:title>Luke Faraone <lfaraone@humbughq.com></dc:title>
 | 
			
		||||
            <dc:title>Luke Faraone <lfaraone@zulip.com></dc:title>
 | 
			
		||||
          </cc:Agent>
 | 
			
		||||
        </dc:creator>
 | 
			
		||||
        <dc:rights>
 | 
			
		||||
 
 | 
			
		||||
| 
		 Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB  | 
@@ -554,7 +554,7 @@ def forward_to_zephyr(message):
 | 
			
		||||
 | 
			
		||||
    heading = "Hi there! This is an automated message from Zulip."
 | 
			
		||||
    support_closing = """If you have any questions, please be in touch through the \
 | 
			
		||||
Feedback tab or at support@humbughq.com."""
 | 
			
		||||
Feedback tab or at support@zulip.com."""
 | 
			
		||||
 | 
			
		||||
    (code, stderr) = send_authed_zephyr(zwrite_args, wrapped_content)
 | 
			
		||||
    if code == 0 and stderr == "":
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@ def is_inactive(value):
 | 
			
		||||
    except UserProfile.DoesNotExist:
 | 
			
		||||
        pass
 | 
			
		||||
 | 
			
		||||
SIGNUP_STRING = '<a href="https://humbughq.com/signup">Sign up</a> to find out when Zulip is ready for you.'
 | 
			
		||||
SIGNUP_STRING = '<a href="https://zulip.com/signup">Sign up</a> to find out when Zulip is ready for you.'
 | 
			
		||||
 | 
			
		||||
def has_valid_realm(value):
 | 
			
		||||
    try:
 | 
			
		||||
 
 | 
			
		||||
@@ -1280,7 +1280,7 @@ def do_send_missedmessage_email(user_profile, missed_messages):
 | 
			
		||||
    template_payload = {'name': user_profile.full_name,
 | 
			
		||||
                        'messages': build_message_list(user_profile, missed_messages),
 | 
			
		||||
                        'message_count': len(missed_messages),
 | 
			
		||||
                        'url': 'https://humbughq.com',
 | 
			
		||||
                        'url': 'https://zulip.com',
 | 
			
		||||
                        'reply_warning': False}
 | 
			
		||||
 | 
			
		||||
    senders = set(m.sender.full_name for m in missed_messages)
 | 
			
		||||
@@ -1306,7 +1306,7 @@ def do_send_missedmessage_email(user_profile, missed_messages):
 | 
			
		||||
        # There are some @-mentions mixed in with personals
 | 
			
		||||
        template_payload['mention'] = True
 | 
			
		||||
        template_payload['reply_warning'] = True
 | 
			
		||||
        headers['Reply-To'] = "Nobody <noreply@humbughq.com>"
 | 
			
		||||
        headers['Reply-To'] = "Nobody <noreply@zulip.com>"
 | 
			
		||||
 | 
			
		||||
    subject = "Missed Zulip%s from %s" % ('s' if len(senders) > 1 else '', sender_str)
 | 
			
		||||
    from_email = "%s (via Zulip) <noreply@zulip.com>" % (sender_str)
 | 
			
		||||
 
 | 
			
		||||
@@ -76,7 +76,7 @@ class Realm(models.Model):
 | 
			
		||||
# been validated via django.core.validators.validate_email
 | 
			
		||||
#
 | 
			
		||||
# Note that we need to use some care, since can you have multiple @-signs; e.g.
 | 
			
		||||
# "tabbott@test"@humbughq.com
 | 
			
		||||
# "tabbott@test"@zulip.com
 | 
			
		||||
# is valid email address
 | 
			
		||||
def email_to_username(email):
 | 
			
		||||
    return "@".join(email.split("@")[:-1])
 | 
			
		||||
 
 | 
			
		||||
@@ -345,7 +345,7 @@ def accounts_accept_terms(request):
 | 
			
		||||
                         'ip': request.META['REMOTE_ADDR'],
 | 
			
		||||
                         'browser': request.META['HTTP_USER_AGENT']}),
 | 
			
		||||
                        "humbug@humbughq.com",
 | 
			
		||||
                        ["all@humbughq.com"])
 | 
			
		||||
                        ["all@zulip.com"])
 | 
			
		||||
            do_change_full_name(request.user, full_name)
 | 
			
		||||
            return redirect(home)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user