r4/go-musicbot
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some code simplifications

Browse Source
This commit is contained in:
r4 2021-07-28 19:10:57 +02:00
parent 7530a6a426
commit f17522a5d1
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
commands.go
View File

@ -62,10 +62,10 @@ func secsToMinsSecs(secs int) string {
// Removes/replaces some characters with special formatting meaning in discord // Removes/replaces some characters with special formatting meaning in discord
// messages (for example *). // messages (for example *).
func dcSanitize(in string) string { func dcSanitize(in string) string {
in = strings.ReplaceAll(in, "*", "\u2217") in = strings.ReplaceAll(in, "*", "\\*")
in = strings.ReplaceAll(in, "~~", "\u02dc\u02dc") in = strings.ReplaceAll(in, "~~", "\\~\\~")
in = strings.ReplaceAll(in, "`", "'") in = strings.ReplaceAll(in, "`", "\\`")
return strings.ReplaceAll(in, "||", "\u2758\u2758") return strings.ReplaceAll(in, "||", "\\|\\|")
} }
//////////////////////////////// ////////////////////////////////
@ -240,18 +240,12 @@ func commandAdd(c *Client, args []string, inPlace bool) {
MediaUrl: mediaUrl, MediaUrl: mediaUrl,
} }
if inPlace && !isPlaylist { if inPlace && !isPlaylist {
// To replace the currently playing track (if one is currently
// playing), insert the new one at Queue[0] and skip the current
// one.
c.QueuePushFront(track)
if playback, ok := c.GetPlaybackInfo(); ok { if playback, ok := c.GetPlaybackInfo(); ok {
// To replace the currently playing track, insert the new one
// at Queue[0] and skip the current one.
if c.QueueLen() == 0 {
c.QueuePushBack(track)
} else {
c.QueuePushFront(track)
}
// Skip the current track.
playback.CmdCh <- dca0.CommandStop{} playback.CmdCh <- dca0.CommandStop{}
} else {
c.QueuePushFront(track)
} }
} else { } else {
c.QueuePushBack(track) c.QueuePushBack(track)