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

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, initDatabase, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, stringToAcct, acctToString, getFullApAccount, isSelfHost, extractHost, toPuny, toPunyOptional, convertToHiddenPost, countSameRenotes, sqlLikeEscape, safeForSql, formatMilliseconds, nativeInitIdGenerator, nativeCreateId, nativeGetTimestamp, fetchMeta, metaToPugArgs, genString, IdConvertType, convertId } = nativeBinding
 
 module.exports.EnvConfig = EnvConfig
 module.exports.readEnvironmentConfig = readEnvironmentConfig
 module.exports.readServerConfig = readServerConfig
+module.exports.JsDbConn = JsDbConn
+module.exports.initDatabase = initDatabase
 module.exports.AntennaSrcEnum = AntennaSrcEnum
 module.exports.MutedNoteReasonEnum = MutedNoteReasonEnum
 module.exports.NoteVisibilityEnum = NoteVisibilityEnum
@@ -318,12 +320,15 @@ module.exports.extractHost = extractHost
 module.exports.toPuny = toPuny
 module.exports.toPunyOptional = toPunyOptional
 module.exports.convertToHiddenPost = convertToHiddenPost
+module.exports.countSameRenotes = countSameRenotes
 module.exports.sqlLikeEscape = sqlLikeEscape
 module.exports.safeForSql = safeForSql
 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.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]]
@@ -412,9 +413,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -422,7 +423,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -2025,9 +2026,9 @@ dependencies = [
 
 [[package]]
 name = "sea-orm"
-version = "0.12.11"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f66e2129991acd51fcad7b59da1edd862edca69773cc9a19cb17b967fae2fb"
+checksum = "0cbf88748872fa54192476d6d49d0775e208566a72656e267e45f6980b926c8d"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2053,9 +2054,9 @@ dependencies = [
 
 [[package]]
 name = "sea-orm-macros"
-version = "0.12.11"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03da1864306242678ac3b6567e69f70dd1252a72742baa23a4d92d2d45da3fc"
+checksum = "e0dbc880d47aa53c6a572e39c99402c7fad59b50766e51e0b0fc1306510b0555"
 dependencies = [
  "heck",
  "proc-macro2",

packages/backend-rs/Cargo.toml

@@ -33,6 +33,7 @@ url = "2.5.0"
 napi = { version = "2.14.2", 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 init_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::init_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_to_database() {
+        assert!(init_database(read_server_config().db).await.is_ok());
+    }
+
+    #[tokio::test]
+    async fn invalid_db_password() {
+        let mut config = read_server_config().db;
+        config.pass.push('.'); // make password wrong
+        assert!(init_database(config).await.is_err());
     }
 }

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

@@ -0,0 +1,19 @@
+use crate::database::{JsDbConn, NapiDbErrExt};
+use crate::model::entity::note;
+use sea_orm::prelude::*;
+
+#[napi_derive::napi]
+pub async fn count_same_renotes(
+    conn: &JsDbConn,
+    user_id: String,
+    renote_id: String,
+    exclude_note_id: Option<String>,
+) -> napi::Result<u64> {
+    let mut query = note::Entity::find()
+        .filter(note::Column::UserId.eq(user_id))
+        .filter(note::Column::RenoteId.eq(renote_id));
+    if let Some(exclude_note_id) = exclude_note_id {
+        query = query.filter(note::Column::Id.ne(exclude_note_id));
+    }
+    query.count(conn.inner()).await.map_err(NapiDbErrExt::into)
+}

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: bool) -> napi::Result<Meta> {
+    // try using cache
+    if !invalidate_cache {
+        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

@@ -1,7 +1,9 @@
 pub mod acct;
 pub mod convert_host;
 pub mod convert_to_hidden_post;
+pub mod count_same_renotes;
 pub mod escape_sql;
 pub mod format_milliseconds;
 pub mod id;
+pub mod meta;
 pub mod random;

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,30 @@
 import {
 	readServerConfig,
 	readEnvironmentConfig,
+	initDatabase,
+	countSameRenotes as countSameRenotesImpl,
+	fetchMeta as fetchMetaImpl,
 	getFullApAccount as getFullApAccountImpl,
 	isSelfHost as isSelfHostImpl,
 } from "backend-rs";
 
 export const serverConfig = readServerConfig();
 export const envConfig = readEnvironmentConfig();
+const dbPromise = initDatabase(serverConfig.db);
 
 type Option<T> = T | null | undefined;
 
+type WithoutState<F> = F extends (state: any, ...args: infer P) => infer R
+	? (...args: P) => R
+	: never;
+
+export const countSameRenotes: WithoutState<typeof countSameRenotesImpl> = (
+	...args
+) => dbPromise.then((db) => countSameRenotesImpl(db, ...args));
+
+export const fetchMeta = (invalidateCache = false) =>
+	dbPromise.then((db) => fetchMetaImpl(db, invalidateCache));
+
 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/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/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/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 { countSameRenotes } 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 countSameRenotes(user.id, data.renote.id, note.id)) === 0n
 		) {
 			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 { countSameRenotes } 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 countSameRenotes(user.id, note.renoteId, note.id)) === 0n &&
 		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;