publish both vcard4 and vcard-temp when avatar conversion is unavaial…

…ble on the server
psi-im · Jun 21, 2024 · ee60f24 · ee60f24
1 parent 1f37adf
commit ee60f24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/iris b/iris
diff --git a/src/infodlg.cpp b/src/infodlg.cpp
@@ -731,6 +731,15 @@ void InfoWidget::publish()
         }
     });
 
+    bool hasAvaConv = account()->client()->serverInfoManager()->accountFeatures().hasAvatarConversion();
+    if (!hasAvaConv) {
+        v.detach();
+        if (d->photo.size()) {
+            v.setPhoto(VCard4::UriValue { d->photo, d->photoMime });
+        }
+        VCardFactory::instance()->setVCard(d->pa, v, target, flags | VCardFactory::ForceVCardTemp);
+    }
+
     if (d->type == Self) {
         // publish or retract avatar depending on d->photo contents
         d->pa->avatarFactory()->setSelfAvatar(QImage::fromData(d->photo));

diff --git a/src/vcardfactory.cpp b/src/vcardfactory.cpp
@@ -231,7 +231,8 @@ VCard4::VCard VCardFactory::vcard(const Jid &j, Flags flags)
  */
 Task *VCardFactory::setVCard(PsiAccount *account, const VCard4::VCard &v, const Jid &targetJid, Flags flags)
 {
-    if ((flags & MucRoom)) { // || !account->client()->serverInfoManager()->hasPersistentStorage()) {
+    if ((flags & MucRoom) || (flags & ForceVCardTemp)) {
+        // || !account->client()->serverInfoManager()->hasPersistentStorage()) {
         JT_VCard *jtVCard_ = new JT_VCard(account->client()->rootTask());
         connect(jtVCard_, &JT_VCard::finished, this, [this, v, jtVCard_, flags]() {
             if (jtVCard_->success()) {