mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Remove 25 trivial WhatIsThis types

Browse source
This commit is contained in:
Evan Hahn 2021-05-03 11:38:20 -05:00 • committed by GitHub
parent e5e7e8d392
commit c1730e055f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/models/conversations.ts
View file

@ -3547,7 +3547,7 @@ export class ConversationModel extends window.Backbone
}
async getSendMetadata(
options: { syncMessage?: string; disableMeCheck?: boolean } = {}
options: { syncMessage?: boolean; disableMeCheck?: boolean } = {}
): Promise<SendMetadataType | undefined> {
const { syncMessage, disableMeCheck } = options;
@ -4227,7 +4227,7 @@ export class ConversationModel extends window.Backbone
async markRead(
newestUnreadDate: number,
providedOptions: { readAt?: number; sendReadReceipts: boolean }
): Promise<WhatIsThis> {
): Promise<void> {
const options = providedOptions || {};
window._.defaults(options, { sendReadReceipts: true });
@ -5048,7 +5048,10 @@ export class ConversationModel extends window.Backbone
return `mute(${this.get('id')})`;
}
async notify(message: WhatIsThis, reaction?: WhatIsThis): Promise<void> {
async notify(
message: Readonly<MessageModel>,
reaction?: WhatIsThis
): Promise<void> {
// As a performance optimization don't perform any work if notifications are
// disabled.
if (!window.Whisper.Notifications.isEnabled) {
@ -5296,7 +5299,7 @@ window.Whisper.ConversationCollection = window.Backbone.Collection.extend({
this.generateLookups(this.models);
},
generateLookups(models: Array<WhatIsThis>) {
generateLookups(models: ReadonlyArray<ConversationModel>) {
models.forEach(model => {
const e164 = model.get('e164');
if (e164) {

13
ts/models/messages.ts
View file

@ -3541,9 +3541,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
// GroupV1
if (!isGroupV2 && dataMessage.group) {
const pendingGroupUpdate = [];
const memberConversations: Array<
typeof window.WhatIsThis
> = await Promise.all(
const memberConversations: Array<ConversationModel> = await Promise.all(
dataMessage.group.membersE164.map((e164: string) =>
window.ConversationController.getOrCreateAndWait(
e164,
@ -3815,10 +3813,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
});
}
window.MessageController.register(
message.id,
message as typeof window.WhatIsThis
);
window.MessageController.register(message.id, message);
conversation.incrementMessageCount();
window.Signal.Data.updateConversation(conversation.attributes);
@ -4102,7 +4097,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
}
window.Whisper.Message = MessageModel as typeof window.WhatIsThis;
window.Whisper.Message = MessageModel;
window.Whisper.Message.getLongMessageAttachment = ({
body,
@ -4137,7 +4132,7 @@ window.Whisper.Message.updateTimers = () => {
window.Whisper.MessageCollection = window.Backbone.Collection.extend({
model: window.Whisper.Message,
comparator(left: typeof window.WhatIsThis, right: typeof window.WhatIsThis) {
comparator(left: Readonly<MessageModel>, right: Readonly<MessageModel>) {
if (left.get('received_at') === right.get('received_at')) {
return (left.get('sent_at') || 0) - (right.get('sent_at') || 0);
}