From a33462327a25ff807a6df2d50222b1cc79475729 Mon Sep 17 00:00:00 2001 From: Craig Lamparter Date: Sat, 9 Jan 2021 14:02:16 -0800 Subject: [PATCH] swap Query command characters a bit --- aprsd/plugin.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/aprsd/plugin.py b/aprsd/plugin.py index b7f350b..cbcbbe6 100644 --- a/aprsd/plugin.py +++ b/aprsd/plugin.py @@ -370,20 +370,19 @@ class QueryPlugin(APRSDPluginBase): searchstring = "^" + self.config["ham"]["callsign"] + ".*" # only I can do admin commands if re.search(searchstring, fromcall): - r = re.search(r"^\?-\*", message) + r = re.search(r"^\?[rR].*", message) if r is not None: if len(tracker) > 0: - reply = "Resend ALL Delayed msgs" - LOG.debug(reply) + reply = messaging.NULL_MESSAGE tracker.restart_delayed() else: reply = "No Delayed Msgs" LOG.debug(reply) return reply - r = re.search(r"^\?-[fF]!", message) + r = re.search(r"^\?[dD].*", message) if r is not None: - reply = "Deleting ALL Delayed msgs." + reply = "Deleted ALL unacked msgs" LOG.debug(reply) tracker.flush() return reply