Merge pull request #1 from yunochi/remote_avatar_deco_cache

Remote avatar deco cache
serafuku · Dec 1, 2023 · b936482 · b936482
2 parents d3cbfb0 + 0c85ada
commit b936482
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/package.json b/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",

diff --git a/packages/backend/src/core/AvatarDecorationService.ts b/packages/backend/src/core/AvatarDecorationService.ts
@@ -21,6 +21,7 @@ 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 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 		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);
 	}
@@ -177,8 +179,10 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 		};
 		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,
@@ -212,11 +216,12 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 	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());
 		}
 	}
 

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/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,