From 7135fc1fb19a5e14cc79db015b32771b177681f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=5B=EC=A0=9C=EC=9D=B4=EC=8A=A8=20=EC=A0=9C?= =?UTF-8?q?=EB=A1=AC=5D?= <20238115+DuckBoss@users.noreply.github.com> Date: Tue, 28 Jul 2020 23:36:40 -0400 Subject: [PATCH 1/4] Updated security policy to include v4.0.0 --- SECURITY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SECURITY.md b/SECURITY.md index 598e8d4e..d0ae5ab6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,6 +4,7 @@ | Version | Supported | | ------- | ------------------ | +| 4.0 | :white_check_mark: | | 3.0 | :white_check_mark: | | < 3.0 | :x: | From bfad87aa7605959d06a7c42480b2c14d15b79108 Mon Sep 17 00:00:00 2001 From: Jason Jerome Date: Wed, 29 Jul 2020 14:32:49 -0400 Subject: [PATCH 2/4] Update help.html --- JJMumbleBot/plugins/extensions/media/help.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JJMumbleBot/plugins/extensions/media/help.html b/JJMumbleBot/plugins/extensions/media/help.html index 50d1aad0..55ead3cc 100644 --- a/JJMumbleBot/plugins/extensions/media/help.html +++ b/JJMumbleBot/plugins/extensions/media/help.html @@ -2,5 +2,5 @@ !ytsearch 'search_term': Searches youtube for a song/video.
!ytplay 'item_number' 'item_count'(optional): Plays the selected song from youtube.
!ytplaylist 'youtube_playlist': Adds the given youtube playlist to the queue.
-!link 'youtube_link': Adds the given youtube link to the queue.
-!linkfront 'youtube_link': Priority inserts the given link to the front of the queue. +!link 'youtube/soundcloud_link': Adds the given youtube link to the queue.
+!linkfront 'youtube/soundcloud_link': Priority inserts the given link to the front of the queue. From 1ee18707c71f65b4e78a07e850c3b038f13efd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=5B=EC=A0=9C=EC=9D=B4=EC=8A=A8=20=EC=A0=9C?= =?UTF-8?q?=EB=A1=AC=5D?= <20238115+DuckBoss@users.noreply.github.com> Date: Wed, 29 Jul 2020 15:54:35 -0400 Subject: [PATCH 3/4] Fixed some cases where the bgcolor in a PGUI wasn't set right --- JJMumbleBot/lib/pgui.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/JJMumbleBot/lib/pgui.py b/JJMumbleBot/lib/pgui.py index be99cdd5..46fbe9c9 100644 --- a/JJMumbleBot/lib/pgui.py +++ b/JJMumbleBot/lib/pgui.py @@ -34,12 +34,13 @@ def quick_gui(self, content, text_type="data", text_color=None, text_font=None, self.display_box(channel=channel, user=user, ignore_whisper=ignore_whisper) self.clear_display() - def quick_gui_img(self, directory, img_data, format_img=False, caption=None, caption_align='center', caption_font=None, bgcolor="black", channel=None, user=None, img_size=65536, cellspacing="5"): + def quick_gui_img(self, directory, img_data, format_img=False, caption=None, caption_align='center', caption_font=None, bgcolor=None, channel=None, user=None, img_size=65536, cellspacing="5"): if self.box_open: return False if channel is None: channel = runtime_utils.get_my_channel() - + if bgcolor is None: + bgcolor = GS.cfg[C_PGUI_SETTINGS][P_CANVAS_IMG_BG_COL] self.open_box(align='left', bgcolor=bgcolor, cellspacing=cellspacing) if format_img: @@ -94,13 +95,15 @@ def append_content(self, content): self.content += content return True - def make_content(self, text, text_type="data", text_color=None, text_font=None, text_align="center", bgcolor="black", image_bgcolor=None, image=False): + def make_content(self, text, text_type="data", text_color=None, text_font=None, text_align="center", bgcolor=None, image_bgcolor=None, image=False): if not self.box_open: return None if image: if image_bgcolor is None: image_bgcolor = GS.cfg[C_PGUI_SETTINGS][P_CANVAS_IMG_BG_COL] return PGUIHelper.img_content(text, text_align, image_bgcolor) + if bgcolor is None: + bgcolor = GS.cfg[C_PGUI_SETTINGS][P_CANVAS_BG_COL] if text_color is None: text_color = GS.cfg[C_PGUI_SETTINGS][P_CANVAS_TXT_COL] if text_font is None: From 262df63d86d5077bfb9981e7e6c2c1c99715ab94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=5B=EC=A0=9C=EC=9D=B4=EC=8A=A8=20=EC=A0=9C?= =?UTF-8?q?=EB=A1=AC=5D?= <20238115+DuckBoss@users.noreply.github.com> Date: Wed, 29 Jul 2020 16:20:19 -0400 Subject: [PATCH 4/4] Fixed bug in !setalias command --- JJMumbleBot/plugins/core/core_commands/core_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JJMumbleBot/plugins/core/core_commands/core_commands.py b/JJMumbleBot/plugins/core/core_commands/core_commands.py index 68f7b590..01d38dd4 100644 --- a/JJMumbleBot/plugins/core/core_commands/core_commands.py +++ b/JJMumbleBot/plugins/core/core_commands/core_commands.py @@ -233,7 +233,7 @@ def cmd_help(self, data): log(INFO, f"Displayed help screen for {plugin_name} in the channel.", origin=L_COMMAND) def cmd_setalias(self, data): - all_data = data.message.strip().split(' ', 3) + all_data = data.message.strip().split(' ', 2) if len(all_data) < 3: GS.gui_service.quick_gui( f"Incorrect Formatting!
"