From 41468d5467183780301beac74496c273cb8887d6 Mon Sep 17 00:00:00 2001 From: Hemna Date: Wed, 6 Oct 2021 15:55:53 -0400 Subject: [PATCH] Fixed to work with utils_refactor --- aprsd_slack_plugin/base_plugin.py | 3 +-- aprsd_slack_plugin/location_plugin.py | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/aprsd_slack_plugin/base_plugin.py b/aprsd_slack_plugin/base_plugin.py index 84328ea..ca1b74c 100644 --- a/aprsd_slack_plugin/base_plugin.py +++ b/aprsd_slack_plugin/base_plugin.py @@ -1,6 +1,5 @@ import logging -from aprsd import utils as aprsd_utils from slack_sdk import WebClient import aprsd_slack_plugin @@ -46,7 +45,7 @@ class SlackPluginBase: # signing_secret = self.config["slack"]["signing_secret"] try: - aprsd_utils.check_config_option(self.config, ["services", "slack", "bot_token"]) + self.config.exists(["services", "slack", "bot_token"]) except Exception as ex: LOG.error("Failed to find config slack:bot_token {}".format(ex)) return "No slack bot_token found" diff --git a/aprsd_slack_plugin/location_plugin.py b/aprsd_slack_plugin/location_plugin.py index 13a0ca5..b708906 100644 --- a/aprsd_slack_plugin/location_plugin.py +++ b/aprsd_slack_plugin/location_plugin.py @@ -2,8 +2,7 @@ import logging import re import time -from aprsd import messaging, plugin_utils -from aprsd import utils as aprsd_utils +from aprsd import messaging, plugin, plugin_utils import aprsd_slack_plugin from aprsd_slack_plugin import base_plugin @@ -11,7 +10,7 @@ from aprsd_slack_plugin import base_plugin LOG = logging.getLogger("APRSD") -class SlackLocationPlugin(base_plugin.SlackPluginBase): +class SlackLocationPlugin(base_plugin.SlackPluginBase, plugin.APRSDRegexCommandPluginBase): """SlackCommandPlugin. This APRSD plugin looks for the location command comming in @@ -48,7 +47,7 @@ class SlackLocationPlugin(base_plugin.SlackPluginBase): command_regex = "^[lL]" command_name = "location-slack" - def command(self, packet): + def process(self, packet): LOG.info("SlackCommandPlugin") fromcall = packet["from"] @@ -60,7 +59,7 @@ class SlackLocationPlugin(base_plugin.SlackPluginBase): # get last location of a callsign, get descriptive name from weather service try: - aprsd_utils.check_config_option(self.config, ["services", "aprs.fi", "apiKey"]) + self.config.exists(["services", "aprs.fi", "apiKey"]) except Exception as ex: LOG.error("Failed to find config aprs.fi:apikey {}".format(ex)) return "No aprs.fi apikey found"