Skip to content

Commit d9fb58e

Browse files
committed
Use snake_case for all database keys
1 parent c8fa4e5 commit d9fb58e

16 files changed

Lines changed: 47 additions & 37 deletions

File tree

cogs/settings.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ async def dj(self, ctx: commands.Context, role: discord.Role = None):
9999

100100
@settings.command(name="queue", aliases=get_aliases("queue"))
101101
@app_commands.choices(mode=[
102-
app_commands.Choice(name="FairQueue", value="FairQueue"),
103-
app_commands.Choice(name="Queue", value="Queue")
102+
app_commands.Choice(name=queue_type.capitalize(), value=queue_type)
103+
for queue_type in voicelink.queue.QUEUE_TYPES.keys()
104104
])
105105
@commands.has_permissions(manage_guild=True)
106106
@commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
107107
async def queue(self, ctx: commands.Context, mode: str):
108108
"Change to another type of queue mode."
109-
mode = "FairQueue" if mode.lower() == "fairqueue" else "Queue"
110-
await update_settings(ctx.guild.id, {"$set": {"queueType": mode}})
111-
await send(ctx, "setqueue", mode)
109+
mode = mode if mode.lower() in voicelink.queue.QUEUE_TYPES else next(iter(voicelink.queue.QUEUE_TYPES))
110+
await update_settings(ctx.guild.id, {"$set": {"queue_type": mode}})
111+
await send(ctx, "setQueue", mode.capitalize())
112112

113113
@settings.command(name="247", aliases=get_aliases("247"))
114114
@commands.has_permissions(manage_guild=True)
@@ -126,8 +126,8 @@ async def playforever(self, ctx: commands.Context):
126126
async def bypassvote(self, ctx: commands.Context):
127127
"Toggles voting system."
128128
settings = await get_settings(ctx.guild.id)
129-
toggle = settings.get('votedisable', True)
130-
await update_settings(ctx.guild.id, {"$set": {'votedisable': not toggle}})
129+
toggle = settings.get('disabled_vote', True)
130+
await update_settings(ctx.guild.id, {"$set": {'disabled_vote': not toggle}})
131131
await send(ctx, 'bypassVote', await get_lang(ctx.guild.id, "enabled" if not toggle else "disabled"))
132132

133133
@settings.command(name="view", aliases=get_aliases("view"))
@@ -149,16 +149,16 @@ async def view(self, ctx: commands.Context):
149149
settings.get('lang', 'EN'),
150150
settings.get('controller', True),
151151
dj_role.name if dj_role else 'None',
152-
settings.get('votedisable', False),
152+
settings.get('disabled_vote', False),
153153
settings.get('24/7', False),
154154
settings.get('volume', 100),
155-
ctime(settings.get('playTime', 0) * 60 * 1000),
155+
ctime(settings.get('played_time', 0) * 60 * 1000),
156156
inline=True)
157157
)
158158
embed.add_field(name=texts[3], value=texts[4].format(
159-
settings.get("queueType", "Queue"),
159+
settings.get("queue_type", "Queue"),
160160
func.settings.max_queue,
161-
settings.get("duplicateTrack", True)
161+
settings.get("duplicate_track", True)
162162
))
163163

164164
if stage_template := settings.get("stage_announce_template"):
@@ -212,12 +212,12 @@ async def togglecontroller(self, ctx: commands.Context):
212212
async def duplicatetrack(self, ctx: commands.Context):
213213
"Toggle Vocard to prevent duplicate songs from queuing."
214214
settings = await get_settings(ctx.guild.id)
215-
toggle = not settings.get('duplicateTrack', False)
215+
toggle = not settings.get('duplicate_track', False)
216216
player: voicelink.Player = ctx.guild.voice_client
217217
if player:
218218
player.queue._allow_duplicate = toggle
219219

220-
await update_settings(ctx.guild.id, {"$set": {'duplicateTrack': toggle}})
220+
await update_settings(ctx.guild.id, {"$set": {'duplicate_track': toggle}})
221221
return await send(ctx, "toggleDuplicateTrack", await get_lang(ctx.guild.id, "disabled" if toggle else "enabled"))
222222

223223
@settings.command(name="customcontroller", aliases=get_aliases("customcontroller"))
@@ -248,9 +248,9 @@ async def controllermsg(self, ctx: commands.Context):
248248
async def silentmsg(self, ctx: commands.Context):
249249
"Toggle silent messaging to send discreet messages without alerting recipients."
250250
settings = await get_settings(ctx.guild.id)
251-
toggle = not settings.get('silentMsg', False)
251+
toggle = not settings.get('silent_msg', False)
252252

253-
await update_settings(ctx.guild.id, {"$set": {'silentMsg': toggle}})
253+
await update_settings(ctx.guild.id, {"$set": {'silent_msg': toggle}})
254254
await send(ctx, 'toggleSilentMsg', await get_lang(ctx.guild.id, "enabled" if toggle else "disabled"))
255255

256256
@settings.command(name="stageannounce", aliases=get_aliases("stageannounce"))

function.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ async def send(
223223
"embed": embed,
224224
"ephemeral": ephemeral,
225225
"allowed_mentions": ALLOWED_MENTIONS,
226-
"silent": settings.get("silentMsg", False),
226+
"silent": settings.get("silent_msg", False),
227227
}
228228

