chore: removes findByFederationMediaIdAndServerName and add mediaId index into upload collection

ricardogarim · ricardogarim · commit c3e7d7de3eee · 2025-09-15T16:04:29.000-03:00
diff --git a/ee/packages/federation-matrix/src/api/_matrix/media.ts b/ee/packages/federation-matrix/src/api/_matrix/media.ts
@@ -63,8 +63,8 @@ function createMultipartResponse(
 	};
 }
 
-async function getMediaFile(mediaId: string, serverName: string): Promise<{ file: IUpload; buffer: Buffer } | null> {
-	const file = await MatrixMediaService.getLocalFileForMatrixNode(mediaId, serverName);
+async function getMediaFile(mediaId: string): Promise<{ file: IUpload; buffer: Buffer } | null> {
+	const file = await MatrixMediaService.getLocalFileForMatrixNode(mediaId);
 	if (!file) {
 		return null;
 	}
@@ -74,7 +74,7 @@ async function getMediaFile(mediaId: string, serverName: string): Promise<{ file
 }
 
 export const getMatrixMediaRoutes = (homeserverServices: HomeserverServices) => {
-	const { config, federationAuth } = homeserverServices;
+	const { federationAuth } = homeserverServices;
 	const router = new Router('/federation');
 
 	router.get(
@@ -95,10 +95,9 @@ export const getMatrixMediaRoutes = (homeserverServices: HomeserverServices) =>
 		async (c) => {
 			try {
 				const { mediaId } = c.req.param();
-				const { serverName } = config;
 
 				// TODO: Add file streaming support
-				const result = await getMediaFile(mediaId, serverName);
+				const result = await getMediaFile(mediaId);
 				if (!result) {
 					return {
 						statusCode: 404,
diff --git a/ee/packages/federation-matrix/src/services/MatrixMediaService.ts b/ee/packages/federation-matrix/src/services/MatrixMediaService.ts
@@ -65,9 +65,9 @@ export class MatrixMediaService {
 		}
 	}
 
-	static async getLocalFileForMatrixNode(mediaId: string, serverName: string): Promise<IUpload | null> {
+	static async getLocalFileForMatrixNode(mediaId: string): Promise<IUpload | null> {
 		try {
-			let file = await Uploads.findByFederationMediaIdAndServerName(mediaId, serverName);
+			let file = await Uploads.findByFederationMediaId(mediaId);
 
 			if (!file) {
 				file = await Uploads.findOneById(mediaId);
@@ -102,7 +102,7 @@ export class MatrixMediaService {
 				throw new Error('Invalid MXC URI');
 			}
 
-			const uploadAlreadyExists = await Uploads.findByFederationMediaIdAndServerName(parts.mediaId, parts.serverName);
+			const uploadAlreadyExists = await Uploads.findByFederationMediaId(parts.mediaId);
 			if (uploadAlreadyExists) {
 				return uploadAlreadyExists._id;
 			}
diff --git a/packages/model-typings/src/models/IUploadsModel.ts b/packages/model-typings/src/models/IUploadsModel.ts
@@ -15,7 +15,7 @@ export interface IUploadsModel extends IBaseUploadsModel<IUpload> {
 		options?: Omit<FindOptions<IUpload>, 'sort'>,
 	): FindPaginated<FindCursor<WithId<IUpload>>>;
 
-	findByFederationMediaIdAndServerName(mediaId: string, serverName: string): Promise<IUpload | null>;
+	findByFederationMediaId(mediaId: string): Promise<IUpload | null>;
 
 	setFederationInfo(fileId: string, info: { mxcUri: string; serverName: string; mediaId: string }): Promise<Document | UpdateResult>;
 }
diff --git a/packages/models/src/models/Uploads.ts b/packages/models/src/models/Uploads.ts
@@ -12,7 +12,12 @@ export class UploadsRaw extends BaseUploadModelRaw implements IUploadsModel {
 	}
 
 	protected modelIndexes(): IndexDescription[] {
-		return [...super.modelIndexes(), { key: { uploadedAt: -1 } }, { key: { rid: 1, _hidden: 1, typeGroup: 1 } }];
+		return [
+			...super.modelIndexes(),
+			{ key: { uploadedAt: -1 } },
+			{ key: { rid: 1, _hidden: 1, typeGroup: 1 } },
+			{ key: { 'federation.mediaId': 1 } },
+		];
 	}
 
 	findNotHiddenFilesOfRoom(roomId: string, searchText: string, fileType: string, limit: number): FindCursor<IUpload> {
@@ -47,8 +52,8 @@ export class UploadsRaw extends BaseUploadModelRaw implements IUploadsModel {
 		});
 	}
 
-	findByFederationMediaIdAndServerName(mediaId: string, serverName: string): Promise<IUpload | null> {
-		return this.findOne({ 'federation.mediaId': mediaId, 'federation.serverName': serverName });
+	findByFederationMediaId(mediaId: string): Promise<IUpload | null> {
+		return this.findOne({ 'federation.mediaId': mediaId });
 	}
 
 	setFederationInfo(fileId: string, info: { mxcUri: string; serverName: string; mediaId: string }): Promise<Document | UpdateResult> {

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@ export class MatrixMediaService {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- static async getLocalFileForMatrixNode(mediaId: string, serverName: string): Promise<IUpload \| null> {`
	`68`	`+ static async getLocalFileForMatrixNode(mediaId: string): Promise<IUpload \| null> {`
`69`	`69`	`try {`
`70`		`- let file = await Uploads.findByFederationMediaIdAndServerName(mediaId, serverName);`
	`70`	`+ let file = await Uploads.findByFederationMediaId(mediaId);`
`71`	`71`
`72`	`72`	`if (!file) {`
`73`	`73`	`file = await Uploads.findOneById(mediaId);`
`@@ -102,7 +102,7 @@ export class MatrixMediaService {`
`102`	`102`	`throw new Error('Invalid MXC URI');`
`103`	`103`	`}`
`104`	`104`
`105`		`- const uploadAlreadyExists = await Uploads.findByFederationMediaIdAndServerName(parts.mediaId, parts.serverName);`
	`105`	`+ const uploadAlreadyExists = await Uploads.findByFederationMediaId(parts.mediaId);`
`106`	`106`	`if (uploadAlreadyExists) {`
`107`	`107`	`return uploadAlreadyExists._id;`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export interface IUploadsModel extends IBaseUploadsModel<IUpload> {`
`15`	`15`	`options?: Omit<FindOptions<IUpload>, 'sort'>,`
`16`	`16`	`): FindPaginated<FindCursor<WithId<IUpload>>>;`
`17`	`17`
`18`		`- findByFederationMediaIdAndServerName(mediaId: string, serverName: string): Promise<IUpload \| null>;`
	`18`	`+ findByFederationMediaId(mediaId: string): Promise<IUpload \| null>;`
`19`	`19`
`20`	`20`	`setFederationInfo(fileId: string, info: { mxcUri: string; serverName: string; mediaId: string }): Promise<Document \| UpdateResult>;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,12 @@ export class UploadsRaw extends BaseUploadModelRaw implements IUploadsModel {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`protected modelIndexes(): IndexDescription[] {`
`15`		`- return [...super.modelIndexes(), { key: { uploadedAt: -1 } }, { key: { rid: 1, _hidden: 1, typeGroup: 1 } }];`
	`15`	`+ return [`
	`16`	`+ ...super.modelIndexes(),`
	`17`	`+ { key: { uploadedAt: -1 } },`
	`18`	`+ { key: { rid: 1, _hidden: 1, typeGroup: 1 } },`
	`19`	`+ { key: { 'federation.mediaId': 1 } },`
	`20`	`+ ];`
`16`	`21`	`}`
`17`	`22`
`18`	`23`	`findNotHiddenFilesOfRoom(roomId: string, searchText: string, fileType: string, limit: number): FindCursor<IUpload> {`
`@@ -47,8 +52,8 @@ export class UploadsRaw extends BaseUploadModelRaw implements IUploadsModel {`
`47`	`52`	`});`
`48`	`53`	`}`
`49`	`54`
`50`		`- findByFederationMediaIdAndServerName(mediaId: string, serverName: string): Promise<IUpload \| null> {`
`51`		`- return this.findOne({ 'federation.mediaId': mediaId, 'federation.serverName': serverName });`
	`55`	`+ findByFederationMediaId(mediaId: string): Promise<IUpload \| null> {`
	`56`	`+ return this.findOne({ 'federation.mediaId': mediaId });`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`setFederationInfo(fileId: string, info: { mxcUri: string; serverName: string; mediaId: string }): Promise<Document \| UpdateResult> {`