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:
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!
"
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.
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: |