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

background.ts/conversation_view.ts modules, Whisper.View/ToastView in TS

Browse source
This commit is contained in:
Scott Nonnenberg 2021-02-26 13:06:37 -08:00 • committed by Josh Perez
parent 2aa2aca9f2
commit d0e3a2ce29
34 changed files with 957 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

13
background.html
View file

@ -19,7 +19,7 @@
img-src 'self' blob: data:;
media-src 'self' blob:;
object-src 'none';
script-src 'self';
script-src 'self' 'sha256-5J9nLKMi84ERvoy7r/3XVwiW1iZ5YaPic9BNaF/0rtI=';
style-src 'self' 'unsafe-inline';"
>
<title>Signal</title>
@ -348,14 +348,11 @@
<script type='text/javascript' src='js/message_controller.js'></script>
<script type='text/javascript' src='js/views/react_wrapper_view.js'></script>
<script type='text/javascript' src='js/views/whisper_view.js'></script>
<script type='text/javascript' src='js/views/toast_view.js'></script>
<script type='text/javascript' src='js/views/list_view.js'></script>
<script type='text/javascript' src='js/views/contact_list_view.js'></script>
<script type='text/javascript' src='js/views/key_verification_view.js'></script>
<script type='text/javascript' src='js/views/group_member_list_view.js'></script>
<script type='text/javascript' src='js/views/recorder_view.js'></script>
<script type='text/javascript' src='ts/views/conversation_view.js'></script>
<script type='text/javascript' src='js/views/inbox_view.js'></script>
<script type='text/javascript' src='ts/shims/showConfirmationDialog.js'></script>
<script type='text/javascript' src='js/views/identicon_svg_view.js'></script>
@ -386,6 +383,12 @@
</div>
</div>
<script type='text/javascript' src='ts/background.js'></script>
<!--
Note: this inline script cannot be changed without also changing the hash in
the CSP at the top of this file
-->
<script type='text/javascript'>
window.startApp();
</script>
</body>
</html>

2
debug_log.html
View file

@ -55,8 +55,6 @@
</script>
<script type='text/javascript' src='js/components.js'></script>
<script type='text/javascript' src='ts/backboneJquery.js'></script>
<script type='text/javascript' src='js/views/whisper_view.js'></script>
<script type='text/javascript' src='js/views/toast_view.js'></script>
<script type='text/javascript' src='js/views/debug_log_view.js'></script>
<script type='text/javascript' src='js/debug_log_start.js'></script>
</html>

3
debug_log_preload.js
View file

@ -29,6 +29,9 @@ window.nodeSetImmediate = setImmediate;
window.getNodeVersion = () => config.node_version;
window.getEnvironment = getEnvironment;
window.Backbone = require('backbone');
require('./ts/backbone/views/whisper_view');
require('./ts/backbone/views/toast_view');
require('./ts/logging/set_up_renderer_logging');
window.closeDebugLog = () => ipcRenderer.send('close-debug-log');

4
js/views/banner_view.js
View file

