Don't send begin/color to bots
This commit is contained in:
parent
22cda74bb9
commit
f5e4f52911
2 changed files with 5 additions and 8 deletions
|
@ -17,6 +17,7 @@ from pnc import lexercon
|
|||
from generic import mysteryTime
|
||||
from quirks import ScriptQuirks
|
||||
from pyquirks import PythonQuirks
|
||||
from scripts.services import BOTNAMES
|
||||
|
||||
PchumLog = logging.getLogger("pchumLogger")
|
||||
|
||||
|
@ -851,8 +852,8 @@ def kxhandleInput(ctx, text=None, flavor=None, irc_compatible=False):
|
|||
if flavor == "convo":
|
||||
# if ceased, rebegin
|
||||
if hasattr(ctx, "chumopen") and not ctx.chumopen:
|
||||
if not irc_compatible:
|
||||
ctx.mainwindow.newConvoStarted.emit(str(ctx.title()), True)
|
||||
if not irc_compatible and ctx.title().casefold() not in BOTNAMES:
|
||||
ctx.mainwindow.newConvoStarted.emit(ctx.title(), True)
|
||||
ctx.setChumOpen(True)
|
||||
|
||||
# Post-process and send the messages.
|
||||
|
|
|
@ -1903,12 +1903,8 @@ class PesterWindow(MovingWindow):
|
|||
if chum.handle.casefold() in BOTNAMES:
|
||||
convoWindow.toggleQuirks(True)
|
||||
convoWindow.quirksOff.setChecked(True)
|
||||
if (
|
||||
not self.config.irc_compatibility_mode()
|
||||
or chum.handle.casefold() in CUSTOMBOTS
|
||||
):
|
||||
self.newConvoStarted.emit(chum.handle, initiated)
|
||||
else:
|
||||
elif not self.config.irc_compatibility_mode():
|
||||
# Send PESTERCHUM:BEGIN and color.
|
||||
self.newConvoStarted.emit(chum.handle, initiated)
|
||||
convoWindow.show()
|
||||
|
||||
|
|
Loading…
Reference in a new issue