kibi/f0ckm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(chan): use /abyss/:board/:tid path format for thread scroller

Browse Source
This commit is contained in:
kibi
2026-09-26 16:07:56 +02:00
parent 875bc9fef2
commit 3d6e762dcc
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/s/js/scroller.js
+20 -12
View File
@@ -1456,7 +1456,7 @@
? `<a class="scroll-id-link" href="https://boards.4chan.org/${item.external_board}/thread/${item.external_tid}#p${item.external_id}" target="_blank">/${item.external_board}/thread/${item.external_tid}</a>`
: (item.local_id
? `<a class="scroll-id-link" href="/${item.local_id}" target="_blank">#${item.local_id}</a>`
: `<a class="scroll-id-link" href="/abyss#${item.id}">#${item.id}</a>`)}
: `<a class="scroll-id-link" href="/abyss/${item.id}">#${item.id}</a>`)}
</div>`;
slide.appendChild(meta);
@@ -1636,8 +1636,8 @@
const localId = slide?.dataset.localId;
const id = localId || shareBtn.dataset.id;
const abyssUrl = localId
? `${location.origin}/abyss#${localId}`
: `${location.origin}/abyss#${id}`;
? `${location.origin}/abyss/${localId}`
: (id ? `${location.origin}/abyss/${id}` : `${location.origin}/abyss`);
openSharePanel(abyssUrl);
});
const rehostBtn = actions.querySelector('.rehost-btn');
@@ -3139,7 +3139,7 @@
});
}
// ── Auto-load 4chan thread from hash (e.g. #wsg/6132740) ────────────────
// ── Auto-load 4chan thread from path or hash (e.g. /abyss/wsg/6211653 or #wsg/6211653) ────────────────
let chanHashPending = null; // async promise if we need server lookup
{
const hid = hashId();
@@ -3153,21 +3153,29 @@
const postMap = JSON.parse(localStorage.getItem('4chan_post_threads') || '{}');
tid = postMap[hid]; // hid is "board/postno"
} catch(_) {}
if (tid) {
applied.externalUrl = `https://boards.4chan.org/${board}/thread/${tid}`;
const effectiveTid = tid || postno;
applied.externalUrl = `https://boards.4chan.org/${board}/thread/${effectiveTid}`;
applied.order = 'oldest';
unlock4chan();
} else {
// No local mapping — ask the server to find the thread
if (!tid) {
// In case postno was a reply post rather than thread OP, query find in background
chanHashPending = fetch(`/api/v2/scroller/external/4chan/${board}/find/${postno}`)
.then(r => r.json())
.then(data => {
window.f0ckDebug('[CHAN] Find result:', data);
window.f0ckDebug && window.f0ckDebug('[CHAN] Find result:', data);
if (data.success && data.tid) {
try {
const postMap = JSON.parse(localStorage.getItem('4chan_post_threads') || '{}');
postMap[hid] = data.tid;
localStorage.setItem('4chan_post_threads', JSON.stringify(postMap));
} catch(_) {}
if (String(data.tid) !== String(effectiveTid)) {
applied.externalUrl = `https://boards.4chan.org/${board}/thread/${data.tid}`;
applied.order = 'oldest';
unlock4chan();
window.f0ckDebug('[CHAN] Set externalUrl:', applied.externalUrl);
reloadFeed();
}
}
})
.catch(err => { console.error('[CHAN] Find error:', err); });
@@ -3923,7 +3931,7 @@
const restored = tryRestoreFromCache();
if (!restored) {
if (chanHashPending) {
if (chanHashPending && !applied.externalUrl) {
chanHashPending.then(() => fetchItems());
} else {
fetchItems();
src/inc/lib.mjs
+3 -2
View File
@@ -545,15 +545,16 @@ export default new class {
};
async chanAuth(req, res, next) {
const isApi = (req.url?.pathname && req.url.pathname.startsWith('/api/')) || req.headers['x-requested-with'] === 'XMLHttpRequest' || req.headers['accept']?.includes('application/json');
if (!req.session || !req.session.user) {
if (req.headers['x-requested-with'] === 'XMLHttpRequest') {
if (isApi) {
return res.reply({ code: 401, body: JSON.stringify({ success: false, msg: "Unauthorized" }), type: 'application/json' });
}
return res.redirect('/login');
}
const hasGroup = req.session.admin || (Array.isArray(req.session.groups) && req.session.groups.includes('4chan'));
if (!hasGroup) {
if (req.headers['x-requested-with'] === 'XMLHttpRequest') {
if (isApi) {
return res.reply({ code: 403, body: JSON.stringify({ success: false, msg: "4chan group required" }), type: 'application/json' });
}
return res.reply({
src/inc/routes/scroller.mjs
+12
View File
@@ -5,6 +5,12 @@ import f0cklib from "../routeinc/f0cklib.mjs";
import { isAnonymizeSession, isAnonSession } from "../settings.mjs";
export default (router, tpl) => {
// Redirect /scroller to /abyss (preserving ID or fragment)
router.get(/^\/scroller(?:\/(?<id>[a-zA-Z0-9_\/-]+))?\/?$/, (req, res) => {
const id = req.params?.id || req.params?.[0];
return res.redirect(id ? `/abyss/${id}` : '/abyss');
});
// Serve the scroller page
router.get(/^\/abyss(?:\/(?<id>[a-zA-Z0-9_\/-]+))?\/?$/, async (req, res) => {
if (cfg.websrv.abyss_enabled === false) return res.reply({ code: 404, body: tpl.render('error', { message: 'Not found', tmp: null }, req) });
@@ -48,6 +54,12 @@ export default (router, tpl) => {
} catch (e) {
console.error('[SCROLLER] Failed to fetch meta for ID:', id, e);
}
} else if (id && /^([a-z0-9]+)\/(\d+)$/i.test(id.trim())) {
const chanMatch = id.trim().match(/^([a-z0-9]+)\/(\d+)$/i);
const [, board, tid] = chanMatch;
page_meta.title = `/${board}/${tid} — Abyss`;
page_meta.description = `Watch /${board}/ thread ${tid} in Abyss`;
page_meta.url = `https://${cfg.main.url.domain}/abyss/${board}/${tid}`;
}
return res.reply({
views/chan/thread.html
+2 -2
View File
@@ -14,8 +14,8 @@
<i class="fa-solid fa-play"></i> Player View
</a>
@endif
<a href="/scroller#{{ board }}/{{ tid }}" class="chan-action-btn" title="Open in vertical video scroller">
<i class="fa-solid fa-mobile-screen"></i> Scroller
<a href="/abyss/{{ board }}/{{ tid }}" class="chan-action-btn" title="Open in Abyss vertical video scroller">
<i class="fa-solid fa-dice-d6"></i> Abyss
</a>
<a href="https://boards.4chan.org/{{ board }}/thread/{{ tid }}" target="_blank" rel="noopener noreferrer" class="chan-action-btn" title="View original thread on 4chan">
<i class="fa-solid fa-arrow-up-right-from-square"></i> 4chan.org