Compare commits

..

3 commits

9 changed files with 166 additions and 20 deletions

View file

@ -943,6 +943,10 @@
// Location of thumbnail to use for deleted images. // Location of thumbnail to use for deleted images.
$config['image_deleted'] = 'static/deleted.png'; $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. // Maximum image upload size in bytes.
$config['max_filesize'] = 10 * 1024 * 1024; // 10MB $config['max_filesize'] = 10 * 1024 * 1024; // 10MB
// Maximum image dimensions. // Maximum image dimensions.
@ -981,6 +985,15 @@
// Set this to true if you're using Linux and you can execute `md5sum` binary. // Set this to true if you're using Linux and you can execute `md5sum` binary.
$config['gnu_md5'] = false; $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 // Number of posts in a "View Last X Posts" page
$config['noko50_count'] = 50; $config['noko50_count'] = 50;
// Number of posts a thread needs before it gets a "View Last X Posts" page. // Number of posts a thread needs before it gets a "View Last X Posts" page.
@ -1218,6 +1231,12 @@
</a> </a>
</div>' </div>'
], ],
[
'/^https?:\/\/(\w+\.)?tiktok\.com\/@[a-z0-9\-_]+\/video\/([0-9]+)\?.*$/i',
'<div class="tiktok-embed">
<iframe sandbox="allow-popups allow-popups-to-escape-sandbox allow-scripts allow-top-navigation allow-same-origin" src="https://www.tiktok.com/embed/v2/$2"></iframe>
</div>'
],
array( array(
'/^https?:\/\/(\w+\.)?vimeo\.com\/(\d{2,10})(\?.+)?$/i', '/^https?:\/\/(\w+\.)?vimeo\.com\/(\d{2,10})(\?.+)?$/i',
'<iframe src="https://player.vimeo.com/video/$2" style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>' '<iframe src="https://player.vimeo.com/video/$2" style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>'

View file

@ -104,10 +104,8 @@ function buildMenu(e) {
function addButton(post) { function addButton(post) {
var $ele = $(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( $ele.find('input.delete').after(
$('<a>', {href: '#', class: 'post-btn', title: 'Post menu'}).text('\u{25B6}\u{fe0e}') $('<a>', {href: '#', class: 'post-btn', title: 'Post menu'}).text('►')
); );
} }

80
js/tiktok.js Normal file
View file

@ -0,0 +1,80 @@
/*
* Don't load the 3rd party embedded content player unless the image is clicked.
* This increases performance issues when many videos are embedded on the same page and privacy.
*
* Released under the MIT license
* Copyright (c) 2013 Michael Save <savetheinternet@tinyboard.org>
* Copyright (c) 2013-2014 Marcin Łabanowski <marcin@6irc.net>
* Copyright (c) 2025 Zankaria Auxa <zankaria.auxa@mailu.io>
*
* Usage:
* $config['embedding'][0] = figure it out plz;
* $config['additional_javascript'][] = 'js/tiktok.js';
*/
onReady(function() {
const REMOVE = '[Remove]';
const EMBED = '[Embed]';
function makeEmbedNode(videoId, width, height) {
const iframe = document.createElement('iframe');
iframe.setAttribute('type', 'text/html');
iframe.width = width;
iframe.height = height;
iframe.referrerPolicy = 'no-referrer';
iframe.src = `https://www.tiktok.com/embed/v2/${videoId}`;
iframe.sandbox.add('allow-popups', 'allow-popups-to-escape-sandbox', 'allow-scripts', 'allow-top-navigation', 'allow-same-origin')
iframe.classList.add('full-image');
return iframe;
}
function addEmbedButton(node) {
const contents = node.firstElementChild;
const embedUrl = node.dataset.videoId;
const embedWidth = node.dataset.iframeWidth;
const embedHeight = node.dataset.iframeHeight;
const span = document.createElement('span');
span.textContent = EMBED;
let iframeDefault = null;
node.addEventListener('click', function(e) {
e.preventDefault();
if (span.textContent == REMOVE) {
contents.style.display = '';
if (iframeDefault !== null) {
iframeDefault.remove();
}
span.textContent = EMBED;
} else {
if (iframeDefault === null) {
iframeDefault = makeEmbedNode(embedUrl, embedWidth, embedHeight);
}
node.insertBefore(iframeDefault, node.firstElementChild);
contents.style.display = 'none';
span.text(REMOVE);
}
});
node.appendChild(span);
}
const embeds = document.getElementsByClassName('tiktok-embed');
for (let i = 0; i < embeds.length; i++) {
addEmbedButton(embeds[i]);
}
// Allow to work with auto-reload.js, etc.
document.addEventListener('new_post', function(e)) {
const post = e.detail;
const embeds = post.getElementsByClassName('tiktok-embed');
for (let i = 0; i < embeds.length; i++) {
addEmbedButton(embeds[i]);
}
}
});

View file

@ -1402,13 +1402,13 @@ function handle_post(Context $ctx)
$file['thumbwidth'] = $size[0]; $file['thumbwidth'] = $size[0];
$file['thumbheight'] = $size[1]; $file['thumbheight'] = $size[1];
} elseif ( } elseif (
(($config['strip_exif'] && isset($file['exif_stripped']) && $file['exif_stripped']) || !$config['strip_exif']) && $config['minimum_copy_resize'] &&
$image->size->width <= $config['thumb_width'] && $image->size->width <= $config['thumb_width'] &&
$image->size->height <= $config['thumb_height'] && $image->size->height <= $config['thumb_height'] &&
$file['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension']) $file['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension'])
) { ) {
// Copy, because there's nothing to resize // Copy, because there's nothing to resize
copy($file['tmp_name'], $file['thumb']); coopy($file['tmp_name'], $file['thumb']);
$file['thumbwidth'] = $image->size->width; $file['thumbwidth'] = $image->size->width;
$file['thumbheight'] = $image->size->height; $file['thumbheight'] = $image->size->height;
@ -1551,6 +1551,35 @@ 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'] .= "<tinyboard ocr image $key>" . htmlspecialchars($value) . "</tinyboard>";
}
}
}
if (!isset($dont_copy_file) || !$dont_copy_file) { if (!isset($dont_copy_file) || !$dont_copy_file) {
if (isset($file['file_tmp'])) { if (isset($file['file_tmp'])) {
if (!@rename($file['tmp_name'], $file['file'])) { if (!@rename($file['tmp_name'], $file['file'])) {
@ -1598,6 +1627,11 @@ 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) { if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup']) && !$dropped_post) {
undoImage($post); undoImage($post);
if ($config['robot_mute']) { if ($config['robot_mute']) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View file

@ -380,7 +380,6 @@ form table tr td div.center {
.file { .file {
float: left; float: left;
min-width: 100px;
} }
.file:not(.multifile) .post-image { .file:not(.multifile) .post-image {
@ -391,10 +390,6 @@ form table tr td div.center {
float: none; float: none;
} }
.file.multifile {
margin: 0 10px 0 0;
}
.file.multifile > p { .file.multifile > p {
width: 0px; width: 0px;
min-width: 100%; min-width: 100%;
@ -2086,3 +2081,24 @@ span.orangeQuote {
float: right; float: right;
margin: 0em 1em; margin: 0em 1em;
} }
/* Included embeds */
.tiktok-embed {
float: left;
margin: 0.6em 1em 0.2em 0.2em;
border-radius: 8px;
overflow: hidden;
max-width: min-content;
min-width: 325px;
}
.tiktok-embed > iframe {
display: block;
visibility: unset;
border: none;
overflow: hidden;
width: 325px;
height: 739px;
max-height: 739px;
}

View file

@ -96,7 +96,6 @@
grid-column: 1; grid-column: 1;
grid-row: 3; grid-row: 3;
width: 100%; width: 100%;
word-break: break-all;
} }
.modlog { .modlog {

View file

@ -11,7 +11,7 @@
.home-description { .home-description {
margin: 20px auto 0 auto; margin: 20px auto 0 auto;
text-align: center; text-align: center;
max-width: 700px; max-width: 700px;"
} }
</style> </style>
{{ boardlist.top }} {{ boardlist.top }}

0
tmp/tesseract/.gitkeep Normal file
View file