From 2fd549357258bf5fe07e4e5a1ff5580b44294820 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Fri, 18 Oct 2019 12:45:35 -0400 Subject: [PATCH] Fixed VIA for Joe --- mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 531fb89..2cfe5d1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -10674,7 +10674,7 @@ void MainWindow::processCommandActivity() { if(match.captured("type") != ">"){ text = text.replace(match.capturedStart("type"), match.capturedLength("type"), ">"); } - reply = QString("%1 VIA %2").arg(text).arg(d.from); + reply = QString("%1 *DE* %2").arg(text).arg(d.from); // otherwise, as long as we're not an ACK...alert the user and either send an ACK or Message } else if(!d.text.startsWith("ACK")) { @@ -11219,7 +11219,7 @@ int MainWindow::getNextMessageIdForCallsign(QString callsign){ QStringList MainWindow::parseRelayPathCallsigns(QString from, QString text){ QStringList calls; - QString callDePattern = {R"(\sVIA\s(?\b(?[A-Z0-9]{1,4}\/)?(?([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?)(?\/[A-Z0-9]{1,4})?)\b)"}; + QString callDePattern = {R"(\s[*]DE[*]\s(?\b(?[A-Z0-9]{1,4}\/)?(?([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?)(?\/[A-Z0-9]{1,4})?)\b)"}; QRegularExpression re(callDePattern); auto iter = re.globalMatch(text); while(iter.hasNext()){