file comment fix, avatar dropping bug fix, url detection bug fix

core/rosteritem.cpp

@@ -423,10 +423,10 @@ Shared::VCard Core::RosterItem::handleResponseVCard(const QXmppVCardIq& card, co
     } else {
         if (!hasAvatar || !info.autogenerated) {
             setAutoGeneratedAvatar(resource);
+        }
         type = Shared::Avatar::autocreated;
         path = avatarPath(resource) + ".png";
     }
-    }
     
     
     vCard.setAvatarType(type);

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;
     }
 }