Skip to content

Better multiple events support #25

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

Open
HQ063 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Better multiple events support #25

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

.DS_Store
12 changes: 8 additions & 4 deletions bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,12 @@ def sub(pattern, self=self):
func.thread = True

if not hasattr(func, 'event'):
func.event = 'PRIVMSG'
else: func.event = func.event.upper()
func.event = ['PRIVMSG']
else:
if isinstance(func.event, list):
func.event = [element.upper() for element in func.event]
else:
func.event = [func.event.upper()]

if hasattr(func, 'rule'):
if isinstance(func.rule, str):
Expand Down Expand Up @@ -205,8 +209,8 @@ def dispatch(self, origin, args):
items = self.commands[priority].items()
for regexp, funcs in items:
for func in funcs:
if event != func.event: continue

if event not in func.event and '*' not in func.event: continue
if '!'+event in func.event: continue
match = regexp.match(text)
if match:
if self.limit(origin, func): continue
Expand Down