diff --git a/apps/static/js/home/settings.js b/apps/static/js/home/settings.js index 3f3b48c..11514d6 100644 --- a/apps/static/js/home/settings.js +++ b/apps/static/js/home/settings.js @@ -35,6 +35,7 @@ $("#serverSettingsForm").on("submit", async function(e) { showToast("success", "Server Settings Saved", "Primary Key: " + pk); } + updateDefaultSubEmbedColour(); $("#serverSettingsModal").modal("hide"); }) diff --git a/apps/static/js/home/subscriptions.js b/apps/static/js/home/subscriptions.js index a175f7c..a0d2620 100644 --- a/apps/static/js/home/subscriptions.js +++ b/apps/static/js/home/subscriptions.js @@ -181,7 +181,6 @@ $("#addSubscriptionBtn").on("click", async function() { }); async function showEditSubModal(subId) { - if (subId === -1) { $("#subFormModal .form-create, #subAdvancedModal .form-create").show(); $("#subFormModal .form-edit, #subAdvancedModal .form-edit").hide(); @@ -374,7 +373,7 @@ $(document).on("selectedServerChange", async function() { let server = getCurrentlyActiveServer(); guildId = server.guild_id; - $("#subEmbedColour .colour-reset").attr("data-defaultcolour", "#" + server.default_embed_colour); + await updateDefaultSubEmbedColour(); await loadSubscriptions(guildId); await loadChannelOptions(guildId); @@ -382,6 +381,13 @@ $(document).on("selectedServerChange", async function() { await loadMutatorOptions(); }) +async function updateDefaultSubEmbedColour(settings=null) { + if (!settings){ + settings = (await getGuildSettings(guildId))[0] + } + $("#subEmbedColour .colour-reset").attr("data-defaultcolour", "#" + settings.default_embed_colour); +} + // #endregion