oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Lint

Browse source
This commit is contained in:
Maxim Shishmarev 2020-07-02 12:47:31 +10:00
parent 255c7ada68
commit b31b6bb912
4 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/modules/attachment_downloads.js
View file

@ -1,6 +1,6 @@
/* global Whisper, Signal, setTimeout, clearTimeout, MessageController, NewReceiver */
const { isFunction, isNumber, omit } = require('lodash');
const { isNumber, omit } = require('lodash');
const getGuid = require('uuid/v4');
const {
getMessageById,

21
ts/receiver/receiver.ts
View file

@ -301,9 +301,7 @@ async function handleDecryptedEnvelope(
}
}
export async function handleUnencryptedMessage({message : outerMessage} : any) {
export async function handleUnencryptedMessage({ message: outerMessage }: any) {
const { source } = outerMessage;
const { group, profile, profileKey } = outerMessage.message;
@ -315,27 +313,20 @@ export async function handleUnencryptedMessage({message : outerMessage} : any) {
source,
'private'
);
await updateProfile(
conversation,
profile,
profileKey
);
await updateProfile(conversation, profile, profileKey);
}
const primaryDevice = window.storage.get('primaryDevicePubKey');
const isOurDevice = source &&
(source === ourNumber || source === primaryDevice);
const isOurDevice =
source && (source === ourNumber || source === primaryDevice);
const isPublicChatMessage =
group &&
group.id &&
!!group.id.match(/^publicChat:/);
group && group.id && !!group.id.match(/^publicChat:/);
const ev = {
// Public chat messages from ourselves should be outgoing
type: (isPublicChatMessage && isOurDevice) ? 'sent' : 'message',
type: isPublicChatMessage && isOurDevice ? 'sent' : 'message',
data: outerMessage,
};
await handleMessageEvent(ev);
}

1
ts/session/snode_api/swarmPolling.ts
View file

@ -164,7 +164,6 @@ export class SwarmPolling {
node: Snode,
pubkey: PubKey
): Promise<Array<any>> {
const edkey = node.pubkey_ed25519;
const pkStr = pubkey.key ? pubkey.key : pubkey;

28
ts/test/session/utils/SyncMessage_test.ts
View file

@ -21,22 +21,18 @@ describe('Sync Message Utils', () => {
// Fill half with secondaries, half with primaries
const numConversations = 20;
const primaryConversations = new Array(numConversations / 2)
.fill({})
.map(
() =>
new TestUtils.MockConversation({
type: TestUtils.MockConversationType.Primary,
})
);
const secondaryConversations = new Array(numConversations / 2)
.fill({})
.map(
() =>
new TestUtils.MockConversation({
type: TestUtils.MockConversationType.Secondary,
})
);
const primaryConversations = new Array(numConversations / 2).fill({}).map(
() =>
new TestUtils.MockConversation({
type: TestUtils.MockConversationType.Primary,
})
);
const secondaryConversations = new Array(numConversations / 2).fill({}).map(
() =>
new TestUtils.MockConversation({
type: TestUtils.MockConversationType.Secondary,
})
);
const conversations = [...primaryConversations, ...secondaryConversations];
const sandbox = sinon.createSandbox();