mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Lexi 2011-07-13 08:44:45 +01:00
commit bc69abba8f
10 changed files with 131 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.mkdn
View file

@ -57,6 +57,7 @@ CHANGELOG
* Compress exit dumps into one line - Kiooeht [evacipatedBox] (Idea: Lexi [lexicalNuance])
* Display channel mode change message - Kiooeht [evacipatedBox]
* Disable quirks in +c memos - Lexi [lexicalNuance]
* Founder, admin, and halfop support - Kiooeht [evacipatedBox]
* Bug fixes
* Logviewer updates - Kiooeht [evacipatedBox]
* Memo scrollbar thing - Kiooeht [evacipatedBox]

5
TODO.mkdn
View file

@ -17,7 +17,6 @@ Features
* Tab completion of two letter names
* Customizable name alerts
* When 'banned' make impossible to connect using timestamp banned under
* This nickname has been registered; you may not use it.
Bugs
----
@ -29,7 +28,6 @@ Bugs
* If pesterchum is open but offline due to a network failure and you open the memos screen, it connects you but doesn't fetch the memo list when it finishes connecting
* right clicking an offline chum and choosing remove asks you why you're reporting someone, and if you hit cancel the menus stop working
* Closing a timeclone doesn't actually cease for everyone else
* +q(~) and +a(&) do weird things
* Kill Zalgo
* Handle netsplits
@ -37,9 +35,6 @@ Windows Bugs
------------
* XP SP2: sometimes mouse clicks dont register? must be some kinda crash
* On reconnect and nick change, momentary theme change causes menu items to stop working
* Is using the 3.41 beta update, sending messages to memos freezes Pesterchum
* After adding quirks, test quirks freezes
* Using regexp replace quirks and trying to send messages freezes Pesterchum
* Random chums won't show up on chumroll
Mac Bugs

2
irc.py
View file

@ -23,7 +23,7 @@ class PesterIRC(QtCore.QThread):
def IRCConnect(self):
server = self.config.server()
port = self.config.port()
self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc30', blocking=True, timeout=15)
self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc31', blocking=True, timeout=15)
self.cli.command_handler.parent = self
self.cli.command_handler.mainwindow = self.mainwindow
self.cli.connect()

225
memos.py
View file

