little sugar

psi-im · May 27, 2024 · e8efe0b · e8efe0b
1 parent 0184b6c
commit e8efe0b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
@@ -307,6 +307,9 @@ void Jid::setNode(const QString &s)
 
 void Jid::setResource(const QString &s)
 {
+    if (r == s) {
+        return;
+    }
     if (!valid)
         return;
     QString norm;

diff --git a/src/xmpp/xmpp-core/xmpp_stanza.h b/src/xmpp/xmpp-core/xmpp_stanza.h
@@ -79,6 +79,12 @@ class Stanza {
         int  code() const;
         bool fromCode(int code);
 
+        inline bool isCancel() const { return type == ErrorType::Cancel; }
+        inline bool isContinue() const { return type == ErrorType::Continue; }
+        inline bool isModify() const { return type == ErrorType::Modify; }
+        inline bool isAuth() const { return type == ErrorType::Auth; }
+        inline bool isWait() const { return type == ErrorType::Wait; }
+
         QPair<QString, QString> description() const;
         QString                 toString() const;
 

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
@@ -2067,13 +2067,13 @@ class StatusPrivate : public QSharedData {
 public:
     StatusPrivate() = default;
 
-    int        priority = 0;
-    QString    show, status, key;
-    QDateTime  timeStamp;
-    bool       isAvailable = false;
-    bool       isInvisible = false;
-    QByteArray photoHash;
-    bool       hasPhotoHash = false;
+    int       priority = 0;
+    QString   show, status, key;
+    QDateTime timeStamp;
+    bool      isAvailable = false;
+    bool      isInvisible = false;
+
+    std::optional<QByteArray> photoHash;
 
     QString xsigned;
     // gabber song extension
@@ -2230,15 +2230,9 @@ void Status::setMUCHistory(int maxchars, int maxstanzas, int seconds, const QDat
     d->mucHistorySince      = since;
 }
 
-const QByteArray &Status::photoHash() const { return d->photoHash; }
-
-void Status::setPhotoHash(const QByteArray &h)
-{
-    d->photoHash    = h;
-    d->hasPhotoHash = true;
-}
+const std::optional<QByteArray> &Status::photoHash() const { return d->photoHash; }
 
-bool Status::hasPhotoHash() const { return d->hasPhotoHash; }
+void Status::setPhotoHash(const QByteArray &h) { d->photoHash = h; }
 
 void Status::addBoBData(const BoBData &bob) { d->bobDataList.append(bob); }
 

diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
@@ -29,6 +29,8 @@
 #include <QString>
 #include <QStringList>
 
+#include <optional>
+
 namespace XMPP {
 class DiscoItem;
 class StatusPrivate;
@@ -132,9 +134,8 @@ class Status {
     void setSongTitle(const QString &);
 
     // XEP-0153: vCard-Based Avatars
-    const QByteArray &photoHash() const;
-    void              setPhotoHash(const QByteArray &);
-    bool              hasPhotoHash() const;
+    const std::optional<QByteArray> &photoHash() const;
+    void                             setPhotoHash(const QByteArray &);
 
     // XEP-0231 bits of binary
     void           addBoBData(const BoBData &);

diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -610,9 +610,9 @@ void JT_Presence::pres(const Status &s)
             tag.appendChild(m);
         }
 
-        if (s.hasPhotoHash()) {
+        if (s.photoHash().has_value()) {
             QDomElement m = doc()->createElementNS("vcard-temp:x:update", "x");
-            m.appendChild(textTag(doc(), "photo", QString::fromLatin1(s.photoHash().toHex())));
+            m.appendChild(textTag(doc(), "photo", QString::fromLatin1(s.photoHash()->toHex())));
             tag.appendChild(m);
         }
 
@@ -751,7 +751,7 @@ bool JT_PushPresence::take(const QDomElement &e)
             if (!t.isNull())
                 p.setPhotoHash(
                     QByteArray::fromHex(tagContent(t).toLatin1())); // if hash is empty this may mean photo removal
-            // else vcard.hasPhotoHash() returns false and that's mean user is not yet ready to advertise his image
+            // else vcard.photoHash() returns false and that's mean user is not yet ready to advertise his image
         } else if (i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/muc#user") {
             for (QDomElement muc_e = i.firstChildElement(); !muc_e.isNull(); muc_e = muc_e.nextSiblingElement()) {
                 if (muc_e.tagName() == "item")