diff --git a/inc/Data/Driver/HttpDriver.php b/inc/Data/Driver/HttpDriver.php deleted file mode 100644 index 2e379f27..00000000 --- a/inc/Data/Driver/HttpDriver.php +++ /dev/null @@ -1,135 +0,0 @@ -inner); - \curl_setopt_array($this->inner, [ - \CURLOPT_URL => $url, - \CURLOPT_TIMEOUT => $timeout, - \CURLOPT_USERAGENT => 'Tinyboard', - \CURLOPT_PROTOCOLS => \CURLPROTO_HTTP | \CURLPROTO_HTTPS, - ]); - } - - public function __construct(int $timeout, int $max_file_size) { - $this->inner = \curl_init(); - $this->timeout = $timeout; - $this->max_file_size = $max_file_size; - } - - public function __destruct() { - \curl_close($this->inner); - } - - /** - * Execute a GET request. - * - * @param string $endpoint Uri endpoint. - * @param ?array $data Optional GET parameters. - * @param ?array $data Optional HTTP headers. - * @param int $timeout Optional request timeout in seconds. Use the default timeout if 0. - * @return string Returns the body of the response. - * @throws RuntimeException Throws on IO error. - */ - public function requestGet(string $endpoint, ?array $data, ?array $headers = null, int $timeout = 0): string { - if (!empty($data)) { - $endpoint .= '?' . \http_build_query($data); - } - if ($timeout == 0) { - $timeout = $this->timeout; - } - - $this->resetTowards($endpoint, $timeout); - if (!empty($headers)) { - \curl_setopt($this->inner, \CURLOPT_HTTPHEADER, $headers); - } - \curl_setopt($this->inner, \CURLOPT_RETURNTRANSFER, true); - $ret = \curl_exec($this->inner); - - if ($ret === false) { - throw new \RuntimeException(\curl_error($this->inner)); - } - return $ret; - } - - /** - * Execute a POST request. - * - * @param string $endpoint Uri endpoint. - * @param ?array $data Optional POST parameters. - * @param int $timeout Optional request timeout in seconds. Use the default timeout if 0. - * @return string Returns the body of the response. - * @throws RuntimeException Throws on IO error. - */ - public function requestPost(string $endpoint, ?array $data, int $timeout = 0): string { - if ($timeout == 0) { - $timeout = $this->timeout; - } - - $this->resetTowards($endpoint, $timeout); - \curl_setopt($this->inner, \CURLOPT_POST, true); - if (!empty($data)) { - \curl_setopt($this->inner, \CURLOPT_POSTFIELDS, \http_build_query($data)); - } - \curl_setopt($this->inner, \CURLOPT_RETURNTRANSFER, true); - $ret = \curl_exec($this->inner); - - if ($ret === false) { - throw new \RuntimeException(\curl_error($this->inner)); - } - return $ret; - } - - /** - * Download the url's target with curl. - * - * @param string $url Url to the file to download. - * @param ?array $data Optional GET parameters. - * @param resource $fd File descriptor to save the content to. - * @param int $timeout Optional request timeout in seconds. Use the default timeout if 0. - * @return bool Returns true on success, false if the file was too large. - * @throws RuntimeException Throws on IO error. - */ - public function requestGetInto(string $endpoint, ?array $data, mixed $fd, int $timeout = 0): bool { - if (!empty($data)) { - $endpoint .= '?' . \http_build_query($data); - } - if ($timeout == 0) { - $timeout = $this->timeout; - } - - $this->resetTowards($endpoint, $timeout); - // Adapted from: https://stackoverflow.com/a/17642638 - $opt = (\PHP_MAJOR_VERSION >= 8 && \PHP_MINOR_VERSION >= 2) ? \CURLOPT_XFERINFOFUNCTION : \CURLOPT_PROGRESSFUNCTION; - \curl_setopt_array($this->inner, [ - \CURLOPT_NOPROGRESS => false, - $opt => fn($res, $next_dl, $dl, $next_up, $up) => (int)($dl <= $this->max_file_size), - \CURLOPT_FAILONERROR => true, - \CURLOPT_FOLLOWLOCATION => false, - \CURLOPT_FILE => $fd, - \CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4, - ]); - $ret = \curl_exec($this->inner); - - if ($ret === false) { - if (\curl_errno($this->inner) === CURLE_ABORTED_BY_CALLBACK) { - return false; - } - - throw new \RuntimeException(\curl_error($this->inner)); - } - return true; - } -} diff --git a/inc/Data/OembedResponse.php b/inc/Data/OembedResponse.php deleted file mode 100644 index 0e99f5ff..00000000 --- a/inc/Data/OembedResponse.php +++ /dev/null @@ -1,11 +0,0 @@ -log = $log; - $this->oembed_extractor = $oembed_extractor; - $this->embed_entries = $embed_entries; - $this->thumb_download_timeout = $thumb_download_timeout; - } - - private function make_tmp_file(): string { - $ret = \tempnam($this->tmp_dir, self::TMP_FILE_PREFIX); - if ($ret === false) { - throw new \RuntimeException("Could not create temporary file in {$this->tmp_dir}"); - } - \register_shutdown_function(fn() => @unlink($ret)); - return $ret; - } - - /** - * Downloads the thumbnail into a temporary file. - * - * @return ?string The path to the temporary file, null if the file was too large. - */ - private function fetchThumbnail(string $thumbnail_url): ?string { - $tmp_file = $this->make_tmp_file(); - $fd = \fopen($tmp_file, 'w+b'); - if ($fd === false) { - throw new \RuntimeException("Could not open temporary file $tmp_file for read/write"); - } - - $ret = $this->http->requestGetInto($thumbnail_url, null, $fd, $this->thumb_download_timeout); - return $ret ? $tmp_file : null; - } - - /** - * Returns the path to the thumbnail from a matched url, if any. - * - * @param string $url The url to embed. - * @param int $entry_index The index of the embedding entry. - * @return ?array Returns the url to the thumbnail and the path to the fallback. - */ - private function extractThumb(string $url, int $entry_index) { - $embed_entry = $this->embed_entries[$entry_index]; - $match_regex = $embed_entry['match_regex']; - $type = $embed_entry['type']; - - if ($type === 'oembed') { - $thumbnail_url_fallback = $embed_entry['thumbnail_url_fallback'] ?? null; - $provider = $embed_entry['provider_url']; - $oembed_resp = $this->oembed_extractor->fetch($provider, $url); - - return [ $oembed_resp->thumbnail_url, $thumbnail_url_fallback ]; - } elseif ($type === 'regex') { - $thumbnail_url_regex = $embed_entry['thumbnail_url']; - // Plz somebody review this. - return [ \preg_replace($match_regex, $thumbnail_url_regex, $url), null ]; - } else { - $this->log->log(LogDriver::ERROR, "Unknown embed type '$type' in embed entry $entry_index, ignoring the entry"); - return [ null, null ]; - } - } - - /** - * Find the embed entry matching with the url, if any. - * - * @param string $url Url to embed. MUST BE ALREADY VALIDATED. - * @return int The index of the matched embed entry or null. - */ - public function matchEmbed(string $url): ?int { - for ($i = 0; $i < \count($this->embed_entries); $i++) { - $match_regex = $this->embed_entries[$i]['match_regex']; - if (\preg_match($match_regex, $url, $matches)) { - return $i; - } - } - - return null; - } - - /** - * Get the embed's thumbnail if possible. May download it from the network into a temporary file, or use a static file. - * - * @param string $url Url to embed. MUST BE ALREADY VALIDATED. - * @param int The index of the matched embed entry. - * @return ?array Null if no thumbnail can be selected, otherwise an array with the local file path to the thumbnail - * and if the the file is a temporary or a static one. - */ - public function getEmbedThumb(string $url, int $entry_index): ?array { - $ret = $this->extractThumb($url, $entry_index); - list($thumbnail_url, $thumbnail_url_fallback) = $ret; - if (!isset($thumbnail_url, $thumbnail_url_fallback)) { - return null; - } - - if (\filter_var($thumbnail_url, \FILTER_VALIDATE_URL) === false) { - $this->log->log(LogDriver::ERROR, "Thumbnail URL '$thumbnail_url' from embed entry $entry_index is not a valid URL, trying fallback"); - } else { - $tmp_file = $this->fetchThumbnail($thumbnail_url); - if ($tmp_file !== null) { - return [ $tmp_file, true ]; - } - $this->log->log(LogDriver::NOTICE, "Thumbnail at '$thumbnail_url' was too large, trying fallback"); - } - - if ($thumbnail_url_fallback === null) { - return null; - } - return [ $thumbnail_url_fallback, false ]; - } - - public function renderEmbed(string $url, int $entry_index, string $thumbnail_path): string { - $embed_entry = $this->embed_entries[$entry_index]; - $match_regex = $embed_entry['match_regex']; - $html = $embed_entry['html']; - - $ret = \preg_replace($match_regex, $html, $url); - if (!\is_string($ret)) { - throw new \RuntimeException("Error while applying regex replacement for embed entry $entry_index"); - } - - \str_replace('%%embed_url%%', $url, $ret); - \str_replace('%%thumbnail_path%%', $thumbnail_path, $ret); - return $ret; - } -} diff --git a/inc/Service/Embed/OembedExtractor.php b/inc/Service/Embed/OembedExtractor.php deleted file mode 100644 index f86b2013..00000000 --- a/inc/Service/Embed/OembedExtractor.php +++ /dev/null @@ -1,66 +0,0 @@ -cache = $cache; - $this->http = $http; - $this->provider_timeout = $provider_timeout; - } - - /** - * Fetch the oembed data from the given provider with the given url. - * - * @param string $identifier Opaque identifier for caching, must be unique for each $url-$provider combination. - * @return OembedResponse The serialized remove response. May be cached. - */ - public function fetch(string $provider_url, string $url): OembedResponse { - $ret = $this->cache->get("oembed_embedder_$provider_url$url"); - if ($ret === null) { - $body = $this->http->requestGet( - $provider_url, - [ - 'url' => $url, - 'format' => 'json' - ], - [ - 'Content-Type: application/json' - ], - $this->provider_timeout - ); - $json = \json_decode($body, true, 512, \JSON_THROW_ON_ERROR); - - $ret = [ - 'title' => $json['title'] ?? null, - 'thumbnail_url' => $json['thumbnail_url'] ?? null, - ]; - - $cache_timeout = self::DEFAULT_CACHE_TIMEOUT; - if (isset($json['cache_age'])) { - $cache_age = \intval($json['cache_age']); - if ($cache_age > 0) { - $cache_age = \max($cache_age, self::MIN_CACHE_TIMEOUT); - } - } - - $this->cache->set("oembed_embedder_$provider_url$url", $ret, $cache_timeout); - } - - $resp = new OembedResponse(); - $resp->title = $ret['title']; - $resp->thumbnail_url = $ret['thumbnail_url']; - return $resp; - } -} diff --git a/inc/config.php b/inc/config.php index 8afb699f..71b0fbf4 100644 --- a/inc/config.php +++ b/inc/config.php @@ -943,10 +943,6 @@ // Location of thumbnail to use for deleted images. $config['image_deleted'] = 'static/deleted.png'; - // When a thumbnailed image is going to be the same (in dimension), just copy the entire file and use - // that as a thumbnail instead of resizing/redrawing. - $config['minimum_copy_resize'] = false; - // Maximum image upload size in bytes. $config['max_filesize'] = 10 * 1024 * 1024; // 10MB // Maximum image dimensions. @@ -985,15 +981,6 @@ // Set this to true if you're using Linux and you can execute `md5sum` binary. $config['gnu_md5'] = false; - // Use Tesseract OCR to retrieve text from images, so you can use it as a spamfilter. - $config['tesseract_ocr'] = false; - - // Tesseract parameters - $config['tesseract_params'] = ''; - - // Tesseract preprocess command - $config['tesseract_preprocess_command'] = 'convert -monochrome %s -'; - // Number of posts in a "View Last X Posts" page $config['noko50_count'] = 50; // Number of posts a thread needs before it gets a "View Last X Posts" page. @@ -1265,37 +1252,6 @@ $config['embed_width'] = 300; $config['embed_height'] = 246; - // Download timeout for the remove embed thumbnails in seconds. - $config['embed_thumb_timeout'] = 2; - - /** - * Replacement parameters: - * - $1-$N: matched arguments from 'match_regex'. - * - %%thumbnail_path%%: Path to the downloaded thumbnail. - */ - $config['embedding_2'] = [ - [ - 'match_regex' => '/^(?:(?:https?:)?\/\/)?((?:www|m)\.)?(?:(?:youtube(?:-nocookie)?\.com|youtu\.be))(?:\/(?:[\w\-]+\?v=|embed\/|live\/|v\/)?)([\w\-]{11})((?:\?|\&)\S+)?$/i', - 'type' => 'regex', - 'thumbnail_url' => 'https://img.youtube.com/vi/$2/0.jpg', - 'html' => '
- - - -
' - ], - [ - 'match_regex' => '/^https?:\/\/(\w+\.)?tiktok\.com\/@([a-z0-9\-_]+)\/video\/([0-9]+)\?.*$/i', - 'type' => 'oembed', - 'provider_url' => 'https://www.tiktok.com/oembed', - 'html' => '
- - - -
' - ] - ]; - /* * ==================== * Error messages diff --git a/inc/context.php b/inc/context.php index c5375d89..11a153ec 100644 --- a/inc/context.php +++ b/inc/context.php @@ -2,9 +2,7 @@ namespace Vichan; use Vichan\Data\{IpNoteQueries, ReportQueries, UserPostQueries}; -use Vichan\Data\Driver\{CacheDriver, HttpDriver, ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver}; -use Vichan\Service\Embed\EmbedService; -use Vichan\Service\Embed\OembedExtractor; +use Vichan\Data\Driver\{CacheDriver, ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver}; defined('TINYBOARD') or exit; @@ -65,10 +63,6 @@ function build_context(array $config): Context { // Use the global for backwards compatibility. return \cache::getCache(); }, - HttpDriver::class => function($c) { - $config = $c->get('config'); - return new HttpDriver($config['upload_by_url_timeout'], $config['max_filesize']); - }, \PDO::class => function($c) { global $pdo; // Ensure the PDO is initialized. @@ -84,19 +78,5 @@ function build_context(array $config): Context { return new UserPostQueries($c->get(\PDO::class)); }, IpNoteQueries::class => fn($c) => new IpNoteQueries($c->get(\PDO::class), $c->get(CacheDriver::class)), - OembedExtractor::class => fn($c) => new OembedExtractor( - $c->get(CacheDriver::class), - $c->get(HttpDriver::class), - $c->get('config')['embed_thumb_timeout'] - ), - EmbedService::class => function($c) { - $config = $c->get('config'); - return new EmbedService( - $c->get(LogDriver::class), - $c->get(OembedExtractor::class), - $config['embedding_2'], - $config['embed_thumb_timeout'] - ); - } ]); } diff --git a/js/post-menu.js b/js/post-menu.js index 79cfd868..c2155c00 100644 --- a/js/post-menu.js +++ b/js/post-menu.js @@ -104,8 +104,10 @@ function buildMenu(e) { function addButton(post) { var $ele = $(post); + // Use unicode code with ascii variant selector + // https://stackoverflow.com/questions/37906969/how-to-prevent-ios-from-converting-ascii-into-emoji $ele.find('input.delete').after( - $('', {href: '#', class: 'post-btn', title: 'Post menu'}).text('►') + $('', {href: '#', class: 'post-btn', title: 'Post menu'}).text('\u{25B6}\u{fe0e}') ); } diff --git a/post.php b/post.php index b8d2073f..5483600d 100644 --- a/post.php +++ b/post.php @@ -262,26 +262,6 @@ function send_matrix_report( } } -function normalize_files(array $file_array) { - $out_files = []; - // If more than 0 files were uploaded - if (!empty($file_array['tmp_name'][0])) { - $i = 0; - $n = count($file_array['tmp_name']); - while ($i < $n) { - $out_files[strval($i + 1)] = array( - 'name' => $file_array['name'][$i], - 'tmp_name' => $file_array['tmp_name'][$i], - 'type' => $file_array['type'][$i], - 'error' => $file_array['error'][$i], - 'size' => $file_array['size'][$i] - ); - $i++; - } - } - return $out_files; -} - /** * Deletes the (single) captcha associated with the ip and code. * @@ -944,6 +924,7 @@ function handle_post(Context $ctx) isset($post['thread']) ? $post['thread'] : ($config['try_smarter'] && isset($_POST['page']) ? 0 - (int) $_POST['page'] : null) ) ); + //$post['antispam_hash'] = checkSpam(); if ($post['antispam_hash'] === true) { error($config['error']['spam']); @@ -972,11 +953,7 @@ function handle_post(Context $ctx) // Check for an embed field if ($config['enable_embedding'] && isset($_POST['embed']) && !empty($_POST['embed'])) { // yep; validate it - $value = \trim($_POST['embed']); - if (\filter_var($value, \FILTER_VALIDATE_URL) === false) { - error($config['error']['invalid_embed']); - } - + $value = $_POST['embed']; foreach ($config['embedding'] as &$embed) { if (preg_match($embed[0], $value)) { // Valid link @@ -1013,7 +990,23 @@ function handle_post(Context $ctx) // Convert multiple upload format to array of files. This makes the following code // work the same whether we used the JS or HTML multiple file upload techniques. if (array_key_exists('file_multiple', $_FILES)) { - $_FILES = normalize_files($_FILES['file_multiple']); + $file_array = $_FILES['file_multiple']; + $_FILES = []; + // If more than 0 files were uploaded + if (!empty($file_array['tmp_name'][0])) { + $i = 0; + $n = count($file_array['tmp_name']); + while ($i < $n) { + $_FILES[strval($i + 1)] = array( + 'name' => $file_array['name'][$i], + 'tmp_name' => $file_array['tmp_name'][$i], + 'type' => $file_array['type'][$i], + 'error' => $file_array['error'][$i], + 'size' => $file_array['size'][$i] + ); + $i++; + } + } } // We must do this check now before the passowrd is hashed and overwritten. @@ -1409,13 +1402,13 @@ function handle_post(Context $ctx) $file['thumbwidth'] = $size[0]; $file['thumbheight'] = $size[1]; } elseif ( - $config['minimum_copy_resize'] && + (($config['strip_exif'] && isset($file['exif_stripped']) && $file['exif_stripped']) || !$config['strip_exif']) && $image->size->width <= $config['thumb_width'] && $image->size->height <= $config['thumb_height'] && $file['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension']) ) { // Copy, because there's nothing to resize - coopy($file['tmp_name'], $file['thumb']); + copy($file['tmp_name'], $file['thumb']); $file['thumbwidth'] = $image->size->width; $file['thumbheight'] = $image->size->height; @@ -1558,35 +1551,6 @@ function handle_post(Context $ctx) } } - if ($config['tesseract_ocr'] && $file['thumb'] != 'file') { - // Let's OCR it! - $fname = $file['tmp_name']; - - if ($file['height'] > 500 || $file['width'] > 500) { - $fname = $file['thumb']; - } - - if ($fname == 'spoiler') { - // We don't have that much CPU time, do we? - } else { - $tmpname = __DIR__ . "/tmp/tesseract/" . rand(0, 10000000); - - // Preprocess command is an ImageMagick b/w quantization - $error = shell_exec_error(sprintf($config['tesseract_preprocess_command'], escapeshellarg($fname)) . " | " . - 'tesseract stdin ' . escapeshellarg($tmpname) . ' ' . $config['tesseract_params']); - $tmpname .= ".txt"; - - $value = @file_get_contents($tmpname); - @unlink($tmpname); - - if ($value && trim($value)) { - // This one has an effect, that the body is appended to a post body. So you can write a correct - // spamfilter. - $post['body_nomarkup'] .= "" . htmlspecialchars($value) . ""; - } - } - } - if (!isset($dont_copy_file) || !$dont_copy_file) { if (isset($file['file_tmp'])) { if (!@rename($file['tmp_name'], $file['file'])) { @@ -1634,11 +1598,6 @@ function handle_post(Context $ctx) } } - // Do filters again if OCRing - if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) { - do_filters($ctx, $post); - } - if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup']) && !$dropped_post) { undoImage($post); if ($config['robot_mute']) { diff --git a/static/banners/just-monika-opt.webp b/static/banners/just-monika-opt.webp deleted file mode 100644 index 731f985a..00000000 Binary files a/static/banners/just-monika-opt.webp and /dev/null differ diff --git a/stylesheets/style.css b/stylesheets/style.css index 815e1853..4a090f33 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -380,6 +380,7 @@ form table tr td div.center { .file { float: left; + min-width: 100px; } .file:not(.multifile) .post-image { @@ -390,6 +391,10 @@ form table tr td div.center { float: none; } +.file.multifile { + margin: 0 10px 0 0; +} + .file.multifile > p { width: 0px; min-width: 100%; diff --git a/templates/themes/categories/frames.html b/templates/themes/categories/frames.html index 6b2fac38..1c4673cc 100644 --- a/templates/themes/categories/frames.html +++ b/templates/themes/categories/frames.html @@ -16,13 +16,13 @@ border-width: 2px; margin-right: 15px; } - + .introduction { grid-column: 2 / 9; grid-row: 1; width: 100%; } - + .content { grid-column: 2 / 9; grid-row: 2; @@ -35,7 +35,7 @@ gap: 20px; height: 100vh; } - + .modlog { width: 50%; text-align: left; @@ -69,7 +69,7 @@ li a.system { font-weight: bold; } - + @media (max-width:768px) { body{ display: grid; @@ -78,7 +78,7 @@ height: 100vh; width: 100%; } - + .introduction { grid-column: 1; grid-row: 1; @@ -96,17 +96,18 @@ grid-column: 1; grid-row: 3; width: 100%; + word-break: break-all; } - + .modlog { width: 100%; text-align: center; } - + table { table-layout: fixed; } - + table.modlog tr th { white-space: normal; word-wrap: break-word; diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index 484c4eb0..76722e41 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -11,7 +11,7 @@ .home-description { margin: 20px auto 0 auto; text-align: center; - max-width: 700px;" + max-width: 700px; } {{ boardlist.top }} diff --git a/tmp/tesseract/.gitkeep b/tmp/tesseract/.gitkeep deleted file mode 100644 index e69de29b..00000000