combine find_setting() and find_setting_prefix() on user/channel/server/bot

1 files changed, 10 insertions, 8 deletions

diff --git a/src/IRCServer.py b/src/IRCServer.py
index 6faedeac..3c7a634d 100644
--- a/src/IRCServer.py
+++ b/src/IRCServer.py
@@ -116,14 +116,16 @@ class Server(IRCObject.Object):
             ) -> typing.Any:
         return self.bot.database.server_settings.get(self.id,
             setting, default)
-    def find_settings(self, pattern: str, default: typing.Any=[]
-            ) -> typing.List[typing.Any]:
-        return self.bot.database.server_settings.find(self.id,
-            pattern, default)
-    def find_settings_prefix(self, prefix: str, default: typing.Any=[]
-            ) -> typing.List[typing.Any]:
-        return self.bot.database.server_settings.find_prefix(
-            self.id, prefix, default)
+    def find_settings(self, pattern: str=None, prefix: str=None,
+            default: typing.Any=[]) -> typing.List[typing.Any]:
+        if not pattern == None:
+            return self.bot.database.server_settings.find(self.id, pattern,
+                default)
+        elif not prefix == None:
+            return self.bot.database.server_settings.find_prefix(self.id,
+                prefix, default)
+        else:
+            raise ValueError("Please provide 'pattern' or 'prefix'")
     def del_setting(self, setting: str):
         self.bot.database.server_settings.delete(self.id, setting)