Use custom error code for PlayURL errors (#22)

* use custom error code

* rename error

* add second error code

* rename errors
This commit is contained in:
plally 2023-07-12 18:46:01 -04:00 committed by GitHub
parent 26111a8845
commit 5efe54bb64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -97,8 +97,13 @@ local function wrapPost()
end
end
-- the URI was blocked because it was not in the whitelist
CFCHTTP.BASS_ERROR_BLOCKED_URI = 11001
-- unused: the request was blocked after inspecting the content
-- this is likely because the content could result in playing blocked URIs
CFCHTTP.BASS_ERROR_BLOCKED_CONTENT = 11002
local function wrapPlayURL()
local BASS_ERROR_ILLPARAM = 20
_sound_PlayURL = _sound_PlayURL or sound.PlayURL
print( "sound.PlayURL wrapped, original function at _sound_PlayUrl" )
@ -110,7 +115,7 @@ local function wrapPlayURL()
local stack = string.Split( debug.traceback(), "\n" )
logRequest( "GET", url, stack[3], isAllowed, noisy )
if not isAllowed then
if callback then callback( nil, BASS_ERROR_ILLPARAM, "BASS_ERROR_ILLPARAM" ) end
if callback then callback( nil, CFCHTTP.BASS_ERROR_BLOCKED_URI, "BASS_ERROR_BLOCKED_URI" ) end
return
end
_sound_PlayURL( url, flags, callback )
@ -129,8 +134,8 @@ local function wrapHTMLPanel( panelName )
local setHTML = funcName( "SetHTML" )
local openURL = funcName( "OpenURL" )
_G[setHTML] = _G[setHTML] or controlTable.SetHTML
_G[openURL] = _G[openURL] or controlTable.OpenURL
_G[setHTML] = _G[setHTML] or controlTable.SetHTML
_G[openURL] = _G[openURL] or controlTable.OpenURL
controlTable.SetHTML = function( self, html, ... )
local isAllowed, url = CFCHTTP.isHTMLAllowed( html )