@ -591,17 +591,15 @@ class PesterMemo(PesterConvo):
self.layout.setContentsMargins(margins["left"], margins["top"],
margins["right"], margins["bottom"])
for item in [self.userlist.item(i) for i in range(0,self.userlist.count())]:
if item.op:
icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
item.setIcon(icon)
elif item.voice:
icon = PesterIcon(self.mainwindow.theme["memos/voice/icon"])
item.setIcon(icon)
self.iconCrap(item)
def addUser(self, handle):
chumdb = self.mainwindow.chumdb
defaultcolor = QtGui.QColor("black")
founder = False
op = False
halfop = False
admin = False
voice = False
if handle[0] == '@':
op = True
@ -611,23 +609,36 @@ class PesterMemo(PesterConvo):
self.userlist.optionsMenu.addAction(self.banuserAction)
self.optionsMenu.addMenu(self.chanModeMenu)
self.op = True
elif handle[0] == '%':
halfop = True
handle = handle[1:]
if handle == self.mainwindow.profile().handle:
self.userlist.optionsMenu.addAction(self.opAction)
self.userlist.optionsMenu.addAction(self.banuserAction)
self.optionsMenu.addMenu(self.chanModeMenu)
self.halfop = True
elif handle[0] == '+':
voice = True
handle = handle[1:]
elif handle[0] == '~':
founder = True
handle = handle[1:]
elif handle[0] == '&':
admin = True
handle = handle[1:]
item = QtGui.QListWidgetItem(handle)
if handle == self.mainwindow.profile().handle:
color = self.mainwindow.profile().color
else:
color = chumdb.getColor(handle, defaultcolor)
item.setTextColor(color)
item.founder = founder
item.op = op
item.halfop = halfop
item.admin = admin
item.voice = voice
if op:
icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
item.setIcon(icon)
elif voice:
icon = PesterIcon(self.mainwindow.theme["memos/voice/icon"])
item.setIcon(icon)
self.umodes = ["founder", "op", "halfop", "admin", "voice"]
self.iconCrap(item)
self.userlist.addItem(item)
self.sortUsers()
@ -637,7 +648,7 @@ class PesterMemo(PesterConvo):
while listing is not None:
users.append(self.userlist.takeItem(0))
listing = self.userlist.item(0)
users.sort(key=lambda x: ((0 if x.op else 1), (0 if x.voice else 1), x.text()))
users.sort(key=lambda x: ((0 if x.founder else (1 if x.op else (2 if x.halfop else (3 if x.admin else (4 if x.voice else 5))))), x.text()))
for u in users:
self.userlist.addItem(u)
@ -851,6 +862,33 @@ class PesterMemo(PesterConvo):
self.mainwindow.chatlog.log(self.channel, msg)
>>>>>>> upstream/master
def chumOPstuff(self, h, op):
chum = PesterProfile(h)
if h == self.mainwindow.profile().handle:
chum = self.mainwindow.profile()
ttracker = self.time
curtime = self.time.getTime()
elif self.times.has_key(h):
ttracker = self.times[h]
else:
ttracker = TimeTracker(timedelta(0))
opchum = PesterProfile(op)
if self.times.has_key(op):
opgrammar = self.times[op].getGrammar()
elif op == self.mainwindow.profile().handle:
opgrammar = self.time.getGrammar()
else:
opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
return (chum, opchum, opgrammar)
def iconCrap(self, c, down=True):
for m in (self.umodes if down else reversed(self.umodes)):
if eval("c."+m):
icon = PesterIcon(self.mainwindow.theme["memos/"+m+"/icon"])
c.setIcon(icon)
return
icon = QtGui.QIcon()
c.setIcon(icon)
@QtCore.pyqtSlot(QtCore.QString, QtCore.QString, QtCore.QString)
def userPresentChange(self, handle, channel, update):
h = unicode(handle)
@ -870,7 +908,9 @@ class PesterMemo(PesterConvo):
l = update.split(":")
update = l[0]
op = l[1]
if (update in ["join","left", "kick", "+o", "-o", "+v", "-v"]) \
if (update in ["join","left", "kick", \
"+q", "-q", "+o", "-o", "+h", "-h", \
"+a", "-a", "+v", "-v"]) \
and channel != self.channel:
return
chums = self.userlist.findItems(h, QtCore.Qt.MatchFlags(0))
@ -896,14 +936,11 @@ class PesterMemo(PesterConvo):
newchums = self.userlist.findItems(newnick, QtCore.Qt.MatchFlags(0))
for nc in newchums:
for c in chums:
if c.op:
nc.op = True
icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
nc.setIcon(icon)
if c.voice:
nc.voice = True
icon = PesterIcon(self.mainwindow.theme["memos/voice/icon"])
nc.setIcon(icon)
nc.founder = c.founder
nc.op = c.op
nc.halfop = c.halfop
nc.admin = c.admin
self.iconCrap(nc)
self.sortUsers()
elif update == "kick":
if len(chums) == 0:
@ -963,31 +1000,25 @@ class PesterMemo(PesterConvo):
time = self.time.getTime()
serverText = "PESTERCHUM:TIME>"+delta2txt(time, "server")
self.messageSent.emit(serverText, self.title())
elif update == "+q":
for c in chums:
c.founder = True
self.iconCrap(c)
self.sortUsers()
elif update == "-q":
for c in chums:
c.founder = False
self.iconCrap(c)
self.sortUsers()
elif update == "+o":
if self.mainwindow.config.opvoiceMessages():
chum = PesterProfile(h)
if h == self.mainwindow.profile().handle:
chum = self.mainwindow.profile()
ttracker = self.time
curtime = self.time.getTime()
elif self.times.has_key(h):
ttracker = self.times[h]
else:
ttracker = TimeTracker(timedelta(0))
opchum = PesterProfile(op)
if self.times.has_key(op):
opgrammar = self.times[op].getGrammar()
elif op == self.mainwindow.profile().handle:
opgrammar = self.time.getGrammar()
else:
opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
(chum, opchum, opgrammar) = self.chumOPstuff(h, op)
msg = chum.memoopmsg(opchum, opgrammar, systemColor)
self.textArea.append(convertTags(msg))
self.mainwindow.chatlog.log(self.channel, msg)
for c in chums:
c.op = True
icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
c.setIcon(icon)
self.iconCrap(c)
if unicode(c.text()) == self.mainwindow.profile().handle:
self.userlist.optionsMenu.addAction(self.opAction)
self.userlist.optionsMenu.addAction(self.voiceAction)
@ -998,33 +1029,13 @@ class PesterMemo(PesterConvo):
elif update == "-o":
self.mainwindow.channelNames.emit(self.channel)
if self.mainwindow.config.opvoiceMessages():
chum = PesterProfile(h)
if h == self.mainwindow.profile().handle:
chum = self.mainwindow.profile()
ttracker = self.time
curtime = self.time.getTime()
elif self.times.has_key(h):
ttracker = self.times[h]
else:
ttracker = TimeTracker(timedelta(0))
opchum = PesterProfile(op)
if self.times.has_key(op):
opgrammar = self.times[op].getGrammar()
elif op == self.mainwindow.profile().handle:
opgrammar = self.time.getGrammar()
else:
opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
(chum, opchum, opgrammar) = self.chumOPstuff(h, op)
msg = chum.memodeopmsg(opchum, opgrammar, systemColor)
self.textArea.append(convertTags(msg))
self.mainwindow.chatlog.log(self.channel, msg)
for c in chums:
c.op = False
if c.voice:
icon = PesterIcon(self.mainwindow.theme["memos/voice/icon"])
c.setIcon(icon)
else:
icon = QtGui.QIcon()
c.setIcon(icon)
self.iconCrap(c)
if unicode(c.text()) == self.mainwindow.profile().handle:
self.userlist.optionsMenu.removeAction(self.opAction)
self.userlist.optionsMenu.removeAction(self.voiceAction)
@ -1032,62 +1043,70 @@ class PesterMemo(PesterConvo):
self.userlist.optionsMenu.removeAction(self.quirkDisableAction)
self.optionsMenu.removeAction(self.chanModeMenu.menuAction())
self.sortUsers()
elif update == "+h":
if self.mainwindow.config.opvoiceMessages():
(chum, opchum, opgrammar) = self.chumOPstuff(h, op)
msg = chum.memoopmsg(opchum, opgrammar, systemColor)
self.textArea.append(convertTags(msg))
self.mainwindow.chatlog.log(self.channel, msg)
for c in chums:
c.halfop = True
self.iconCrap(c)
if unicode(c.text()) == self.mainwindow.profile().handle:
self.userlist.optionsMenu.addAction(self.opAction)
self.userlist.optionsMenu.addAction(self.voiceAction)
self.userlist.optionsMenu.addAction(self.banuserAction)
self.userlist.optionsMenu.addAction(self.quirkDisableAction)
self.optionsMenu.addMenu(self.chanModeMenu)
self.sortUsers()
elif update == "-h":
self.mainwindow.channelNames.emit(self.channel)
if self.mainwindow.config.opvoiceMessages():
(chum, opchum, opgrammar) = self.chumOPstuff(h, op)
msg = chum.memodeopmsg(opchum, opgrammar, systemColor)
self.textArea.append(convertTags(msg))
self.mainwindow.chatlog.log(self.channel, msg)
for c in chums:
c.halfop = False
self.iconCrap(c)
if unicode(c.text()) == self.mainwindow.profile().handle:
self.userlist.optionsMenu.removeAction(self.opAction)
self.userlist.optionsMenu.removeAction(self.voiceAction)
self.userlist.optionsMenu.removeAction(self.banuserAction)
self.userlist.optionsMenu.removeAction(self.quirkDisableAction)
self.optionsMenu.removeAction(self.chanModeMenu.menuAction())
self.sortUsers()
elif update == "+a":
for c in chums:
c.admin = True
self.iconCrap(c)
self.sortUsers()
elif update == "-a":
for c in chums:
c.admin = False
self.iconCrap(c)
self.sortUsers()
elif c == self.channel and h == "" and update[0] in ["+","-"]:
self.updateChanModes(update, op)
elif update == "+v":
if self.mainwindow.config.opvoiceMessages():
chum = PesterProfile(h)
if h == self.mainwindow.profile().handle:
chum = self.mainwindow.profile()
ttracker = self.time
curtime = self.time.getTime()
elif self.times.has_key(h):
ttracker = self.times[h]
else:
ttracker = TimeTracker(timedelta(0))
opchum = PesterProfile(op)
if self.times.has_key(op):
opgrammar = self.times[op].getGrammar()
elif op == self.mainwindow.profile().handle:
opgrammar = self.time.getGrammar()
else:
opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
(chum, opchum, opgrammar) = self.chumOPstuff(h, op)
msg = chum.memovoicemsg(opchum, opgrammar, systemColor)
self.textArea.append(convertTags(msg))
self.mainwindow.chatlog.log(self.channel, msg)
for c in chums:
c.voice = True
if not c.op:
icon = PesterIcon(self.mainwindow.theme["memos/voice/icon"])
c.setIcon(icon)
self.iconCrap(c)
self.sortUsers()
elif update == "-v":
if self.mainwindow.config.opvoiceMessages():
chum = PesterProfile(h)
if h == self.mainwindow.profile().handle:
chum = self.mainwindow.profile()
ttracker = self.time
curtime = self.time.getTime()
elif self.times.has_key(h):
ttracker = self.times[h]
else:
ttracker = TimeTracker(timedelta(0))
opchum = PesterProfile(op)
if self.times.has_key(op):
opgrammar = self.times[op].getGrammar()
elif op == self.mainwindow.profile().handle:
opgrammar = self.time.getGrammar()
else:
opgrammar = TimeGrammar("CURRENT", "C", "RIGHT NOW")
(chum, opchum, opgrammar) = self.chumOPstuff(h, op)
msg = chum.memodevoicemsg(opchum, opgrammar, systemColor)
self.textArea.append(convertTags(msg))
self.mainwindow.chatlog.log(self.channel, msg)
for c in chums:
c.voice = False
if c.op:
icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
c.setIcon(icon)
else:
icon = QtGui.QIcon()
c.setIcon(icon)
self.iconCrap(c)
self.sortUsers()
elif c == self.channel and h == "" and update[0] in ["+","-"]:
self.updateChanModes(update, op)

BIN
themes/pesterchum/admin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 433 B

BIN
themes/pesterchum/founder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 433 B

BIN
themes/pesterchum/halfop.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 224 B

5
themes/pesterchum/style.js
View file

@ -314,6 +314,9 @@
},
"systemMsgColor": "#646464",
"op": { "icon": "$path/op.png" },
"voice": { "icon": "$path/voice.png" }
"halfop": { "icon": "$path/halfop.png" },
"voice": { "icon": "$path/voice.png" },
"founder": { "icon": "$path/founder.png" },
"admin": { "icon": "$path/admin.png" }
}
}

BIN
themes/trollian/halfop.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 239 B

1
themes/trollian/style.js
View file

@ -346,6 +346,7 @@
},
"systemMsgColor": "#646464",
"op": { "icon": "$path/op.png" },
"halfop": { "icon": "$path/halfop.png" },
"voice": { "icon": "$path/voice.png" }
}
}