From 626227db938e679042f31e4567e829e41d8afb1e Mon Sep 17 00:00:00 2001
From: blue <blue@macaw.me>
Date: Thu, 16 Jan 2020 11:52:54 +0300
Subject: [PATCH] file comment fix, avatar dropping bug fix, url detection bug
 fix

---
 core/rosteritem.cpp  | 4 ++--
 ui/utils/message.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/rosteritem.cpp b/core/rosteritem.cpp
index a8d48a4..b9801d9 100644
--- a/core/rosteritem.cpp
+++ b/core/rosteritem.cpp
@@ -423,9 +423,9 @@ Shared::VCard Core::RosterItem::handleResponseVCard(const QXmppVCardIq& card, co
     } else {
         if (!hasAvatar || !info.autogenerated) {
             setAutoGeneratedAvatar(resource);
-            type = Shared::Avatar::autocreated;
-            path = avatarPath(resource) + ".png";
         }
+        type = Shared::Avatar::autocreated;
+        path = avatarPath(resource) + ".png";
     }
     
     
diff --git a/ui/utils/message.cpp b/ui/utils/message.cpp
index 479a3a0..1725a9b 100644
--- a/ui/utils/message.cpp
+++ b/ui/utils/message.cpp
@@ -27,9 +27,9 @@ const QRegularExpression urlReg("(?<!<a\\shref=['\"])(?<!<img\\ssrc=['\"])("
                                 "(?:https?|ftp):\\/\\/"
                                     "\\w+"
                                     "(?:"
-                                        "[\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+]?"
+                                        "[\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+\\-]?"
                                         "(?:"
-                                            "\\([\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+]+\\)"
+                                            "\\([\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+\\-]+\\)"
                                         ")?"
                                     ")*"
                                 ")");
@@ -207,6 +207,7 @@ void Message::hideComment()
         bodyLayout->removeWidget(fileComment);
         fileComment->hide();
         fileComment->setWordWrap(false);
+        commentAdded = false;
     }
 }