diff options
| author |  jesopo | 2019-10-07 12:46:52 +0100 |
|---|---|---|
| committer | jesopo | 2019-10-07 12:46:52 +0100 |
| commit | 50d1eb6b8c8d4333fc50695521054443bc191cc0 (patch) | |
| tree | ab6bd9479231feaa02d24924d42223c78b0876f5 /modules | |
| parent | parse out content_type in Response ctor (diff) | |
| signature | ||
combine find_setting() and find_setting_prefix() on user/channel/server/bot
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/fediverse/ap_server.py | 4 | ||||
| -rw-r--r-- | modules/relay.py | 2 | ||||
| -rw-r--r-- | modules/rest_api.py | 2 | ||||
| -rw-r--r-- | modules/vote.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/fediverse/ap_server.py b/modules/fediverse/ap_server.py index d4ae9044..df592d4c 100644 --- a/modules/fediverse/ap_server.py +++ b/modules/fediverse/ap_server.py @@ -46,8 +46,8 @@ class Server(object): def _get_activities(self): activities = [] - for setting, (content, timestamp) in self.bot.find_settings_prefix( - ACTIVITY_SETTING_PREFIX): + for setting, (content, timestamp) in self.bot.find_settings( + prefix=ACTIVITY_SETTING_PREFIX): activity_id = setting.replace(ACTIVITY_SETTING_PREFIX, "", 1) activities.append([activity_id, content, timestamp]) return activities diff --git a/modules/relay.py b/modules/relay.py index 71a45e42..9660f571 100644 --- a/modules/relay.py +++ b/modules/relay.py @@ -89,7 +89,7 @@ class Module(ModuleManager.BaseModule): def relay_group(self, event): subcommand = event["args_split"][0].lower() - group_settings = self.bot.find_settings_prefix("relay-group-") + group_settings = self.bot.find_settings(prefix="relay-group-") groups = {} for setting, value in group_settings: name = setting.replace("relay-group-", "", 1) diff --git a/modules/rest_api.py b/modules/rest_api.py index a1fb66bf..abf947e9 100644 --- a/modules/rest_api.py +++ b/modules/rest_api.py @@ -203,7 +203,7 @@ class Module(ModuleManager.BaseModule): alias_lower = alias.lower() api_keys = {} - for key, value in self.bot.find_settings_prefix("api-key-"): + for key, value in self.bot.find_settings(prefix="api-key-"): api_keys[key] = value if alias and value["comment"].lower() == alias_lower: alias = value["comment"] diff --git a/modules/vote.py b/modules/vote.py index 060c849a..27216392 100644 --- a/modules/vote.py +++ b/modules/vote.py @@ -64,7 +64,7 @@ class Module(ModuleManager.BaseModule): def _open_votes(self, channel): open = [] - for setting, vote in channel.find_settings_prefix("vote-"): + for setting, vote in channel.find_setting(prefix="vote-"): if vote["open"]: open.append(vote) return open |