229229
if "delete_after" in send_func.__code__.co_varnames:

ipc/methods.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
SCOPES = {
1313
"prefix": str,
1414
"lang": str,
15-
"queueType": str,
15+
"queue_type": str,
1616
"dj": int,
1717
"controller": bool,
18+
"controller_msg": bool,
1819
"24/7": bool,
19-
"votedisable": bool,
20-
"duplicateTrack": bool,
20+
"disabled_vote": bool,
21+
"duplicate_track": bool,
22+
"silent_msg": bool,
2123
"default_controller": dict,
2224
"stage_announce_template": str
2325
}

langs/CH.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "已成功切換到 `{0}` 語言包。",
1616
"setPrefix": "完成!我的前綴在您的伺服器中現在是 `{0}`。嘗試運行 `{1}ping` 來測試它。",
1717
"setDJ": "已將 DJ 設置為 {0}。",
18-
"setqueue": "已將隊列模式設置為 `{0}`。",
18+
"setQueue": "已將隊列模式設置為 `{0}`。",
1919
"247": "現在您有 `{0}` 24/7 模式。",
2020
"bypassVote": "現在您有 `{0}` 投票系統。",
2121
"setVolume": "已將音量設置為 `{0}`%",

langs/DE.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "Erfolgreich auf das Sprachpaket `{0}` geändert.",
1616
"setPrefix": "Erledigt! Mein Präfix ist jetzt `{0}` auf deinem Server. Versuche, `{1}ping` auszuführen, um es zu testen.",
1717
"setDJ": "Stelle den DJ auf {0}.",
18-
"setqueue": "Stelle den Warteschlangenmodus auf `{0}` ein.",
18+
"setQueue": "Stelle den Warteschlangenmodus auf `{0}` ein.",
1919
"247": "Der 24/7-Modus wurde erfolgreich `{0}`.",
2020
"bypassVote": "Das Abstimmungssystem wurde `{0}`",
2121
"setVolume": "Stelle die Lautstärke auf `{0}`%.",

langs/EN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "Successfully changed to `{0}` language pack.",
1616
"setPrefix": "Done! My prefix in your server is now `{0}`. Try running `{1}ping` to test it out.",
1717
"setDJ": "Set the dj to {0}.",
18-
"setqueue": "Set queue mode to `{0}`.",
18+
"setQueue": "Set queue mode to `{0}`.",
1919
"247": "24/7 mode is now `{0}`.",
2020
"bypassVote": "You have `{0}` voting system.",
2121
"setVolume": "Set the volume to `{0}`%",

langs/ES.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "Cambiado con éxito al paquete de idioma `{0}`.",
1616
"setPrefix": "¡Listo! Mi prefijo en tu servidor ahora es `{0}`. Intenta ejecutar `{1}ping` para probarlo.",
1717
"setDJ": "Establecer el DJ a {0}.",
18-
"setqueue": "Establecer el modo de cola en `{0}`.",
18+
"setQueue": "Establecer el modo de cola en `{0}`.",
1919
"247": "Ahora tienes `{0}` modo 24/7.",
2020
"bypassVote": "Ahora tienes `{0}` sistema de votación.",
2121
"setVolume": "Ajustar el volumen a `{0}`%",

langs/FR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "Changement réussi vers le pack de langue `{0}`.",
1616
"setPrefix": "C'est fait ! Mon préfixe dans votre serveur est désormais `{0}`. Essayez de lancer `{1}ping` pour tester.",
1717
"setDJ": "Le DJ a été défini sur {0}.",
18-
"setqueue": "Le mode file d'attente est défini sur `{0}`.",
18+
"setQueue": "Le mode file d'attente est défini sur `{0}`.",
1919
"247": "Le mode 24/7 est maintenant `{0}`.",
2020
"bypassVote": "Vous avez le système de vote `{0}`.",
2121
"setVolume": "Le volume est réglé à `{0}`%",

langs/JA.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "「{0}」言語パックに正常に変更しました。",
1616
"setPrefix": "完了!あなたのサーバーのプレフィックスは今や「{0}」です。 `{1}ping`を実行してテストしてみてください。",
1717
"setDJ": "{0}にDJを設定しました。",
18-
"setqueue": "キューモードを「{0}」に設定しました。",
18+
"setQueue": "キューモードを「{0}」に設定しました。",
1919
"247": "今、24/7モードは「{0}」です。",
2020
"bypassVote": "今、投票システムは「{0}」になりました。",
2121
"setVolume": "音量を「{0}%」に設定しました。",

langs/KO.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"changedLanguage": "성공적으로 `{0}` 언어 팩으로 변경되었습니다.",
1616
"setPrefix": "완료되었습니다! 이 서버에서 내 접두사는 이제 `{0}`입니다. `{1}ping`을 실행하여 테스트해보세요.",
1717
"setDJ": "DJ를 {0}(으)로 설정했습니다.",
18-
"setqueue": "큐 모드를 `{0}`(으)로 설정했습니다.",
18+
"setQueue": "큐 모드를 `{0}`(으)로 설정했습니다.",
1919
"247": "이제 24/7 모드에서 `{0}`으로 변경되었습니다.",
2020
"bypassVote": "이제 `{0}` 투표 시스템을 사용할 수 있습니다.",
2121
"setVolume": "볼륨을 `{0}`%로 설정했습니다.",

0 commit comments

Comments
 (0)