feat: expose per-server default plays setting
This commit is contained in:
7 files changed
+91
-1
No files matched your search
@@ -59,6 +59,7 @@ export const api = {
|
|||||||
remove: (id: string) => post('/api/remove', { id }),
|
remove: (id: string) => post('/api/remove', { id }),
|
||||||
reorder: (queueIds: string[]) => post('/api/reorder', { queue_ids: queueIds }),
|
reorder: (queueIds: string[]) => post('/api/reorder', { queue_ids: queueIds }),
|
||||||
setTrackPlays: (id: string, plays: number) => post('/api/queue/plays', { id, plays }),
|
setTrackPlays: (id: string, plays: number) => post('/api/queue/plays', { id, plays }),
|
||||||
|
setDefaultPlays: (plays: number) => post('/api/default_plays', { default_plays: plays }),
|
||||||
|
|
||||||
uploads: () => request<{ files: UploadedFile[] }>('/api/uploads'),
|
uploads: () => request<{ files: UploadedFile[] }>('/api/uploads'),
|
||||||
deleteUpload: (filename: string) =>
|
deleteUpload: (filename: string) =>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ const props = defineProps<{ status: BotStatus | null }>()
|
|||||||
const { notify, run } = useToasts()
|
const { notify, run } = useToasts()
|
||||||
const selected = ref('')
|
const selected = ref('')
|
||||||
const selectedNotification = ref('')
|
const selectedNotification = ref('')
|
||||||
|
const defaultPlays = ref(5)
|
||||||
|
|
||||||
const channels = computed(() => props.status?.voice_channels ?? [])
|
const channels = computed(() => props.status?.voice_channels ?? [])
|
||||||
const active = computed(() => props.status?.active_voice_channel ?? null)
|
const active = computed(() => props.status?.active_voice_channel ?? null)
|
||||||
@@ -29,6 +30,14 @@ watch(
|
|||||||
{ immediate: true },
|
{ immediate: true },
|
||||||
)
|
)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.status?.default_plays,
|
||||||
|
(value) => {
|
||||||
|
if (value !== undefined) defaultPlays.value = value
|
||||||
|
},
|
||||||
|
{ immediate: true },
|
||||||
|
)
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
[activeNotificationId, notificationChannels],
|
[activeNotificationId, notificationChannels],
|
||||||
([activeChannel, available]) => {
|
([activeChannel, available]) => {
|
||||||
@@ -61,6 +70,14 @@ async function setNotificationChannel() {
|
|||||||
'Nie udało się ustawić kanału logów',
|
'Nie udało się ustawić kanału logów',
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function saveDefaultPlays() {
|
||||||
|
await run(
|
||||||
|
() => api.setDefaultPlays(defaultPlays.value),
|
||||||
|
'Zapisano domyślną liczbę odtworzeń',
|
||||||
|
'Nie udało się zapisać domyślnej liczby odtworzeń',
|
||||||
|
)
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -121,6 +138,24 @@ async function setNotificationChannel() {
|
|||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="default-plays-row">
|
||||||
|
<label for="default-plays">Domyślny licznik</label>
|
||||||
|
<input
|
||||||
|
id="default-plays"
|
||||||
|
v-model.number="defaultPlays"
|
||||||
|
class="premium-input"
|
||||||
|
type="number"
|
||||||
|
min="1"
|
||||||
|
max="999"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn btn-secondary"
|
||||||
|
type="button"
|
||||||
|
@click="saveDefaultPlays"
|
||||||
|
>
|
||||||
|
Zapisz
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -143,4 +178,20 @@ async function setNotificationChannel() {
|
|||||||
.notification-channel-row .premium-select {
|
.notification-channel-row .premium-select {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.default-plays-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
margin-top: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.default-plays-row label {
|
||||||
|
min-width: 130px;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.default-plays-row .premium-input {
|
||||||
|
width: 90px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -31,6 +31,7 @@ EXPECTED_ENDPOINTS = {
|
|||||||
("post", "/api/connect"),
|
("post", "/api/connect"),
|
||||||
("post", "/api/disconnect"),
|
("post", "/api/disconnect"),
|
||||||
("post", "/api/notification_channel"),
|
("post", "/api/notification_channel"),
|
||||||
|
("post", "/api/default_plays"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -148,6 +148,20 @@ class MusicPlayerQueueTest(unittest.IsolatedAsyncioTestCase):
|
|||||||
|
|
||||||
self.assertEqual(track.volume, 0.25)
|
self.assertEqual(track.volume, 0.25)
|
||||||
|
|
||||||
|
async def test_default_plays_are_applied_per_guild(self):
|
||||||
|
player, _ = build_player()
|
||||||
|
player._config.get_default_plays.side_effect = lambda guild_id: {1: 2, 2: 7}.get(
|
||||||
|
guild_id, 5
|
||||||
|
)
|
||||||
|
|
||||||
|
first = FakeTrack("first")
|
||||||
|
second = FakeTrack("second")
|
||||||
|
await player.enqueue(1, first)
|
||||||
|
await player.enqueue(2, second)
|
||||||
|
|
||||||
|
self.assertEqual(first.plays_left, 1)
|
||||||
|
self.assertEqual(second.plays_left, 7)
|
||||||
|
|
||||||
async def test_broken_tracks_stop_instead_of_looping_forever(self):
|
async def test_broken_tracks_stop_instead_of_looping_forever(self):
|
||||||
player, _, state = await self._queue_abc()
|
player, _, state = await self._queue_abc()
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ class MusicPlayer:
|
|||||||
def is_ready(self) -> bool:
|
def is_ready(self) -> bool:
|
||||||
return self._bot.is_ready()
|
return self._bot.is_ready()
|
||||||
|
|
||||||
@property
|
|
||||||
@property
|
@property
|
||||||
def default_plays(self) -> int:
|
def default_plays(self) -> int:
|
||||||
"""Legacy fallback used when no guild context is available."""
|
"""Legacy fallback used when no guild context is available."""
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
|
class DefaultPlaysRequest(BaseModel):
|
||||||
|
"""Domyślna liczba odtworzeń nowych utworów."""
|
||||||
|
|
||||||
|
default_plays: int
|
||||||
@@ -13,6 +13,7 @@ from zyrarbot.ui.api.dependencies import (
|
|||||||
get_player,
|
get_player,
|
||||||
get_settings,
|
get_settings,
|
||||||
)
|
)
|
||||||
|
from zyrarbot.ui.api.requests.default_plays_request import DefaultPlaysRequest
|
||||||
from zyrarbot.ui.api.requests.jump_request import JumpRequest
|
from zyrarbot.ui.api.requests.jump_request import JumpRequest
|
||||||
from zyrarbot.ui.api.requests.remove_request import RemoveRequest
|
from zyrarbot.ui.api.requests.remove_request import RemoveRequest
|
||||||
from zyrarbot.ui.api.requests.reorder_request import ReorderRequest
|
from zyrarbot.ui.api.requests.reorder_request import ReorderRequest
|
||||||
@@ -22,6 +23,22 @@ from zyrarbot.ui.api.status_broadcaster import StatusBroadcaster
|
|||||||
router = APIRouter(prefix="/api", tags=["queue"])
|
router = APIRouter(prefix="/api", tags=["queue"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/default_plays")
|
||||||
|
async def set_default_plays(
|
||||||
|
request: DefaultPlaysRequest,
|
||||||
|
guild: discord.Guild = Depends(get_active_guild),
|
||||||
|
player: MusicPlayer = Depends(get_player),
|
||||||
|
settings: Settings = Depends(get_settings),
|
||||||
|
broadcaster: StatusBroadcaster = Depends(get_broadcaster),
|
||||||
|
) -> dict[str, int | str]:
|
||||||
|
if not settings.is_valid_plays(request.default_plays):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid default plays value")
|
||||||
|
|
||||||
|
player.set_default_plays(guild.id, request.default_plays)
|
||||||
|
await broadcaster.broadcast()
|
||||||
|
return {"status": "success", "default_plays": request.default_plays}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jump")
|
@router.post("/jump")
|
||||||
async def jump(
|
async def jump(
|
||||||
request: JumpRequest,
|
request: JumpRequest,
|
||||||
|
|||||||
Reference in new issue
Block a user