Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Revert "Merge tag 'v2.10.6'"

Browse Source 
This reverts commit 122ea4ab9e, reversing
changes made to c54a11e250.
This commit is contained in:
MichaelYick
2024-02-16 23:06:09 -06:00
parent 122ea4ab9e
commit 6c08ee9675
521 changed files with 12363 additions and 14503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
ext/graphql/main.php
View File

@@ -4,10 +4,6 @@ declare(strict_types=1);
namespace Shimmie2;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\{InputInterface,InputArgument};
use Symfony\Component\Console\Output\OutputInterface;
use GraphQL\GraphQL as GQL;
use GraphQL\Server\StandardServer;
use GraphQL\Error\DebugFlag;
@@ -74,14 +70,14 @@ class GraphQL extends Extension
}
}
public function onInitExt(InitExtEvent $event): void
public function onInitExt(InitExtEvent $event)
{
global $config;
$config->set_default_string('graphql_cors_pattern', "");
$config->set_default_bool('graphql_debug', false);
}
public function onPageRequest(PageRequestEvent $event): void
public function onPageRequest(PageRequestEvent $event)
{
global $config, $page;
if ($event->page_matches("graphql")) {
@@ -92,8 +88,6 @@ class GraphQL extends Extension
]);
$t2 = ftime();
$resp = $server->executeRequest();
assert(!is_array($resp));
assert(is_a($resp, \GraphQL\Executor\ExecutionResult::class));
if ($config->get_bool("graphql_debug")) {
$debug = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::RETHROW_INTERNAL_EXCEPTIONS;
$body = $resp->toArray($debug);
@@ -107,19 +101,16 @@ class GraphQL extends Extension
// sleep(1);
$page->set_mode(PageMode::DATA);
$page->set_mime("application/json");
$page->set_data(json_encode_ex($body, JSON_UNESCAPED_UNICODE));
$page->set_data(\json_encode($body, JSON_UNESCAPED_UNICODE));
}
if ($event->page_matches("graphql_upload")) {
$this->cors();
$page->set_mode(PageMode::DATA);
$page->set_mime("application/json");
$page->set_data(json_encode_ex(self::handle_uploads()));
$page->set_data(\json_encode(self::handle_uploads()));
}
}
/**
* @return array{error?:string,results?:array<array{error?:string,image_ids?:int[]}>}
*/
private static function handle_uploads(): array
{
global $user;
@@ -132,7 +123,7 @@ class GraphQL extends Extension
$common_source = $_POST['common_source'];
$results = [];
for ($n = 0; $n < 100; $n++) {
for ($n=0; $n<100; $n++) {
if (empty($_POST["url$n"]) && empty($_FILES["data$n"])) {
break;
}
@@ -140,7 +131,7 @@ class GraphQL extends Extension
break;
}
try {
$results[] = ["image_ids" => self::handle_upload($n, $common_tags, $common_source)];
$results[] = self::handle_upload($n, $common_tags, $common_source);
} catch(\Exception $e) {
$results[] = ["error" => $e->getMessage()];
}
@@ -148,14 +139,12 @@ class GraphQL extends Extension
return ["results" => $results];
}
/**
* @return int[]
*/
private static function handle_upload(int $n, string $common_tags, string $common_source): array
{
global $database;
if (!empty($_POST["url$n"])) {
throw new UploadException("URLs not handled yet");
return ["error" => "URLs not handled yet"];
$tmpname = "...";
$filename = "...";
} else {
$ec = $_FILES["data$n"]["error"];
switch($ec) {
@@ -164,9 +153,9 @@ class GraphQL extends Extension
$filename = $_FILES["data$n"]["name"];
break;
case UPLOAD_ERR_INI_SIZE:
throw new UploadException("File larger than PHP can handle");
return ["error" => "File larger than PHP can handle"];
default:
throw new UploadException("Mystery error: $ec");
return ["error" => "Mystery error: $ec"];
}
}
@@ -175,42 +164,38 @@ class GraphQL extends Extension
if (!empty($_POST["source$n"])) {
$source = $_POST["source$n"];
}
$event = $database->with_savepoint(function () use ($tmpname, $filename, $tags, $source) {
return send_event(new DataUploadEvent($tmpname, [
'filename' => $filename,
'tags' => Tag::explode($tags),
'source' => $source,
]));
});
$event = send_event(new DataUploadEvent($tmpname, [
'filename' => $filename,
'tags' => Tag::explode($tags),
'source' => $source,
]));
return array_map(fn ($im) => $im->id, $event->images);
return ["image_id" => $event->image_id];
}
public function onCliGen(CliGenEvent $event): void
public function onCommand(CommandEvent $event)
{
$event->app->register('graphql:query')
->addArgument('query', InputArgument::REQUIRED)
->setDescription('Run a GraphQL query')
->setCode(function (InputInterface $input, OutputInterface $output): int {
$query = $input->getArgument('query');
$t1 = ftime();
$schema = $this->get_schema();
$t2 = ftime();
$debug = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::RETHROW_INTERNAL_EXCEPTIONS;
$body = GQL::executeQuery($schema, $query)->toArray($debug);
$t3 = ftime();
$body['stats'] = get_debug_info_arr();
$body['stats']['graphql_schema_time'] = round($t2 - $t1, 2);
$body['stats']['graphql_execute_time'] = round($t3 - $t2, 2);
echo json_encode_ex($body, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
return Command::SUCCESS;
});
$event->app->register('graphql:schema')
->setDescription('Print out the GraphQL schema')
->setCode(function (InputInterface $input, OutputInterface $output): int {
$schema = $this->get_schema();
echo(SchemaPrinter::doPrint($schema));
return Command::SUCCESS;
});
if ($event->cmd == "help") {
print "\tgraphql <query string>\n";
print "\t\teg 'graphql \"{ post(id: 18) { id, hash } }\"'\n\n";
print "\tgraphql-schema\n";
print "\t\tdump the schema\n\n";
}
if ($event->cmd == "graphql") {
$t1 = ftime();
$schema = $this->get_schema();
$t2 = ftime();
$debug = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::RETHROW_INTERNAL_EXCEPTIONS;
$body = GQL::executeQuery($schema, $event->args[0])->toArray($debug);
$t3 = ftime();
$body['stats'] = get_debug_info_arr();
$body['stats']['graphql_schema_time'] = round($t2 - $t1, 2);
$body['stats']['graphql_execute_time'] = round($t3 - $t2, 2);
echo \json_encode($body, JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT);
}
if ($event->cmd == "graphql-schema") {
$schema = $this->get_schema();
echo(SchemaPrinter::doPrint($schema));
}
}
}