Remote avatar deco cache

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2023.11.1+munochi.4",
+	"version": "2023.11.1+munochi.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/core/AvatarDecorationService.ts

@@ -16,11 +16,12 @@
 import { HttpRequestService } from "@/core/HttpRequestService.js";
 import { appendQuery, query } from '@/misc/prelude/url.js';
 import type { Config } from '@/config.js';
 import {IsNull} from "typeorm";
 
 @Injectable()
 export class AvatarDecorationService implements OnApplicationShutdown {
 	public cache: MemorySingleCache<MiAvatarDecoration[]>;
+	public cacheWithRemote: MemorySingleCache<MiAvatarDecoration[]>;
 
 	constructor(
 		@Inject(DI.config)
@@ -44,6 +45,7 @@
 		private httpRequestService: HttpRequestService,
 	) {
 		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30);
+		this.cacheWithRemote = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30);
 
 		this.redisForSub.on('message', this.onMessage);
 	}
@@ -142,7 +144,7 @@
 		if (!avatarDecorations) {
 			const updates = {} as Partial<MiUser>;
 			updates.avatarDecorations = [];
 			await this.usersRepository.update({id: user.id}, updates);
 			return;
 		}
 
@@ -151,14 +153,14 @@
 		const decorationApiUrl = `https://${instanceHost}/api/get-avatar-decorations`;
 		const allRes = await this.httpRequestService.send(decorationApiUrl, {
 			method: 'POST',
 			headers: {"Content-Type": "application/json"},
 			body: JSON.stringify({}),
 		});
 		const allDecorations: any = await allRes.json();
 		let name;
 		let description;
 		for (const decoration of allDecorations) {
 			if (decoration.id == avatarDecorationId) {
 				name = decoration.name;
 				description = decoration.description;
 				break;
@@ -177,8 +179,10 @@
 		};
 		if (existingDecoration == null) {
 			await this.create(decorationData);
+			this.cacheWithRemote.delete();
 		} else {
 			await this.update(existingDecoration.id, decorationData);
+			this.cacheWithRemote.delete();
 		}
 		const findDecoration = await this.avatarDecorationsRepository.findOneBy({
 			host: userHost,
@@ -190,7 +194,7 @@
 			angle: avatarDecorations.angle ?? 0,
 			flipH: avatarDecorations.flipH ?? false,
 		}];
 		await this.usersRepository.update({id: user.id}, updates);
 	}
 
 	@bindThis
@@ -212,11 +216,12 @@
 	public async getAll(noCache = false, withRemote = false): Promise<MiAvatarDecoration[]> {
 		if (noCache) {
 			this.cache.delete();
+			this.cacheWithRemote.delete();
 		}
 		if (!withRemote) {
 			return this.cache.fetch(() => this.avatarDecorationsRepository.find({ where: { host: IsNull() } }));
 		} else {
-			return this.cache.fetch(() => this.avatarDecorationsRepository.find());
+			return this.cacheWithRemote.fetch(() => this.avatarDecorationsRepository.find());
 		}
 	}
 

packages/backend/src/core/entities/UserEntityService.ts

@@ -358,7 +358,7 @@ export class UserEntityService implements OnModuleInit {
 			host: user.host,
 			avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user),
 			avatarBlurhash: user.avatarBlurhash,
-			avatarDecorations: user.avatarDecorations.length > 0 ? this.avatarDecorationService.getAll(true, true).then(decorations => user.avatarDecorations.filter(ud => decorations.some(d => d.id === ud.id)).map(ud => ({
+			avatarDecorations: user.avatarDecorations.length > 0 ? this.avatarDecorationService.getAll(false, true).then(decorations => user.avatarDecorations.filter(ud => decorations.some(d => d.id === ud.id)).map(ud => ({
 				id: ud.id,
 				angle: ud.angle || undefined,
 				flipH: ud.flipH || undefined,