forked from CloudBotIRC/CloudBot
-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
Prevent Snoonet Bots from triggering ducks #242
Open
ctrlshftn
wants to merge
393
commits into
edwardslabs:gonzobot
Choose a base branch
from
ctrlshftn:patch-1
base: gonzobot
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # plugins/correction.py
Remove old optouts See merge request snoonet-dev/gonzobot!5
Fix NameError in horoscope.py See merge request snoonet-dev/gonzobot!6
Checking for "snoonet/bot/" in the host before incrementing Message Counter or adding the host to the list of unique hosts because all snoonet bots contain this prefix in their vhost. Checking for "/bot/" can also be done to avoid other known bots from triggering a duck.
linuxdaemon
reviewed
Jan 11, 2018
@@ -116,7 +116,7 @@ def incrementMsgCounter(event, conn): | |||
global game_status | |||
if event.chan in opt_out: | |||
return | |||
if game_status[conn.name][event.chan]['game_on'] == 1 and game_status[conn.name][event.chan]['duck_status'] == 0: | |||
if game_status[conn.name][event.chan]['game_on'] == 1 and game_status[conn.name][event.chan]['duck_status'] == 0 and "snoonet/bot/" not in event.host: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We generally try to avoid network specific code like this, but something like this may work instead:
# Will return None if the plugin can not be found but doesn't hold a strong reference to it like an import would
ignore_plugin = event.bot.plugin_manager.find_plugin("ignore")
if ignore_plugin and ignore_plugin.code.is_ignored(conn.name, event.chan, event.mask.lower()):
return
All PRs for gonzobot should be submitted to snoonetIRC/CloudBot now. This repo has been abandoned for the most part. |
nikolas
referenced
this pull request
in nikolas/CloudBot
Oct 18, 2018
* Pin versions of dependencies * Sort requirements file * Pin test dependency versions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checking for "snoonet/bot/" in the host before incrementing Message Counter or adding the host to the list of unique hosts because all snoonet bots contain this prefix in their vhost. Checking for "/bot/" can also be done to avoid other known bots from triggering a duck.