remove the speaker from messages coming over the bridge when learning
This commit is contained in:
parent
0bfe3f9549
commit
ec1767e38b
|
@ -73,17 +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
|
||||||
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()
|
||||||
trimmed_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
|
||||||
|
if channel and who == channel.discord_bridge:
|
||||||
|
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", trimmed_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(trimmed_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:
|
||||||
|
|
|
@ -33,3 +33,16 @@ class MarkovTestCase(TestCase):
|
||||||
self.plugin.handle_chatter(self.mock_connection, mock_event)
|
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')
|
||||||
|
|
||||||
|
def test_learn_bridge_edit(self):
|
||||||
|
"""Test that we don't learn the speaker's nick when learning a message from the bridge."""
|
||||||
|
mock_event = mock.MagicMock()
|
||||||
|
mock_event.arguments = ['<tester> hello this is a test message']
|
||||||
|
mock_event.target = '#test'
|
||||||
|
mock_event.recursing = False
|
||||||
|
mock_event.source = 'bridge!bridge@localhost'
|
||||||
|
|
||||||
|
with mock.patch('markov.lib.learn_line') as mock_learn_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')
|
||||||
|
|
Loading…
Reference in New Issue