blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

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

Browse Source
This commit is contained in:
Blue 2020-01-16 11:52:54 +03:00
parent 13a1970047
commit 626227db93
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rosteritem.cpp
View File

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

5
ui/utils/message.cpp
View File

@ -27,9 +27,9 @@ const QRegularExpression urlReg("(?<!<a\\shref=['\"])(?<!<img\\ssrc=['\"])("
"(?:https?|ftp):\\/\\/" "(?:https?|ftp):\\/\\/"
"\\w+" "\\w+"
"(?:" "(?:"
"[\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+]?" "[\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+\\-]?"
"(?:" "(?:"
"\\([\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+]+\\)" "\\([\\w\\.\\/\\:\\;\\?\\&\\=\\@\\%\\#\\+\\-]+\\)"
")?" ")?"
")*" ")*"
")"); ")");
@ -207,6 +207,7 @@ void Message::hideComment()
bodyLayout->removeWidget(fileComment); bodyLayout->removeWidget(fileComment);
fileComment->hide(); fileComment->hide();
fileComment->setWordWrap(false); fileComment->setWordWrap(false);
commentAdded = false;
} }
} }