Skip to content

Commit 318dcc7

Browse files
committed
Smaller diff from code review
1 parent 3a5f87c commit 318dcc7

File tree

5 files changed

+48
-165
lines changed

5 files changed

+48
-165
lines changed

Diff for: src/ClientWidgetApi.ts

+11-33
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,7 @@ export class ClientWidgetApi extends EventEmitter {
469469

470470
if (!this.canReceiveRoomAccountData(request.data.type)) {
471471
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
472-
error: {
473-
message: "Cannot read room account data of this type",
474-
},
472+
error: { message: "Cannot read room account data of this type" },
475473
});
476474
}
477475

@@ -502,9 +500,7 @@ export class ClientWidgetApi extends EventEmitter {
502500
for (const roomId of askRoomIds) {
503501
if (!this.canUseRoomTimeline(roomId)) {
504502
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
505-
error: {
506-
message: `Unable to access room timeline: ${roomId}`,
507-
},
503+
error: { message: `Unable to access room timeline: ${roomId}` },
508504
});
509505
}
510506
}
@@ -519,18 +515,14 @@ export class ClientWidgetApi extends EventEmitter {
519515
stateKey = request.data.state_key === true ? undefined : request.data.state_key.toString();
520516
if (!this.canReceiveStateEvent(request.data.type, stateKey ?? null)) {
521517
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
522-
error: {
523-
message: "Cannot read state events of this type",
524-
},
518+
error: { message: "Cannot read state events of this type" },
525519
});
526520
}
527521
} else {
528522
msgtype = request.data.msgtype;
529523
if (!this.canReceiveRoomEvent(request.data.type, msgtype)) {
530524
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
531-
error: {
532-
message: "Cannot read room events of this type",
533-
},
525+
error: { message: "Cannot read room events of this type" },
534526
});
535527
}
536528
}
@@ -550,9 +542,7 @@ export class ClientWidgetApi extends EventEmitter {
550542
),
551543
)
552544
).flat(1);
553-
this.transport.reply<IReadEventFromWidgetResponseData>(request, {
554-
events,
555-
});
545+
this.transport.reply<IReadEventFromWidgetResponseData>(request, { events });
556546
}
557547

558548
private handleSendEvent(request: ISendEventFromWidgetActionRequest): void {
@@ -564,9 +554,7 @@ export class ClientWidgetApi extends EventEmitter {
564554

565555
if (!!request.data.room_id && !this.canUseRoomTimeline(request.data.room_id)) {
566556
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
567-
error: {
568-
message: `Unable to access room timeline: ${request.data.room_id}`,
569-
},
557+
error: { message: `Unable to access room timeline: ${request.data.room_id}` },
570558
});
571559
}
572560

@@ -581,9 +569,7 @@ export class ClientWidgetApi extends EventEmitter {
581569
if (request.data.state_key !== undefined) {
582570
if (!this.canSendStateEvent(request.data.type, request.data.state_key)) {
583571
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
584-
error: {
585-
message: "Cannot send state events of this type",
586-
},
572+
error: { message: "Cannot send state events of this type" },
587573
});
588574
}
589575

@@ -609,9 +595,7 @@ export class ClientWidgetApi extends EventEmitter {
609595
const msgtype = content["msgtype"];
610596
if (!this.canSendRoomEvent(request.data.type, msgtype)) {
611597
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
612-
error: {
613-
message: "Cannot send room events of this type",
614-
},
598+
error: { message: "Cannot send room events of this type" },
615599
});
616600
}
617601

@@ -682,9 +666,7 @@ export class ClientWidgetApi extends EventEmitter {
682666
break;
683667
default:
684668
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
685-
error: {
686-
message: "Invalid request - unsupported action",
687-
},
669+
error: { message: "Invalid request - unsupported action" },
688670
});
689671
}
690672
}
@@ -797,9 +779,7 @@ export class ClientWidgetApi extends EventEmitter {
797779

798780
if (request.data.room_id !== undefined && !this.canUseRoomTimeline(request.data.room_id)) {
799781
return this.transport.reply<IWidgetApiErrorResponseData>(request, {
800-
error: {
801-
message: `Unable to access room timeline: ${request.data.room_id}`,
802-
},
782+
error: { message: `Unable to access room timeline: ${request.data.room_id}` },
803783
});
804784
}
805785

@@ -1001,9 +981,7 @@ export class ClientWidgetApi extends EventEmitter {
1001981
* @param lang The BCP 47 identifier representing the client's current language.
1002982
*/
1003983
public updateLanguage(lang: string): Promise<IWidgetApiResponseData> {
1004-
return this.transport.send(WidgetApiToWidgetAction.LanguageChange, {
1005-
lang,
1006-
});
984+
return this.transport.send(WidgetApiToWidgetAction.LanguageChange, { lang });
1007985
}
1008986

1009987
/**

Diff for: src/WidgetApi.ts

+3-12
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,7 @@ export class WidgetApi extends EventEmitter {
468468
...(stateKey !== undefined && { state_key: stateKey }),
469469
...(roomId !== undefined && { room_id: roomId }),
470470
...(delay !== undefined && { delay }),
471-
...(parentDelayId !== undefined && {
472-
parent_delay_id: parentDelayId,
473-
}),
471+
...(parentDelayId !== undefined && { parent_delay_id: parentDelayId }),
474472
},
475473
);
476474
}
@@ -505,11 +503,7 @@ export class WidgetApi extends EventEmitter {
505503
): Promise<ISendToDeviceFromWidgetResponseData> {
506504
return this.transport.send<ISendToDeviceFromWidgetRequestData, ISendToDeviceFromWidgetResponseData>(
507505
WidgetApiFromWidgetAction.SendToDevice,
508-
{
509-
type: eventType,
510-
encrypted,
511-
messages: contentMap,
512-
},
506+
{ type: eventType, encrypted, messages: contentMap },
513507
);
514508
}
515509

@@ -538,10 +532,7 @@ export class WidgetApi extends EventEmitter {
538532
roomIds?: (string | Symbols.AnyRoom)[],
539533
since?: string | undefined,
540534
): Promise<IRoomEvent[]> {
541-
const data: IReadEventFromWidgetRequestData = {
542-
type: eventType,
543-
msgtype: msgtype,
544-
};
535+
const data: IReadEventFromWidgetRequestData = { type: eventType, msgtype: msgtype };
545536
if (limit !== undefined) {
546537
data.limit = limit;
547538
}

Diff for: src/transport/PostmessageTransport.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,7 @@ export class PostmessageTransport extends EventEmitter implements ITransport {
138138
this.stopController.signal.removeEventListener("abort", onStop);
139139
};
140140

141-
this.outboundRequests.set(request.requestId, {
142-
request,
143-
resolve,
144-
reject,
145-
});
141+
this.outboundRequests.set(request.requestId, { request, resolve, reject });
146142
this.sendInternal(request);
147143
});
148144
}

0 commit comments

Comments
 (0)