f0ck/f0ckv2
3
4
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

fixing weird mini thumb in firefox #60

Merged
schrumpel merged 2 commits from dev into master 2023-04-05 21:14:42 +00:00
Conversation 0 Commits 2 Files Changed 1 +53 -32
5 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5da67f2a6a - Show all commits

32
package-lock.json generated
View File

@ -1,24 +1,24 @@
{
"name": "f0ckv2",
"version": "2.2.0",
"version": "2.2.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "f0ckv2",
"version": "2.2.0",
"version": "2.2.1",
"license": "MIT",
"dependencies": {
"cuffeo": "^1.1.0",
"cuffeo": "^1.2.1",
"flumm-fetch": "^1.0.1",
"flummpress": "^2.0.5",
"postgres": "^3.0.1"
"postgres": "^3.3.4"
}
},
"node_modules/cuffeo": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.1.0.tgz",
"integrity": "sha512-7lmx2dvREqCYwy8oUzk3Q0EkyLZkKQTYTBLEjNqKVbinzdEL45Oimi54lmBDFPlrrvTLzQkFvzKmiJ7Zcegi2w==",
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.2.1.tgz",
"integrity": "sha512-nQMrXj7xR4RWO6nS8Un4uFuiVSIzVOgvShEeJvWyEHnW38X9g+BicrY8Lc/lqcw6mmtsED6KuuOs9KHD3Y6oIA==",
"dependencies": {
"flumm-fetch": "^1.0.1"
}
@ -34,9 +34,9 @@
"integrity": "sha512-C/8Im6OvoZw67q9DvYIXKjKr28zHYLJdH4DucQ6zpVbN1eWPySmxkJTURbkq3uEwABXLngXLifS6mjxAC++umQ=="
},
"node_modules/postgres": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.1.0.tgz",
"integrity": "sha512-yQbJtA7z6SsQuFiF01rmHlkG2gU5IEv9D/Pn2fu8Tz6x3/suNWZs4fIPd59rkL+dfVfhDqYQ7DU3YnUqzEDB5Q==",
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.4.tgz",
"integrity": "sha512-XVu0+d/Y56pl2lSaf0c7V19AhAEfpVrhID1IENWN8nf0xch6hFq6dAov5dtUX6ZD46wfr1TxvLhxLtV8WnNsOg==",
"funding": {
"type": "individual",
"url": "https://github.com/sponsors/porsager"
@ -45,9 +45,9 @@
},
"dependencies": {
"cuffeo": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.1.0.tgz",
"integrity": "sha512-7lmx2dvREqCYwy8oUzk3Q0EkyLZkKQTYTBLEjNqKVbinzdEL45Oimi54lmBDFPlrrvTLzQkFvzKmiJ7Zcegi2w==",
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.2.1.tgz",
"integrity": "sha512-nQMrXj7xR4RWO6nS8Un4uFuiVSIzVOgvShEeJvWyEHnW38X9g+BicrY8Lc/lqcw6mmtsED6KuuOs9KHD3Y6oIA==",
"requires": {
"flumm-fetch": "^1.0.1"
}
@ -63,9 +63,9 @@
"integrity": "sha512-C/8Im6OvoZw67q9DvYIXKjKr28zHYLJdH4DucQ6zpVbN1eWPySmxkJTURbkq3uEwABXLngXLifS6mjxAC++umQ=="
},
"postgres": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.1.0.tgz",
"integrity": "sha512-yQbJtA7z6SsQuFiF01rmHlkG2gU5IEv9D/Pn2fu8Tz6x3/suNWZs4fIPd59rkL+dfVfhDqYQ7DU3YnUqzEDB5Q=="
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.4.tgz",
"integrity": "sha512-XVu0+d/Y56pl2lSaf0c7V19AhAEfpVrhID1IENWN8nf0xch6hFq6dAov5dtUX6ZD46wfr1TxvLhxLtV8WnNsOg=="
}
}
}

18
package.json
View File

@ -4,20 +4,20 @@
"description": "f0ck, kennste?",
"main": "index.mjs",
"scripts": {
"start": "node --experimental-json-modules src/index.mjs",
"trigger": "node --experimental-json-modules debug/trigger.mjs",
"autotagger": "node --experimental-json-modules debug/autotagger.mjs",
"thumbnailer": "node --experimental-json-modules debug/thumbnailer.mjs",
"test": "node --experimental-json-modules debug/test.mjs",
"clean": "node --experimental-json-modules debug/clean.mjs",
"adduser": "node --experimental-json-modules debug/adduser.mjs"
"start": "node --trace-uncaught src/index.mjs",
"trigger": "node debug/trigger.mjs",
"autotagger": "node debug/autotagger.mjs",
"thumbnailer": "node debug/thumbnailer.mjs",
"test": "node debug/test.mjs",
"clean": "node debug/clean.mjs",
"adduser": "node debug/adduser.mjs"
},
"author": "Flummi",
"license": "MIT",
"dependencies": {
"cuffeo": "^1.1.0",
"cuffeo": "^1.2.1",
"flumm-fetch": "^1.0.1",
"flummpress": "^2.0.5",
"postgres": "^3.0.1"
"postgres": "^3.3.4"
}
}

11
public/s/css/f0ck.css
View File

@ -1136,9 +1136,9 @@ body {
line-height: 2;
scrollbar-color: var(--scrollbar-color) transparent;
scrollbar-width: thin;
overscroll-behavior-y: contain;
overflow: unset;
font-size: 14px;
overflow: hidden;
height: 100%;
}
.wrapper {
@ -1247,6 +1247,8 @@ div.posts>a:hover::after {
}
.navbar {
position: sticky;
top: 0;
padding: 0;
width: 100%;
z-index: 3;
@ -2796,8 +2798,3 @@ ul.navbar-nav-guests li.nav-item {
background: #00000036;
}
}
#main {
overflow: auto;
height: calc(100%);
}

21
src/inc/trigger/f0ckrand.mjs
View File

@ -10,6 +10,7 @@ export default async bot => {
active: false,
f: async e => {
let args = e.args.slice(1);
/*let rows = sql("items").select("id", "username", "mime", "size");
for(let i = 0; i < args.length; i++) {
@ -21,6 +22,26 @@ export default async bot => {
rows = await rows.orderByRaw("random()").limit(1);*/
const rows = await db`
select id, mime, username, size
from "items"
where
${ args.map(a => a.charAt(0) === "!"
? db`username not ilike ${a.slice(1)}`
: db`username ilike ${a}`
).join(' and ')}
order by random()
`;
console.log(`select id, mime, username, size
from "items"
where
${ args.map(a => a.charAt(0) === "!"
? `username not ilike ${a.slice(1)}`
: `username ilike ${a}`
).join(' and ')}
order by random()`);
if(rows.length === 0)
return e.reply("nothing found, f0cker");

3
views/item.html
View File

@ -97,6 +97,9 @@
@endif
</span>
</div>
<div class="random">
<a href="/random"></a>
</div>
</div>
@include(snippets/footer)
</div>