From 253196af352aa9b455da977febc2c501b9f91c05 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Mon, 14 Nov 2016 22:47:56 -0800
Subject: [PATCH] rss-bot: Fix incorrect use of zulip.generate_option_group.

The fields set by the automatic option group all have `zulip_` at the
start of their names.
---
 integrations/rss/rss-bot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/integrations/rss/rss-bot b/integrations/rss/rss-bot
index 42910fcb..2cdabf79 100755
--- a/integrations/rss/rss-bot
+++ b/integrations/rss/rss-bot
@@ -151,7 +151,7 @@ def send_zulip(entry, feed_name):
                                   strip_tags(entry.summary),
                                   entry.link)
     message = {"type": "stream",
-               "sender": opts.email,
+               "sender": opts.zulip_email,
                "to": opts.stream,
                "subject": elide_subject(feed_name),
                "content": content,
@@ -164,8 +164,8 @@ try:
 except IOError:
     log_error_and_exit("Unable to read feed file at %s." % (opts.feed_file,))
 
-client = zulip.Client(email=opts.email, api_key=opts.api_key,
-                       site=opts.site, client="ZulipRSS/" + VERSION)
+client = zulip.Client(email=opts.zulip_email, api_key=opts.zulip_api_key,
+                      site=opts.zulip_site, client="ZulipRSS/" + VERSION)
 
 first_message = True