bss/dr.botzo
1
0
Fork 0
Code Issues 3 Pull Requests Releases 2 Wiki Activity

Compare commits

base: bss:cf648cd55569f64f069b9e80a02592e1c174bdf2
Branches Tags
bss:master
bss:v3.1.0
bss:v3.0.0
..
compare: bss:45413e2256fdb8e54d65e235b03e4f76e231110f
Branches Tags
bss:master
bss:v3.1.0
bss:v3.0.0

2 Commits
cf648cd555 ... 45413e2256

Author SHA1 Message Date
Brian S. Stephan
45413e2256
test the ability to not learn our nick when addressed 2023-02-18 20:10:38 -06:00
Brian S. Stephan
cf5814a565
remove the speaker from messages coming over the bridge when learning 2023-02-18 20:10:14 -06:00
2 changed files with 9 additions and 6 deletions
Show Stats Expand all files Collapse all files

9
markov/ircplugin.py
View File

@ -73,23 +73,24 @@ class Markov(Plugin):
log.debug("not learning from %s as i've been told to ignore it", channel) log.debug("not learning from %s as i've been told to ignore it", channel)
else: else:
# learn the line # learn the line
learning_what = what
# remove our own nick and aliases from what we learn # remove our own nick and aliases from what we learn
if connection.server_config.additional_addressed_nicks: if connection.server_config.additional_addressed_nicks:
all_nicks = '|'.join(connection.server_config.additional_addressed_nicks.split('\n') + all_nicks = '|'.join(connection.server_config.additional_addressed_nicks.split('\n') +
[connection.get_nickname()]) [connection.get_nickname()])
else: else:
all_nicks = connection.get_nickname() all_nicks = connection.get_nickname()
what = re.sub(r'^(({nicks})[:,]|@({nicks}))\s+'.format(nicks=all_nicks), '', what) learning_what = re.sub(r'^(({nicks})[:,]|@({nicks}))\s+'.format(nicks=all_nicks), '', learning_what)
# don't learn the speaker's nick if this came over a bridge # don't learn the speaker's nick if this came over a bridge
if channel and who == channel.discord_bridge: if channel and who == channel.discord_bridge:
what = ' '.join(what.split(' ')[1:]) learning_what = ' '.join(learning_what.split(' ')[1:])
recursing = getattr(event, 'recursing', False) recursing = getattr(event, 'recursing', False)
if not recursing: if not recursing:
log.debug("learning %s", what) log.debug("learning %s", learning_what)
context = markovlib.get_or_create_target_context(target) context = markovlib.get_or_create_target_context(target)
markovlib.learn_line(what, context) markovlib.learn_line(learning_what, context)
log.debug("searching '%s' for '%s'", what, all_nicks) log.debug("searching '%s' for '%s'", what, all_nicks)
if re.search(all_nicks, what, re.IGNORECASE) is not None: if re.search(all_nicks, what, re.IGNORECASE) is not None:

6
tests/test_markov_ircplugin.py
View File

@ -42,7 +42,8 @@ class MarkovTestCase(TestCase):
mock_event.recursing = False mock_event.recursing = False
with mock.patch('markov.lib.learn_line') as mock_learn_line: with mock.patch('markov.lib.learn_line') as mock_learn_line:
self.plugin.handle_chatter(self.mock_connection, mock_event) with mock.patch('markov.lib.generate_line'):
self.plugin.handle_chatter(self.mock_connection, mock_event)
self.assertEqual(mock_learn_line.call_args.args[0], 'hello this is a test message') self.assertEqual(mock_learn_line.call_args.args[0], 'hello this is a test message')
@ -54,7 +55,8 @@ class MarkovTestCase(TestCase):
mock_event.recursing = False mock_event.recursing = False
with mock.patch('markov.lib.learn_line') as mock_learn_line: with mock.patch('markov.lib.learn_line') as mock_learn_line:
self.plugin.handle_chatter(self.mock_connection, mock_event) with mock.patch('markov.lib.generate_line'):
self.plugin.handle_chatter(self.mock_connection, mock_event)
self.assertEqual(mock_learn_line.call_args.args[0], 'hello this is a test message') self.assertEqual(mock_learn_line.call_args.args[0], 'hello this is a test message')