refactor: move misc/count-same-renotes.ts to backend-rs

docs/changes.md

@@ -42,6 +42,9 @@
 
 ### 細かい変更点
 
+- コードブロックの構文ハイライトの対応言語を強化
+  - TODO: CDN を利用しない設定でもこれを行えるようにする
+  - TODO: 本家版にもマージリクエストを出す
 - モバイル表示の下部のウィジェットボタンを再読み込みボタンに変更可能に
   - スマートフォンでウィジェットは使わないけど再読み込みはたくさんする人はいそう
 - 設定のバックアップファイルに `misskeyVersion` の値が含まれていなくても警告しないように変更

locales/en-US.yml

@@ -1174,6 +1174,8 @@ pullDownToReload: "Pull down to reload"
 enableTimelineStreaming: "Update timelines automatically"
 useEmojiCdn: "Get Twemoji from CDN"
 useEmojiCdnDescription: "Use Twemoji from the JSDelivr CDN instead of the server's assets."
+useCdn: "Get assets from CDN"
+useCdnDescription: "Load some static assets like Twemoji from the JSDelivr CDN instead of this Firefish server."
 suggested: "Suggested"
 noLanguage: "No language"
 

locales/ja-JP.yml

@@ -1008,6 +1008,8 @@ emphasizeFollowed: "フォロワーのアカウントに表示される「フォ
 iconSet: "アイコンのスタイル"
 useEmojiCdn: "CDNのTwemojiを利用する"
 useEmojiCdnDescription: "サーバー上に保存されているTwemojiのアセットの代わりに、JSDelivr CDNから配信されたものを用います。"
+useCdn: "CDNのアセットを利用する"
+useCdnDescription: "このFirefishサーバーからではなくJSDelivr CDNからTwiemojiなどのアセットを読み込みます。"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てられます。サーバーの負荷が少し増えます。"

neko/index.js

@@ -295,11 +295,13 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { EnvConfig, readEnvironmentConfig, readServerConfig, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, stringToAcct, acctToString, getFullApAccount, isSelfHost, extractHost, toPuny, toPunyOptional, convertToHiddenPost, sqlLikeEscape, safeForSql, formatMilliseconds, nativeInitIdGenerator, nativeCreateId, nativeGetTimestamp, genString, IdConvertType, convertId } = nativeBinding
+const { EnvConfig, readEnvironmentConfig, readServerConfig, JsDbConn, connectToDatabase, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, stringToAcct, acctToString, getFullApAccount, isSelfHost, extractHost, toPuny, toPunyOptional, convertToHiddenPost, sqlLikeEscape, safeForSql, formatMilliseconds, nativeInitIdGenerator, nativeCreateId, nativeGetTimestamp, fetchMeta, metaToPugArgs, hasOtherRenoteOfThisNote, genString, IdConvertType, convertId } = nativeBinding
 
 module.exports.EnvConfig = EnvConfig
 module.exports.readEnvironmentConfig = readEnvironmentConfig
 module.exports.readServerConfig = readServerConfig
+module.exports.JsDbConn = JsDbConn
+module.exports.connectToDatabase = connectToDatabase
 module.exports.AntennaSrcEnum = AntennaSrcEnum
 module.exports.MutedNoteReasonEnum = MutedNoteReasonEnum
 module.exports.NoteVisibilityEnum = NoteVisibilityEnum
@@ -324,6 +326,9 @@ module.exports.formatMilliseconds = formatMilliseconds
 module.exports.nativeInitIdGenerator = nativeInitIdGenerator
 module.exports.nativeCreateId = nativeCreateId
 module.exports.nativeGetTimestamp = nativeGetTimestamp
+module.exports.fetchMeta = fetchMeta
+module.exports.metaToPugArgs = metaToPugArgs
+module.exports.hasOtherRenoteOfThisNote = hasOtherRenoteOfThisNote
 module.exports.genString = genString
 module.exports.IdConvertType = IdConvertType
 module.exports.convertId = convertId

packages/backend-rs/Cargo.lock

@@ -222,6 +222,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "url",
+ "urlencoding",
 ]
 
 [[package]]

packages/backend-rs/Cargo.toml

@@ -33,6 +33,7 @@ url = "2.5.0"
 napi = { version = "2.14.4", default-features = false, features = ["napi9", "tokio_rt", "chrono_date", "serde-json"] }
 napi-derive = { version = "2.14.6", optional = true }
 basen = "0.1.0"
+urlencoding = "2.1.3"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

packages/backend-rs/src/database/error.rs

@@ -11,3 +11,12 @@ pub enum Error {
 }
 
 impl_napi_error_from!(Error);
