offline avatars in mucs

ui/models/room.cpp

@@ -32,7 +32,8 @@ Models::Room::Room(const QString& p_jid, const QMap<QString, QVariant>& data, Mo
     avatarState(Shared::Avatar::empty),
     avatarPath(""),
     messages(),
-    participants()
+    participants(),
+    exParticipantAvatars()
 {
     QMap<QString, QVariant>::const_iterator itr = data.find("autoJoin");
     if (itr != data.end()) {
@@ -62,6 +63,15 @@ Models::Room::Room(const QString& p_jid, const QMap<QString, QVariant>& data, Mo
     if (itr != data.end()) {
         setAvatarPath(itr.value().toString());
     }
+    
+    
+    itr = data.find("avatars");
+    if (itr != data.end()) {
+        QMap<QString, QVariant> avs = itr.value().toMap();
+        for (QMap<QString, QVariant>::const_iterator itr = avs.begin(), end = avs.end(); itr != end; ++itr) {
+            exParticipantAvatars.insert(std::make_pair(itr.key(), itr.value().toString()));
+        }
+    }
 }
 
 Models::Room::~Room()
@@ -284,6 +294,11 @@ void Models::Room::addParticipant(const QString& p_name, const QMap<QString, QVa
         qDebug() << "An attempt to add already existing participant" << p_name << "to the room" << name << ", updating instead";
         handleParticipantUpdate(itr, data);
     } else {
+        std::map<QString, QString>::const_iterator eitr = exParticipantAvatars.find(name);
+        if (eitr != exParticipantAvatars.end()) {
+            exParticipantAvatars.erase(eitr);
+        }
+        
         Participant* part = new Participant(data);
         part->setName(p_name);
         participants.insert(std::make_pair(p_name, part));
@@ -311,6 +326,11 @@ void Models::Room::removeParticipant(const QString& p_name)
         Participant* p = itr->second;
         participants.erase(itr);
         removeChild(p->row());
+        
+        if (p->getAvatarState() != Shared::Avatar::empty) {
+            exParticipantAvatars.insert(std::make_pair(p_name, p->getAvatarPath()));
+        }
+        
         p->deleteLater();
         emit participantLeft(p_name);
     }
@@ -408,3 +428,8 @@ QString Models::Room::getParticipantIconPath(const QString& name) const
     
     return itr->second->getAvatarPath();
 }
+
+std::map<QString, QString> Models::Room::getExParticipantAvatars() const
+{
+    return exParticipantAvatars;
+}

ui/models/room.h

@@ -75,6 +75,7 @@ public:
     QString getAvatarPath() const;
     std::map<QString, const Participant&> getParticipants() const;
     QString getParticipantIconPath(const QString& name) const;
+    std::map<QString, QString> getExParticipantAvatars() const;
     
 signals:
     void participantJoined(const Participant& participant);
@@ -99,6 +100,7 @@ private:
     QString avatarPath;
     Messages messages;
     std::map<QString, Participant*> participants;
+    std::map<QString, QString> exParticipantAvatars;
 
 };
 

ui/utils/messageline.cpp

@@ -29,6 +29,7 @@ MessageLine::MessageLine(bool p_room, QWidget* parent):
     palMessages(),
     uploadPaths(),
     palAvatars(),
+    exPalAvatars(),
     layout(new QVBoxLayout(this)),
     myName(),
     myAvatarPath(),
@@ -80,6 +81,11 @@ MessageLine::Position MessageLine::message(const Shared::Message& msg, bool forc
                 std::map<QString, QString>::iterator aItr = palAvatars.find(sender);
                 if (aItr != palAvatars.end()) {
                     aPath = aItr->second;
+                } else {
+                    aItr = exPalAvatars.find(sender);
+                    if (aItr != exPalAvatars.end()) {
+                        aPath = aItr->second;
+                    }
                 }
                 outgoing = false;
             }
@@ -248,6 +254,11 @@ void MessageLine::setPalAvatar(const QString& jid, const QString& path)
     std::map<QString, QString>::iterator itr = palAvatars.find(jid);
     if (itr == palAvatars.end()) {
         palAvatars.insert(std::make_pair(jid, path));
+        
+        std::map<QString, QString>::const_iterator eitr = exPalAvatars.find(jid);
+        if (eitr != exPalAvatars.end()) {
+            exPalAvatars.erase(eitr);
+        }
     } else {
         itr->second = path;
     }
@@ -265,16 +276,36 @@ void MessageLine::dropPalAvatar(const QString& jid)
     std::map<QString, QString>::iterator itr = palAvatars.find(jid);
     if (itr != palAvatars.end()) {
         palAvatars.erase(itr);
-        
-        std::map<QString, Index>::iterator pItr = palMessages.find(jid);
-        if (pItr != palMessages.end()) {
-            for (Index::const_iterator itr = pItr->second.begin(), end = pItr->second.end(); itr != end; ++itr) {
-                itr->second->setAvatarPath("");
-            }
+    }
+    
+    std::map<QString, QString>::const_iterator eitr = exPalAvatars.find(jid);
+    if (eitr != exPalAvatars.end()) {
+        exPalAvatars.erase(eitr);
+    }
+    
+    std::map<QString, Index>::iterator pItr = palMessages.find(jid);
+    if (pItr != palMessages.end()) {
+        for (Index::const_iterator itr = pItr->second.begin(), end = pItr->second.end(); itr != end; ++itr) {
+            itr->second->setAvatarPath("");
         }
     }
 }
 
+void MessageLine::movePalAvatarToEx(const QString& name)
+{
+    std::map<QString, QString>::iterator itr = palAvatars.find(name);
+    if (itr != palAvatars.end()) {
+        std::map<QString, QString>::iterator eitr = exPalAvatars.find(name);
+        if (eitr != exPalAvatars.end()) {
+            eitr->second = itr->second;
+        } else {
+            exPalAvatars.insert(std::make_pair(name, itr->second));
+        }
+        
+        palAvatars.erase(itr);
+    }
+}
+
 void MessageLine::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
@@ -459,3 +490,19 @@ void MessageLine::setMyAvatarPath(const QString& p_path)
         }
     }
 }
