Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

check git-show-private *after* we have unfiltered_targets

Browse source
This commit is contained in:
jesopo 2020-02-01 00:23:41 +00:00
parent b4b610ec18
commit 18b27c256e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/git_webhooks/__init__.py
View file

@ -85,10 +85,6 @@ class Module(ModuleManager.BaseModule):
channel = server.channels.get(channel_name) channel = server.channels.get(channel_name)
hooks = channel.get_setting("git-webhooks", {}) hooks = channel.get_setting("git-webhooks", {})
if is_private and not channel.get_setting(
PRIVATE_SETTING_NAME, False):
continue
if hooks: if hooks:
found_hook = self._find_hook( found_hook = self._find_hook(
full_name_lower, repo_username_lower, full_name_lower, repo_username_lower,
@ -104,6 +100,10 @@ class Module(ModuleManager.BaseModule):
repo_hooked = bool(unfiltered_targets) repo_hooked = bool(unfiltered_targets)
targets = [] targets = []
for server, channel, hook in unfiltered_targets: for server, channel, hook in unfiltered_targets:
if is_private and not channel.get_setting(
PRIVATE_SETTING_NAME, False):
continue
if (branch and if (branch and
hook["branches"] and hook["branches"] and
not branch in hook["branches"]): not branch in hook["branches"]):