Skip to content

Commit

Permalink
remove old verb, add fallback to simple asset transport
Browse files Browse the repository at this point in the history
  • Loading branch information
@fira
fira committed Nov 15, 2023
1 parent dcab1e3 commit e439af2
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 117 deletions.
6 changes: 2 additions & 4 deletions code/modules/admin/admin_verbs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@ var/list/admin_verbs_ban = list(
)

var/list/admin_verbs_sounds = list(
/client/proc/play_web_sound,
/client/proc/play_sound,
/client/proc/stop_web_sound,
/client/proc/stop_sound,
/client/proc/play_admin_sound,
/client/proc/stop_admin_sound,
/client/proc/cmd_admin_vox_panel
)

Expand Down
149 changes: 38 additions & 111 deletions code/modules/admin/verbs/playsound.dm
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/client/proc/play_web_sound()
/client/proc/play_admin_sound()
set category = "Admin.Fun"
set name = "Play Admin Sound"
if(!check_rights(R_SOUNDS))
return

var/sound_mode = tgui_input_list(src, "Play a sound from which source?", "Select Source", list("Youtube-DL", "Upload"))
var/sound_mode = tgui_input_list(src, "Play a sound from which source?", "Select Source", list("Web", "Upload"))
if(!sound_mode)
return

var/list/data = list()
var/log_title = TRUE
var/web_sound_input
if(sound_mode == "Youtube-DL")
var/asset_name
var/must_send_assets = FALSE
var/announce_title = TRUE

