From cb8c7ddd2e5d830844a8be32b64e4953ac170cde Mon Sep 17 00:00:00 2001 From: Pietro Carrara Date: Sun, 4 Jul 2021 19:33:31 -0300 Subject: [PATCH] Load board config while generating json --- inc/api.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/inc/api.php b/inc/api.php index 3054b494..230d3d26 100644 --- a/inc/api.php +++ b/inc/api.php @@ -112,13 +112,17 @@ class Api { $apiPost['file_path'] = $config['uri_img'] . $file->file; // Pick the correct thumbnail - if (!isset ($file->thumb) || $file->thumb === 'file') { - $thumbFile = $config['file_icons']['default']; - if (isset($file->extension) && isset($config['file_icons'][$file->extension])) { - $thumbFile = $config['file_icons'][$file->extension]; - } + if (isset($file->thumb)) { + if ($file->thumb === 'spoiler') { + $apiPost['thumb_path'] = $config['root'] . $config['spoiler_image']; + } else if ($file->thumb === 'file') { + $thumbFile = $config['file_icons']['default']; + if (isset($file->extension) && isset($config['file_icons'][$file->extension])) { + $thumbFile = $config['file_icons'][$file->extension]; + } - $apiPost['thumb_path'] = $config['root'] . sprintf($config['file_thumb'], $thumbFile); + $apiPost['thumb_path'] = $config['root'] . sprintf($config['file_thumb'], $thumbFile); + } } else { $apiPost['thumb_path'] = $config['uri_thumb'] . $file->thumb; } @@ -133,6 +137,11 @@ class Api { if (isset($config['poster_ids']) && $config['poster_ids']) $apiPost['id'] = poster_id($post->ip, $post->thread, $board['uri']); if ($threadsPage) return $apiPost; + // Load board info + if (isset($post->board)) { + openBoard($post->board); + } + // Handle special fields if (isset($post->body_nomarkup) && ($this->config['country_flags'] || $this->config['user_flag'])) { $modifiers = extract_modifiers($post->body_nomarkup);