Compare commits
5 Commits
eins-patch
...
f0bm
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
964284d5c9 | ||
|
|
9b1041dda7 | ||
|
|
45f9345e9c | ||
|
|
c74e5a7402 | ||
|
|
6799ec1567 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@ deleted/b
|
||||
deleted/ca
|
||||
deleted/t
|
||||
tmp/*
|
||||
tools
|
||||
@@ -1197,7 +1197,9 @@ body {
|
||||
overscroll-behavior-y: contain;
|
||||
overflow: unset;
|
||||
font-size: 14px;
|
||||
height: /* 100%; */auto;
|
||||
height:
|
||||
/* 100%; */
|
||||
auto;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
@@ -1318,6 +1320,13 @@ div.posts>a:hover::after {
|
||||
grid-template-columns: auto 1fr 0fr;
|
||||
justify-content: start;
|
||||
border-bottom: 1px solid var(--nav-border-color);
|
||||
background: var(--nav-bg);
|
||||
transition: background 0.2s ease;
|
||||
}
|
||||
|
||||
.navbar.scrolled {
|
||||
background: #000 !important;
|
||||
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
@@ -1424,7 +1433,7 @@ ul.navbar-nav li.nav-item {
|
||||
}
|
||||
|
||||
.nav-link[data-toggle="dropdown"].ddcontent::after {
|
||||
content: "\00a0("attr(content) ")\00a0\25bc";
|
||||
content: "\00a0(" attr(content) ")\00a0\25bc";
|
||||
}
|
||||
|
||||
.nav-link[data-toggle="dropdown"]:not(.ddcontent)::after {
|
||||
@@ -1608,7 +1617,7 @@ span.placeholder {
|
||||
}
|
||||
|
||||
@media (max-width: 1325px) {
|
||||
/* ranking page - idea */
|
||||
/* ranking page - idea */
|
||||
/* .ranking {
|
||||
grid-template-columns: 1fr 1fr !important;
|
||||
} */
|
||||
@@ -1783,8 +1792,9 @@ span.placeholder {
|
||||
.index-container {
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
/* background-color: var(--navigation-links-bg);
|
||||
*/}
|
||||
/* background-color: var(--navigation-links-bg);
|
||||
*/
|
||||
}
|
||||
|
||||
@media (min-width: 361px) {
|
||||
.embed-responsive-image {
|
||||
@@ -2779,7 +2789,9 @@ ul.navbar-nav-guests li.nav-item {
|
||||
margin-right: .5rem;
|
||||
}
|
||||
|
||||
.navbar-expand-lg .navbar-nav-guests .nav-link, .pagination > a, .pagination > span {
|
||||
.navbar-expand-lg .navbar-nav-guests .nav-link,
|
||||
.pagination>a,
|
||||
.pagination>span {
|
||||
padding-right: .5rem;
|
||||
padding-left: .5rem;
|
||||
}
|
||||
@@ -2792,7 +2804,7 @@ ul.navbar-nav-guests li.nav-item {
|
||||
margin: 0;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
|
||||
ul.navbar-nav-guests li.nav-item {
|
||||
margin-right: unset;
|
||||
}
|
||||
@@ -2812,16 +2824,20 @@ ul.navbar-nav-guests li.nav-item {
|
||||
|
||||
/* Pagination Responsiveness */
|
||||
@media (max-width: 799px) {
|
||||
.navbar-expand-lg .navbar-nav-guests .nav-link, .pagination > a, .pagination > span {
|
||||
|
||||
.navbar-expand-lg .navbar-nav-guests .nav-link,
|
||||
.pagination>a,
|
||||
.pagination>span {
|
||||
padding-right: 2px;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
.pagination > a, .pagination > span {
|
||||
|
||||
.pagination>a,
|
||||
.pagination>span {
|
||||
margin-right: 2px;
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
|
||||
.pagination {
|
||||
justify-content: center !important;
|
||||
}
|
||||
@@ -2830,15 +2846,19 @@ ul.navbar-nav-guests li.nav-item {
|
||||
/* fadeIn effect */
|
||||
@keyframes fadeIn {
|
||||
0% {
|
||||
opacity: 0;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 1;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
img#f0ck-image, div.imageDoor, div.posts a, video {
|
||||
animation: 1s ease-out 0s 1 fadeInFX;
|
||||
img#f0ck-image,
|
||||
div.imageDoor,
|
||||
div.posts a,
|
||||
video {
|
||||
animation: 1s ease-out 0s 1 fadeInFX;
|
||||
}
|
||||
|
||||
/* f0ckgle */
|
||||
@@ -2867,7 +2887,7 @@ img#f0ck-image, div.imageDoor, div.posts a, video {
|
||||
background: var(--nav-bg);
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
|
||||
.profile_head_avatar {
|
||||
margin: 0;
|
||||
}
|
||||
@@ -2892,11 +2912,13 @@ img#f0ck-image, div.imageDoor, div.posts a, video {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.f0cks h5, .favs h5 {
|
||||
.f0cks h5,
|
||||
.favs h5 {
|
||||
background: var(--dropdown-bg);
|
||||
}
|
||||
|
||||
.f0cks-header, .favs-header {
|
||||
.f0cks-header,
|
||||
.favs-header {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr auto;
|
||||
background: var(--img-border-color);
|
||||
@@ -2940,46 +2962,50 @@ button#togglebg {
|
||||
0% {
|
||||
opacity: 0;
|
||||
}
|
||||
100% {
|
||||
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes fadeOutFX {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
100% {
|
||||
|
||||
100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@keyframes fadeIn {
|
||||
0% {
|
||||
opacity: 0;
|
||||
}
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0.2;
|
||||
}
|
||||
opacity: 0.2;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes fadeOut {
|
||||
0% {
|
||||
opacity: 0.2;
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
}
|
||||
0% {
|
||||
opacity: 0.2;
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.fader-in {
|
||||
animation: fadeIn .8s steps(100) forwards;
|
||||
animation: fadeIn .8s steps(100) forwards;
|
||||
}
|
||||
|
||||
.fader-out {
|
||||
animation: fadeOut .8s steps(100) forwards
|
||||
}
|
||||
animation: fadeOut .8s steps(100) forwards
|
||||
}
|
||||
|
||||
.settings {
|
||||
display: grid;
|
||||
@@ -3004,6 +3030,7 @@ input#s_avatar {
|
||||
#s_avatar:hover {
|
||||
background: #ffffff0f;
|
||||
}
|
||||
|
||||
.theforceofthree {
|
||||
display: grid;
|
||||
grid-template-columns: 0.4fr 1fr 0.4fr;
|
||||
@@ -3011,4 +3038,24 @@ input#s_avatar {
|
||||
|
||||
.upload {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
/* Infinite scroll loading indicator */
|
||||
.loading-spinner {
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
color: var(--footbar-color);
|
||||
animation: pulse 1s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
|
||||
0%,
|
||||
100% {
|
||||
opacity: 0.4;
|
||||
}
|
||||
|
||||
50% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
@@ -130,12 +130,12 @@
|
||||
return false;
|
||||
}
|
||||
renderTags(res.tags);
|
||||
span.parentElement.removeChild(span);
|
||||
if (span.parentElement) span.parentElement.removeChild(span);
|
||||
testList.innerText = "";
|
||||
addtagClick();
|
||||
}
|
||||
else if (e.key === "Escape") {
|
||||
span.parentElement.removeChild(span);
|
||||
if (span.parentElement) span.parentElement.removeChild(span);
|
||||
testList.innerText = "";
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -68,6 +68,18 @@ window.requestAnimFrame = (function () {
|
||||
}
|
||||
};
|
||||
|
||||
// Navbar scroll effect - make background black when scrolling
|
||||
const navbar = document.querySelector('.navbar');
|
||||
if (navbar) {
|
||||
window.addEventListener('scroll', () => {
|
||||
if (window.scrollY > 50) {
|
||||
navbar.classList.add('scrolled');
|
||||
} else {
|
||||
navbar.classList.remove('scrolled');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const loadItemAjax = async (url, inheritContext = true) => {
|
||||
console.log("loadItemAjax called with:", url, "inheritContext:", inheritContext);
|
||||
// Show loading indicator
|
||||
@@ -140,7 +152,7 @@ window.requestAnimFrame = (function () {
|
||||
html = rawText;
|
||||
}
|
||||
|
||||
let container = document.querySelector('.container');
|
||||
let container = document.querySelector('#main .container');
|
||||
|
||||
if (!container && document.querySelector('.index-container')) {
|
||||
// Transition from Index to Item View
|
||||
@@ -148,13 +160,19 @@ window.requestAnimFrame = (function () {
|
||||
main.innerHTML = '<div class="container"></div>';
|
||||
container = main.querySelector('.container');
|
||||
} else if (container) {
|
||||
// Already in Item View, clear usage
|
||||
const oldContent = container.querySelector('.content');
|
||||
const oldMetadata = container.querySelector('.metadata');
|
||||
const oldHeader = container.querySelector('._204863');
|
||||
if (oldHeader) oldHeader.remove();
|
||||
if (oldContent) oldContent.remove();
|
||||
if (oldMetadata) oldMetadata.remove();
|
||||
// Check if we are on Tags Overview logic (which reuses .container)
|
||||
const tagsOverview = container.querySelector('.tags');
|
||||
if (tagsOverview) {
|
||||
container.innerHTML = '';
|
||||
} else {
|
||||
// Already in Item View, clear usage
|
||||
const oldContent = container.querySelector('.content');
|
||||
const oldMetadata = container.querySelector('.metadata');
|
||||
const oldHeader = container.querySelector('._204863');
|
||||
if (oldHeader) oldHeader.remove();
|
||||
if (oldContent) oldContent.remove();
|
||||
if (oldMetadata) oldMetadata.remove();
|
||||
}
|
||||
}
|
||||
|
||||
container.insertAdjacentHTML('beforeend', html);
|
||||
@@ -187,13 +205,12 @@ window.requestAnimFrame = (function () {
|
||||
};
|
||||
|
||||
const changePage = (e, pbwork = true) => {
|
||||
if (e.tagName === 'A') {
|
||||
e.preventDefault();
|
||||
loadItemAjax(e.href);
|
||||
} else {
|
||||
pbwork && document.querySelector("nav.navbar").classList.add("pbwork");
|
||||
!tt && (tt = setTimeout(() => e.click(), stimeout));
|
||||
if (pbwork) {
|
||||
const nav = document.querySelector("nav.navbar");
|
||||
if (nav) nav.classList.add("pbwork");
|
||||
}
|
||||
// Trigger native click for navigation
|
||||
e.click();
|
||||
};
|
||||
|
||||
// Intercept clicks
|
||||
@@ -208,10 +225,10 @@ window.requestAnimFrame = (function () {
|
||||
return;
|
||||
}
|
||||
|
||||
const link = e.target.closest('#next, #prev, #random, .id-link, .nav-next, .nav-prev');
|
||||
const link = e.target.closest('#next, #prev, #random, #nav-random, .id-link, .nav-next, .nav-prev');
|
||||
if (link && link.href && link.hostname === window.location.hostname && !e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey) {
|
||||
// Special check for random
|
||||
if (link.id === 'random') {
|
||||
if (link.id === 'random' || link.id === 'nav-random') {
|
||||
e.preventDefault();
|
||||
const nav = document.querySelector("nav.navbar");
|
||||
if (nav) nav.classList.add("pbwork");
|
||||
@@ -240,7 +257,10 @@ window.requestAnimFrame = (function () {
|
||||
window.location.href = link.href;
|
||||
}
|
||||
})
|
||||
.catch(() => window.location.href = link.href);
|
||||
.catch((err) => {
|
||||
console.error("Random fetch failed:", err);
|
||||
window.location.href = link.href;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -261,7 +281,7 @@ window.requestAnimFrame = (function () {
|
||||
"a": clickOnElementBinding("#next"),
|
||||
"ArrowRight": clickOnElementBinding("#prev"),
|
||||
"d": clickOnElementBinding("#prev"),
|
||||
"r": clickOnElementBinding("#random"),
|
||||
"r": clickOnElementBinding("#random, #nav-random"),
|
||||
" ": clickOnElementBinding("#f0ck-image")
|
||||
};
|
||||
document.addEventListener("keydown", e => {
|
||||
@@ -327,59 +347,116 @@ window.requestAnimFrame = (function () {
|
||||
}
|
||||
// </image-responsive>
|
||||
|
||||
// <scroller>
|
||||
let tts = 0;
|
||||
const scroll_treshold = 1;
|
||||
if ([...document.querySelectorAll("div.posts")].length === 1) {
|
||||
document.addEventListener("wheel", e => {
|
||||
// <infinite-scroll>
|
||||
const postsContainer = document.querySelector("div.posts");
|
||||
if (postsContainer) {
|
||||
// Infinite scroll state
|
||||
let infiniteState = {
|
||||
loading: false,
|
||||
hasMore: true,
|
||||
currentPage: 1
|
||||
};
|
||||
|
||||
// Extract current page from URL
|
||||
const pageMatch = window.location.pathname.match(/\/p\/(\d+)/);
|
||||
if (pageMatch) infiniteState.currentPage = parseInt(pageMatch[1]);
|
||||
|
||||
// Extract context (tag/user/mime) from URL
|
||||
const getContext = () => {
|
||||
const ctx = {};
|
||||
const tagMatch = window.location.pathname.match(/\/tag\/([^/]+)/);
|
||||
if (tagMatch) ctx.tag = decodeURIComponent(tagMatch[1]);
|
||||
const userMatch = window.location.pathname.match(/\/user\/([^/]+)/);
|
||||
if (userMatch) ctx.user = decodeURIComponent(userMatch[1]);
|
||||
const mimeMatch = window.location.pathname.match(/\/(image|audio|video)(?:\/|$)/);
|
||||
if (mimeMatch) ctx.mime = mimeMatch[1];
|
||||
return ctx;
|
||||
};
|
||||
|
||||
// Build URL path for history
|
||||
const buildUrl = (page) => {
|
||||
const ctx = getContext();
|
||||
let path = '/';
|
||||
if (ctx.tag) path += `tag/${ctx.tag}/`;
|
||||
if (ctx.user) path += `user/${ctx.user}/`;
|
||||
if (ctx.mime) path += `${ctx.mime}/`;
|
||||
if (page > 1) path += `p/${page}`;
|
||||
return path.replace(/\/$/, '') || '/';
|
||||
};
|
||||
|
||||
// Fetch and append more items
|
||||
const loadMoreItems = async () => {
|
||||
if (infiniteState.loading || !infiniteState.hasMore) return;
|
||||
|
||||
infiniteState.loading = true;
|
||||
const foot = document.querySelector("div#footbar");
|
||||
if (foot) {
|
||||
foot.innerHTML = '<span class="loading-spinner">Loading...</span>';
|
||||
foot.style.color = 'var(--footbar-color)';
|
||||
}
|
||||
|
||||
const nextPage = infiniteState.currentPage + 1;
|
||||
const ctx = getContext();
|
||||
|
||||
const params = new URLSearchParams();
|
||||
params.append('page', nextPage);
|
||||
if (ctx.tag) params.append('tag', ctx.tag);
|
||||
if (ctx.user) params.append('user', ctx.user);
|
||||
if (ctx.mime) params.append('mime', ctx.mime);
|
||||
|
||||
try {
|
||||
const response = await fetch(`/ajax/items?${params.toString()}`);
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success && data.html) {
|
||||
// Append new thumbnails
|
||||
postsContainer.insertAdjacentHTML('beforeend', data.html);
|
||||
|
||||
// Update state
|
||||
infiniteState.currentPage = data.currentPage;
|
||||
infiniteState.hasMore = data.hasMore;
|
||||
|
||||
// Update URL
|
||||
history.replaceState({}, '', buildUrl(infiniteState.currentPage));
|
||||
|
||||
// Update pagination display if exists
|
||||
const paginationLinks = document.querySelectorAll('.pagination .pagination-int-item, .pagination .btn');
|
||||
paginationLinks.forEach(el => {
|
||||
if (el.textContent.trim() == infiniteState.currentPage) {
|
||||
el.classList.add('disabled');
|
||||
}
|
||||
});
|
||||
} else {
|
||||
infiniteState.hasMore = false;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Infinite scroll fetch error:', err);
|
||||
} finally {
|
||||
infiniteState.loading = false;
|
||||
if (foot) {
|
||||
foot.innerHTML = infiniteState.hasMore ? '▼' : '—';
|
||||
foot.style.color = 'transparent';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Scroll detection - preload before reaching bottom
|
||||
const PRELOAD_OFFSET = 500; // pixels before bottom to trigger load
|
||||
|
||||
window.addEventListener("scroll", () => {
|
||||
if (!document.querySelector('#main')) return;
|
||||
|
||||
if (Math.ceil(window.innerHeight + window.scrollY) >= document.querySelector('#main').offsetHeight && e.deltaY > 0) { // down
|
||||
if (elem = document.querySelector(".pagination > .next:not(.disabled)")) {
|
||||
if (tts < scroll_treshold) {
|
||||
const foot = document.querySelector("div#footbar");
|
||||
if (foot) {
|
||||
foot.style.boxShadow = "inset 0px 4px 0px var(--footbar-color)";
|
||||
foot.style.color = "var(--footbar-color)";
|
||||
}
|
||||
tts++;
|
||||
}
|
||||
else
|
||||
changePage(elem);
|
||||
}
|
||||
}
|
||||
else if (window.scrollY <= 0 && e.deltaY < 0) { // up
|
||||
if (elem = document.querySelector(".pagination > .prev:not(.disabled)")) {
|
||||
if (tts < scroll_treshold) {
|
||||
const nav = document.querySelector("nav.navbar");
|
||||
if (nav) {
|
||||
nav.style.boxShadow = "0px 2px 0px var(--loading-indicator-color)";
|
||||
nav.style.transition = ".2s ease-in-out";
|
||||
}
|
||||
tts++;
|
||||
}
|
||||
else
|
||||
changePage(elem);
|
||||
}
|
||||
}
|
||||
else {
|
||||
tts = 0;
|
||||
const foot = document.querySelector("div#footbar");
|
||||
if (foot) {
|
||||
foot.style.boxShadow = "unset";
|
||||
foot.style.color = "transparent";
|
||||
}
|
||||
const nav = document.querySelector("nav.navbar");
|
||||
if (nav) nav.style.boxShadow = "unset";
|
||||
const scrollPosition = window.innerHeight + window.scrollY;
|
||||
const pageHeight = document.querySelector('#main').offsetHeight;
|
||||
const distanceFromBottom = pageHeight - scrollPosition;
|
||||
|
||||
// Load more when within PRELOAD_OFFSET pixels of bottom
|
||||
if (distanceFromBottom < PRELOAD_OFFSET && infiniteState.hasMore && !infiniteState.loading) {
|
||||
loadMoreItems();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const rmatch = /\/p\/(\d+?)/;
|
||||
if (document.referrer.match(rmatch) && document.location.href.match(rmatch))
|
||||
if (document.location.href.match(rmatch) < document.referrer.match(rmatch))
|
||||
document.body.scrollTop = document.body.scrollHeight;
|
||||
// </scroller>
|
||||
// </infinite-scroll>
|
||||
|
||||
// <swipe>
|
||||
const swipeRT = {
|
||||
@@ -541,10 +618,13 @@ function init() {
|
||||
|
||||
window.addEventListener('load', init);
|
||||
|
||||
document.getElementById('sbtForm').addEventListener('submit', (e) => {
|
||||
e.preventDefault();
|
||||
const input = document.getElementById('sbtInput').value.trim();
|
||||
if (input) {
|
||||
window.location.href = `/tag/${encodeURIComponent(input)}`;
|
||||
}
|
||||
});
|
||||
const sbtForm = document.getElementById('sbtForm');
|
||||
if (sbtForm) {
|
||||
sbtForm.addEventListener('submit', (e) => {
|
||||
e.preventDefault();
|
||||
const input = document.getElementById('sbtInput').value.trim();
|
||||
if (input) {
|
||||
window.location.href = `/tag/${encodeURIComponent(input)}`;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
const Cookie = {
|
||||
get: name => {
|
||||
const c = document.cookie.match(`(?:(?:^|.*; *)${name} *= *([^;]*).*$)|^.*$`)[1];
|
||||
if(c) return decodeURIComponent(c);
|
||||
if (c) return decodeURIComponent(c);
|
||||
},
|
||||
set: (name, value, opts = {}) => {
|
||||
if(opts.days) {
|
||||
if (opts.days) {
|
||||
opts['max-age'] = opts.days * 60 * 60 * 24;
|
||||
delete opts.days;
|
||||
}
|
||||
@@ -17,8 +17,11 @@ const Cookie = {
|
||||
(() => {
|
||||
const acttheme = Cookie.get('theme') ?? "w0bm";
|
||||
const themecontainer = document.querySelector("li#themes > ul.dropdown-menu");
|
||||
|
||||
if (!themecontainer) return; // Theme menu not present on this page
|
||||
|
||||
const themes = [...themecontainer.querySelectorAll("li > a")].map(t => t.innerText.toLowerCase());
|
||||
if(acttheme !== document.documentElement.getAttribute("theme") && themes.includes(acttheme))
|
||||
if (acttheme !== document.documentElement.getAttribute("theme") && themes.includes(acttheme))
|
||||
document.documentElement.setAttribute("theme", acttheme);
|
||||
[...themecontainer.querySelectorAll("li > a")].forEach(t => t.addEventListener("click", e => {
|
||||
e.preventDefault();
|
||||
@@ -30,15 +33,15 @@ const Cookie = {
|
||||
}));
|
||||
|
||||
document.addEventListener("keydown", e => {
|
||||
if(e.target.tagName === "INPUT" || e.target.tagName === "TEXTAREA")
|
||||
if (e.target.tagName === "INPUT" || e.target.tagName === "TEXTAREA")
|
||||
return;
|
||||
const acttheme = Cookie.get('theme') ?? "w0bm";
|
||||
const themes = [...themecontainer.querySelectorAll("li > a")].map(t => t.innerText.toLowerCase());
|
||||
const k = e.key;
|
||||
if(k === "t") {
|
||||
if (k === "t") {
|
||||
e.preventDefault();
|
||||
let i = themes.indexOf(acttheme);
|
||||
if(++i >= themes.length)
|
||||
if (++i >= themes.length)
|
||||
i = 0;
|
||||
document.documentElement.setAttribute("theme", themes[i]);
|
||||
document.querySelector("#themes > a").setAttribute("content", themes[i]);
|
||||
@@ -46,10 +49,10 @@ const Cookie = {
|
||||
}
|
||||
});
|
||||
|
||||
if(tbuttonfull = document.querySelector('svg#a_tfull')) {
|
||||
if (tbuttonfull = document.querySelector('svg#a_tfull')) {
|
||||
tbuttonfull.addEventListener('click', e => {
|
||||
let f = Cookie.get('fullscreen');
|
||||
if(f == 1) {
|
||||
if (f == 1) {
|
||||
Cookie.set('fullscreen', 0);
|
||||
document.querySelector('html').setAttribute('res', '');
|
||||
tbuttonfull.innerHTML = `<use href="/s/img/iconset.svg#window-maximize"></use>`;
|
||||
|
||||
@@ -64,5 +64,58 @@ export default (router, tpl) => {
|
||||
});
|
||||
});
|
||||
|
||||
// Infinite scroll endpoint for index thumbnails
|
||||
router.get(/\/ajax\/items/, async (req, res) => {
|
||||
let query = {};
|
||||
if (typeof req.url === 'string') {
|
||||
const parsedUrl = url.parse(req.url, true);
|
||||
query = parsedUrl.query;
|
||||
} else {
|
||||
query = req.url.qs || {};
|
||||
}
|
||||
|
||||
const page = parseInt(query.page) || 1;
|
||||
|
||||
const data = await f0cklib.getf0cks({
|
||||
page: page,
|
||||
tag: query.tag || null,
|
||||
user: query.user || null,
|
||||
mime: query.mime || null,
|
||||
mode: req.session.mode,
|
||||
session: !!req.session,
|
||||
fav: false
|
||||
});
|
||||
|
||||
if (!data.success) {
|
||||
return res.reply({
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
success: false,
|
||||
html: '',
|
||||
hasMore: false
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
// Render just the thumbnail items
|
||||
const itemsHtml = tpl.render('snippets/items-grid', {
|
||||
items: data.items,
|
||||
link: data.link
|
||||
});
|
||||
|
||||
const hasMore = data.pagination.next !== null;
|
||||
|
||||
return res.reply({
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
success: true,
|
||||
html: itemsHtml,
|
||||
hasMore: hasMore,
|
||||
nextPage: data.pagination.next,
|
||||
currentPage: data.pagination.page
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
return router;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@ import db from '../../sql.mjs';
|
||||
import lib from '../../lib.mjs';
|
||||
import search from '../../routeinc/search.mjs';
|
||||
|
||||
const allowedMimes = [ "audio", "image", "video", "%" ];
|
||||
const allowedMimes = ["audio", "image", "video", "%"];
|
||||
export default router => {
|
||||
router.group(/^\/api\/v2/, group => {
|
||||
group.get(/$/, (req, res) => {
|
||||
@@ -13,24 +13,28 @@ export default router => {
|
||||
group.get(/\/random(\/user\/.+|\/image|\/video|\/audio)?$/, async (req, res) => {
|
||||
const user = req.url.split[3] === "user" ? req.url.split[4] : "%";
|
||||
const mime = (allowedMimes.filter(n => req.url.split[3]?.startsWith(n))[0] ? req.url.split[3] : "") + "%";
|
||||
|
||||
const tag = req.url.qs.tag || null;
|
||||
|
||||
const rows = await db`
|
||||
select *
|
||||
select "items".*
|
||||
from "items"
|
||||
left join tags_assign on tags_assign.item_id = items.id
|
||||
left join tags on tags.id = tags_assign.tag_id
|
||||
where
|
||||
mime ilike ${mime} and
|
||||
username ilike ${user} and
|
||||
active = 'true'
|
||||
${tag ? db`and tags.normalized ilike ${'%' + tag + '%'}` : db``}
|
||||
order by random()
|
||||
limit 1
|
||||
`;
|
||||
|
||||
|
||||
return res.json({
|
||||
success: rows.length > 0,
|
||||
items: rows.length > 0 ? rows[0] : []
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
group.get(/\/items\/get/, async (req, res) => {
|
||||
let eps = 150;
|
||||
|
||||
@@ -51,17 +55,15 @@ export default router => {
|
||||
where
|
||||
${db.unsafe(modequery)} and
|
||||
active = 'true'
|
||||
${
|
||||
opt.older
|
||||
? db`and id <= ${opt.older}`
|
||||
: opt.newer
|
||||
? db`and id >= ${opt.newer}`
|
||||
: db``
|
||||
}
|
||||
order by id ${
|
||||
opt.newer
|
||||
? db`asc`
|
||||
: db`desc`
|
||||
${opt.older
|
||||
? db`and id <= ${opt.older}`
|
||||
: opt.newer
|
||||
? db`and id >= ${opt.newer}`
|
||||
: db``
|
||||
}
|
||||
order by id ${opt.newer
|
||||
? db`asc`
|
||||
: db`desc`
|
||||
}
|
||||
limit ${eps}
|
||||
`).sort((a, b) => b.id - a.id);
|
||||
@@ -73,10 +75,10 @@ export default router => {
|
||||
items: rows
|
||||
}, 200);
|
||||
});
|
||||
|
||||
|
||||
group.get(/\/item\/[0-9]+$/, async (req, res) => {
|
||||
const id = +req.url.split[3];
|
||||
|
||||
|
||||
const item = await db`
|
||||
select *
|
||||
from "items"
|
||||
@@ -97,14 +99,14 @@ export default router => {
|
||||
order by id desc
|
||||
limit 1
|
||||
`;
|
||||
|
||||
if(item.length === 0) {
|
||||
|
||||
if (item.length === 0) {
|
||||
return res.json({
|
||||
success: false,
|
||||
msg: 'no items found'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
const rows = {
|
||||
...item[0],
|
||||
...{
|
||||
@@ -118,11 +120,11 @@ export default router => {
|
||||
rows
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
group.get(/\/user\/.*(\/\d+)?$/, async (req, res) => {
|
||||
const user = req.url.split[3];
|
||||
const eps = +req.url.split[4] || 50;
|
||||
|
||||
|
||||
const rows = db`
|
||||
select id, mime, size, src, stamp, userchannel, username, usernetwork
|
||||
from "items"
|
||||
@@ -130,7 +132,7 @@ export default router => {
|
||||
order by stamp desc
|
||||
limit ${+eps}
|
||||
`;
|
||||
|
||||
|
||||
return res.json({
|
||||
success: rows.length > 0,
|
||||
items: rows.length > 0 ? rows : []
|
||||
@@ -140,7 +142,7 @@ export default router => {
|
||||
// tags lol
|
||||
|
||||
group.put(/\/admin\/tags\/(?<tagname>.*)/, lib.loggedin, async (req, res) => {
|
||||
if(!req.params.tagname || !req.post.newtag) {
|
||||
if (!req.params.tagname || !req.post.newtag) {
|
||||
return res.json({
|
||||
success: false,
|
||||
msg: 'missing tagname or newtag',
|
||||
@@ -154,7 +156,7 @@ export default router => {
|
||||
const tagname = decodeURIComponent(req.params.tagname);
|
||||
const newtag = req.post.newtag;
|
||||
|
||||
if(['sfw', 'nsfw'].includes(tagname) || ['sfw', 'nsfw'].includes(newtag)) {
|
||||
if (['sfw', 'nsfw'].includes(tagname) || ['sfw', 'nsfw'].includes(newtag)) {
|
||||
return res.json({
|
||||
msg: 'f0ck you'
|
||||
}, 405); // method not allowed
|
||||
@@ -166,8 +168,8 @@ export default router => {
|
||||
where tag = ${tagname}
|
||||
limit 1
|
||||
`)[0];
|
||||
|
||||
if(!tmptag) {
|
||||
|
||||
if (!tmptag) {
|
||||
return res.json({
|
||||
success: false,
|
||||
msg: 'no tag found'
|
||||
@@ -175,10 +177,9 @@ export default router => {
|
||||
}
|
||||
|
||||
const q = (await db`
|
||||
update "tags" set ${
|
||||
db({
|
||||
tag: newtag
|
||||
}, 'tag')
|
||||
update "tags" set ${db({
|
||||
tag: newtag
|
||||
}, 'tag')
|
||||
}
|
||||
where tag = ${tagname}
|
||||
returning *
|
||||
@@ -195,7 +196,7 @@ export default router => {
|
||||
|
||||
const searchString = req.url.qs.q;
|
||||
|
||||
if(searchString?.length <= 1) {
|
||||
if (searchString?.length <= 1) {
|
||||
reply.error = 'too short lol';
|
||||
return res.json(reply);
|
||||
}
|
||||
@@ -212,7 +213,7 @@ export default router => {
|
||||
`;
|
||||
reply.success = true;
|
||||
reply.suggestions = search(q, searchString);
|
||||
} catch(err) {
|
||||
} catch (err) {
|
||||
reply.error = err.msg;
|
||||
}
|
||||
|
||||
@@ -220,7 +221,7 @@ export default router => {
|
||||
});
|
||||
|
||||
group.post(/\/admin\/deletepost$/, lib.auth, async (req, res) => {
|
||||
if(!req.post.postid) {
|
||||
if (!req.post.postid) {
|
||||
return res.json({
|
||||
success: false,
|
||||
msg: 'no postid'
|
||||
@@ -228,7 +229,7 @@ export default router => {
|
||||
}
|
||||
const id = +req.post.postid;
|
||||
|
||||
if(id <= 1) {
|
||||
if (id <= 1) {
|
||||
return res.json({
|
||||
success: false
|
||||
});
|
||||
@@ -243,7 +244,7 @@ export default router => {
|
||||
limit 1
|
||||
`;
|
||||
|
||||
if(f0ck.length === 0) {
|
||||
if (f0ck.length === 0) {
|
||||
return res.json({
|
||||
success: false,
|
||||
msg: `f0ck ${id}: f0ck not found`
|
||||
@@ -251,15 +252,15 @@ export default router => {
|
||||
}
|
||||
|
||||
await db`update "items" set active = 'false' where id = ${id}`;
|
||||
|
||||
await fs.copyFile(`./public/b/${f0ck[0].dest}`, `./deleted/b/${f0ck[0].dest}`).catch(_=>{});
|
||||
await fs.copyFile(`./public/t/${id}.webp`, `./deleted/t/${id}.webp`).catch(_=>{});
|
||||
await fs.unlink(`./public/b/${f0ck[0].dest}`).catch(_=>{});
|
||||
await fs.unlink(`./public/t/${id}.webp`).catch(_=>{});
|
||||
|
||||
if(f0ck[0].mime.startsWith('audio')) {
|
||||
await fs.copyFile(`./public/ca/${id}.webp`, `./deleted/ca/${id}.webp`).catch(_=>{});
|
||||
await fs.unlink(`./public/ca/${id}.webp`).catch(_=>{});
|
||||
await fs.copyFile(`./public/b/${f0ck[0].dest}`, `./deleted/b/${f0ck[0].dest}`).catch(_ => { });
|
||||
await fs.copyFile(`./public/t/${id}.webp`, `./deleted/t/${id}.webp`).catch(_ => { });
|
||||
await fs.unlink(`./public/b/${f0ck[0].dest}`).catch(_ => { });
|
||||
await fs.unlink(`./public/t/${id}.webp`).catch(_ => { });
|
||||
|
||||
if (f0ck[0].mime.startsWith('audio')) {
|
||||
await fs.copyFile(`./public/ca/${id}.webp`, `./deleted/ca/${id}.webp`).catch(_ => { });
|
||||
await fs.unlink(`./public/ca/${id}.webp`).catch(_ => { });
|
||||
}
|
||||
|
||||
res.json({
|
||||
@@ -269,14 +270,14 @@ export default router => {
|
||||
|
||||
group.post(/\/admin\/togglefav$/, lib.loggedin, async (req, res) => {
|
||||
const postid = +req.post.postid;
|
||||
|
||||
|
||||
let favs = await db`
|
||||
select user_id
|
||||
from "favorites"
|
||||
where item_id = ${+postid}
|
||||
`;
|
||||
|
||||
if(Object.values(favs).filter(u => u.user_id === req.session.id)[0]) {
|
||||
if (Object.values(favs).filter(u => u.user_id === req.session.id)[0]) {
|
||||
// del fav
|
||||
await db`
|
||||
delete from "favorites"
|
||||
@@ -287,11 +288,10 @@ export default router => {
|
||||
else {
|
||||
// add fav
|
||||
await db`
|
||||
insert into "favorites" ${
|
||||
db({
|
||||
item_id: +postid,
|
||||
user_id: +req.session.id
|
||||
}, 'item_id', 'user_id')
|
||||
insert into "favorites" ${db({
|
||||
item_id: +postid,
|
||||
user_id: +req.session.id
|
||||
}, 'item_id', 'user_id')
|
||||
}
|
||||
`;
|
||||
}
|
||||
@@ -310,7 +310,7 @@ export default router => {
|
||||
favs
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
return router;
|
||||
|
||||
7
views/snippets/items-grid.html
Normal file
7
views/snippets/items-grid.html
Normal file
@@ -0,0 +1,7 @@
|
||||
@each(items as item)
|
||||
<a href="{{ link.main }}{{ item.id }}" data-mime="{{ item.mime }}"
|
||||
data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}"
|
||||
style="background-image: url('/t/{{ item.id }}.webp')">
|
||||
<p></p>
|
||||
</a>
|
||||
@endeach
|
||||
@@ -8,7 +8,7 @@
|
||||
<a href="/tags">tags</a>
|
||||
<a href="/about">about</a>
|
||||
@if(!/^\/\d$/.test(url.pathname))
|
||||
<a href="/random">rand</a>
|
||||
<a href="/random" id="nav-random">rand</a>
|
||||
@endif
|
||||
</ol>
|
||||
</div>
|
||||
@@ -33,7 +33,7 @@
|
||||
<a href="/tags">tags</a>
|
||||
<a href="/about">about</a>
|
||||
@if(!/^\/\d$/.test(url.pathname))
|
||||
<a href="/random">rand</a>
|
||||
<a href="/random" id="nav-random">rand</a>
|
||||
@endif
|
||||
</ol>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user