diff --git a/admin/emoji.php b/admin/emoji.php index 10a3db4..b9400d8 100644 --- a/admin/emoji.php +++ b/admin/emoji.php @@ -5,6 +5,8 @@ if (!$emojiEnabled) { exit(); } +include "../boilerplate/question.php"; + $ch = curl_init(); curl_setopt($ch, CURLOPT_HTTPHEADER, array("Authorization: {$emojiAPIToken}")); @@ -44,6 +46,39 @@ if (count($jsonResp)) { pg_query($db, rtrim($query, ",") . ";"); } +$query = " +SELECT * FROM data; +"; + +$queryResponse = pg_query($db, $query); +$questions = pg_fetch_all($queryResponse); + +foreach ($questions as $question) { + $parsed_text = insertEmoji($question["text"]); + + $parsed_cw = NULL; + if ($question["iscwed"] === "t") { + $parsed_cw = insertEmoji($question["cw"]); + } + + $parsed_response = NULL; + if ($question["isrespondedto"] === "t") { + $parsed_response = insertEmoji($question["responsetext"]); + } + + pg_update( + $db, "data", + array( + "parsedtext" => $parsed_text, + "parsedcw" => $parsed_cw, + "parsedresponsetext" => $parsed_response + ), + array( + "id" => $question["id"] + ) + ); +} + header("Location: index.php?pw={$adminPassword}&emoji=1"); ?> diff --git a/admin/migrate.php b/admin/migrate.php index cc6c8e7..c67642a 100644 --- a/admin/migrate.php +++ b/admin/migrate.php @@ -13,7 +13,8 @@ $migrations = array( "20240218-AddMarkReadOption-a7e43358", "20240218-AddFalsesToPrivRead-67d82b18", "20250310-AddFediIDColumn-64520350", - "20250314-AddEmoji" + "20250314-AddEmoji", + "20250407-AddParsedText" ); foreach ($migrations as $mig) { diff --git a/admin/respond.php b/admin/respond.php index 9ea8fb6..eb0f451 100644 --- a/admin/respond.php +++ b/admin/respond.php @@ -7,7 +7,6 @@ if ($id === null) { } if ($_GET["text"] !== null) { - $text = $_GET["text"]; $cdate = date("Y-m-d H:i:sP"); $query = " @@ -16,16 +15,28 @@ if ($_GET["text"] !== null) { WHERE id = {$id}; "; + $text = $_GET["text"]; $cw = $_GET["cw"]; $cwEnabled = strlen($cw) !== 0; + $parsed_response = NULL; + $parsed_cw = NULL; + + if ($emojiEnabled) { + include "../boilerplate/question.php"; + $parsed_response = insertEmoji($_GET["text"]); + $parsed_cw = insertEmoji($_GET["cw"]); + } + pg_query($db, $query); pg_update( $db, "data", array( "responsetext" => $text, + "parsedresponsetext" => $parsed_response, "iscwed" => $cwEnabled, - "cw" => $cw + "cw" => $cw, + "parsedcw" => $parsed_cw ), array("id" => $id) ); diff --git a/boilerplate/question.php b/boilerplate/question.php index f7afd0c..a73f178 100644 --- a/boilerplate/question.php +++ b/boilerplate/question.php @@ -1,11 +1,9 @@ {$question['time']}"; if ($question["responsetext"]) { - $q .= "