Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating the RSS module to work with ZNC partyline #424

Merged
merged 1 commit into from
Apr 29, 2014
Merged

Updating the RSS module to work with ZNC partyline #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions willie/modules/rss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,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)
Expand Down Expand Up @@ -223,7 +223,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)
Expand Down Expand Up @@ -263,7 +263,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)
Expand Down Expand Up @@ -294,7 +294,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)
Expand Down