@ -1,7 +1,7 @@
// Copyright 2017-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper */
/* global Whisper, $ */
// eslint-disable-next-line func-names
(function () {
@ -9,7 +9,7 @@
Whisper.BannerView = Whisper.View.extend({
className: 'banner',
templateName: 'banner',
template: () => $('#banner').html(),
events: {
'click .dismiss': 'onDismiss',
'click .body': 'onClick',

7
js/views/clear_data_view.js
View file

@ -1,10 +1,7 @@
// Copyright 2018-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global i18n: false */
/* global Whisper: false */
/* eslint-disable no-new */
/* global i18n, Whisper, $ */
// eslint-disable-next-line func-names
(function () {
@ -16,7 +13,7 @@
DELETING: 2,
};
window.Whisper.ClearDataView = Whisper.View.extend({
templateName: 'clear-data',
template: () => $('#clear-data').html(),
className: 'full-screen-flow overlay',
events: {
'click .cancel': 'onCancel',

5
js/views/contact_list_view.js
View file

@ -1,8 +1,7 @@
// Copyright 2015-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper: false */
/* global textsecure: false */
/* global Whisper, textsecure, $ */
// eslint-disable-next-line func-names
(function () {
@ -13,7 +12,7 @@
itemView: Whisper.View.extend({
tagName: 'div',
className: 'contact',
templateName: 'contact',
template: () => $('#contact').html(),
initialize(options) {
this.ourNumber = textsecure.storage.user.getNumber();
this.listenBack = options.listenBack;

7
js/views/debug_log_view.js
View file

@ -1,8 +1,7 @@
// Copyright 2015-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global i18n: false */
/* global Whisper: false */
/* global i18n, Whisper, $ */
// eslint-disable-next-line func-names
(function () {
@ -31,7 +30,7 @@
});
Whisper.DebugLogLinkView = Whisper.View.extend({
templateName: 'debug-log-link',
template: () => $('#debug-log-link').html(),
initialize(options) {
this.url = options.url;
},
@ -66,7 +65,7 @@
* edit them in their own editor. This is mostly a stopgap solution.
*/
Whisper.DebugLogView = Whisper.View.extend({
templateName: 'debug-log',
template: () => $('#debug-log').html(),
className: 'debug-log modal',
initialize() {
this.render();

5
js/views/group_member_list_view.js
View file

@ -1,16 +1,15 @@
// Copyright 2015-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper, i18n */
/* global Whisper, i18n, $ */
// eslint-disable-next-line func-names
(function () {
window.Whisper = window.Whisper || {};
// TODO: take a title string which could replace the 'members' header
Whisper.GroupMemberList = Whisper.View.extend({
className: 'group-member-list panel',
templateName: 'group-member-list',
template: () => $('#group-member-list').html(),
initialize(options) {
this.needVerify = options.needVerify;

4
js/views/identicon_svg_view.js
View file

@ -1,7 +1,7 @@
// Copyright 2015-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper, loadImage */
/* global Whisper, loadImage, $ */
// eslint-disable-next-line func-names
(function () {
@ -11,7 +11,7 @@
* Render an avatar identicon to an svg for use in a notification.
*/
Whisper.IdenticonSVGView = Whisper.View.extend({
templateName: 'identicon-svg',
template: () => $('#identicon-svg').html(),
initialize(options) {
this.render_attributes = options;
this.render_attributes.color = COLORS[this.render_attributes.color];

7
js/views/inbox_view.js
View file

@ -5,7 +5,8 @@
ConversationController,
i18n,
Whisper,
Signal
Signal,
$
*/
// eslint-disable-next-line func-names
@ -60,7 +61,7 @@
});
Whisper.AppLoadingScreen = Whisper.View.extend({
templateName: 'app-loading-screen',
template: () => $('#app-loading-screen').html(),
className: 'app-loading-screen',
updateProgress(count) {
if (count > 0) {
@ -74,7 +75,7 @@
});
Whisper.InboxView = Whisper.View.extend({
templateName: 'two-column',
template: () => $('#two-column').html(),
className: 'inbox index',
initialize(options = {}) {
this.ready = false;

2
js/views/install_view.js
View file

@ -24,7 +24,7 @@
const TOO_OLD = 409;
Whisper.InstallView = Whisper.View.extend({
templateName: 'link-flow-template',
template: () => $('#link-flow-template').html(),
className: 'main full-screen-flow',
events: {
'click .try-again': 'connect',

6
js/views/key_verification_view.js
View file

@ -1,9 +1,7 @@
// Copyright 2015-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Backbone, Signal, Whisper */
/* eslint-disable more/no-then */
/* global Backbone, Signal, Whisper, $ */
// eslint-disable-next-line func-names
(function () {
@ -11,7 +9,7 @@
Whisper.KeyVerificationPanelView = Whisper.View.extend({
className: 'panel',
templateName: 'key-verification',
template: () => $('#key-verification').html(),
initialize(options) {
this.render();

4
js/views/phone-input-view.js
View file

@ -1,7 +1,7 @@
// Copyright 2015-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global libphonenumber, Whisper */
/* global libphonenumber, Whisper, $ */
// eslint-disable-next-line func-names
(function () {
@ -10,7 +10,7 @@
Whisper.PhoneInputView = Whisper.View.extend({
tagName: 'div',
className: 'phone-input',
templateName: 'phone-number',
template: () => $('#phone-number').html(),
initialize() {
this.$('input.number').intlTelInput();
},

2
js/views/recorder_view.js
View file

@ -11,7 +11,7 @@
Whisper.RecorderView = Whisper.View.extend({
className: 'recorder clearfix',
templateName: 'recorder',
template: () => $('#recorder').html(),
initialize() {
this.startTime = Date.now();
this.interval = setInterval(this.updateTime.bind(this), 1000);

4
js/views/safety_number_change_dialog_view.js
View file

@ -1,14 +1,14 @@
// Copyright 2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper, Signal */
/* global Whisper, Signal, $ */
// eslint-disable-next-line func-names
(function () {
window.Whisper = window.Whisper || {};
Whisper.SafetyNumberChangeDialogView = Whisper.View.extend({
templateName: 'safety-number-change-dialog',
template: () => $('#safety-number-change-dialog').html(),
initialize(options) {
const dialog = new Whisper.ReactWrapperView({
Component: window.Signal.Components.SafetyNumberChangeDialog,

4
js/views/settings_view.js
View file

@ -91,7 +91,7 @@
});
Whisper.SettingsView = Whisper.View.extend({
className: 'settings modal expand',
templateName: 'settings',
template: () => $('#settings').html(),
initialize() {
this.render();
new RadioButtonGroupView({
@ -271,7 +271,7 @@
});
const SyncView = Whisper.View.extend({
templateName: 'syncSettings',
template: () => $('#syncSettings').html(),
className: 'syncSettings',
events: {
'click .sync': 'sync',

2
js/views/standalone_registration_view.js
View file

@ -10,7 +10,7 @@
window.Whisper = window.Whisper || {};
Whisper.StandaloneRegistrationView = Whisper.View.extend({
templateName: 'standalone',
template: () => $('#standalone').html(),
className: 'full-screen-flow',
initialize() {
window.readyForUpdates();

40
js/views/toast_view.js
View file

@ -1,40 +0,0 @@
// Copyright 2015-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper, Mustache, _ */
// eslint-disable-next-line func-names
(function () {
window.Whisper = window.Whisper || {};
Whisper.ToastView = Whisper.View.extend({
className: 'toast',
templateName: 'toast',
initialize() {
this.$el.hide();
this.timeout = 2000;
},
close() {
this.$el.fadeOut(this.remove.bind(this));
},
render() {
this.$el.html(
Mustache.render(
_.result(this, 'template', ''),
_.result(this, 'render_attributes', '')
)
);
this.$el.attr('tabIndex', 0);
this.$el.show();
setTimeout(this.close.bind(this), this.timeout);
},
});
Whisper.ToastView.show = (View, el) => {
const toast = new View();
toast.$el.appendTo(el);
toast.render();
};
})();

79
js/views/whisper_view.js
View file

@ -1,79 +0,0 @@
// Copyright 2015-2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper, Backbone, Mustache, _, $ */
/*
* Whisper.View
*
* This is the base for most of our views. The Backbone view is extended
* with some conveniences:
*
* 1. Pre-parses all our mustache templates for performance.
* https://github.com/janl/mustache.js#pre-parsing-and-caching-templates
*
* 2. Defines a default definition for render() which allows sub-classes
* to simply specify a templateName and renderAttributes which are plugged
* into Mustache.render
*
* 3. Makes all the templates available for rendering as partials.
* https://github.com/janl/mustache.js#partials
*
* 4. Provides some common functionality, e.g. confirmation dialog
*
*/
// eslint-disable-next-line func-names
(function () {
window.Whisper = window.Whisper || {};
Whisper.View = Backbone.View.extend(
{
constructor(...params) {
Backbone.View.call(this, ...params);
Mustache.parse(_.result(this, 'template'));
},
render_attributes() {
return _.result(this.model, 'attributes', {});
},
render_partials() {
return Whisper.View.Templates;
},
template() {
if (this.templateName) {
return Whisper.View.Templates[this.templateName];
}
return '';
},
render() {
const attrs = _.result(this, 'render_attributes', {});
const template = _.result(this, 'template', '');
const partials = _.result(this, 'render_partials', '');
this.$el.html(Mustache.render(template, attrs, partials));
return this;
},
confirm(message, okText) {
return new Promise((resolve, reject) => {
window.showConfirmationDialog({
message,
okText,
resolve,
reject,
});
});
},
},
{
// Class attributes
Templates: (() => {
const templates = {};
$('script[type="text/x-tmpl-mustache"]').each((i, el) => {
const $el = $(el);
const id = $el.attr('id');
templates[id] = $el.html();
});
return templates;
})(),
}
);
})();

1
permissions_popup.html
View file

@ -25,7 +25,6 @@
</body>
<script type='text/javascript' src='js/components.js'></script>
<script type='text/javascript' src='ts/backboneJquery.js'></script>
<script type='text/javascript' src='js/views/whisper_view.js'></script>
<script type='text/javascript' src='ts/shims/showConfirmationDialog.js'></script>
<script type='text/javascript' src='js/permissions_popup_start.js'></script>
</html>

5
preload.js
View file

@ -520,6 +520,11 @@ try {
require('./ts/models/messages');
require('./ts/models/conversations');
require('./ts/backbone/views/whisper_view');
require('./ts/backbone/views/toast_view');
require('./ts/views/conversation_view');
require('./ts/background');
function wrapWithPromise(fn) {
return (...args) => Promise.resolve(fn(...args));
}

1
settings.html
View file

@ -168,7 +168,6 @@
</script>
<script type='text/javascript' src='js/components.js'></script>
<script type='text/javascript' src='ts/backboneJquery.js'></script>
<script type='text/javascript' src='js/views/whisper_view.js'></script>
<script type='text/javascript' src='js/views/settings_view.js'></script>
<script type='text/javascript' src='js/settings_start.js'></script>
</html>

5
settings_preload.js
View file

@ -126,6 +126,7 @@ function makeSetter(name) {
});
}
require('./ts/logging/set_up_renderer_logging');
window.Backbone = require('backbone');
require('./ts/backbone/views/whisper_view');
require('./ts/backbone/views/toast_view');
require('./ts/logging/set_up_renderer_logging');

35
ts/backbone/views/toast_view.ts Normal file
View file

@ -0,0 +1,35 @@
// Copyright 2015-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
window.Whisper = window.Whisper || {};
window.Whisper.ToastView = window.Whisper.View.extend({
className: 'toast',
template: () => $('#toast').html(),
initialize() {
this.$el.hide();
this.timeout = 2000;
},
close() {
this.$el.fadeOut(this.remove.bind(this));
},
render() {
this.$el.html(
window.Mustache.render(
window._.result(this, 'template', ''),
window._.result(this, 'render_attributes', '')
)
);
this.$el.attr('tabIndex', 0);
this.$el.show();
setTimeout(this.close.bind(this), this.timeout);
},
});
window.Whisper.ToastView.show = (View, el) => {
const toast = new View();
toast.$el.appendTo(el);
toast.render();
};

32
ts/backbone/views/whisper_view.ts Normal file
View file

@ -0,0 +1,32 @@
// Copyright 2015-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/*
* Defines a default definition for render() which allows sub-classes
* to simply specify a template property and renderAttributes which are plugged
* into Mustache.render
*/
// eslint-disable-next-line func-names
(function () {
window.Whisper = window.Whisper || {};
window.Whisper.View = Backbone.View.extend({
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
constructor(...params: Array<any>) {
window.Backbone.View.call(this, ...params);
// Checks for syntax errors
window.Mustache.parse(_.result(this, 'template'));
},
render_attributes() {
return _.result(this.model, 'attributes', {});
},
render() {
const attrs = window._.result(this, 'render_attributes', {});
const template = window._.result(this, 'template', '');
this.$el.html(window.Mustache.render(template, attrs));
return this;
},
});
})();

23
ts/background.ts
View file

@ -1,15 +1,10 @@
// Copyright 2020-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
// This allows us to pull in types despite the fact that this is not a module. We can't
// use normal import syntax, nor can we use 'import type' syntax, or this will be turned
// into a module, and we'll get the dreaded 'exports is not defined' error.
// see https://github.com/microsoft/TypeScript/issues/41562
type DataMessageClass = import('./textsecure.d').DataMessageClass;
type WhatIsThis = import('./window.d').WhatIsThis;
import { DataMessageClass } from './textsecure.d';
import { WhatIsThis } from './window.d';
// eslint-disable-next-line func-names
(async function () {
export async function startApp(): Promise<void> {
const eventHandlerQueue = new window.PQueue({
concurrency: 1,
timeout: 1000 * 60 * 2,
@ -23,7 +18,7 @@ type WhatIsThis = import('./window.d').WhatIsThis;
wait: 500,
maxSize: 500,
processBatch: async (items: WhatIsThis) => {
const byConversationId = _.groupBy(items, item =>
const byConversationId = window._.groupBy(items, item =>
window.ConversationController.ensureContactIds({
e164: item.source,
uuid: item.sourceUuid,
@ -205,12 +200,12 @@ type WhatIsThis = import('./window.d').WhatIsThis;
if (messageReceiver) {
return messageReceiver.getStatus();
}
if (_.isNumber(preMessageReceiverStatus)) {
if (window._.isNumber(preMessageReceiverStatus)) {
return preMessageReceiverStatus;
}
return WebSocket.CLOSED;
};
window.Whisper.events = _.clone(window.Backbone.Events);
window.Whisper.events = window._.clone(window.Backbone.Events);
let accountManager: typeof window.textsecure.AccountManager;
window.getAccountManager = () => {
if (!accountManager) {
@ -2632,7 +2627,7 @@ type WhatIsThis = import('./window.d').WhatIsThis;
sentTo = data.unidentifiedStatus.map(
(item: WhatIsThis) => item.destinationUuid || item.destination
);
const unidentified = _.filter(data.unidentifiedStatus, item =>
const unidentified = window._.filter(data.unidentifiedStatus, item =>
Boolean(item.unidentified)
);
// eslint-disable-next-line no-param-reassign
@ -3284,4 +3279,6 @@ type WhatIsThis = import('./window.d').WhatIsThis;
// Note: We don't wait for completion here
window.Whisper.DeliveryReceipts.onReceipt(receipt);
}
})();
}
window.startApp = startApp;

4
ts/groups/joinViaLink.ts
View file

@ -61,7 +61,7 @@ export async function joinViaLink(hash: string): Promise<void> {
window.reduxActions.conversations.openConversationInternal({
conversationId: existingConversation.id,
});
window.window.Whisper.ToastView.show(
window.Whisper.ToastView.show(
window.Whisper.AlreadyGroupMemberToast,
document.getElementsByClassName('conversation-stack')[0]
);
@ -333,7 +333,7 @@ export async function joinViaLink(hash: string): Promise<void> {
window.log.info(`joinViaLink/${logId}: Showing modal`);
let groupV2InfoDialog = new Whisper.ReactWrapperView({
let groupV2InfoDialog = new window.Whisper.ReactWrapperView({
className: 'group-v2-join-dialog-wrapper',
JSX: window.Signal.State.Roots.createGroupV2JoinModal(window.reduxStore, {
join,

8
ts/models/conversations.ts
View file

@ -4052,7 +4052,7 @@ export class ConversationModel extends window.Backbone.Model<
this.set({ left: true });
window.Signal.Data.updateConversation(this.attributes);
const model = new Whisper.Message(({
const model = new window.Whisper.Message(({
group_update: { left: 'You' },
conversationId: this.id,
type: 'outgoing',
@ -4062,7 +4062,7 @@ export class ConversationModel extends window.Backbone.Model<
} as unknown) as MessageAttributesType);
const id = await window.Signal.Data.saveMessage(model.attributes, {
Message: Whisper.Message,
Message: window.Whisper.Message,
});
model.set({ id });
@ -5128,13 +5128,13 @@ window.Whisper.ConversationCollection = window.Backbone.Collection.extend({
// We create a new model if it's not already a model
if (!item.get) {
hydratedData.push(new Whisper.Conversation(item));
hydratedData.push(new window.Whisper.Conversation(item));
} else {
hydratedData.push(item);
}
}
} else if (!data.get) {
hydratedData = new Whisper.Conversation(data);
hydratedData = new window.Whisper.Conversation(data);
} else {
hydratedData = data;
}

4
ts/shims/showConfirmationDialog.tsx
View file

@ -13,7 +13,7 @@ type ConfirmationDialogViewProps = {
confirmStyle?: 'affirmative' | 'negative';
message: string;
okText: string;
reject?: () => void;
reject?: (error: Error) => void;
resolve: () => void;
};
@ -65,7 +65,7 @@ function showConfirmationDialog(options: ConfirmationDialogViewProps) {
onClose={() => {
removeConfirmationDialog();
if (options.reject) {
options.reject();
options.reject(new Error('showConfirmationDialog: onClose called'));
}
}}
title={options.message}

16
ts/test-electron/models/messages_test.ts
View file

@ -22,7 +22,7 @@ describe('Message', () => {
const ourUuid = window.getGuid();
function createMessage(attrs: { [key: string]: unknown }) {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
return messages.add(attrs);
}
@ -136,13 +136,13 @@ describe('Message', () => {
describe('getContact', () => {
it('gets outgoing contact', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
const message = messages.add(attributes);
message.getContact();
});
it('gets incoming contact', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
const message = messages.add({
type: 'incoming',
source,
@ -153,7 +153,7 @@ describe('Message', () => {
describe('isIncoming', () => {
it('checks if is incoming message', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
let message = messages.add(attributes);
assert.notOk(message.isIncoming());
message = messages.add({ type: 'incoming' });
@ -163,7 +163,7 @@ describe('Message', () => {
describe('isOutgoing', () => {
it('checks if is outgoing message', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
let message = messages.add(attributes);
assert.ok(message.isOutgoing());
message = messages.add({ type: 'incoming' });
@ -173,7 +173,7 @@ describe('Message', () => {
describe('isGroupUpdate', () => {
it('checks if is group update', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
let message = messages.add(attributes);
assert.notOk(message.isGroupUpdate());
@ -584,7 +584,7 @@ describe('Message', () => {
describe('isEndSession', () => {
it('checks if it is end of the session', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
let message = messages.add(attributes);
assert.notOk(message.isEndSession());
@ -596,7 +596,7 @@ describe('Message', () => {
describe('MessageCollection', () => {
it('should be ordered oldest to newest', () => {
const messages = new Whisper.MessageCollection();
const messages = new window.Whisper.MessageCollection();
// Timestamps
const today = Date.now();
const tomorrow = today + 12345;

1344
ts/util/lint/exceptions.json
View file

File diff suppressed because it is too large Load diff

6
ts/util/longRunningTaskWrapper.ts
View file

@ -16,14 +16,14 @@ export async function longRunningTaskWrapper<T>({
const ONE_SECOND = 1000;
const TWO_SECONDS = 2000;
let progressView: typeof Whisper.ReactWrapperView | undefined;
let progressView: typeof window.Whisper.ReactWrapperView | undefined;
let spinnerStart;
let progressTimeout: NodeJS.Timeout | undefined = setTimeout(() => {
window.log.info(`longRunningTaskWrapper/${idLog}: Creating spinner`);
// Note: this component uses a portal to render itself into the top-level DOM. No
// need to attach it to the DOM here.
progressView = new Whisper.ReactWrapperView({
progressView = new window.Whisper.ReactWrapperView({
className: 'progress-modal-wrapper',
Component: window.Signal.Components.ProgressModal,
});
@ -76,7 +76,7 @@ export async function longRunningTaskWrapper<T>({
// Note: this component uses a portal to render itself into the top-level DOM. No
// need to attach it to the DOM here.
const errorView = new Whisper.ReactWrapperView({
const errorView = new window.Whisper.ReactWrapperView({
className: 'error-modal-wrapper',
Component: window.Signal.Components.ErrorModal,
props: {

76
ts/views/conversation_view.ts
View file

@ -3,14 +3,10 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
// This allows us to pull in types despite the fact that this is not a module. We can't
// use normal import syntax, nor can we use 'import type' syntax, or this will be turned
// into a module, and we'll get the dreaded 'exports is not defined' error.
// see https://github.com/microsoft/TypeScript/issues/41562
type AttachmentType = import('../types/Attachment').AttachmentType;
type GroupV2PendingMemberType = import('../model-types.d').GroupV2PendingMemberType;
type MediaItemType = import('../components/LightboxGallery').MediaItemType;
type MessageType = import('../state/ducks/conversations').MessageType;
import { AttachmentType } from '../types/Attachment';
import { GroupV2PendingMemberType } from '../model-types.d';
import { MediaItemType } from '../components/LightboxGallery';
import { MessageType } from '../state/ducks/conversations';
type GetLinkPreviewImageResult = {
data: ArrayBuffer;
@ -250,7 +246,7 @@ Whisper.MessageBodyTooLongToast = Whisper.ToastView.extend({
});
Whisper.FileSizeToast = Whisper.ToastView.extend({
templateName: 'file-size-modal',
template: () => $('#file-size-modal').html(),
render_attributes() {
return {
'file-size-warning': window.i18n('fileSizeWarning'),
@ -267,31 +263,31 @@ Whisper.UnableToLoadToast = Whisper.ToastView.extend({
});
Whisper.DangerousFileTypeToast = Whisper.ToastView.extend({
template: window.i18n('dangerousFileType'),
template: () => window.i18n('dangerousFileType'),
});
Whisper.OneNonImageAtATimeToast = Whisper.ToastView.extend({
template: window.i18n('oneNonImageAtATimeToast'),
template: () => window.i18n('oneNonImageAtATimeToast'),
});
Whisper.CannotMixImageAndNonImageAttachmentsToast = Whisper.ToastView.extend({
template: window.i18n('cannotMixImageAndNonImageAttachments'),
template: () => window.i18n('cannotMixImageAndNonImageAttachments'),
});
Whisper.MaxAttachmentsToast = Whisper.ToastView.extend({
template: window.i18n('maximumAttachments'),
template: () => window.i18n('maximumAttachments'),
});
Whisper.AlreadyGroupMemberToast = Whisper.ToastView.extend({
template: window.i18n('GroupV2--join--already-in-group'),
template: () => window.i18n('GroupV2--join--already-in-group'),
});
Whisper.AlreadyRequestedToJoinToast = Whisper.ToastView.extend({
template: window.i18n('GroupV2--join--already-awaiting-approval'),
template: () => window.i18n('GroupV2--join--already-awaiting-approval'),
});
Whisper.ConversationLoadingScreen = Whisper.View.extend({
templateName: 'conversation-loading-screen',
template: () => $('#conversation-loading-screen').html(),
className: 'conversation-loading-screen',
});
@ -302,7 +298,7 @@ Whisper.ConversationView = Whisper.View.extend({
id() {
return `conversation-${this.model.cid}`;
},
template: $('#conversation').html(),
template: () => $('#conversation').html(),
render_attributes() {
return {
'send-message': window.i18n('sendMessage'),
@ -374,31 +370,37 @@ Whisper.ConversationView = Whisper.View.extend({
this.downloadNewVersion
);
this.lazyUpdateVerified = _.debounce(
this.lazyUpdateVerified = window._.debounce(
this.model.updateVerified.bind(this.model),
1000 // one second
);
this.model.throttledGetProfiles =
this.model.throttledGetProfiles ||
_.throttle(this.model.getProfiles.bind(this.model), FIVE_MINUTES);
window._.throttle(this.model.getProfiles.bind(this.model), FIVE_MINUTES);
this.model.throttledUpdateSharedGroups =
this.model.throttledUpdateSharedGroups ||
_.throttle(this.model.updateSharedGroups.bind(this.model), FIVE_MINUTES);
window._.throttle(
this.model.updateSharedGroups.bind(this.model),
FIVE_MINUTES
);
this.model.throttledFetchLatestGroupV2Data =
this.model.throttledFetchLatestGroupV2Data ||
_.throttle(
window._.throttle(
this.model.fetchLatestGroupV2Data.bind(this.model),
FIVE_MINUTES
);
this.model.throttledMaybeMigrateV1Group =
this.model.throttledMaybeMigrateV1Group ||
_.throttle(this.model.maybeMigrateV1Group.bind(this.model), FIVE_MINUTES);
window._.throttle(
this.model.maybeMigrateV1Group.bind(this.model),
FIVE_MINUTES
);
this.debouncedMaybeGrabLinkPreview = _.debounce(
this.debouncedMaybeGrabLinkPreview = window._.debounce(
this.maybeGrabLinkPreview.bind(this),
200
);
this.debouncedSaveDraft = _.debounce(this.saveDraft.bind(this), 200);
this.debouncedSaveDraft = window._.debounce(this.saveDraft.bind(this), 200);
this.render();
@ -1506,7 +1508,7 @@ Whisper.ConversationView = Whisper.View.extend({
const draftAttachments = this.model.get('draftAttachments') || [];
this.model.set({
draftAttachments: _.reject(
draftAttachments: window._.reject(
draftAttachments,
item => item.path === attachment.path
),
@ -1553,7 +1555,7 @@ Whisper.ConversationView = Whisper.View.extend({
}
const draftAttachments = this.model.get('draftAttachments') || [];
const files = _.compact(
const files = window._.compact(
await Promise.all(
draftAttachments.map((attachment: any) => this.getFile(attachment))
)
@ -1575,7 +1577,7 @@ Whisper.ConversationView = Whisper.View.extend({
}
return {
..._.pick(attachment, [
...window._.pick(attachment, [
'contentType',
'fileName',
'size',
@ -1620,14 +1622,14 @@ Whisper.ConversationView = Whisper.View.extend({
if (toWrite.data) {
const path = await writeNewDraftData(toWrite.data);
toWrite = {
..._.omit(toWrite, ['data']),
...window._.omit(toWrite, ['data']),
path,
};
}
if (toWrite.screenshotData) {
const screenshotPath = await writeNewDraftData(toWrite.screenshotData);
toWrite = {
..._.omit(toWrite, ['screenshotData']),
...window._.omit(toWrite, ['screenshotData']),
screenshotPath,
};
}
@ -3168,8 +3170,10 @@ Whisper.ConversationView = Whisper.View.extend({
},
async destroyMessages() {
try {
await this.confirm(window.i18n('deleteConversationConfirmation'));
window.showConfirmationDialog({
message: window.i18n('deleteConversationConfirmation'),
okText: window.i18n('delete'),
resolve: () => {
this.longRunningTaskWrapper({
name: 'destroymessages',
task: async () => {
@ -3178,9 +3182,11 @@ Whisper.ConversationView = Whisper.View.extend({
this.model.updateLastMessage();
},
});
} catch (error) {
// nothing to see here, user canceled out of dialog
}
},
reject: () => {
window.log.info('destroyMessages: User canceled delete');
},
});
},
async isCallSafe() {
@ -3981,7 +3987,7 @@ Whisper.ConversationView = Whisper.View.extend({
// We eliminate the ObjectURL here, unneeded for send or save
return {
...item,
image: _.omit(item.image, 'url'),
image: window._.omit(item.image, 'url'),
};
}

66
ts/window.d.ts vendored
View file

@ -107,7 +107,7 @@ type ConfirmationDialogViewProps = {
confirmStyle?: 'affirmative' | 'negative';
message: string;
okText: string;
reject?: () => void;
reject?: (error: Error) => void;
resolve: () => void;
};
@ -115,6 +115,8 @@ declare global {
// We want to extend `window`'s properties, so we need an interface.
// eslint-disable-next-line no-restricted-syntax
interface Window {
startApp: () => void;
_: typeof Underscore;
$: typeof jQuery;
@ -127,6 +129,10 @@ declare global {
PQueue: typeof PQueue;
PQueueType: PQueue;
Mustache: {
render: (template: string, data: any, partials?: any) => string;
parse: (template: string) => void;
};
WhatIsThis: WhatIsThis;
@ -655,7 +661,7 @@ export type WhisperType = {
ClearDataView: WhatIsThis;
ReactWrapperView: WhatIsThis;
activeConfirmationView: WhatIsThis;
ToastView: typeof Whisper.View & {
ToastView: typeof window.Whisper.View & {
show: (view: typeof Backbone.View, el: Element) => void;
};
ConversationArchivedToast: WhatIsThis;
@ -731,33 +737,35 @@ export type WhisperType = {
deliveryReceiptBatcher: BatcherType<WhatIsThis>;
RotateSignedPreKeyListener: WhatIsThis;
AlreadyGroupMemberToast: typeof Whisper.ToastView;
AlreadyRequestedToJoinToast: typeof Whisper.ToastView;
BlockedGroupToast: typeof Whisper.ToastView;
BlockedToast: typeof Whisper.ToastView;
CannotMixImageAndNonImageAttachmentsToast: typeof Whisper.ToastView;
DangerousFileTypeToast: typeof Whisper.ToastView;
ExpiredToast: typeof Whisper.ToastView;
FileSavedToast: typeof Whisper.ToastView;
AlreadyGroupMemberToast: typeof window.Whisper.ToastView;
AlreadyRequestedToJoinToast: typeof window.Whisper.ToastView;
BlockedGroupToast: typeof window.Whisper.ToastView;
BlockedToast: typeof window.Whisper.ToastView;
CannotMixImageAndNonImageAttachmentsToast: typeof window.Whisper.ToastView;
DangerousFileTypeToast: typeof window.Whisper.ToastView;
ExpiredToast: typeof window.Whisper.ToastView;
FileSavedToast: typeof window.Whisper.ToastView;
FileSizeToast: any;
FoundButNotLoadedToast: typeof Whisper.ToastView;
InvalidConversationToast: typeof Whisper.ToastView;
LeftGroupToast: typeof Whisper.ToastView;
MaxAttachmentsToast: typeof Whisper.ToastView;
MessageBodyTooLongToast: typeof Whisper.ToastView;
OneNonImageAtATimeToast: typeof Whisper.ToastView;
OriginalNoLongerAvailableToast: typeof Whisper.ToastView;
OriginalNotFoundToast: typeof Whisper.ToastView;
PinnedConversationsFullToast: typeof Whisper.ToastView;
ReactionFailedToast: typeof Whisper.ToastView;
TapToViewExpiredIncomingToast: typeof Whisper.ToastView;
TapToViewExpiredOutgoingToast: typeof Whisper.ToastView;
TimerConflictToast: typeof Whisper.ToastView;
UnableToLoadToast: typeof Whisper.ToastView;
VoiceNoteLimit: typeof Whisper.ToastView;
VoiceNoteMustBeOnlyAttachmentToast: typeof Whisper.ToastView;
FoundButNotLoadedToast: typeof window.Whisper.ToastView;
InvalidConversationToast: typeof window.Whisper.ToastView;
LeftGroupToast: typeof window.Whisper.ToastView;
MaxAttachmentsToast: typeof window.Whisper.ToastView;
MessageBodyTooLongToast: typeof window.Whisper.ToastView;
OneNonImageAtATimeToast: typeof window.Whisper.ToastView;
OriginalNoLongerAvailableToast: typeof window.Whisper.ToastView;
OriginalNotFoundToast: typeof window.Whisper.ToastView;
PinnedConversationsFullToast: typeof window.Whisper.ToastView;
ReactionFailedToast: typeof window.Whisper.ToastView;
TapToViewExpiredIncomingToast: typeof window.Whisper.ToastView;
TapToViewExpiredOutgoingToast: typeof window.Whisper.ToastView;
TimerConflictToast: typeof window.Whisper.ToastView;
UnableToLoadToast: typeof window.Whisper.ToastView;
VoiceNoteLimit: typeof window.Whisper.ToastView;
VoiceNoteMustBeOnlyAttachmentToast: typeof window.Whisper.ToastView;
ConversationLoadingScreen: typeof Whisper.View;
ConversationView: typeof Whisper.View;
View: typeof Backbone.View;
ConversationLoadingScreen: typeof window.Whisper.View;
ConversationView: typeof window.Whisper.View;
View: typeof Backbone.View & {
Templates: Record<string, string>;
};
};