This commit is contained in:
Mikunj 2019-04-17 12:01:19 +10:00
parent e343a04eea
commit 57195017f9
5 changed files with 72 additions and 68 deletions

View file

@ -8,7 +8,15 @@ const { remove: removeUserConfig } = require('./user_config');
const pify = require('pify'); const pify = require('pify');
const uuidv4 = require('uuid/v4'); const uuidv4 = require('uuid/v4');
const { map, isString, fromPairs, forEach, last, isEmpty, isObject } = require('lodash'); const {
map,
isString,
fromPairs,
forEach,
last,
isEmpty,
isObject,
} = require('lodash');
// To get long stack traces // To get long stack traces
// https://github.com/mapbox/node-sqlite3/wiki/API#sqlite3verbose // https://github.com/mapbox/node-sqlite3/wiki/API#sqlite3verbose

View file

@ -1342,7 +1342,7 @@
// Add the message sending on another queue so that our UI doesn't get blocked // Add the message sending on another queue so that our UI doesn't get blocked
this.queueMessageSend(async () => { this.queueMessageSend(async () => {
message.send(this.wrapSend(promise)) message.send(this.wrapSend(promise));
}); });
return true; return true;

View file

@ -23,7 +23,7 @@
Contact, Contact,
PhoneNumber, PhoneNumber,
Attachment, Attachment,
Errors Errors,
} = Signal.Types; } = Signal.Types;
const { const {

View file

@ -1024,9 +1024,7 @@ MessageReceiver.prototype.extend({
const groupId = message.group && message.group.id; const groupId = message.group && message.group.id;
const isBlocked = this.isGroupBlocked(groupId); const isBlocked = this.isGroupBlocked(groupId);
const isMe = envelope.source === textsecure.storage.user.getNumber(); const isMe = envelope.source === textsecure.storage.user.getNumber();
const conversation = window.ConversationController.get( const conversation = window.ConversationController.get(envelope.source);
envelope.source
);
const isLeavingGroup = Boolean( const isLeavingGroup = Boolean(
message.group && message.group &&
message.group.type === textsecure.protobuf.GroupContext.Type.QUIT message.group.type === textsecure.protobuf.GroupContext.Type.QUIT
@ -1087,8 +1085,7 @@ MessageReceiver.prototype.extend({
message, message,
}; };
return this.dispatchAndWait(ev); return this.dispatchAndWait(ev);
} })
)
); );
}, },
handleLegacyMessage(envelope) { handleLegacyMessage(envelope) {

View file

@ -31,7 +31,6 @@ interface Props {
showFriendRequestIndicator?: boolean; showFriendRequestIndicator?: boolean;
isBlocked: boolean; isBlocked: boolean;
isOnline: boolean; isOnline: boolean;
isMe: boolean;
hasNickname: boolean; hasNickname: boolean;
i18n: Localizer; i18n: Localizer;