if(sound_mode == "Web")
var/ytdl = CONFIG_GET(string/invoke_youtubedl)
if(!ytdl)
to_chat(src, SPAN_BOLDWARNING("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
Expand Down Expand Up @@ -45,31 +49,31 @@

else if(sound_mode == "Upload")
var/current_transport = CONFIG_GET(string/asset_transport)
if(current_transport == "simple")
to_chat(src, SPAN_WARNING("Your server is not using an external asset transport. Use 'Play Midi Sound' instead to play sounds directly."))
return
if(!current_transport || current_transport == "simple")
if(tgui_alert(usr, "WARNING: Your server is using simple asset transport. Sounds will have to be sent directly to players, which may freeze the game for long durations. Are you SURE?", "Really play direct sound?", list("Yes", "No")) != "Yes")
return
must_send_assets = TRUE

var/soundfile = input(usr, "Choose a sound file to play", "Upload Sound") as null|file
if(!soundfile)
return

var/static/regex/only_extension = regex(@{"\.([a-z0-9]{1,5})$"}, "gi")
var/static/regex/only_extension = regex(@{"^.*\.([a-z0-9]{1,5})$"}, "gi")
var/extension = only_extension.Replace("[soundfile]", "$1")
if(!length(extension))
to_chat(src, SPAN_WARNING("Invalid filename extension."))
return

var/static/regex/remove_extension = regex(@{"\.[a-z0-9]+$"}, "gi")
data["title"] = remove_extension.Replace("[soundfile]", "")

log_title = FALSE
web_sound_input = "[soundfile]"
var/static/playsound_notch = 1
var/asset_name = "admin_sound_[playsound_notch++].[extension]"
asset_name = "admin_sound_[playsound_notch++].[extension]"
SSassets.transport.register_asset(asset_name, soundfile)
message_admins("[key_name_admin(src)] uploaded '[soundfile]' to asset transport.")
message_admins("[key_name_admin(src)] uploaded admin sound '[soundfile]' to asset transport.")

var/static/regex/remove_extension = regex(@{"\.[a-z0-9]+$"}, "gi")
data["title"] = remove_extension.Replace("[soundfile]", "")
data["url"] = SSassets.transport.get_asset_url(asset_name)
web_sound_input = "[soundfile]"
log_title = FALSE

var/title
var/web_sound_url = ""
Expand All @@ -82,19 +86,28 @@
music_extra_data["start"] = data["start_time"]
music_extra_data["end"] = data["end_time"]

if(web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
if(!must_send_assets && web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
to_chat(src, SPAN_BOLDWARNING("BLOCKED: Content URL not using http(s) protocol"), confidential = TRUE)
to_chat(src, SPAN_WARNING("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol"), confidential = TRUE)
return

switch(tgui_alert(src, "Show the name of this sound to the players?", "Sound Name", list("Yes","No","Cancel")))
if("No")
music_extra_data["title"] = "Admin sound"
announce_title = FALSE
if("Cancel")
return

var/list/targets = list()
var/list/sound_type_list = list(
"Meme" = SOUND_ADMIN_MEME,
"Atmospheric" = SOUND_ADMIN_ATMOSPHERIC
)

var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All Inview", "Single Inview", "Cancel"))
var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
sound_type = sound_type_list[sound_type]

switch(style)
if("Globally")
targets = GLOB.mob_list
Expand All @@ -114,24 +127,21 @@
else
return

switch(tgui_alert(src, "Show the name of this sound to the players?", "Sound Name", list("Yes","No","Cancel")))
if("No")
music_extra_data["title"] = "Admin sound"
if("Cancel")
return

for(var/i in targets)
var/mob/M = i
var/client/client = M?.client
for(var/mob/mob as anything in targets)
var/client/client = mob?.client
if((client?.prefs.toggles_sound & SOUND_INTERNET) && (client?.prefs.toggles_sound & sound_type))
client?.tgui_panel?.play_music(web_sound_url, music_extra_data)
if(must_send_assets)
SSassets.transport.send_assets(client, asset_name)
client?.tgui_panel?.play_music(web_sound_url, music_extra_data)
if(announce_title)
to_chat(client, SPAN_BOLDANNOUNCE("An admin played: [music_extra_data["title"]]"), confidential = TRUE)
else
client?.tgui_panel?.stop_music()

log_admin("[key_name(src)] played web sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
message_admins("[key_name_admin(src)] played web sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
log_admin("[key_name(src)] played admin sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
message_admins("[key_name_admin(src)] played admin sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")

/client/proc/stop_web_sound()
/client/proc/stop_admin_sound()
set category = "Admin.Fun"
set name = "Stop Admin Sounds"

Expand All @@ -145,86 +155,3 @@
log_admin("[key_name(src)] stopped the currently playing web sounds.")
message_admins("[key_name_admin(src)] stopped the currently playing web sounds.")

/client/proc/play_sound(S as sound)
set category = "Admin.Fun"
set name = "Play Midi Sound"
if(!check_rights(R_SOUNDS))
return

var/freq = 1
var/vol = tgui_input_number(src, "What volume would you like the sound to play at?", "Volume", 25, 100, 1)
if(!vol)
return
vol = clamp(vol, 1, 100)

var/sound/admin_sound = new()
admin_sound.file = S
admin_sound.priority = 250
admin_sound.channel = SOUND_CHANNEL_ADMIN_MIDI
admin_sound.frequency = freq
admin_sound.wait = 1
admin_sound.repeat = FALSE
admin_sound.status = SOUND_STREAM
admin_sound.volume = vol

var/showtitle = FALSE
var/res = alert(src, "Show the title of this song to the players?",, "Yes","No", "Cancel")
switch(res)
if("Yes")
showtitle = TRUE
if("Cancel")
return

var/list/targets = list()
var/list/sound_type_list = list(
"Meme" = SOUND_ADMIN_MEME,
"Atmospheric" = SOUND_ADMIN_ATMOSPHERIC
)
var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All Inview", "Single Inview"))
var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
sound_type = sound_type_list[sound_type]
switch(style)
if("Globally")
targets = GLOB.mob_list
if("Xenos")
targets = GLOB.xeno_mob_list + GLOB.dead_mob_list
if("Marines")
targets = GLOB.human_mob_list + GLOB.dead_mob_list
if("Ghosts")
targets = GLOB.observer_list + GLOB.dead_mob_list
if("All Inview")
targets = viewers(usr.client.view, src)
if("Single Inview")
var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", sortmobs())
if(QDELETED(choice))
return
targets.Add(choice)
else
return

for(var/items in targets)
var/mob/Mob = items
var/client/client = Mob?.client
if((client?.prefs.toggles_sound & SOUND_INTERNET) && (client?.prefs.toggles_sound & sound_type))
admin_sound.volume = vol * client?.admin_music_volume
SEND_SOUND(Mob, admin_sound)
admin_sound.volume = vol
if(showtitle)
to_chat(client, SPAN_BOLDANNOUNCE("An admin played: [S]"), confidential = TRUE)

log_admin("[key_name(src)] played midi sound [S] - [style]")
message_admins("[key_name_admin(src)] played midi sound [S] - [style]")

/client/proc/stop_sound()
set category = "Admin.Fun"
set name = "Stop Midi Sounds"

if(!check_rights(R_SOUNDS))
return

for(var/mob/M in GLOB.player_list)
if(M.client)
SEND_SOUND(M, sound(null))

log_admin("[key_name(src)] stopped midi sounds.")
message_admins("[key_name_admin(src)] stopped midi sounds.")
5 changes: 3 additions & 2 deletions code/modules/tgui_panel/audio.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
/datum/tgui_panel/proc/play_music(url, extra_data)
if(!is_ready())
return
if(!findtext(url, GLOB.is_http_protocol))
return
// Commented to allow playing via simple asset transport. Just check when calling.
// if(!findtext(url, GLOB.is_http_protocol))
// return
var/list/payload = list()
if(length(extra_data) > 0)
for(var/key in extra_data)
Expand Down

0 comments on commit e439af2

Please sign in to comment.