From aa397194a1f9a9de6b305fdb90d527781eee6024 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 26 May 2016 15:06:52 -0700
Subject: [PATCH] Allowing twitter URL to not have https/http in it.

---
 apps/rss_feeds/models.py | 2 +-
 utils/feed_fetcher.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index a440ff633..73d82b9ab 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -382,7 +382,7 @@ class Feed(models.Model):
         
         if url and url.startswith('newsletter:'):
             return cls.objects.get(feed_address=url)
-        if url and re.match('https?://twitter.com/\w+/?$', url):
+        if url and re.match('(https?://)?twitter.com/\w+/?$', url):
             without_rss = True
         if url and 'youtube.com/user/' in url:
             username = re.search('youtube.com/user/(\w+)', url).group(1)
diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py
index 59605b93f..9dc5dcd63 100644
--- a/utils/feed_fetcher.py
+++ b/utils/feed_fetcher.py
@@ -106,7 +106,7 @@ class FetchFeed:
                               (self.feed.title[:30], address))
                 return FEED_ERRHTTP, None
             self.fpf = feedparser.parse(youtube_feed)
-        elif re.match('https?://twitter.com/\w+/?$', address):
+        elif re.match('(https?)?://twitter.com/\w+/?$', address):
             # try:
             twitter_feed = self.fetch_twitter(address)
             # except Exception, e: