.gitignore

@@ -2,7 +2,6 @@ node_modules/
 dist/
 config/
 log/
-media/
 !config/default.js
 assets/js/config/
 !assets/js/config/default.js

components/posts/post.vue

@@ -27,14 +27,7 @@
 			class="title-link"
 		>
 			<img
-				v-if="post.hasThumbnail"
 				class="thumbnail"
-				:src="`/media/thumbnails/${post.id}.jpeg`"
-			>
-
-			<img
-				v-else
-				class="thumbnail missing"
 				:src="blockedIcon"
 			>
 		</a>
@@ -179,16 +172,11 @@ async function submitVote(value) {
 	width: 7rem;
 	height: 4rem;
 	box-sizing: border-box;
+	padding: 1rem;
 	border-radius: .25rem;
 	margin: .5rem;
-	object-fit: cover;
+	background: var(--grey-light-10);
-
+	opacity: .25;
-	&.missing {
-		padding: 1rem;
-		background: var(--grey-light-10);
-		opacity: .25;
-		object-fit: contain;
-	}
 }
 
 .votes {

migrations/20230513004141_init.js

@@ -115,10 +115,6 @@ export async function up(knex) {
 			.references('id')
 			.inTable('users');
 
-		table.text('thumbnail')
-			.notNullable()
-			.default(false);
-
 		table.datetime('created_at')
 			.notNullable()
 			.defaultTo(knex.fn.now());
@@ -209,7 +205,6 @@ export async function down(knex) {
 	await knex.schema.dropTableIfExists('posts_votes');
 	await knex.schema.dropTableIfExists('posts');
 	await knex.schema.dropTableIfExists('shelves_settings');
-	await knex.schema.dropTableIfExists('shelves_subscriptions');
 	await knex.schema.dropTableIfExists('shelves');
 	await knex.schema.dropTableIfExists('users');
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shack",
-  "version": "0.5.0",
+  "version": "0.4.0",
   "description": "Shack is a self-hosted social news aggregate",
   "main": "src/web/server.js",
   "type": "module",
@@ -20,7 +20,6 @@
     "build": "vite build",
     "server": "node --experimental-specifier-resolution=node ./src/web/server",
     "server:prod": "cross-env NODE_ENV=production node ./src/web/server",
-    "thumbs": "node --experimental-specifier-resolution=node ./src/cli thumbs",
     "migrate-make": "knex migrate:make",
     "migrate": "knex migrate:latest",
     "rollback": "knex migrate:rollback"
@@ -56,10 +55,8 @@
     "pg": "^8.11.0",
     "pinia": "^2.1.3",
     "redis": "^4.6.6",
-    "sharp": "^0.32.1",
     "short-uuid": "^4.2.2",
     "sirv": "^2.0.2",
-    "unprint": "^0.9.3",
     "vite": "^4.0.3",
     "vite-plugin-ssr": "^0.4.126",
     "vite-plugin-vue-markdown": "^0.23.5",

src/cli.js

@@ -1,8 +1,7 @@
 // import config from 'config';
 import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
 
-const { argv } = yargs(hideBin(process.argv))
+const { argv } = yargs
 	.command('npm start')
 	.option('log-level', {
 		alias: 'level',

src/posts.js

@@ -5,13 +5,8 @@ import { HttpError } from './errors';
 
 import { fetchShelf, fetchShelves } from './shelves';
 import { fetchUsers } from './users';
-import { generateThumbnail } from './thumbnails';
 import slugify from './utils/slugify';
 
-import initLogger from './logger';
-
-const logger = initLogger();
-
 const emptyVote = {
 	tally: 0,
 	total: 0,
@@ -30,7 +25,6 @@ function curateDatabasePost(post, {
 		link: post.link,
 		shelfId: post.shelf_id,
 		createdAt: post.created_at,
-		hasThumbnail: post.thumbnail,
 		shelf: shelf || shelves?.[post.shelf_id],
 		user: users.find((user) => user.id === post.user_id),
 		vote: vote || votes?.[post.id] || emptyVote,
@@ -172,8 +166,6 @@ async function votePost(postId, value, user) {
 			.merge();
 	}
 
-	logger.silly(`User ${user.username} voted ${value} on post ${postId}`);
-
 	const votes = await fetchPostVotes([postId], user);
 
 	return votes[postId] || emptyVote;
@@ -206,10 +198,6 @@ async function createPost(post, shelfId, user) {
 		votePost(postEntry.id, 1, user),
 	]);
 
-	logger.verbose(`User ${user.username} created post ${postEntry.id} on s/${shelf.slug}`);
-
-	generateThumbnail(postEntry.id);
-
 	return curateDatabasePost(postEntry, { shelf, users, vote });
 }
 

src/thumbnails.js

@@ -1,80 +0,0 @@
-import bhttp from 'bhttp';
-import unprint from 'unprint';
-import fs from 'fs';
-import sharp from 'sharp';
-
-import knex from './knex';
-import initLogger from './logger';
-
-const logger = initLogger();
-
-async function createThumbnail(data, post) {
-	await fs.promises.mkdir('media/thumbnails', { recursive: true });
-
-	await sharp(data)
-		.resize(300, 300)
-		.jpeg({
-			quality: 80,
-		})
-		.toFile(`media/thumbnails/${post.id}.jpeg`);
-
-	await knex('posts')
-		.where('id', post.id)
-		.update('thumbnail', true);
-
-	logger.debug(`Saved thumbnail for ${post.id}`);
-}
-
-async function generateThumbnail(postId) {
-	const post = await knex('posts').where('id', postId).first();
-
-	if (!post) {
-		logger.warn(`Cannot generate thumbnail for non-existent post ${postId}`);
-		return;
-	}
-
-	if (!post.link) {
-		logger.debug(`Skipped thumbnail generation for text-only post ${postId}`);
-		return;
-	}
-
-	const res = await bhttp.get(post.link);
-
-	if (res.statusCode !== 200) {
-		logger.warn(`Failed thumbnail generation for ${post.link} from ${postId} (${res.statusCode})`);
-		return;
-	}
-
-	if (res.headers['content-type'].includes('image/')) {
-		await createThumbnail(res.body, post);
-		return;
-	}
-
-	const { query } = unprint.init(res.body.toString());
-	const ogHeader = query.attribute('meta[property="og:image"]', 'content');
-
-	if (ogHeader) {
-		const imgRes = await bhttp.get(ogHeader);
-
-		if (imgRes.statusCode === 200 && imgRes.headers['content-type'].includes('image/')) {
-			await createThumbnail(imgRes.body, post);
-		}
-	}
-}
-
-async function generateMissingThumbnails(force = false) {
-	const postsWithoutThumbnail = await knex('posts')
-		.select('id')
-		.modify((builder) => {
-			if (!force) {
-				builder.where('thumbnail', false);
-			}
-		});
-
-	await Promise.all(postsWithoutThumbnail.map(async (post) => generateThumbnail(post.id)));
-}
-
-export {
-	generateThumbnail,
-	generateMissingThumbnails,
-};

src/tools/generate-thumbs.js

@@ -1,9 +0,0 @@
-import { generateMissingThumbnails } from '../thumbnails';
-import args from '../cli';
-
-async function init() {
-	await generateMissingThumbnails(!!args.force);
-	process.exit();
-}
-
-init();