+
+void MessageLine::setExPalAvatars(const std::map<QString, QString>& data)
+{
+    exPalAvatars = data;
+    
+    for (const std::pair<QString, Index>& pair : palMessages) {
+        if (palAvatars.find(pair.first) == palAvatars.end()) {
+            std::map<QString, QString>::const_iterator eitr = exPalAvatars.find(pair.first);
+            if (eitr != exPalAvatars.end()) {
+                for (const std::pair<QString, Message*>& mp : pair.second) {
+                    mp.second->setAvatarPath(eitr->second);
+                }
+            }
+        }
+    }
+}

ui/utils/messageline.h

@@ -59,6 +59,8 @@ public:
     void setPalAvatar(const QString& jid, const QString& path);
     void dropPalAvatar(const QString& jid);
     void changeMessage(const QString& id, const QMap<QString, QVariant>& data);
+    void setExPalAvatars(const std::map<QString, QString>& data);
+    void movePalAvatarToEx(const QString& name);
     
 signals:
     void resize(int amount);
@@ -90,6 +92,7 @@ private:
     std::map<QString, Index> palMessages;
     std::map<QString, QString> uploadPaths;
     std::map<QString, QString> palAvatars;
+    std::map<QString, QString> exPalAvatars;
     QVBoxLayout* layout;
     
     QString myName;

ui/widgets/conversation.cpp

@@ -92,6 +92,16 @@ Conversation::Conversation(bool muc, Models::Account* acc, const QString pJid, c
     line->setMyAvatarPath(acc->getAvatarPath());
     line->setMyName(acc->getName());
     
+    QFont nf = m_ui->nameLabel->font();
+    nf.setBold(true);
+    nf.setPointSize(nf.pointSize() + 2);
+    m_ui->nameLabel->setFont(nf);
+    
+    QFont sf = statusLabel->font();
+    sf.setItalic(true);
+    sf.setPointSize(sf.pointSize() - 2);
+    statusLabel->setFont(sf);
+    
     applyVisualEffects();
 }
 

ui/widgets/room.cpp

@@ -38,6 +38,8 @@ Room::Room(Models::Account* acc, Models::Room* p_room, QWidget* parent):
             line->setPalAvatar(pair.first, aPath);
         }
     }
+    
+    line->setExPalAvatars(room->getExParticipantAvatars());
 }
 
 Room::~Room()
@@ -104,5 +106,5 @@ void Room::onParticipantJoined(const Models::Participant& participant)
 
 void Room::onParticipantLeft(const QString& name)
 {
-    line->dropPalAvatar(name);
+    line->movePalAvatarToEx(name);
 }