Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop

.dockerignore

@@ -13,6 +13,9 @@ node_modules
 **/node_modules
 report.*.json
 
+# Rust
+packages/backend/native-utils/target/*
+
 # Cypress
 cypress/screenshots
 cypress/videos
@@ -25,9 +28,6 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.env
 
-#docker dev config
-/dev/docker-compose.yml
-
 # misskey
 built
 db
@@ -47,3 +47,4 @@ packages/backend/assets/instance.css
 # dockerignore custom
 .git
 Dockerfile
+docker-compose.yml

Dockerfile

@@ -1,10 +1,19 @@
 ## Install dev and compilation dependencies, build files
-FROM node:19-alpine as build
+FROM alpine:3.18 as build
 WORKDIR /calckey
 
 # Install compilation dependencies
-RUN apk update
+RUN apk add --no-cache --no-progress git alpine-sdk python3 nodejs-current npm rust cargo vips
-RUN apk add --no-cache --no-progress git alpine-sdk python3 rust cargo vips
+
+# Copy only the cargo dependency-related files first, to cache efficiently
+COPY packages/backend/native-utils/Cargo.toml packages/backend/native-utils/Cargo.toml
+COPY packages/backend/native-utils/Cargo.lock packages/backend/native-utils/Cargo.lock
+COPY packages/backend/native-utils/src/lib.rs packages/backend/native-utils/src/
+COPY packages/backend/native-utils/migration/Cargo.toml packages/backend/native-utils/migration/Cargo.toml
+COPY packages/backend/native-utils/migration/src/lib.rs packages/backend/native-utils/migration/src/
+
+# Install cargo dependencies
+RUN cargo fetch --locked --manifest-path /calckey/packages/backend/native-utils/Cargo.toml
 
 # Copy only the dependency-related files first, to cache efficiently
 COPY package.json pnpm*.yaml ./
@@ -16,27 +25,31 @@ COPY packages/backend/native-utils/package.json packages/backend/native-utils/pa
 COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/backend/native-utils/npm/linux-x64-musl/package.json
 COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
 
-# Configure corepack and pnpm
+# Configure corepack and pnpm, and install dev mode dependencies for compilation
-RUN corepack enable
+RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm i --frozen-lockfile
-RUN corepack prepare pnpm@latest --activate
 
-# Install dev mode dependencies for compilation
+# Copy in the rest of the native-utils rust files
-RUN pnpm i --frozen-lockfile
+COPY packages/backend/native-utils/.cargo packages/backend/native-utils/.cargo
+COPY packages/backend/native-utils/build.rs packages/backend/native-utils/
+COPY packages/backend/native-utils/src packages/backend/native-utils/src/
+COPY packages/backend/native-utils/migration/src packages/backend/native-utils/migration/src/
 
-# Copy in the rest of the files, to compile from TS to JS
+# Compile native-utils
+RUN pnpm run --filter native-utils build
+
+# Copy in the rest of the files to compile
 COPY . ./
-RUN pnpm run build
+RUN env NODE_ENV=production sh -c "pnpm run --filter '!native-utils' build && pnpm run gulp"
 
-# Trim down the dependencies to only the prod deps
+# Trim down the dependencies to only those for production
 RUN pnpm i --prod --frozen-lockfile
 
-
 ## Runtime container
-FROM node:19-alpine
+FROM alpine:3.18
 WORKDIR /calckey
 
 # Install runtime dependencies
-RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip rust cargo
+RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip nodejs-current
 
 COPY . ./
 
@@ -52,8 +65,9 @@ COPY --from=build /calckey/built /calckey/built
 COPY --from=build /calckey/packages/backend/built /calckey/packages/backend/built
 COPY --from=build /calckey/packages/backend/assets/instance.css /calckey/packages/backend/assets/instance.css
 COPY --from=build /calckey/packages/backend/native-utils/built /calckey/packages/backend/native-utils/built
-COPY --from=build /calckey/packages/backend/native-utils/target /calckey/packages/backend/native-utils/target
 
-RUN corepack enable
+RUN corepack enable && corepack prepare pnpm@latest --activate
+ENV NODE_ENV=production
+VOLUME "/calckey/files"
 ENTRYPOINT [ "/sbin/tini", "--" ]
 CMD [ "pnpm", "run", "migrateandstart" ]

docker-compose.yml

@@ -19,8 +19,6 @@ services:
     environment:
       NODE_ENV: production
     volumes:
-      - ./.cargo-cache:/root/.cargo
-      - ./.cargo-target:/calckey/packages/backend/native-utils/target
       - ./files:/calckey/files
       - ./.config:/calckey/.config:ro
 

packages/backend/native-utils/migration/Cargo.toml

@@ -10,14 +10,14 @@ path = "src/lib.rs"
 
 [features]
 default = []
-convert = ["dep:native-utils"]
+convert = ["dep:native-utils", "dep:indicatif", "dep:futures"]
 
 [dependencies]
 serde_json = "1.0.96"
 native-utils = { path = "../", optional = true }
-indicatif = { version = "0.17.4", features = ["tokio"] }
+indicatif = { version = "0.17.4", features = ["tokio"], optional = true }
 tokio = { version = "1.28.2", features = ["full"] }
-futures = "0.3.28"
+futures = { version = "0.3.28", optional = true }
 serde_yaml = "0.9.21"
 serde = { version = "1.0.163", features = ["derive"] }
 urlencoding = "2.1.2"

packages/backend/native-utils/package.json

@@ -34,10 +34,12 @@
 	},
 	"scripts": {
 		"artifacts": "napi artifacts",
-    "build": "napi build --features napi --platform --release ./built/",
+		"build": "pnpm run build:napi && pnpm run build:migration",
-    "build:debug": "napi build --platform",
+		"build:napi": "napi build --features napi --platform --release ./built/",
+		"build:migration": "cargo build --locked --release --manifest-path ./migration/Cargo.toml && cp -v ./target/release/migration ./built/migration",
+		"build:debug": "napi build --platform ./built/ && cargo build --manifest-path ./migration/Cargo.toml",
 		"prepublishOnly": "napi prepublish -t npm",
-    "test": "pnpm run cargo:test && pnpm run build && ava",
+		"test": "pnpm run cargo:test && pnpm run build:napi && ava",
 		"universal": "napi universal",
 		"version": "napi version",
 		"format": "cargo fmt --all",

packages/backend/package.json

@@ -8,10 +8,10 @@
 		"start:test": "NODE_ENV=test pnpm node ./built/index.js",
 		"migrate": "pnpm run migrate:typeorm && pnpm run migrate:cargo",
 		"migrate:typeorm": "typeorm migration:run -d ormconfig.js",
-		"migrate:cargo": "cargo run --manifest-path ./native-utils/migration/Cargo.toml -- up",
+		"migrate:cargo": "./native-utils/built/migration up",
 		"revertmigration": "pnpm run revertmigration:cargo && pnpm run revertmigration:typeorm",
 		"revertmigration:typeorm": "typeorm migration:revert -d ormconfig.js",
-		"revertmigration:cargo": "cargo run --manifest-path ./native-utils/migration/Cargo.toml -- down",
+		"revertmigration:cargo": "./native-utils/built/migration down",
 		"check:connect": "node ./check_connect.js",
 		"build": "pnpm swc src -d built -D",
 		"watch": "pnpm swc src -d built -D -w",
@@ -20,9 +20,6 @@
 		"test": "pnpm run mocha",
 		"format": "pnpm rome format * --write"
 	},
-	"resolutions": {
-		"chokidar": "^3.3.1"
-	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
 		"@tensorflow/tfjs-node": "3.21.1"

packages/backend/src/misc/is-duplicate-key-value-error.ts

@@ -1,3 +1,4 @@
 export function isDuplicateKeyValueError(e: unknown | Error): boolean {
-	return (e as Error).message?.startsWith("duplicate key value");
+	const nodeError = e as NodeJS.ErrnoException;
+	return nodeError.code === "23505";
 }

packages/backend/src/remote/activitypub/models/image.ts

@@ -26,11 +26,11 @@ export async function createImage(
 	const image = (await new Resolver().resolve(value)) as any;
 
 	if (image.url == null) {
-		throw new Error("invalid image: url not privided");
+		throw new Error("Invalid image, URL not provided");
 	}
 
 	if (!image.url.startsWith("https://") && !image.url.startsWith("http://")) {
-		throw new Error("invalid image: unexpected shcema of url: " + image.url);
+		throw new Error(`Invalid image, unexpected schema: ${image.url}`);
 	}
 
 	logger.info(`Creating the Image: ${image.url}`);

packages/backend/src/server/api/openapi/gen-spec.ts

@@ -182,7 +182,7 @@ export function genOpenapiSpec() {
 				...(endpoint.meta.limit
 					? {
 							"429": {
-								description: "To many requests",
+								description: "Too many requests",
 								content: {
 									"application/json": {
 										schema: {

packages/client/src/components/MkNote.vue

@@ -16,11 +16,12 @@
 			:note="appearNote.reply"
 			class="reply-to"
 		/>
-		<div v-if="!detailedView" 
+		<div
+			v-if="!detailedView"
 			class="note-context"
 			@click="noteClick"
 			:class="{
-				collapsedReply: collapsedReply && appearNote.reply 
+				collapsedReply: collapsedReply && appearNote.reply,
 			}"
 		>
 			<div class="line"></div>
@@ -71,7 +72,10 @@
 			</div>
 			<div v-if="collapsedReply && appearNote.reply" class="info">
 				<MkAvatar class="avatar" :user="appearNote.reply.user" />
-				<MkUserName class="username" :user="appearNote.reply.user"></MkUserName>
+				<MkUserName
+					class="username"
+					:user="appearNote.reply.user"
+				></MkUserName>
 				<Mfm
 					class="summary"
 					:text="getNoteSummary(appearNote.reply)"
@@ -92,10 +96,7 @@
 			<div class="main">
 				<div class="header-container">
 					<MkAvatar class="avatar" :user="appearNote.user" />
-					<XNoteHeader
+					<XNoteHeader class="header" :note="appearNote" />
-						class="header"
-						:note="appearNote"
-					/>
 				</div>
 				<div class="body">
 					<MkSubNoteContent
@@ -747,14 +748,14 @@ defineExpose({
 			}
 			.info {
 				color: var(--fgTransparentWeak);
-				transition: color .2s;
+				transition: color 0.2s;
 			}
 			.avatar {
 				width: 1.2em;
 				height: 1.2em;
 				border-radius: 2em;
 				overflow: hidden;
-				margin-right: .4em;
+				margin-right: 0.4em;
 				background: var(--panelHighlight);
 			}
 			.username {
@@ -765,7 +766,8 @@ defineExpose({
 					content: ": ";
 				}
 			}
-			&:hover, &:focus-within {
+			&:hover,
+			&:focus-within {
 				.info {
 					color: var(--fg);
 				}

packages/client/src/components/MkNotifications.vue

@@ -26,7 +26,11 @@
 					"
 					:key="notification.id"
 					:note="notification.note"
-					:collapsedReply="true"
+					:collapsedReply="
+						notification.type === 'reply' ||
+						(notification.type === 'mention' &&
+							notification.note.replyId != null)
+					"
 				/>
 				<XNotification
 					v-else

scripts/clean-all.js

@@ -1,26 +1,30 @@
-const fs = require('fs');
+const fs = require('node:fs');
 const execa = require('execa');
+const { join } = require('node:path');
 
 (async () => {
-	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/backend/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/backend/node_modules'), { recursive: true, force: true });
 
-	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/backend/native-utils/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/client/node_modules', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/backend/native-utils/node_modules'), { recursive: true, force: true });
 
-	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/client/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/client/node_modules'), { recursive: true, force: true });
 
-	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/sw/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/sw/node_modules'), { recursive: true, force: true });
+
+	fs.rmSync(join(__dirname, '/../built'), { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../node_modules'), { recursive: true, force: true });
 
 	execa('pnpm', ['store', 'prune'], {
-		cwd: __dirname + '/../',
+		cwd: join(__dirname, '/../'),
 		stdio: 'inherit'
 	});
 
 	execa('cargo', ['clean'], {
-		cwd: __dirname + '/../packages/backend/native-utils',
+		cwd: join(__dirname, '/../packages/backend/native-utils'),
 		stdio: 'inherit'
 	});
 })();

scripts/clean.js

@@ -1,8 +1,10 @@
-const fs = require('fs');
+const fs = require('node:fs');
+const { join } = require('node:path');
 
 (async () => {
-	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/backend/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/backend/native-utils/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/client/built'), { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../packages/sw/built'), { recursive: true, force: true });
+	fs.rmSync(join(__dirname, '/../built'), { recursive: true, force: true });
 })();