diff --git a/scripts/Server/helpers.php b/scripts/Server/helpers.php index 3054685e5..c6d4a63fb 100644 --- a/scripts/Server/helpers.php +++ b/scripts/Server/helpers.php @@ -1,5 +1,7 @@ "alien-project", @@ -33,7 +42,7 @@ function createAddSimulationMessage($simName, $userName, $simDesc, $width, $heig "embeds" => [ [ "author" => [ - "name" => "New simulation added to the database", + "name" => $message, "icon_url" => "https://alien-project.org/alien-server/galaxy.png" ], "title" => $simName, @@ -60,7 +69,7 @@ function createAddSimulationMessage($simName, $userName, $simDesc, $width, $heig ], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); } - function createAddGenomeMessage($simName, $userName, $simDesc, $width, $height, $particles) { + function createMessageForGenome($message, $simName, $userName, $simDesc, $width, $height, $particles) { return json_encode([ "username" => "alien-project", "avatar_url" => "https://alien-project.org/alien-server/logo.png", @@ -68,7 +77,7 @@ function createAddGenomeMessage($simName, $userName, $simDesc, $width, $height, "embeds" => [ [ "author" => [ - "name" => "New genome added to the database", + "name" => $message, "icon_url" => "https://alien-project.org/alien-server/genome.png" ], "title" => $simName, diff --git a/scripts/Server/replacesimulation.php b/scripts/Server/replacesimulation.php index e9b76486a..423281e3c 100644 --- a/scripts/Server/replacesimulation.php +++ b/scripts/Server/replacesimulation.php @@ -16,16 +16,12 @@ function closeAndExit($db) { $pw = $_POST["password"]; if (!checkPw($db, $userName, $pw)) { - echo json_encode(["result"=>false]); - $db->close(); - exit; + closeAndExit($db); } $obj = $db->query("SELECT u.ID as id FROM user u WHERE u.NAME='".addslashes($userName)."'")->fetch_object(); if (!$obj) { - echo json_encode(["result"=>false]); - $db->close(); - exit; + closeAndExit($db); } $success = false; @@ -35,11 +31,14 @@ function closeAndExit($db) { $settings = $_POST['settings']; $simId = $_POST['simId']; $size = strlen($content); - $type = array_key_exists('type', $_POST) ? $_POST['type'] : 0; - $workspace = array_key_exists('workspace', $_POST) ? $_POST['workspace'] : 0; $statistics = array_key_exists('statistics', $_POST) ? $_POST['statistics'] : ""; - if ($userName != 'alien-project' && $workspace == 1) { + $obj = $db->query("SELECT sim.NAME as name, sim.TYPE as type, sim.FROM_RELEASE as workspace FROM simulation sim WHERE sim.ID='".addslashes($simId)."'")->fetch_object(); + if (!$obj) { + closeAndExit($db); + } + + if ($userName != 'alien-project' && $obj->workspace == ALIEN_PROJECT_WORKSPACE_TYPE) { closeAndExit($db); } @@ -56,10 +55,10 @@ function closeAndExit($db) { } // create Discord message - //if ($workspace != PRIVATE_WORKSPACE_TYPE) { - // $discordPayload = createAddResourceMessage($type, $simName, $userName, $simDesc, $width, $height, $particles); - // sendDiscordMessage($discordPayload); - //} + if ($obj->workspace != PRIVATE_WORKSPACE_TYPE) { + $discordPayload = createUpdateResourceMessage($obj->type, $obj->name, $userName, $simDesc, $width, $height, $particles); + sendDiscordMessage($discordPayload); + } echo json_encode(["result"=>true]);