fix: resolve federated avatar double-path URL that broke cross-instance profile pictures
profileSync stored avatar/banner paths with /api/uploads/ prefix on remote instances, causing resolveAssetUrl to produce double-path URLs like https://remote/api/uploads//api/uploads/file.jpg that 404'd. Store bare filenames instead, strip prefix defensively in resolveAssetUrl and server-side for existing data self-healing.
This commit is contained in:
@@ -183,6 +183,10 @@ export async function userRoutes(app: FastifyInstance): Promise<void> {
|
|||||||
return reply.code(400).send({ error: 'Avatar URL must be a relative upload path or http/https URL', statusCode: 400 });
|
return reply.code(400).send({ error: 'Avatar URL must be a relative upload path or http/https URL', statusCode: 400 });
|
||||||
}
|
}
|
||||||
updateData.avatar = avatar;
|
updateData.avatar = avatar;
|
||||||
|
// Normalize to bare filename — profileSync historically stored /api/uploads/ prefix
|
||||||
|
if (typeof updateData.avatar === 'string' && updateData.avatar.startsWith('/api/uploads/')) {
|
||||||
|
updateData.avatar = updateData.avatar.slice('/api/uploads/'.length);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (banner !== undefined) {
|
if (banner !== undefined) {
|
||||||
@@ -191,6 +195,10 @@ export async function userRoutes(app: FastifyInstance): Promise<void> {
|
|||||||
}
|
}
|
||||||
if (banner && typeof banner === 'string' && banner.trim().length > 0) {
|
if (banner && typeof banner === 'string' && banner.trim().length > 0) {
|
||||||
updateData.banner = banner.trim();
|
updateData.banner = banner.trim();
|
||||||
|
// Normalize to bare filename — profileSync historically stored /api/uploads/ prefix
|
||||||
|
if (updateData.banner.startsWith('/api/uploads/')) {
|
||||||
|
updateData.banner = updateData.banner.slice('/api/uploads/'.length);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
updateData.banner = null;
|
updateData.banner = null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
import { getApiForOrigin } from '../stores/spaceStore';
|
import { getApiForOrigin } from '../stores/spaceStore';
|
||||||
|
|
||||||
|
/** Strip /api/uploads/ prefix to get bare filename. No-op for bare filenames and absolute URLs. */
|
||||||
|
export function stripUploadPrefix(filename: string): string {
|
||||||
|
return filename.startsWith('/api/uploads/') ? filename.slice('/api/uploads/'.length) : filename;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resolve a relative asset filename to an absolute URL for remote origins.
|
* Resolve a relative asset filename to an absolute URL for remote origins.
|
||||||
* Home-origin filenames are returned as-is (components handle the /api/uploads/ prefix).
|
* Home-origin filenames are returned as-is (components handle the /api/uploads/ prefix).
|
||||||
@@ -7,7 +12,7 @@ import { getApiForOrigin } from '../stores/spaceStore';
|
|||||||
*/
|
*/
|
||||||
export function resolveAssetUrl(filename: string | null | undefined, origin: string): typeof filename {
|
export function resolveAssetUrl(filename: string | null | undefined, origin: string): typeof filename {
|
||||||
if (!filename || !origin || filename.startsWith('http')) return filename;
|
if (!filename || !origin || filename.startsWith('http')) return filename;
|
||||||
return getApiForOrigin(origin).uploads.url(filename);
|
return getApiForOrigin(origin).uploads.url(stripUploadPrefix(filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -10,7 +10,9 @@ async function downloadAsset(filename: string, origin?: string): Promise<Blob> {
|
|||||||
const res = await fetch(filename);
|
const res = await fetch(filename);
|
||||||
return res.blob();
|
return res.blob();
|
||||||
}
|
}
|
||||||
const base = origin ? `${origin}/api/uploads/${filename}` : `/api/uploads/${filename}`;
|
// Strip /api/uploads/ prefix to avoid double-path URLs (profileSync previously stored full paths)
|
||||||
|
const bare = filename.startsWith('/api/uploads/') ? filename.slice('/api/uploads/'.length) : filename;
|
||||||
|
const base = origin ? `${origin}/api/uploads/${bare}` : `/api/uploads/${bare}`;
|
||||||
const res = await fetch(base);
|
const res = await fetch(base);
|
||||||
return res.blob();
|
return res.blob();
|
||||||
}
|
}
|
||||||
@@ -62,7 +64,7 @@ async function pushProfileToRemote(inst: ConnectedInstance, homeUser: NonNullabl
|
|||||||
try {
|
try {
|
||||||
const blob = await downloadAsset(homeUser.avatar);
|
const blob = await downloadAsset(homeUser.avatar);
|
||||||
const attachment = await inst.api.uploads.upload(new File([blob], homeUser.avatar));
|
const attachment = await inst.api.uploads.upload(new File([blob], homeUser.avatar));
|
||||||
payload.avatar = `/api/uploads/${attachment.filename}`;
|
payload.avatar = attachment.filename;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('[ProfileSync] Failed to upload avatar to remote:', err);
|
console.warn('[ProfileSync] Failed to upload avatar to remote:', err);
|
||||||
}
|
}
|
||||||
@@ -75,7 +77,7 @@ async function pushProfileToRemote(inst: ConnectedInstance, homeUser: NonNullabl
|
|||||||
try {
|
try {
|
||||||
const blob = await downloadAsset(homeUser.banner);
|
const blob = await downloadAsset(homeUser.banner);
|
||||||
const attachment = await inst.api.uploads.upload(new File([blob], homeUser.banner));
|
const attachment = await inst.api.uploads.upload(new File([blob], homeUser.banner));
|
||||||
payload.banner = `/api/uploads/${attachment.filename}`;
|
payload.banner = attachment.filename;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('[ProfileSync] Failed to upload banner to remote:', err);
|
console.warn('[ProfileSync] Failed to upload banner to remote:', err);
|
||||||
}
|
}
|
||||||
@@ -108,7 +110,7 @@ async function pullProfileFromRemote(inst: ConnectedInstance): Promise<void> {
|
|||||||
try {
|
try {
|
||||||
const blob = await downloadAsset(remoteUser.avatar, inst.origin);
|
const blob = await downloadAsset(remoteUser.avatar, inst.origin);
|
||||||
const attachment = await api.uploads.upload(new File([blob], remoteUser.avatar.split('/').pop() || 'avatar'));
|
const attachment = await api.uploads.upload(new File([blob], remoteUser.avatar.split('/').pop() || 'avatar'));
|
||||||
payload.avatar = `/api/uploads/${attachment.filename}`;
|
payload.avatar = attachment.filename;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('[ProfileSync] Failed to download/upload avatar from remote:', err);
|
console.warn('[ProfileSync] Failed to download/upload avatar from remote:', err);
|
||||||
}
|
}
|
||||||
@@ -121,7 +123,7 @@ async function pullProfileFromRemote(inst: ConnectedInstance): Promise<void> {
|
|||||||
try {
|
try {
|
||||||
const blob = await downloadAsset(remoteUser.banner, inst.origin);
|
const blob = await downloadAsset(remoteUser.banner, inst.origin);
|
||||||
const attachment = await api.uploads.upload(new File([blob], remoteUser.banner.split('/').pop() || 'banner'));
|
const attachment = await api.uploads.upload(new File([blob], remoteUser.banner.split('/').pop() || 'banner'));
|
||||||
payload.banner = `/api/uploads/${attachment.filename}`;
|
payload.banner = attachment.filename;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('[ProfileSync] Failed to download/upload banner from remote:', err);
|
console.warn('[ProfileSync] Failed to download/upload banner from remote:', err);
|
||||||
}
|
}
|
||||||
@@ -206,7 +208,7 @@ export async function syncProfileUpdateToRemotes(update: Partial<UpdateUserReque
|
|||||||
if (avatarBlob && avatarFilename) {
|
if (avatarBlob && avatarFilename) {
|
||||||
try {
|
try {
|
||||||
const attachment = await inst.api.uploads.upload(new File([avatarBlob], avatarFilename));
|
const attachment = await inst.api.uploads.upload(new File([avatarBlob], avatarFilename));
|
||||||
perInstPayload.avatar = `/api/uploads/${attachment.filename}`;
|
perInstPayload.avatar = attachment.filename;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn(`[ProfileSync] Failed to upload avatar to ${inst.origin}:`, err);
|
console.warn(`[ProfileSync] Failed to upload avatar to ${inst.origin}:`, err);
|
||||||
}
|
}
|
||||||
@@ -220,7 +222,7 @@ export async function syncProfileUpdateToRemotes(update: Partial<UpdateUserReque
|
|||||||
if (bannerBlob && bannerFilename) {
|
if (bannerBlob && bannerFilename) {
|
||||||
try {
|
try {
|
||||||
const attachment = await inst.api.uploads.upload(new File([bannerBlob], bannerFilename));
|
const attachment = await inst.api.uploads.upload(new File([bannerBlob], bannerFilename));
|
||||||
perInstPayload.banner = `/api/uploads/${attachment.filename}`;
|
perInstPayload.banner = attachment.filename;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn(`[ProfileSync] Failed to upload banner to ${inst.origin}:`, err);
|
console.warn(`[ProfileSync] Failed to upload banner to ${inst.origin}:`, err);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user