|
|
|
|
@ -5,7 +5,6 @@
|
|
|
|
|
i18n,
|
|
|
|
|
Signal,
|
|
|
|
|
storage,
|
|
|
|
|
textsecure,
|
|
|
|
|
Whisper,
|
|
|
|
|
ConversationController,
|
|
|
|
|
*/
|
|
|
|
|
@ -214,25 +213,6 @@
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
onChangePlaceholder(type) {
|
|
|
|
|
if (!this.$messageField) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let placeholder;
|
|
|
|
|
switch (type) {
|
|
|
|
|
case 'left-group':
|
|
|
|
|
placeholder = i18n('sendMessageLeftGroup');
|
|
|
|
|
break;
|
|
|
|
|
case 'blocked-user':
|
|
|
|
|
placeholder = i18n('sendMessageBlockedUser');
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
placeholder = i18n('sendMessage');
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
this.$messageField.attr('placeholder', placeholder);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
unload(reason) {
|
|
|
|
|
window.log.info(
|
|
|
|
|
'unloading conversation',
|
|
|
|
|
@ -390,79 +370,6 @@
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async toggleMicrophone() {
|
|
|
|
|
// FIXME audric hide microphone for now until refactor branch is merged
|
|
|
|
|
// const allowMicrophone = await window.getMediaPermissions();
|
|
|
|
|
// if (
|
|
|
|
|
// !allowMicrophone ||
|
|
|
|
|
// this.$('.send-message').val().length > 0 ||
|
|
|
|
|
// this.fileInput.hasFiles()
|
|
|
|
|
// ) {
|
|
|
|
|
this.$('.capture-audio').hide();
|
|
|
|
|
// } else {
|
|
|
|
|
// this.$('.capture-audio').show();
|
|
|
|
|
// }
|
|
|
|
|
},
|
|
|
|
|
captureAudio(e) {
|
|
|
|
|
e.preventDefault();
|
|
|
|
|
|
|
|
|
|
if (this.fileInput.hasFiles()) {
|
|
|
|
|
// pushToast() this toast too
|
|
|
|
|
const toast = new Whisper.VoiceNoteMustBeOnlyAttachmentToast();
|
|
|
|
|
toast.$el.appendTo(this.$el);
|
|
|
|
|
toast.render();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Note - clicking anywhere will close the audio capture panel, due to
|
|
|
|
|
// the onClick handler in InboxView, which calls its closeRecording method.
|
|
|
|
|
|
|
|
|
|
if (this.captureAudioView) {
|
|
|
|
|
this.captureAudioView.remove();
|
|
|
|
|
this.captureAudioView = null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.captureAudioView = new Whisper.RecorderView();
|
|
|
|
|
|
|
|
|
|
const view = this.captureAudioView;
|
|
|
|
|
view.render();
|
|
|
|
|
view.on('send', this.handleAudioCapture.bind(this));
|
|
|
|
|
view.on('closed', this.endCaptureAudio.bind(this));
|
|
|
|
|
view.$el.appendTo(this.$('.capture-audio'));
|
|
|
|
|
|
|
|
|
|
this.$('.send-message').attr('disabled', true);
|
|
|
|
|
this.$('.microphone').hide();
|
|
|
|
|
},
|
|
|
|
|
handleAudioCapture(blob) {
|
|
|
|
|
this.fileInput.addAttachment({
|
|
|
|
|
contentType: blob.type,
|
|
|
|
|
file: blob,
|
|
|
|
|
isVoiceNote: true,
|
|
|
|
|
});
|
|
|
|
|
this.$('.bottom-bar form').submit();
|
|
|
|
|
},
|
|
|
|
|
endCaptureAudio() {
|
|
|
|
|
this.$('.send-message').removeAttr('disabled');
|
|
|
|
|
this.$('.microphone').show();
|
|
|
|
|
this.captureAudioView = null;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
unfocusBottomBar() {
|
|
|
|
|
this.$('.bottom-bar form').removeClass('active');
|
|
|
|
|
},
|
|
|
|
|
focusBottomBar() {
|
|
|
|
|
this.$('.bottom-bar form').addClass('active');
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
onLazyScroll() {
|
|
|
|
|
// The in-progress fetch check is important, because while that happens, lots
|
|
|
|
|
// of messages are added to the DOM, one by one, changing window size and
|
|
|
|
|
// generating scroll events.
|
|
|
|
|
if (!this.isHidden() && window.isFocused() && !this.inProgressFetch) {
|
|
|
|
|
this.lastActivity = Date.now();
|
|
|
|
|
this.markRead();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
updateUnread() {
|
|
|
|
|
this.resetLastSeenIndicator();
|
|
|
|
|
// Waiting for scrolling caused by resetLastSeenIndicator to settle down
|
|
|
|
|
@ -533,107 +440,6 @@
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
addScrollDownButtonWithCount() {
|
|
|
|
|
this.updateScrollDownButton(1);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
addScrollDownButton() {
|
|
|
|
|
if (!this.scrollDownButton) {
|
|
|
|
|
this.updateScrollDownButton();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
updateScrollDownButton(count) {
|
|
|
|
|
if (!this.scrollDownButton) {
|
|
|
|
|
this.scrollDownButton = new Whisper.ScrollDownButtonView({ count });
|
|
|
|
|
this.scrollDownButton.render();
|
|
|
|
|
const container = this.$('.discussion-container');
|
|
|
|
|
container.append(this.scrollDownButton.el);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
removeScrollDownButton() {
|
|
|
|
|
if (this.scrollDownButton) {
|
|
|
|
|
const button = this.scrollDownButton;
|
|
|
|
|
this.scrollDownButton = null;
|
|
|
|
|
button.remove();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
removeLastSeenIndicator() {
|
|
|
|
|
if (this.lastSeenIndicator) {
|
|
|
|
|
const indicator = this.lastSeenIndicator;
|
|
|
|
|
this.lastSeenIndicator = null;
|
|
|
|
|
indicator.remove();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
scrollToBottom() {
|
|
|
|
|
// If we're above the last seen indicator, we should scroll there instead
|
|
|
|
|
// Note: if we don't end up at the bottom of the conversation, button won't go away!
|
|
|
|
|
if (this.lastSeenIndicator) {
|
|
|
|
|
const location = this.lastSeenIndicator.$el.position().top;
|
|
|
|
|
if (location > 0) {
|
|
|
|
|
this.lastSeenIndicator.el.scrollIntoView();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.removeLastSeenIndicator();
|
|
|
|
|
}
|
|
|
|
|
this.view.scrollToBottom();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
resetLastSeenIndicator(options = {}) {
|
|
|
|
|
_.defaults(options, { scroll: true });
|
|
|
|
|
|
|
|
|
|
let unreadCount = 0;
|
|
|
|
|
let oldestUnread = null;
|
|
|
|
|
|
|
|
|
|
// We need to iterate here because unseen non-messages do not contribute to
|
|
|
|
|
// the badge number, but should be reflected in the indicator's count.
|
|
|
|
|
this.model.messageCollection.forEach(model => {
|
|
|
|
|
if (!model.get('unread')) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unreadCount += 1;
|
|
|
|
|
if (!oldestUnread) {
|
|
|
|
|
oldestUnread = model;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
this.removeLastSeenIndicator();
|
|
|
|
|
|
|
|
|
|
if (oldestUnread) {
|
|
|
|
|
this.lastSeenIndicator = new Whisper.LastSeenIndicatorView({
|
|
|
|
|
count: unreadCount,
|
|
|
|
|
});
|
|
|
|
|
const lastSeenEl = this.lastSeenIndicator.render().$el;
|
|
|
|
|
|
|
|
|
|
lastSeenEl.insertBefore(this.$(`#${oldestUnread.get('id')}`));
|
|
|
|
|
|
|
|
|
|
if (this.view.atBottom() || options.scroll) {
|
|
|
|
|
lastSeenEl[0].scrollIntoView();
|
|
|
|
|
}
|
|
|
|
|
} else if (this.view.atBottom()) {
|
|
|
|
|
// If we already thought we were at the bottom, then ensure that's the case.
|
|
|
|
|
// Attempting to account for unpredictable completion of message rendering.
|
|
|
|
|
setTimeout(() => this.view.scrollToBottom(), 1);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
focusMessageField() {
|
|
|
|
|
if (this.panels && this.panels.length) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.$messageField.focus();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
focusMessageFieldAndClearDisabled() {
|
|
|
|
|
this.$messageField.removeAttr('disabled');
|
|
|
|
|
this.$messageField.focus();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async loadMoreMessages() {
|
|
|
|
|
if (this.inProgressFetch) {
|
|
|
|
|
return;
|
|
|
|
|
@ -1091,191 +897,6 @@
|
|
|
|
|
|
|
|
|
|
onKeyUp() {
|
|
|
|
|
this.maybeBumpTyping();
|
|
|
|
|
this.debouncedMaybeGrabLinkPreview();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
maybeGrabLinkPreview() {
|
|
|
|
|
// Don't generate link previews if user has turned them off
|
|
|
|
|
if (!storage.get('link-preview-setting', false)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// Do nothing if we're offline
|
|
|
|
|
if (!textsecure.messaging) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// If we have attachments, don't add link preview
|
|
|
|
|
if (this.fileInput.hasFiles()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// If we're behind a user-configured proxy, we don't support link previews
|
|
|
|
|
if (window.isBehindProxy()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const messageText = this.$messageField.val().trim();
|
|
|
|
|
const caretLocation = this.$messageField.get(0).selectionStart;
|
|
|
|
|
|
|
|
|
|
if (!messageText) {
|
|
|
|
|
this.resetLinkPreview();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (this.disableLinkPreviews) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const links = window.Signal.LinkPreviews.findLinks(
|
|
|
|
|
messageText,
|
|
|
|
|
caretLocation
|
|
|
|
|
);
|
|
|
|
|
const { currentlyMatchedLink } = this;
|
|
|
|
|
if (links.includes(currentlyMatchedLink)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.currentlyMatchedLink = null;
|
|
|
|
|
this.excludedPreviewUrls = this.excludedPreviewUrls || [];
|
|
|
|
|
|
|
|
|
|
const link = links.find(
|
|
|
|
|
item =>
|
|
|
|
|
window.Signal.LinkPreviews.isLinkInWhitelist(item) &&
|
|
|
|
|
!this.excludedPreviewUrls.includes(item)
|
|
|
|
|
);
|
|
|
|
|
if (!link) {
|
|
|
|
|
this.removeLinkPreview();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.currentlyMatchedLink = link;
|
|
|
|
|
this.addLinkPreview(link);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
resetLinkPreview() {
|
|
|
|
|
this.disableLinkPreviews = false;
|
|
|
|
|
this.excludedPreviewUrls = [];
|
|
|
|
|
this.removeLinkPreview();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
removeLinkPreview() {
|
|
|
|
|
(this.preview || []).forEach(item => {
|
|
|
|
|
if (item.url) {
|
|
|
|
|
URL.revokeObjectURL(item.url);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.preview = null;
|
|
|
|
|
this.previewLoading = null;
|
|
|
|
|
this.currentlyMatchedLink = false;
|
|
|
|
|
this.renderLinkPreview();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async addLinkPreview(url) {
|
|
|
|
|
(this.preview || []).forEach(item => {
|
|
|
|
|
if (item.url) {
|
|
|
|
|
URL.revokeObjectURL(item.url);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.preview = null;
|
|
|
|
|
|
|
|
|
|
this.currentlyMatchedLink = url;
|
|
|
|
|
this.previewLoading = this.getPreview(url);
|
|
|
|
|
const promise = this.previewLoading;
|
|
|
|
|
this.renderLinkPreview();
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
const result = await promise;
|
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
url !== this.currentlyMatchedLink ||
|
|
|
|
|
promise !== this.previewLoading
|
|
|
|
|
) {
|
|
|
|
|
// another request was started, or this was canceled
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If we couldn't pull down the initial URL
|
|
|
|
|
if (!result) {
|
|
|
|
|
this.excludedPreviewUrls.push(url);
|
|
|
|
|
this.removeLinkPreview();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (result.image) {
|
|
|
|
|
const blob = new Blob([result.image.data], {
|
|
|
|
|
type: result.image.contentType,
|
|
|
|
|
});
|
|
|
|
|
result.image.url = URL.createObjectURL(blob);
|
|
|
|
|
} else if (!result.title) {
|
|
|
|
|
// A link preview isn't worth showing unless we have either a title or an image
|
|
|
|
|
this.removeLinkPreview();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.preview = [result];
|
|
|
|
|
this.renderLinkPreview();
|
|
|
|
|
} catch (error) {
|
|
|
|
|
window.log.error(
|
|
|
|
|
'Problem loading link preview, disabling.',
|
|
|
|
|
error && error.stack ? error.stack : error
|
|
|
|
|
);
|
|
|
|
|
this.disableLinkPreviews = true;
|
|
|
|
|
this.removeLinkPreview();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
renderLinkPreview() {
|
|
|
|
|
if (this.previewView) {
|
|
|
|
|
this.previewView.remove();
|
|
|
|
|
this.previewView = null;
|
|
|
|
|
}
|
|
|
|
|
if (!this.currentlyMatchedLink) {
|
|
|
|
|
this.view.restoreBottomOffset();
|
|
|
|
|
this.updateMessageFieldSize({});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const first = (this.preview && this.preview[0]) || null;
|
|
|
|
|
const props = {
|
|
|
|
|
...first,
|
|
|
|
|
domain: first && window.Signal.LinkPreviews.getDomain(first.url),
|
|
|
|
|
isLoaded: Boolean(first),
|
|
|
|
|
onClose: () => {
|
|
|
|
|
this.disableLinkPreviews = true;
|
|
|
|
|
this.removeLinkPreview();
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
this.previewView = new Whisper.ReactWrapperView({
|
|
|
|
|
className: 'preview-wrapper',
|
|
|
|
|
Component: window.Signal.Components.StagedLinkPreview,
|
|
|
|
|
elCallback: el => this.$('.send').prepend(el),
|
|
|
|
|
props,
|
|
|
|
|
onInitialRender: () => {
|
|
|
|
|
this.view.restoreBottomOffset();
|
|
|
|
|
this.updateMessageFieldSize({});
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
getLinkPreview() {
|
|
|
|
|
// Don't generate link previews if user has turned them off
|
|
|
|
|
if (!storage.get('link-preview-setting', false)) {
|
|
|
|
|
return [];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!this.preview) {
|
|
|
|
|
return [];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return this.preview.map(item => {
|
|
|
|
|
if (item.image) {
|
|
|
|
|
// We eliminate the ObjectURL here, unneeded for send or save
|
|
|
|
|
return {
|
|
|
|
|
...item,
|
|
|
|
|
image: _.omit(item.image, 'url'),
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return item;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// Called whenever the user changes the message composition field. But only
|
|
|
|
|
|
Audric Ackermann
4 years ago