chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #75: allow messages to group callsigns

Browse Source
This commit is contained in:
Jordan Sherer 2019-01-09 11:25:00 -05:00
parent 1c6b18cb51
commit cf85b18fa5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -9645,7 +9645,7 @@ void MainWindow::processCommandActivity() {
} }
// PROCESS RELAY // PROCESS RELAY
else if (d.cmd == ">" && !isAllCall && !isGroupCall) { else if (d.cmd == ">" && !isAllCall) {
// 1. see if there are any more hops to process // 1. see if there are any more hops to process
// 2. if so, forward // 2. if so, forward
@ -9656,8 +9656,8 @@ void MainWindow::processCommandActivity() {
auto text = d.text; auto text = d.text;
auto match = re.match(text); auto match = re.match(text);
// if the text starts with a callsign, and relay is not disabled, then relay. // if the text starts with a callsign, and relay is not disabled, and this is not a group callsign, then relay.
if(match.hasMatch() && !m_config.relay_off()){ if(match.hasMatch() && !m_config.relay_off() && !isGroupCall){
// replace freetext with relayed free text // replace freetext with relayed free text
if(match.captured("type") != ">"){ if(match.captured("type") != ">"){
text = text.replace(match.capturedStart("type"), match.capturedLength("type"), ">"); text = text.replace(match.capturedStart("type"), match.capturedLength("type"), ">");
@ -9695,7 +9695,7 @@ void MainWindow::processCommandActivity() {
addCommandToInbox(d); addCommandToInbox(d);
QTimer::singleShot(500, this, [this, d](){ QTimer::singleShot(500, this, [this, d](){
MessageBox::information_message(this, QString("A new message was received at %1 UTC").arg(d.utcTimestamp.time().toString())); MessageBox::information_message(this, QString("A new message was received at %1 UTC from %2").arg(d.utcTimestamp.time().toString()).arg(d.from));
}); });
} }
} }