fix: use admin R2 avatars for operator activity..
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
2026-07-14 11:51:43 +09:00
parent cd4bdbecd7
commit e811208773
14 changed files with 96 additions and 142 deletions
+1 -7
View File
@@ -5,6 +5,7 @@ import { ConfigService } from '@nestjs/config';
import { GiteaService } from '../gitea/gitea.service';
import { PrismaService } from '../prisma/prisma.service';
import { getAdminAvatarUrl } from './admin-avatar';
import { AdminRole } from './admin-role';
import {
CreateAdminSshKeyDto,
@@ -334,13 +335,6 @@ export class AdminsService {
}
}
function getAdminAvatarUrl(adminId: string, configService: ConfigService) {
const publicBaseUrl = configService.get<string>('R2_PUBLIC_BASE_URL')?.replace(/\/+$/, '');
if (!publicBaseUrl) return null;
const prefix = configService.get<string>('R2_PUBLIC_FILE_PREFIX', 'studio-files/public');
return `${publicBaseUrl}/${prefix.replace(/^\/+|\/+$/g, '')}/admins/${adminId}/avatar`;
}
const adminSelect = {
id: true,
email: true,