Merge pull request #424 from mtdowling/master

Updating the RSS module to work with ZNC partyline
sopel-irc · Apr 29, 2014 · 2237ac7 · 2237ac7
2 parents 0779141 + 2832bc9
commit 2237ac7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/willie/modules/rss.py b/willie/modules/rss.py
@@ -184,7 +184,7 @@ def _rss_add(self, bot, trigger, c):
         """
         pattern = r'''
             ^\.rss\s+add
-            \s+([&#+!][^\s,]+)   # channel
+            \s+([~&#+!][^\s,]+)   # channel
             \s+("[^"]+"|[\w-]+)  # name, which can contain anything but quotes if quoted
             \s+(\S+)             # url
             (?:\s+(\d+))?        # foreground colour (optional)
@@ -224,7 +224,7 @@ def _rss_del(self, bot, trigger, c):
         """
         pattern = r"""
             ^\.rss\s+del
-            (?:\s+([&#+!][^\s,]+))?  # channel (optional)
+            (?:\s+([~&#+!][^\s,]+))?  # channel (optional)
             (?:\s+("[^"]+"|[\w-]+))? # name (optional)
             """
         match = re.match(pattern, trigger.group(), re.IGNORECASE | re.VERBOSE)
@@ -264,7 +264,7 @@ def _toggle(self, bot, trigger, c):
 
         pattern = r"""
             ^\.rss\s+(enable|disable) # command
-            (?:\s+([&#+!][^\s,]+))?   # channel (optional)
+            (?:\s+([~&#+!][^\s,]+))?   # channel (optional)
             (?:\s+("[^"]+"|[\w-]+))?  # name (optional)
             """
         match = re.match(pattern, trigger.group(), re.IGNORECASE | re.VERBOSE)
@@ -295,7 +295,7 @@ def _rss_list(self, bot, trigger, c):
         """Get information on all feeds in the database. Usage: .rss list [#channel] [Feed_Name]"""
         pattern = r"""
             ^\.rss\s+list
-            (?:\s+([&#+!][^\s,]+))?  # channel (optional)
+            (?:\s+([~&#+!][^\s,]+))?  # channel (optional)
             (?:\s+("[^"]+"|[\w-]+))? # name (optional)
             """
         match = re.match(pattern, trigger.group(), re.IGNORECASE | re.VERBOSE)