0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Load board config while generating json

This commit is contained in:
Pietro Carrara 2021-07-04 19:33:31 -03:00
parent 91bbfccf17
commit 4a69c62df3
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
inc/api.php
View File

@ -108,13 +108,17 @@ class Api {
$apiPost['file_path'] = $config['uri_img'] . $file->file; $apiPost['file_path'] = $config['uri_img'] . $file->file;
// Pick the correct thumbnail // Pick the correct thumbnail
if (!isset ($file->thumb) || $file->thumb === 'file') { if (isset($file->thumb)) {
$thumbFile = $config['file_icons']['default']; if ($file->thumb === 'spoiler') {
if (isset($file->extension) && isset($config['file_icons'][$file->extension])) { $apiPost['thumb_path'] = $config['root'] . $config['spoiler_image'];
$thumbFile = $config['file_icons'][$file->extension]; } 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 { } else {
$apiPost['thumb_path'] = $config['uri_thumb'] . $file->thumb; $apiPost['thumb_path'] = $config['uri_thumb'] . $file->thumb;
} }
@ -129,6 +133,11 @@ class Api {
if (isset($config['poster_ids']) && $config['poster_ids']) $apiPost['id'] = poster_id($post->ip, $post->thread, $board['uri']); if (isset($config['poster_ids']) && $config['poster_ids']) $apiPost['id'] = poster_id($post->ip, $post->thread, $board['uri']);
if ($threadsPage) return $apiPost; if ($threadsPage) return $apiPost;
// Load board info
if (isset($post->board)) {
openBoard($post->board);
}
// Handle special fields // Handle special fields
if (isset($post->body_nomarkup) && ($this->config['country_flags'] || $this->config['user_flag'])) { if (isset($post->body_nomarkup) && ($this->config['country_flags'] || $this->config['user_flag'])) {
$modifiers = extract_modifiers($post->body_nomarkup); $modifiers = extract_modifiers($post->body_nomarkup);

15
status.php
View File

@ -3,6 +3,11 @@
require_once 'inc/functions.php'; require_once 'inc/functions.php';
require_once 'templates/themes/overboards/overboards.php'; require_once 'templates/themes/overboards/overboards.php';
// Boards that are nsfw
$nsfw_boards = ['b', 'overboard'];
// Boards where posts are not allowed to be created
$readonly_boards = [];
// Allowed boards // Allowed boards
$whitelist = []; $whitelist = [];
foreach ($config['boards'] as $boards) { foreach ($config['boards'] as $boards) {
@ -12,15 +17,9 @@ foreach ($config['boards'] as $boards) {
} }
foreach ($overboards_config as $board) { foreach ($overboards_config as $board) {
$whitelist[] = $board['uri']; $whitelist[] = $board['uri'];
$readonly_boards[] = $board['uri'];
} }
// Boards that are nsfw
$nsfw_boards = ['b', 'overboard'];
// Boards that use spoiler_alunya.png as their spoiler
$alunya_spoiler = ['leftypol', 'anime'];
// Boards where posts are not allowed to be created
$readonly_boards = ['overboard', 'sfw', 'alt'];
$board_list = listBoards(); $board_list = listBoards();
// Add objects that are not boards but are treated as such // Add objects that are not boards but are treated as such
@ -33,7 +32,6 @@ foreach ($overboards_config as $overboard) {
* - code<string>: The board code ('b', 'tech', ...) * - code<string>: The board code ('b', 'tech', ...)
* - name<string>: The board user-readable name ('Siberia', ...) * - name<string>: The board user-readable name ('Siberia', ...)
* - sfw<boolean>: Is this board sfw? * - sfw<boolean>: Is this board sfw?
* - alternate_spoilers<boolean>: Does this board use the alunya spoiler?
* - posting_enabled<boolean>: Can new posts be created belonging to this board? * - posting_enabled<boolean>: Can new posts be created belonging to this board?
*/ */
$boards = []; $boards = [];
@ -47,7 +45,6 @@ foreach ($board_list as $board) {
'code' => $board['uri'], 'code' => $board['uri'],
'name' => $board['title'], 'name' => $board['title'],
'sfw' => !in_array($board['uri'], $nsfw_boards), 'sfw' => !in_array($board['uri'], $nsfw_boards),
'alternate_spoilers' => in_array($board['uri'], $alunya_spoiler),
'posting_enabled' => !in_array($board['uri'], $readonly_boards), 'posting_enabled' => !in_array($board['uri'], $readonly_boards),
]; ];
} }