From f1043465cdc0e3d91278c01ec4a6d3668722ad8e Mon Sep 17 00:00:00 2001
From: Igor Sirotin <sirotin@status.im>
Date: Wed, 19 Jun 2024 12:44:55 +0100
Subject: [PATCH] fix: remove filepath from text

---
 src/nim_status_client.nim                | 13 ++++++++++---
 vendor/DOtherSide/lib/src/DOtherSide.cpp |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index d5245ec83b..bd5f89fec2 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -1,4 +1,4 @@
-import NimQml, chronicles, os, stew/shims/strformat, strutils, times, md5, json
+import NimQml, chronicles, os, stew/shims/strformat, strutils, times, md5, json, re
 
 import status_go
 import keycard_go
@@ -86,12 +86,19 @@ proc ensureDirectories*(dataDir, tmpDir, logDir: string) =
   createDir(logDir)
 
 proc logHandlerCallback(messageType: cint, message: cstring, category: cstring, file: cstring, function: cstring, line: cint) {.cdecl, exportc.} =
+  var text = $message
+  let fileString = $file
+
+  if fileString != "" and text.startsWith(fileString):
+    text = text[fileString.len..^1]              # Remove filepath
+    text = text.replace(re"[:0-9]+:\s*")  # Remove line, column, colons and space separator
+
   logScope:
     chroniclesLineNumbers = false
     topics = "qt"
     category = $category
-    file = $file & ":" & $line
-    text = $message
+    file = fileString & ":" & $line
+    text
 
   case int(messageType):
     of 0: # QtDebugMsg
diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp
index b20b13c29e..286751d17d 100644
--- a/vendor/DOtherSide/lib/src/DOtherSide.cpp
+++ b/vendor/DOtherSide/lib/src/DOtherSide.cpp
@@ -197,13 +197,13 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
         return;
     }
 
-    QByteArray localMsg = msg.toLocal8Bit();
+    auto localMessage = msg.toLocal8Bit();
+    const char* message = localMessage.constData();
     const char* category = context.category ? context.category : "";
     const char* file = context.file ? context.file : "";
     const char* function = context.function ? context.function : "";
-
     int messageType = int(type);
-    const char* message = localMsg.constData();
+
     messageHandlerCallback(messageType, message, category, file, function, context.line);
 }