projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
own messages no longer update the activity status
[quassel.git]
/
src
/
client
/
buffer.cpp
diff --git
a/src/client/buffer.cpp
b/src/client/buffer.cpp
index
54bd81a
..
14de0d4
100644
(file)
--- a/
src/client/buffer.cpp
+++ b/
src/client/buffer.cpp
@@
-54,6
+54,10
@@
void Buffer::appendMsg(const Message &msg) {
}
void Buffer::prependMsg(const Message &msg) {
}
void Buffer::prependMsg(const Message &msg) {
+ // check for duplicate first
+ if(contents().count() > 0 && msg.msgId() >= contents().first()->msgId()) {
+ return;
+ }
updateActivityLevel(msg);
layoutQueue.append(msg);
}
updateActivityLevel(msg);
layoutQueue.append(msg);
}
@@
-74,22
+78,32
@@
void Buffer::setVisible(bool visible) {
setLastSeen(layoutedMsgs.last()->timestamp());
}
setLastSeen(layoutedMsgs.last()->timestamp());
}
-void Buffer::setLastSeen(const QDateTime &seen) {
- if(seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
+void Buffer::setLastSeen(const QDateTime &seen) {
// qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen();
+ if(
!lastSeen().isValid() ||
seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
_lastSeen = seen;
_lastSeen = seen;
- Client::bufferSyncer()->requestSetLastSeen(bufferInfo().bufferId(), seen);
+ Client::setBufferLastSeen(bufferInfo().bufferId(), seen);
+ //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
setActivityLevel(NoActivity);
}
}
void Buffer::setActivityLevel(ActivityLevel level) {
_activityLevel = level;
setActivityLevel(NoActivity);
}
}
void Buffer::setActivityLevel(ActivityLevel level) {
_activityLevel = level;
- if(bufferInfo().bufferId() > 0) Client::networkModel()->setBufferActivity(bufferInfo(), level);
+ if(bufferInfo().bufferId() > 0) {
+ Client::networkModel()->setBufferActivity(bufferInfo(), level);
+ //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level;
+ }
}
void Buffer::updateActivityLevel(const Message &msg) {
}
void Buffer::updateActivityLevel(const Message &msg) {
- if(isVisible()) return;
- if(lastSeen().isValid() && lastSeen() >= msg.timestamp()) return;
+ if(isVisible())
+ return;
+
+ if(msg.flags() & Message::Self) // don't update activity for our own messages
+ return;
+
+ if(lastSeen().isValid() && lastSeen() >= msg.timestamp())
+ return;
ActivityLevel level = activityLevel() | OtherActivity;
if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= NewMessage;
ActivityLevel level = activityLevel() | OtherActivity;
if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= NewMessage;