From 811ecccea373b43e76357990fd5c64e294651385 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Sat, 30 Nov 2019 09:45:25 -0500
Subject: [PATCH] Added JS8NET to disallowed group. Added validation to station
 add modal

---
 Configuration.cpp | 10 +++++++++-
 varicode.cpp      |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 11b1dce..c1f5137 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1010,6 +1010,14 @@ QSet<QString> Configuration::my_groups() const {
 }
 
 void Configuration::addGroup(QString const &group){
+    if(!Varicode::isGroupAllowed(group)){
+        MessageBox::critical_message (m_->window(), QString("%1 is a group that cannot be joined").arg(group));
+        return;
+    }
+    if(!Varicode::isCompoundCallsign(group)){
+        MessageBox::critical_message (m_->window(), QString("%1 is not a valid group").arg(group));
+        return;
+    }
     QSet<QString> groups = my_groups();
     groups.insert(group.trimmed());
     m_->my_groups_ = groups.toList();
@@ -2401,7 +2409,7 @@ bool Configuration::impl::validate ()
 
   foreach(auto group, splitGroups(ui_->groups_line_edit->text().toUpper().trimmed(), false)){
       if(!Varicode::isGroupAllowed(group)){
-          MessageBox::critical_message (this, QString("%1 is not an available group").arg(group));
+          MessageBox::critical_message (this, QString("%1 is a group that cannot be joined").arg(group));
           return false;
       }
       if(!Varicode::isCompoundCallsign(group)){
diff --git a/varicode.cpp b/varicode.cpp
index 2447260..e7152f1 100644
--- a/varicode.cpp
+++ b/varicode.cpp
@@ -1278,7 +1278,8 @@ bool Varicode::isCompoundCallsign(const QString &callsign){
 
 bool Varicode::isGroupAllowed(const QString &group){
     const QSet<QString> disallowed = {
-        "@APRSIS"
+        "@APRSIS",
+        "@JS8NET",
     };
     return !disallowed.contains(group);
 }