+
+pub trait NapiDbErrExt {
+    fn into(self) -> napi::Error;
+}
+impl NapiDbErrExt for DbErr {
+    fn into(self) -> napi::Error {
+        napi::Error::from_reason(self.to_string())
+    }
+}

packages/backend-rs/src/database/mod.rs

@@ -1,26 +1,50 @@
 pub mod error;
+pub use error::NapiDbErrExt;
 
-use error::Error;
+use crate::config::server::DbConfig;
 use sea_orm::{Database, DbConn};
+use urlencoding::encode;
 
-static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
-
-pub async fn init_database(conn_uri: impl Into<String>) -> Result<(), Error> {
-    let conn = Database::connect(conn_uri.into()).await?;
-    DB_CONN.get_or_init(move || conn);
-    Ok(())
+#[napi_derive::napi]
+pub struct JsDbConn {
+    inner: DbConn,
+}
+impl JsDbConn {
+    pub fn inner(&self) -> &DbConn {
+        &self.inner
+    }
 }
 
-pub fn get_database() -> Result<&'static DbConn, Error> {
-    DB_CONN.get().ok_or(Error::Uninitialized)
+#[napi_derive::napi]
+pub async fn connect_to_database(config: DbConfig) -> napi::Result<JsDbConn> {
+    let conn_uri = format!(
+        "postgres://{}:{}@{}:{}/{}",
+        config.user,
+        encode(&config.pass),
+        config.host,
+        config.port,
+        config.db,
+    );
+    let conn = Database::connect(conn_uri)
+        .await
+        .map_err(NapiDbErrExt::into)?;
+    Ok(JsDbConn { inner: conn })
 }
 
 #[cfg(test)]
 mod unit_test {
-    use super::{error::Error, get_database};
+    use super::connect_to_database;
+    use crate::config::server::read_server_config;
 
-    #[test]
-    fn error_uninitialized() {
-        assert_eq!(get_database().unwrap_err(), Error::Uninitialized);
+    #[tokio::test]
+    async fn connect_with_server_config() {
+        assert!(connect_to_database(read_server_config().db).await.is_ok());
+    }
+
+    #[tokio::test]
+    async fn connect_with_incorrect_password() {
+        let mut config = read_server_config().db;
+        config.pass.push('.'); // password should be incorrect now
+        assert!(connect_to_database(config).await.is_err());
     }
 }

packages/backend-rs/src/util/meta.rs

@@ -0,0 +1,87 @@
+use crate::database::{JsDbConn, NapiDbErrExt};
+use crate::model::entity::meta;
+use rand::prelude::*;
+use sea_orm::{prelude::*, ActiveValue};
+use std::sync::Mutex;
+
+type Meta = meta::Model;
+
+static CACHE: Mutex<Option<Meta>> = Mutex::new(None);
+fn update_cache(meta: &Meta) {
+    let _ = CACHE.lock().map(|mut cache| *cache = Some(meta.clone()));
+}
+
+#[napi_derive::napi]
+pub async fn fetch_meta(conn: &JsDbConn, invalidate_cache: Option<bool>) -> napi::Result<Meta> {
+    // try using cache
+    if invalidate_cache == Some(true) {
+        if let Some(cache) = CACHE.lock().ok().and_then(|cache| cache.clone()) {
+            return Ok(cache);
+        }
+    }
+
+    // try fetching from db
+    let db = conn.inner();
+    let meta = meta::Entity::find()
+        .one(db)
+        .await
+        .map_err(NapiDbErrExt::into)?;
+    if let Some(meta) = meta {
+        update_cache(&meta);
+        return Ok(meta);
+    }
+
+    // create a new meta object and insert into db
+    let meta = meta::Entity::insert(meta::ActiveModel {
+        id: ActiveValue::Set("x".to_owned()),
+        ..Default::default()
+    })
+    .exec_with_returning(db)
+    .await
+    .map_err(NapiDbErrExt::into)?;
+    update_cache(&meta);
+    Ok(meta)
+}
+
+#[napi_derive::napi(object)]
+pub struct PugArgs {
+    pub img: Option<String>,
+    pub title: String,
+    pub instance_name: String,
+    pub desc: Option<String>,
+    pub icon: Option<String>,
+    pub splash_icon: Option<String>,
+    pub theme_color: Option<String>,
+    pub random_motd: String,
+    pub private_mode: Option<bool>,
+}
+
+#[napi_derive::napi]
+pub fn meta_to_pug_args(meta: Meta) -> PugArgs {
+    let mut rng = rand::thread_rng();
+
+    let splash_icon = meta
+        .custom_splash_icons
+        .choose(&mut rng)
+        .map(|s| s.to_owned())
+        .or_else(|| meta.icon_url.to_owned());
+
+    let random_motd = meta
+        .custom_motd
+        .choose(&mut rng)
+        .map(|s| s.to_owned())
+        .unwrap_or_else(|| "Loading...".to_owned());
+
+    let name = meta.name.unwrap_or_else(|| "Firefish".to_owned());
+    PugArgs {
+        img: meta.banner_url,
+        title: name.clone(),
+        instance_name: name.clone(),
+        desc: meta.description,
+        icon: meta.icon_url,
+        splash_icon,
+        theme_color: meta.theme_color,
+        random_motd,
+        private_mode: meta.private_mode,
+    }
+}

packages/backend-rs/src/util/mod.rs

@@ -4,4 +4,6 @@ pub mod convert_to_hidden_post;
 pub mod escape_sql;
 pub mod format_milliseconds;
 pub mod id;
+pub mod meta;
+pub mod note;
 pub mod random;

packages/backend-rs/src/util/note.rs

@@ -0,0 +1,25 @@
+use crate::database::{JsDbConn, NapiDbErrExt};
+use crate::model::entity::note;
+use sea_orm::prelude::*;
+
+/**
+ * Returns true if user {user_id}
+ * has any renote of note {renote_id}
+ * except the specified renote {excluded_note_id}
+ */
+#[napi_derive::napi]
+pub async fn has_other_renote_of_this_note(
+    conn: &JsDbConn,
+    user_id: String,
+    renote_id: String,
+    excluded_note_id: String,
+) -> napi::Result<bool> {
+    note::Entity::find()
+        .filter(note::Column::UserId.eq(user_id))
+        .filter(note::Column::RenoteId.eq(renote_id))
+        .filter(note::Column::Id.ne(excluded_note_id))
+        .one(conn.inner())
+        .await
+        .map(|row| row.is_some())
+        .map_err(NapiDbErrExt::into)
+}

packages/backend/src/daemons/server-stats.ts

@@ -1,7 +1,7 @@
 import si from "systeminformation";
 import Xev from "xev";
 import * as osUtils from "os-utils";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 // import meilisearch from "@/db/meilisearch.js";
 
 const ev = new Xev();

packages/backend/src/misc/backend-rs.ts

@@ -1,15 +1,28 @@
 import {
 	readServerConfig,
 	readEnvironmentConfig,
+	connectToDatabase,
+	fetchMeta as fetchMetaImpl,
 	getFullApAccount as getFullApAccountImpl,
+	hasOtherRenoteOfThisNote as hasOtherRenoteOfThisNoteImpl,
 	isSelfHost as isSelfHostImpl,
+	JsDbConn,
 } from "backend-rs";
 
 export const serverConfig = readServerConfig();
 export const envConfig = readEnvironmentConfig();
+const dbPromise = connectToDatabase(serverConfig.db);
 
 type Option<T> = T | null | undefined;
 
+const curryDb =
+	<P extends any[], R>(f: (db: JsDbConn, ...args: P) => Promise<R>) =>
+	(...args: P) =>
+		dbPromise.then((db) => f(db, ...args));
+
+export const fetchMeta = curryDb(fetchMetaImpl);
+export const hasOtherRenoteOfThisNote = curryDb(hasOtherRenoteOfThisNoteImpl);
+
 export function getFullApAccount(
 	username: string,
 	host: Option<string>,

packages/backend/src/misc/count-same-renotes.ts

@@ -1,19 +0,0 @@
-import { Notes } from "@/models/index.js";
-
-export async function countSameRenotes(
-	userId: string,
-	renoteId: string,
-	excludeNoteId: string | undefined,
-): Promise<number> {
-	// 指定したユーザーの指定したノートのリノートがいくつあるか数える
-	const query = Notes.createQueryBuilder("note")
-		.where("note.userId = :userId", { userId })
-		.andWhere("note.renoteId = :renoteId", { renoteId });
-
-	// 指定した投稿を除く
-	if (excludeNoteId) {
-		query.andWhere("note.id != :excludeNoteId", { excludeNoteId });
-	}
-
-	return await query.getCount();
-}

packages/backend/src/misc/fetch-meta.ts

@@ -1,72 +0,0 @@
-import { db } from "@/db/postgre.js";
-import { Meta } from "@/models/entities/meta.js";
-
-let cache: Meta;
-
-export function metaToPugArgs(meta: Meta): object {
-	let motd = ["Loading..."];
-	if (meta.customMotd.length > 0) {
-		motd = meta.customMotd;
-	}
-	let splashIconUrl = meta.iconUrl;
-	if (meta.customSplashIcons.length > 0) {
-		splashIconUrl =
-			meta.customSplashIcons[
-				Math.floor(Math.random() * meta.customSplashIcons.length)
-			];
-	}
-
-	return {
-		img: meta.bannerUrl,
-		title: meta.name || "Firefish",
-		instanceName: meta.name || "Firefish",
-		desc: meta.description,
-		icon: meta.iconUrl,
-		splashIcon: splashIconUrl,
-		themeColor: meta.themeColor,
-		randomMOTD: motd[Math.floor(Math.random() * motd.length)],
-		privateMode: meta.privateMode,
-	};
-}
-
-export async function fetchMeta(noCache = false): Promise<Meta> {
-	if (!noCache && cache) return cache;
-
-	return await db.transaction(async (transactionalEntityManager) => {
-		// New IDs are prioritized because multiple records may have been created due to past bugs.
-		const metas = await transactionalEntityManager.find(Meta, {
-			order: {
-				id: "DESC",
-			},
-		});
-
-		const meta = metas[0];
-
-		if (meta) {
-			cache = meta;
-			return meta;
-		} else {
-			// If fetchMeta is called at the same time when meta is empty, this part may be called at the same time, so use fail-safe upsert.
-			const saved = await transactionalEntityManager
-				.upsert(
-					Meta,
-					{
-						id: "x",
-					},
-					["id"],
-				)
-				.then((x) =>
-					transactionalEntityManager.findOneByOrFail(Meta, x.identifiers[0]),
-				);
-
-			cache = saved;
-			return saved;
-		}
-	});
-}
-
-setInterval(() => {
-	fetchMeta(true).then((meta) => {
-		cache = meta;
-	});
-}, 1000 * 10);

packages/backend/src/misc/fetch-proxy-account.ts

@@ -1,4 +1,4 @@
-import { fetchMeta } from "./fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { Users } from "@/models/index.js";
 

packages/backend/src/misc/reaction-lib.ts

@@ -1,5 +1,5 @@
 import { emojiRegex } from "./emoji-regex.js";
-import { fetchMeta } from "./fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Emojis } from "@/models/index.js";
 import { toPunyOptional } from "backend-rs";
 import { IsNull } from "typeorm";

packages/backend/src/misc/should-block-instance.ts

@@ -1,4 +1,4 @@
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import type { Instance } from "@/models/entities/instance.js";
 import type { Meta } from "@/models/entities/meta.js";
 

packages/backend/src/misc/skipped-instances.ts

@@ -1,5 +1,5 @@
 import { Brackets } from "typeorm";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Instances } from "@/models/index.js";
 import type { Instance } from "@/models/entities/instance.js";
 import { DAY } from "@/const.js";

packages/backend/src/misc/translate.ts

@@ -1,7 +1,7 @@
 import fetch from "node-fetch";
 import { Converter } from "opencc-js";
 import { getAgentByUrl } from "@/misc/fetch.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import type { Language } from "@/misc/langmap";
 import * as deepl from "deepl-node";
 

packages/backend/src/prelude/await-all.ts

@@ -1,10 +1,12 @@
+import { unsafeCast } from "./unsafe-cast.js";
+
 export type Promiseable<T> = {
 	[K in keyof T]: Promise<T[K]> | T[K];
 };
 
 export async function awaitAll<T>(obj: Promiseable<T>): Promise<T> {
 	const target = {} as T;
-	const keys = Object.keys(obj) as unknown as (keyof T)[];
+	const keys = unsafeCast<(keyof T)[]>(Object.keys(obj));
 	const values = Object.values(obj) as any[];
 
 	const resolvedValues = await Promise.all(

packages/backend/src/prelude/unsafe-cast.ts

@@ -0,0 +1,4 @@
+// unsafe type cast
+export function unsafeCast<T>(val: unknown): T {
+	return val as T;
+}

packages/backend/src/queue/processors/inbox.ts

@@ -5,7 +5,7 @@ import perform from "@/remote/activitypub/perform.js";
 import Logger from "@/services/logger.js";
 import { registerOrFetchInstanceDoc } from "@/services/register-or-fetch-instance-doc.js";
 import { Instances } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { toPuny, extractHost } from "backend-rs";
 import { getApId } from "@/remote/activitypub/type.js";
 import { fetchInstanceMetadata } from "@/services/fetch-instance-metadata.js";

packages/backend/src/remote/activitypub/check-fetch.ts

@@ -1,7 +1,7 @@
 import { URL } from "url";
 import httpSignature, { IParsedSignature } from "@peertube/http-signature";
 import config from "@/config/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { toPuny } from "backend-rs";
 import DbResolver from "@/remote/activitypub/db-resolver.js";
 import { getApId } from "@/remote/activitypub/type.js";

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

@@ -1,7 +1,7 @@
 import { uploadFromUrl } from "@/services/drive/upload-from-url.js";
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import Resolver from "../resolver.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { apLogger } from "../logger.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { DriveFiles } from "@/models/index.js";

packages/backend/src/remote/activitypub/renderer/like.ts

@@ -4,7 +4,6 @@ import type { NoteReaction } from "@/models/entities/note-reaction.js";
 import type { Note } from "@/models/entities/note.js";
 import { Emojis } from "@/models/index.js";
 import renderEmoji from "./emoji.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
 
 export const renderLike = async (noteReaction: NoteReaction, note: Note) => {
 	const reaction = noteReaction.reaction;

packages/backend/src/remote/activitypub/resolver.ts

@@ -2,7 +2,7 @@ import config from "@/config/index.js";
 import { getJson } from "@/misc/fetch.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { getInstanceActor } from "@/services/instance-actor.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { extractHost } from "backend-rs";
 import { isSelfHost } from "@/misc/backend-rs.js";
 import { signedGet } from "./request.js";

packages/backend/src/server/activitypub.ts

@@ -25,7 +25,7 @@ import {
 	getSignatureUser,
 } from "@/remote/activitypub/check-fetch.js";
 import { getInstanceActor } from "@/services/instance-actor.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import renderFollow from "@/remote/activitypub/renderer/follow.js";
 import Featured from "./activitypub/featured.js";
 import Following from "./activitypub/following.js";

packages/backend/src/server/activitypub/featured.ts

@@ -5,7 +5,7 @@ import renderOrderedCollection from "@/remote/activitypub/renderer/ordered-colle
 import renderNote from "@/remote/activitypub/renderer/note.js";
 import { Users, Notes, UserNotePinings } from "@/models/index.js";
 import { checkFetch } from "@/remote/activitypub/check-fetch.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { setResponseType } from "../activitypub.js";
 import type Router from "@koa/router";
 

packages/backend/src/server/activitypub/followers.ts

@@ -8,7 +8,7 @@ import renderFollowUser from "@/remote/activitypub/renderer/follow-user.js";
 import { Users, Followings, UserProfiles } from "@/models/index.js";
 import type { Following } from "@/models/entities/following.js";
 import { checkFetch } from "@/remote/activitypub/check-fetch.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { setResponseType } from "../activitypub.js";
 import type { FindOptionsWhere } from "typeorm";
 import type Router from "@koa/router";

packages/backend/src/server/activitypub/following.ts

@@ -8,7 +8,7 @@ import renderFollowUser from "@/remote/activitypub/renderer/follow-user.js";
 import { Users, Followings, UserProfiles } from "@/models/index.js";
 import type { Following } from "@/models/entities/following.js";
 import { checkFetch } from "@/remote/activitypub/check-fetch.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { setResponseType } from "../activitypub.js";
 import type { FindOptionsWhere } from "typeorm";
 import type Router from "@koa/router";

packages/backend/src/server/activitypub/outbox.ts

@@ -11,7 +11,7 @@ import * as url from "@/prelude/url.js";
 import { Users, Notes } from "@/models/index.js";
 import type { Note } from "@/models/entities/note.js";
 import { checkFetch } from "@/remote/activitypub/check-fetch.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { makePaginationQuery } from "../api/common/make-pagination-query.js";
 import { setResponseType } from "../activitypub.js";
 import type Router from "@koa/router";

packages/backend/src/server/api/api-handler.ts

@@ -2,7 +2,7 @@ import type Koa from "koa";
 
 import type { User } from "@/models/entities/user.js";
 import { UserIps } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import type { IEndpoint } from "./endpoints.js";
 import authenticate, { AuthenticationError } from "./authenticate.js";
 import call from "./call.js";

packages/backend/src/server/api/call.ts

@@ -9,7 +9,7 @@ import endpoints from "./endpoints.js";
 import compatibility from "./compatibility.js";
 import { ApiError } from "./error.js";
 import { apiLogger } from "./logger.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 
 const accessDenied = {
 	message: "Access denied.",

packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts

@@ -2,6 +2,7 @@ import config from "@/config/index.js";
 import { Meta } from "@/models/entities/meta.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { db } from "@/db/postgre.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import define from "@/server/api/define.js";
 
 export const meta = {
@@ -120,6 +121,8 @@ export default define(meta, paramDef, async (ps, me) => {
 			} else {
 				await transactionalEntityManager.save(Meta, set);
 			}
+			// update meta cache
+			fetchMeta(true);
 		});
 		insertModerationLog(me, "updateMeta");
 	}

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -1,5 +1,5 @@
 import config from "@/config/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
 import define from "@/server/api/define.js";
 

packages/backend/src/server/api/endpoints/admin/set-emoji-moderator.ts

@@ -1,6 +1,8 @@
 import { Users } from "@/models/index.js";
 import { publishInternalEvent } from "@/services/stream.js";
 import define from "../../define.js";
+import type { EmojiModPerm } from "@/models/entities/user.js";
+import { unsafeCast } from "@/prelude/unsafe-cast.js";
 
 export const meta = {
 	tags: ["admin"],
@@ -31,12 +33,8 @@ export default define(meta, paramDef, async (ps) => {
 		);
 	}
 
-	const _emojiModPerm =
-		(ps.emojiModPerm as "unauthorized" | "add" | "mod" | "full") ??
-		"unauthorized";
-
 	await Users.update(user.id, {
-		emojiModPerm: _emojiModPerm,
+		emojiModPerm: unsafeCast<EmojiModPerm>(ps.emojiModPerm),
 	});
 
 	publishInternalEvent("userChangeModeratorState", {

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -1,6 +1,7 @@
 import { Meta } from "@/models/entities/meta.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { db } from "@/db/postgre.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import define from "@/server/api/define.js";
 
 export const meta = {
@@ -571,6 +572,8 @@ export default define(meta, paramDef, async (ps, me) => {
 		} else {
 			await transactionalEntityManager.save(Meta, set);
 		}
+		// update meta cache
+		fetchMeta(true);
 	});
 
 	insertModerationLog(me, "updateMeta");

packages/backend/src/server/api/endpoints/admin/update-user-note.ts

@@ -17,7 +17,7 @@ export const paramDef = {
 	required: ["userId", "text"],
 } as const;
 
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const user = await Users.findOneBy({ id: ps.userId });
 
 	if (user == null) {

packages/backend/src/server/api/endpoints/custom-motd.ts

@@ -1,5 +1,5 @@
 // import { IsNull } from 'typeorm';
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import define from "@/server/api/define.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/custom-splash-icons.ts

@@ -1,5 +1,5 @@
 // import { IsNull } from 'typeorm';
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import define from "@/server/api/define.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/drive.ts

@@ -1,4 +1,4 @@
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { DriveFiles } from "@/models/index.js";
 import define from "@/server/api/define.js";
 

packages/backend/src/server/api/endpoints/drive/files/create.ts

@@ -2,7 +2,7 @@ import { addFile } from "@/services/drive/add-file.js";
 import { DriveFiles } from "@/models/index.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { MINUTE } from "@/const.js";
 import define from "@/server/api/define.js";
 import { apiLogger } from "@/server/api/logger.js";

packages/backend/src/server/api/endpoints/federation/instances.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { Instances } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { sqlLikeEscape } from "backend-rs";
 
 export const meta = {

packages/backend/src/server/api/endpoints/hashtags/trend.ts

@@ -1,6 +1,6 @@
 import { Brackets } from "typeorm";
 import define from "@/server/api/define.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Notes } from "@/models/index.js";
 import type { Note } from "@/models/entities/note.js";
 import { safeForSql } from "backend-rs";

packages/backend/src/server/api/endpoints/i/import-posts.ts

@@ -3,7 +3,7 @@ import { createImportPostsJob } from "@/queue/index.js";
 import { ApiError } from "@/server/api/error.js";
 import { DriveFiles } from "@/models/index.js";
 import { DAY } from "@/const.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 
 export const meta = {
 	secure: true,

packages/backend/src/server/api/endpoints/meta.ts

@@ -1,7 +1,7 @@
 import JSON5 from "json5";
 import { IsNull, MoreThan } from "typeorm";
 import config from "@/config/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Ads, Emojis, Users } from "@/models/index.js";
 import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/notes/global-timeline.ts

@@ -1,4 +1,4 @@
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Notes } from "@/models/index.js";
 import { activeUsersChart } from "@/services/chart/index.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -1,5 +1,5 @@
 import { Brackets } from "typeorm";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Followings, Notes } from "@/models/index.js";
 import { activeUsersChart } from "@/services/chart/index.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/notes/local-timeline.ts

@@ -1,5 +1,5 @@
 import { Brackets } from "typeorm";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Notes } from "@/models/index.js";
 import { activeUsersChart } from "@/services/chart/index.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts

@@ -1,5 +1,5 @@
 import { Brackets } from "typeorm";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Notes } from "@/models/index.js";
 import { activeUsersChart } from "@/services/chart/index.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/pinned-users.ts

@@ -1,6 +1,6 @@
 import { IsNull } from "typeorm";
 import { Users } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { stringToAcct } from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/recommended-instances.ts

@@ -1,5 +1,5 @@
 // import { IsNull } from 'typeorm';
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import define from "@/server/api/define.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/server-info.ts

@@ -2,7 +2,7 @@ import * as os from "node:os";
 import si from "systeminformation";
 import define from "@/server/api/define.js";
 // import meilisearch from "@/db/meilisearch.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 
 export const meta = {
 	requireCredential: false,

packages/backend/src/server/api/endpoints/sw/register.ts

@@ -1,4 +1,4 @@
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { genId } from "@/misc/gen-id.js";
 import { SwSubscriptions } from "@/models/index.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/users/report-abuse.ts

@@ -4,7 +4,7 @@ import { publishAdminStream } from "@/services/stream.js";
 import { AbuseUserReports, UserProfiles, Users } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 import { sendEmail } from "@/services/send-email.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { getUser } from "@/server/api/common/getters.js";
 import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/mastodon/endpoints/meta.ts

@@ -1,6 +1,6 @@
 import { Entity } from "megalodon";
 import config from "@/config/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { MAX_NOTE_TEXT_LENGTH, FILE_TYPE_BROWSERSAFE } from "@/const.js";
 
 export async function getInstance(

packages/backend/src/server/api/mastodon/endpoints/status.ts

@@ -11,7 +11,7 @@ import {
 	convertPoll,
 	convertStatus,
 } from "../converters.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 
 function normalizeQuery(data: any) {
 	const str = querystring.stringify(data);

packages/backend/src/server/api/private/signup.ts

@@ -1,6 +1,6 @@
 import type Koa from "koa";
 import rndstr from "rndstr";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { verifyHcaptcha, verifyRecaptcha } from "@/misc/captcha.js";
 import { Users, RegistrationTickets, UserPendings } from "@/models/index.js";
 import { signup } from "@/server/api/common/signup.js";

packages/backend/src/server/api/stream/channels/global-timeline.ts

@@ -1,5 +1,5 @@
 import Channel from "../channel.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import { isUserRelated } from "@/misc/is-user-related.js";

packages/backend/src/server/api/stream/channels/hybrid-timeline.ts

@@ -1,5 +1,5 @@
 import Channel from "../channel.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";

packages/backend/src/server/api/stream/channels/local-timeline.ts

@@ -1,5 +1,5 @@
 import Channel from "../channel.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import type { Packed } from "@/misc/schema.js";

packages/backend/src/server/api/stream/channels/recommended-timeline.ts

@@ -1,5 +1,5 @@
 import Channel from "../channel.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";

packages/backend/src/server/index.ts

@@ -16,7 +16,7 @@ import { IsNull } from "typeorm";
 import config from "@/config/index.js";
 import Logger from "@/services/logger.js";
 import { Users } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { genIdenticon } from "@/misc/gen-identicon.js";
 import { createTemp } from "@/misc/create-temp.js";
 import { stringToAcct } from "backend-rs";

packages/backend/src/server/nodeinfo.ts

@@ -1,6 +1,6 @@
 import Router from "@koa/router";
 import config from "@/config/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { Users, Notes } from "@/models/index.js";
 import { IsNull, MoreThan } from "typeorm";
 import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";

packages/backend/src/server/web/index.ts

@@ -16,7 +16,8 @@ import { BullAdapter } from "@bull-board/api/bullAdapter.js";
 import { KoaAdapter } from "@bull-board/koa";
 
 import { In, IsNull } from "typeorm";
-import { fetchMeta, metaToPugArgs } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
+import { metaToPugArgs } from "backend-rs";
 import config from "@/config/index.js";
 import {
 	Users,

packages/backend/src/server/web/manifest.ts

@@ -1,5 +1,5 @@
 import type Koa from "koa";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import config from "@/config/index.js";
 import manifest from "./manifest.json" assert { type: "json" };
 

packages/backend/src/server/web/url-preview.ts

@@ -1,6 +1,6 @@
 import type Koa from "koa";
 import summaly from "summaly";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import Logger from "@/services/logger.js";
 import config from "@/config/index.js";
 import { query } from "@/prelude/url.js";

packages/backend/src/server/web/views/base.pug

@@ -72,8 +72,8 @@ html
 		div#splash
 			img#splashIcon(src= splashIcon || `/static-assets/splash.svg?${ timestamp }`)
 			span#splashText
-				block randomMOTD
-					= randomMOTD
+				block randomMotd
+					= randomMotd
 			div#splashSpinner
 				<svg class="spinner bg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
 					<g transform="matrix(1,0,0,1,12,12)">

packages/backend/src/services/drive/add-file.ts

@@ -6,7 +6,7 @@ import type S3 from "aws-sdk/clients/s3.js"; // TODO: migrate to SDK v3
 import sharp from "sharp";
 import { IsNull } from "typeorm";
 import { publishMainStream, publishDriveStream } from "@/services/stream.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { contentDisposition } from "@/misc/content-disposition.js";
 import { getFileInfo } from "@/misc/get-file-info.js";
 import {

packages/backend/src/services/drive/delete-file.ts

@@ -2,7 +2,7 @@ import type { DriveFile } from "@/models/entities/drive-file.js";
 import { InternalStorage } from "./internal-storage.js";
 import { DriveFiles } from "@/models/index.js";
 import { createDeleteObjectStorageFileJob } from "@/queue/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import { getS3 } from "./s3.js";
 import { v4 as uuid } from "uuid";
 

packages/backend/src/services/note/create.ts

@@ -47,7 +47,7 @@ import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js
 import { checkHitAntenna } from "@/misc/check-hit-antenna.js";
 import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { addNoteToAntenna } from "@/services/add-note-to-antenna.js";
-import { countSameRenotes } from "@/misc/count-same-renotes.js";
+import { hasOtherRenoteOfThisNote } from "@/misc/backend-rs.js";
 import { deliverToRelays, getCachedRelays } from "../relay.js";
 import type { Channel } from "@/models/entities/channel.js";
 import { normalizeForSearch } from "@/misc/normalize-for-search.js";
@@ -412,7 +412,7 @@ export default async (
 		if (
 			data.renote &&
 			!user.isBot &&
-			(await countSameRenotes(user.id, data.renote.id, note.id)) === 0
+			!(await hasOtherRenoteOfThisNote(user.id, data.renote.id, note.id))
 		) {
 			incRenoteCount(data.renote);
 		}

packages/backend/src/services/note/delete.ts

@@ -13,7 +13,7 @@ import {
 	deliverToFollowers,
 	deliverToUser,
 } from "@/remote/activitypub/deliver-manager.js";
-import { countSameRenotes } from "@/misc/count-same-renotes.js";
+import { hasOtherRenoteOfThisNote } from "@/misc/backend-rs.js";
 import { registerOrFetchInstanceDoc } from "@/services/register-or-fetch-instance-doc.js";
 import { deliverToRelays } from "@/services/relay.js";
 // import meilisearch from "@/db/meilisearch.js";
@@ -34,7 +34,7 @@ export default async function (
 	// この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
 	if (
 		note.renoteId &&
-		(await countSameRenotes(user.id, note.renoteId, note.id)) === 0 &&
+		!(await hasOtherRenoteOfThisNote(user.id, note.renoteId, note.id)) &&
 		deleteFromDb
 	) {
 		Notes.decrement({ id: note.renoteId }, "renoteCount", 1);

packages/backend/src/services/push-notification.ts

@@ -1,7 +1,7 @@
 import push from "web-push";
 import config from "@/config/index.js";
 import { SwSubscriptions } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import type { Packed } from "@/misc/schema.js";
 import { getNoteSummary } from "@/misc/get-note-summary.js";
 

packages/backend/src/services/send-email.ts

@@ -1,5 +1,5 @@
 import * as nodemailer from "nodemailer";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 import Logger from "@/services/logger.js";
 import config from "@/config/index.js";
 

packages/backend/src/services/validate-email-for-account.ts

@@ -1,6 +1,6 @@
 import { validate as validateEmail } from "deep-email-validator";
 import { UserProfiles } from "@/models/index.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
+import { fetchMeta } from "@/misc/backend-rs.js";
 
 export async function validateEmailForAccount(emailAddress: string): Promise<{
 	available: boolean;

packages/client/src/pages/settings/general.vue

@@ -309,9 +309,9 @@
 				}}</span></FormSwitch
 			>
 			<FormSwitch v-model="useEmojiCdn" class="_formBlock"
-				>{{ i18n.ts.useEmojiCdn
+				>{{ i18n.ts.useCdn
 				}}<template #caption>{{
-					i18n.ts.useEmojiCdnDescription
+					i18n.ts.useCdnDescription
 				}}</template></FormSwitch
 			>
 			<FormSwitch

packages/client/src/scripts/prism.ts

@@ -1,5 +1,6 @@
 import Prism from "prismjs";
 import "prismjs/plugins/autoloader/prism-autoloader.js";
+import { defaultStore } from "@/store";
 
 // TODO
 Prism.plugins.autoloader.languages_path =
@@ -8,6 +9,8 @@ Prism.plugins.autoloader.languages_path =
 const nonExistingLanguagesCache = new Set<string>();
 export const loadLanguage = (lang: string) =>
 	new Promise<void>((resolve, reject) => {
+		// for now
+		if (!defaultStore.state.useEmojiCdn) return reject();
 		// cached non-existing language
 		if (nonExistingLanguagesCache.has(lang)) return reject();
 		// load language with autoloader