diff options
| -rw-r--r-- | modules/github.py | 18 | ||||
| -rw-r--r-- | src/Database.py | 13 |
2 files changed, 28 insertions, 3 deletions
diff --git a/modules/github.py b/modules/github.py index 45c73619..7adee110 100644 --- a/modules/github.py +++ b/modules/github.py @@ -1,6 +1,9 @@ import json from src import ModuleManager, utils +@utils.export("channelset", {"setting": "github-hook", + "help": ("Disable/Enable showing BitBot's github commits in the " + "current channel"), "validate": utils.bool_or_none}) class Module(ModuleManager.BaseModule): @utils.hook("api.post.github") def github(self, event): @@ -22,6 +25,15 @@ class Module(ModuleManager.BaseModule): added_count = len(commit["added"]) removed_count = len(commit["removed"]) - print("(%s) [%d/%d/%d mod/add/del] commit by %s: %s" % ( - full_name, modified_count, added_count, removed_count, - author, message)) + line = ("(%s) [files: %d/%d/%d mod/add/del] commit by %s: " + "'%s'") % (full_name, modified_count, added_count, + removed_count, author, message) + hooks = self.bot.database.channel_settings.find_by_setting( + "github-hook") + hooks = [hook for hook in hooks if hook[2]] + for server_id, channel_name, _ in hooks: + server = self.bot.get_server(server_id) + channel = server.get_channel(channel_name) + + self.events.on("send.stdout").call(target=channel, + module_name="Github", server=server, message=line) diff --git a/src/Database.py b/src/Database.py index 27e4f113..c1d07869 100644 --- a/src/Database.py +++ b/src/Database.py @@ -140,6 +140,19 @@ class ChannelSettings(Table): """DELETE FROM channel_settings WHERE channel_id=? AND setting=?""", [channel_id, setting.lower()]) + def find_by_setting(self, setting, default=[]): + values = self.database.execute_fetchall( + """SELECT channels.server_id, channels.name, + channel_settings.value FROM channel_settings + INNER JOIN channels ON + channel_settings.channel_id=channels.channel_id + WHERE channel_settings.setting=?""", [setting]) + if values: + for i, value in enumerate(values): + values[i] = value[0], value[1], json.loads(value[2]) + return values + return default + class UserSettings(Table): def set(self, user_id, setting, value): self.database.execute( |