Current version of Psi+ is 1.5.1774

It is based on: * psi: d9a3336b * plugins: 3c71dec * psimedia: 478567e * resources: c35f1e3
psi-plus · Apr 19, 2024 · f6c2766 · f6c2766
1 parent 5da4837
commit f6c2766
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/iris/src/xmpp/xmpp-im/jingle-ft.cpp b/iris/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -185,9 +185,10 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
         void expectReceived()
         {
-            qDebug("jingle-ft: waiting for <received>");
+            qDebug("jingle-ft: waiting for <received> for %s", qUtf8Printable(q->pad()->session()->peer().full()));
             expectFinalize([this]() {
-                qDebug("jingle-ft: Waiting for <received> timed out. But likely succeeded anyway");
+                qDebug("jingle-ft: Waiting for <received> timed out. But likely succeeded anyway. %s",
+                       qUtf8Printable(q->pad()->session()->peer().full()));
                 onReceived();
             });
         }
@@ -712,7 +713,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::incomingReceived()
     {
-        qDebug("got received");
+        qDebug("jingle-ft: got received for %s", qUtf8Printable(pad()->session()->peer().full()));
         d->onReceived();
     }
 

diff --git a/src/filesharingproxy.cpp b/src/filesharingproxy.cpp
@@ -31,6 +31,7 @@
 #include "qhttpserverresponse.hpp"
 #include "webserver.h"
 
+#include <QFileInfo>
 #include <QNetworkReply>
 #include <QPointer>
 

diff --git a/src/textutil.cpp b/src/textutil.cpp
@@ -539,16 +539,12 @@ QString TextUtil::emoticonify(const QString &in)
 
                         int n = match.capturedStart();
                         if (ePos == -1 || n < ePos || (match.capturedLength() > foundLen && n < ePos + foundLen)) {
-#if 0
-// this logic is commented out being rather harmful with unicode emoji
                             bool leftSpace  = n == 0 || (n > 0 && str[n - 1].isSpace());
                             bool rightSpace = (n + match.capturedLength() == int(str.length()))
                                 || (n + match.capturedLength() < int(str.length())
                                     && str[n + match.capturedLength()].isSpace());
                             // there must be whitespace at least on one side of the emoticon
-                            if (leftSpace || rightSpace) {
-#endif
-                            if (true) {
+                            if (leftSpace || rightSpace || EmojiRegistry::instance().isEmoji(match.captured())) {
                                 ePos    = n;
                                 closest = icon;
 

diff --git a/version b/version
@@ -1 +1 @@
-1.5.1772 (2024-04-19, 8d4c6dae)
+1.5.1774 (2024-04-19, d9a3336b)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1.5.1772 (2024-04-19, 8d4c6dae)
		1.5.1774 (2024-04-19, d9a3336b)