Encyclopedia: Guard against mistakes.
This commit is contained in:
parent
8ffed09aef
commit
95f8fabc59
|
@ -24,7 +24,7 @@ import supybot
|
||||||
import supybot.world as world
|
import supybot.world as world
|
||||||
from importlib import reload
|
from importlib import reload
|
||||||
|
|
||||||
__version__ = "3.4.0"
|
__version__ = "3.5.0"
|
||||||
__author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@gmail.com")
|
__author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@gmail.com")
|
||||||
__contributors__ = {
|
__contributors__ = {
|
||||||
supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'],
|
supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'],
|
||||||
|
|
|
@ -495,7 +495,8 @@ class Encyclopedia(callbacks.Plugin):
|
||||||
elif re.match(r'^[^|\s]+[^|]*?\s+is(\s+|\b)\S+', text, re.I):
|
elif re.match(r'^[^|\s]+[^|]*?\s+is(\s+|\b)\S+', text, re.I):
|
||||||
edit = 'add'
|
edit = 'add'
|
||||||
else:
|
else:
|
||||||
text, target, retmsg = term
|
if not display:
|
||||||
|
text, target, retmsg = term
|
||||||
ret = self.factoid_lookup(text, channel, msg.nick, display)
|
ret = self.factoid_lookup(text, channel, msg.nick, display)
|
||||||
|
|
||||||
if edit:
|
if edit:
|
||||||
|
@ -697,6 +698,8 @@ class Encyclopedia(callbacks.Plugin):
|
||||||
if not match:
|
if not match:
|
||||||
return
|
return
|
||||||
name = match.group('name').lower()
|
name = match.group('name').lower()
|
||||||
|
if re.match(r'.*<(reply|alias|sed)>.*', name):
|
||||||
|
return "You likely don't want this, %s" % editor
|
||||||
value = match.group('value')
|
value = match.group('value')
|
||||||
if value.startswith(('also ', 'also:')):
|
if value.startswith(('also ', 'also:')):
|
||||||
name += '-also'
|
name += '-also'
|
||||||
|
|
Loading…
Reference in New Issue