mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
Requests: Improve more request checks
This commit is contained in:
parent
d09571f0e3
commit
5350c115bf
@ -79,8 +79,8 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
|
||||
RequestStatus::RequestStatus statusCode = RequestStatus::NoError;
|
||||
std::string comment;
|
||||
|
||||
if (request.RequestData.contains("keyId") && !request.RequestData["keyId"].is_null()) {
|
||||
if (!request.ValidateString("keyId", statusCode, comment))
|
||||
if (request.Contains("keyId")) {
|
||||
if (!request.ValidateOptionalString("keyId", statusCode, comment))
|
||||
return RequestResult::Error(statusCode, comment);
|
||||
|
||||
std::string keyId = request.RequestData["keyId"];
|
||||
@ -88,8 +88,8 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
|
||||
}
|
||||
|
||||
statusCode = RequestStatus::NoError;
|
||||
if (request.RequestData.contains("keyModifiers") && !request.RequestData["keyModifiers"].is_null()) {
|
||||
if (!request.ValidateObject("keyModifiers", statusCode, comment, true))
|
||||
if (request.Contains("keyModifiers")) {
|
||||
if (!request.ValidateOptionalObject("keyModifiers", statusCode, comment, true))
|
||||
return RequestResult::Error(statusCode, comment);
|
||||
|
||||
const json keyModifiersJson = request.RequestData["keyModifiers"];
|
||||
|
@ -68,8 +68,11 @@ RequestResult RequestHandler::CreateSceneItem(const Request& request)
|
||||
return RequestResult::Error(RequestStatus::CannotAct, "You cannot create scene item of a scene within itself.");
|
||||
|
||||
bool sceneItemEnabled = true;
|
||||
if (request.RequestData.contains("sceneItemEnabled") && request.RequestData["sceneItemEnabled"].is_boolean())
|
||||
if (request.Contains("sceneItemEnabled")) {
|
||||
if (!request.ValidateOptionalBoolean("sceneItemEnabled", statusCode, comment))
|
||||
return RequestResult::Error(statusCode, comment);
|
||||
sceneItemEnabled = request.RequestData["sceneItemEnabled"];
|
||||
}
|
||||
|
||||
OBSSceneItemAutoRelease sceneItem = Utils::Obs::ActionHelper::CreateSceneItem(source, scene, sceneItemEnabled);
|
||||
if (!sceneItem)
|
||||
|
Loading…
Reference in New Issue
Block a user