Skip to content

Commit 25b9ff0

Browse files
rodrigokrodrigok
committed
Fix lint
1 parent f8c9d2e commit 25b9ff0

File tree

6 files changed

+25
-18
lines changed

6 files changed

+25
-18
lines changed

‎apps/meteor/server/services/messages/service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
111111
federation: {
112112
eventId: federation_event_id,
113113
version: 1,
114-
},
114+
},
115115
...(file && { file }),
116116
...(files && { files }),
117117
...(attachments && { attachments }),

‎ee/packages/federation-matrix/src/FederationMatrix.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { saveExternalUserIdForLocalUser, saveLocalUserForExternalUserId } from '
3030
import { toExternalMessageFormat, toExternalQuoteMessageFormat } from './helpers/message.parsers';
3131
import { MatrixMediaService } from './services/MatrixMediaService';
3232

33-
3433
export const fileTypes: Record<string, FileMessageType> = {
3534
image: 'm.image',
3635
video: 'm.video',
@@ -292,7 +291,7 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
292291

293292
const remoteDomain = externalUserId.split(':')[1] || this.serverName;
294293

295-
const insertedId = await saveLocalUserForExternalUserId(externalUserId, remoteDomain)
294+
const insertedId = await saveLocalUserForExternalUserId(externalUserId, remoteDomain);
296295

297296
this.logger.debug('Successfully created federated user locally', { userId: insertedId, externalUserId });
298297
}

‎ee/packages/federation-matrix/src/api/_matrix/invite.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ async function joinRoom({
222222
let ourRoom: { _id: string };
223223

224224
if (isDM) {
225-
const senderUser = await Users.findOneById(senderUserId, { projection: { _id: 1, username: 1 } })
225+
const senderUser = await Users.findOneById(senderUserId, { projection: { _id: 1, username: 1 } });
226226
const inviteeUser = user;
227227

228228
if (!senderUser?.username) {

‎ee/packages/federation-matrix/src/api/_matrix/send-join.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export const getMatrixSendJoinRoutes = (services: HomeserverServices) => {
229229
'/v2/send_join/:roomId/:stateKey',
230230
{
231231
params: isSendJoinParamsProps,
232-
body: isSendJoinEventProps,
232+
body: isSendJoinEventProps,
233233
response: {
234234
200: isSendJoinResponseProps,
235235
},

‎ee/packages/federation-matrix/src/events/invite.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function invite(emitter: Emitter<HomeserverEventSignatures>) {
2121
}
2222

2323
const serverName = internalUsername.split(':')[1] || 'unknown';
24-
const insertedId = await saveLocalUserForExternalUserId(internalUsername, serverName)
24+
const insertedId = await saveLocalUserForExternalUserId(internalUsername, serverName);
2525

2626
const user = await Users.findOneById(insertedId);
2727
if (!user) {

‎ee/packages/federation-matrix/src/events/message.ts‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import type { FileMessageContent, MessageType } from '@hs/core';
12
import type { HomeserverEventSignatures } from '@hs/federation-sdk';
3+
import type { EventID } from '@hs/room';
24
import { FederationMatrix, Message, MeteorService } from '@rocket.chat/core-services';
35
import type { IUser, IRoom, FileAttachmentProps } from '@rocket.chat/core-typings';
46
import type { Emitter } from '@rocket.chat/emitter';
@@ -9,8 +11,6 @@ import { fileTypes } from '../FederationMatrix';
911
import { saveLocalUserForExternalUserId } from '../helpers/identifiers';
1012
import { toInternalMessageFormat, toInternalQuoteMessageFormat } from '../helpers/message.parsers';
1113
import { MatrixMediaService } from '../services/MatrixMediaService';
12-
import { FileMessageContent, MessageType } from '@hs/core';
13-
import { EventID } from '@hs/room';
1414

1515
const logger = new Logger('federation-matrix:message');
1616

@@ -113,6 +113,7 @@ async function handleMediaMessage(
113113
msg: string;
114114
federation_event_id: string;
115115
tmid?: string;
116+
attachments: [FileAttachmentProps];
116117
}> {
117118
const mimeType = fileInfo?.mimetype;
118119
const fileName = messageBody;
@@ -151,12 +152,13 @@ async function handleMediaMessage(
151152
image_url: fileUrl,
152153
image_type: mimeType,
153154
image_size: fileInfo?.size || 0,
154-
...(fileInfo?.w && fileInfo?.h && {
155-
image_dimensions: {
156-
width: fileInfo.w,
157-
height: fileInfo.h,
158-
},
159-
}),
155+
...(fileInfo?.w &&
156+
fileInfo?.h && {
157+
image_dimensions: {
158+
width: fileInfo.w,
159+
height: fileInfo.h,
160+
},
161+
}),
160162
};
161163
} else if (msgtype === 'm.video') {
162164
attachment = {
@@ -180,14 +182,15 @@ async function handleMediaMessage(
180182
msg: '',
181183
federation_event_id: eventId,
182184
tmid,
185+
attachments: [attachment],
183186
};
184187
}
185188

186189
export function message(emitter: Emitter<HomeserverEventSignatures>, serverName: string) {
187190
emitter.on('homeserver.matrix.message', async (data) => {
188191
try {
189-
const content = data.content;
190-
const msgtype = content.msgtype;
192+
const { content } = data;
193+
const { msgtype } = content;
191194
const messageBody = content.body.toString();
192195

193196
if (!messageBody && !msgtype) {
@@ -272,12 +275,17 @@ export function message(emitter: Emitter<HomeserverEventSignatures>, serverName:
272275

273276
if (isQuoteMessage && room.name) {
274277
const originalEventId = relatesTo['m.in_reply_to']?.event_id;
275-
const originalMessage = originalEventId && await Messages.findOneByFederationId(originalEventId);
278+
const originalMessage = originalEventId && (await Messages.findOneByFederationId(originalEventId));
276279
if (!originalMessage) {
277280
logger.error('Original message not found for quote:', relatesTo['m.in_reply_to']?.event_id);
278281
return;
279282
}
280-
const messageToReplyToUrl = await MeteorService.getMessageURLToReplyTo(room.t as string, room._id, room.name, originalMessage._id);
283+
const messageToReplyToUrl = await MeteorService.getMessageURLToReplyTo(
284+
room.t as string,
285+
room._id,
286+
room.name,
287+
originalMessage._id,
288+
);
281289
const formatted = await toInternalQuoteMessageFormat({
282290
messageToReplyToUrl,
283291
formattedMessage: content.formatted_body || '',

0 commit comments

Comments
 (0)