Use bot name definitions instead of hardcoded names
This commit is contained in:
parent
525b2b1bf8
commit
ecade05310
1 changed files with 6 additions and 12 deletions
|
@ -103,7 +103,9 @@ canon_handles = ["apocalypseArisen", "arsenicCatnip", "arachnidsGrip", "adiosTor
|
||||||
"caligulasAquarium", "cuttlefishCuller", "carcinoGeneticist", "centaursTesticle", \
|
"caligulasAquarium", "cuttlefishCuller", "carcinoGeneticist", "centaursTesticle", \
|
||||||
"grimAuxiliatrix", "gallowsCalibrator", "gardenGnostic", "ectoBiologist", \
|
"grimAuxiliatrix", "gallowsCalibrator", "gardenGnostic", "ectoBiologist", \
|
||||||
"twinArmageddons", "terminallyCapricious", "turntechGodhead", "tentacleTherapist"]
|
"twinArmageddons", "terminallyCapricious", "turntechGodhead", "tentacleTherapist"]
|
||||||
BOTNAMES = ["NICKSERV", "CHANSERV", "MEMOSERV", "OPERSERV", "HELPSERV", "CALSPRITE", RANDNICK.upper()]
|
CUSTOMBOTS = ["CALSPRITE", RANDNICK.upper()]
|
||||||
|
BOTNAMES = ["NICKSERV", "CHANSERV", "MEMOSERV", "OPERSERV", "HELPSERV"]
|
||||||
|
BOTNAMES.extend(CUSTOMBOTS)
|
||||||
|
|
||||||
|
|
||||||
class waitingMessageHolder(object):
|
class waitingMessageHolder(object):
|
||||||
|
@ -1422,19 +1424,11 @@ class PesterWindow(MovingWindow):
|
||||||
self.connect(convoWindow, QtCore.SIGNAL('windowClosed(QString)'),
|
self.connect(convoWindow, QtCore.SIGNAL('windowClosed(QString)'),
|
||||||
self, QtCore.SLOT('closeConvo(QString)'))
|
self, QtCore.SLOT('closeConvo(QString)'))
|
||||||
self.convos[chum.handle] = convoWindow
|
self.convos[chum.handle] = convoWindow
|
||||||
if unicode(chum.handle).upper() == "CHANSERV" or \
|
if unicode(chum.handle).upper() in BOTNAMES:
|
||||||
unicode(chum.handle).upper() == "NICKSERV" or \
|
|
||||||
unicode(chum.handle).upper() == "MEMOSERV" or \
|
|
||||||
unicode(chum.handle).upper() == "OPERSERV" or \
|
|
||||||
unicode(chum.handle).upper() == "HELPSERV":
|
|
||||||
convoWindow.toggleQuirks(True)
|
convoWindow.toggleQuirks(True)
|
||||||
convoWindow.quirksOff.setChecked(True)
|
convoWindow.quirksOff.setChecked(True)
|
||||||
else:
|
if unicode(chum.handle).upper() in CUSTOMBOTS:
|
||||||
if unicode(chum.handle).upper() == "CALSPRITE" or \
|
self.newConvoStarted.emit(QtCore.QString(chum.handle), initiated)
|
||||||
unicode(chum.handle).upper() == "RANDOMENCOUNTER":
|
|
||||||
convoWindow.toggleQuirks(True)
|
|
||||||
convoWindow.quirksOff.setChecked(True)
|
|
||||||
self.newConvoStarted.emit(QtCore.QString(chum.handle), initiated)
|
|
||||||
convoWindow.show()
|
convoWindow.show()
|
||||||
|
|
||||||
def createTabWindow(self):
|
def createTabWindow(self):
|
||||||
|
|
Loading…
Reference in a new issue