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

Jump to bottom

logging: don't log if opt_in_channels is empty or channel not in it #7

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

logging: don't log if opt_in_channels is empty or channel not in it #7

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05b5a54
logging: don't log is opt_in_channels is empty and channel not in array
RhinosF1 Dec 20, 2020
12099b3
make this more sane
RhinosF1 Dec 21, 2020
dc0f55a
Update __init__.py
RhinosF1 Dec 21, 2020
9fbcd9b
fix
RhinosF1 Dec 21, 2020
530a9b6
Update sopel_modules/chanlogs/__init__.py
RhinosF1 Jan 29, 2021
70897af
Update sopel_modules/chanlogs/__init__.py
RhinosF1 Jan 29, 2021
d9fc0a1
Update sopel_modules/chanlogs/__init__.py
RhinosF1 Jan 29, 2021
5519459
Update sopel_modules/chanlogs/__init__.py
RhinosF1 Jan 29, 2021
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
14 changes: 11 additions & 3 deletions sopel_modules/chanlogs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ChanlogsSection(StaticSection):
quit_template = ValidatedAttribute('quit_template', default=None)
nick_template = ValidatedAttribute('nick_template', default=None)
topic_template = ValidatedAttribute('topic_template', default=None)

opt_in_channels = ListAttribute('opt_in_channels')
RhinosF1 marked this conversation as resolved.
Show resolved Hide resolved

def configure(config):
config.define_section('chanlogs', ChanlogsSection, validate=False)
Expand Down Expand Up @@ -127,7 +127,8 @@ def log_message(bot, message):
# if this is a private message and we're not logging those, return early
if message.sender.is_nick() and not bot.config.chanlogs.privmsg:
return

if message.sender.is_channel() and bot.config.chanlogs.opt_in_channels in not [] and trigger not in bot.config.chanlogs.opt_in_channels:
return
RhinosF1 marked this conversation as resolved.
Show resolved Hide resolved
# determine which template we want, message or action
if message.startswith("\001ACTION ") and message.endswith("\001"):
tpl = bot.config.chanlogs.action_template or ACTION_TPL
Expand All @@ -147,6 +148,8 @@ def log_message(bot, message):
@sopel.module.event("JOIN")
@sopel.module.unblockable
def log_join(bot, trigger):
if message.sender.is_channel() and bot.config.chanlogs.opt_in_channels in not [] and trigger not in bot.config.chanlogs.opt_in_channels:
return
tpl = bot.config.chanlogs.join_template or JOIN_TPL
logline = _format_template(tpl, bot, trigger)
fpath = get_fpath(bot, trigger, channel=trigger.sender)
Expand All @@ -159,6 +162,8 @@ def log_join(bot, trigger):
@sopel.module.event("PART")
@sopel.module.unblockable
def log_part(bot, trigger):
if message.sender.is_channel() and bot.config.chanlogs.opt_in_channels in not [] and trigger not in bot.config.chanlogs.opt_in_channels:
return
tpl = bot.config.chanlogs.part_template or PART_TPL
logline = _format_template(tpl, bot, trigger=trigger)
fpath = get_fpath(bot, trigger, channel=trigger.sender)
Expand Down Expand Up @@ -198,7 +203,8 @@ def log_nick_change(bot, trigger):
privcopy = list(bot.privileges.items())
# write logline to *all* channels that the user is present in
for channel, privileges in privcopy:
if old_nick in privileges or new_nick in privileges:
if old_nick in privileges or new_nick in privileges and message.sender.is_channel() and bot.config.chanlogs.opt_in_channels in not [] and trigger not in bot.config.chanlogs.opt_in_channels:
return
fpath = get_fpath(bot, trigger, channel)
with bot.memory['chanlog_locks'][fpath]:
with open(fpath, "ab") as f:
Expand All @@ -209,6 +215,8 @@ def log_nick_change(bot, trigger):
@sopel.module.event("TOPIC")
@sopel.module.unblockable
def log_topic(bot, trigger):
if message.sender.is_channel() and bot.config.chanlogs.opt_in_channels in not [] and trigger not in bot.config.chanlogs.opt_in_channels:
return
tpl = bot.config.chanlogs.topic_template or TOPIC_TPL
logline = _format_template(tpl, bot, trigger)
fpath = get_fpath(bot, trigger, channel=trigger.sender)
Expand Down