diff --git a/bot/modules/todo/Tasklist.py b/bot/modules/todo/Tasklist.py index dc8737a5..92195fde 100644 --- a/bot/modules/todo/Tasklist.py +++ b/bot/modules/todo/Tasklist.py @@ -4,7 +4,7 @@ import discord import asyncio from cmdClient.lib import SafeCancellation -from meta import client +from meta import client, conf from core import Lion from data import NULL, NOTNULL from settings import GuildSettings @@ -26,11 +26,11 @@ class Tasklist: checkmark = "✔" block_size = 15 - next_emoji = "▶" - prev_emoji = "◀" - question_emoji = "❔" - cancel_emoji = "❌" - refresh_emoji = "🔄" + next_emoji = conf.emojis.forward + prev_emoji = conf.emojis.backward + question_emoji = conf.emojis.question + cancel_emoji = conf.emojis.cancel + refresh_emoji = conf.emojis.refresh paged_reaction_order = ( prev_emoji, cancel_emoji, question_emoji, refresh_emoji, next_emoji @@ -574,7 +574,7 @@ class Tasklist: """ Reaction handler for reactions on our message. """ - str_emoji = str(reaction.emoji) + str_emoji = reaction.emoji if added and str_emoji in self.paged_reaction_order: # Attempt to remove reaction try: diff --git a/config/emojis.conf b/config/emojis.conf new file mode 100644 index 00000000..b2688044 --- /dev/null +++ b/config/emojis.conf @@ -0,0 +1,44 @@ +[EMOJIS] +lionyay = <:lionyay:933610591388581890> +lionlove = <:lionlove:933610591459872868> + +progress_left_empty = <:1dark:933826583934959677> +progress_left_full = <:3_:933820201840021554> +progress_middle_full = <:5_:933823492221173860> +progress_middle_transition = <:6_:933824739414278184> +progress_middle_empty = <:7_:933825425631752263> +progress_right_empty = <:8fixed:933827434950844468> +progress_right_full = <:9full:933828043548524634> + +inactive_achievement_1 = <:1:936107534748635166> +inactive_achievement_2 = <:2:936107534815735879> +inactive_achievement_3 = <:3:936107534782193704> +inactive_achievement_4 = <:4:936107534358577203> +inactive_achievement_5 = <:5:936107534715088926> +inactive_achievement_6 = <:6:936107534169833483> +inactive_achievement_7 = <:7:936107534723448832> +inactive_achievement_8 = <:8:936107534706688070> + +active_achievement_1 = <:a1_:936107582786011196> +active_achievement_2 = <:a2_:936107582693720104> +active_achievement_3 = <:a3_:936107582760824862> +active_achievement_4 = <:a4_:936107582614028348> +active_achievement_5 = <:a5_:936107582630809620> +active_achievement_6 = <:a6_:936107582609821726> +active_achievement_7 = <:a7_:936107582546935818> +active_achievement_8 = <:a8_:936107582626623498> + + +gem = <:gem:975880967891845210> + +skin_equipped = <:checkmarkthinbigger:975880828494151711> +skin_owned = <:greycheckmarkthinbigger:975880828485767198> +skin_unowned = <:newbigger:975880828712288276> + +backward = <:arrowbackwardbigger:975880828460597288> +forward = <:arrowforwardbigger:975880828624199710> +person = <:person01:975880828481581096> + +question = <:questionmarkbigger:975880828645167154> +cancel = <:xbigger:975880828653568012> +refresh = <:cyclebigger:975880828611600404> diff --git a/config/example-bot.conf b/config/example-bot.conf index d0fed43d..dfef772e 100644 --- a/config/example-bot.conf +++ b/config/example-bot.conf @@ -3,6 +3,7 @@ log_file = bot.log log_channel = error_channel = guild_log_channel = +gem_transaction_channel = prefix = ! token = @@ -22,33 +23,4 @@ topgg_port = invite_link = https://discord.studylions.com/invite support_link = https://discord.gg/StudyLions -[EMOJIS] -lionyay = -lionlove = - -progress_left_empty = -progress_left_full = -progress_middle_empty = -progress_middle_full = -progress_middle_transition = -progress_right_empty = -progress_right_full = - - -inactive_achievement_1 = -inactive_achievement_2 = -inactive_achievement_3 = -inactive_achievement_4 = -inactive_achievement_5 = -inactive_achievement_6 = -inactive_achievement_7 = -inactive_achievement_8 = - -active_achievement_1 = -active_achievement_2 = -active_achievement_3 = -active_achievement_4 = -active_achievement_5 = -active_achievement_6 = -active_achievement_7 = -active_achievement_8 = +ALSO_READ = config/emojis.conf