keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

rename console.warn to error or info depending on type

Browse Source
pull/2142/head
Audric Ackermann 3 years ago
parent a21751c611
commit 2b0a2cff46
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
5 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File

23
app/sql.js
Unescape Escape View File

@ -205,7 +205,7 @@ function getUserVersion(db) {
try { try {
return db.pragma('user_version', { simple: true }); return db.pragma('user_version', { simple: true });
} catch (e) { } catch (e) {
console.warn('getUserVersion error', e); console.error('getUserVersion error', e);
return 0; return 0;
} }
} }
@ -300,9 +300,9 @@ function vacuumDatabase(db) {
throw new Error('vacuum: db is not initialized'); throw new Error('vacuum: db is not initialized');
} }
console.time('vaccumming db'); console.time('vaccumming db');
console.warn('Vacuuming DB. This might take a while.'); console.info('Vacuuming DB. This might take a while.');
db.exec('VACUUM;'); db.exec('VACUUM;');
console.warn('Vacuuming DB Finished'); console.info('Vacuuming DB Finished');
console.timeEnd('vaccumming db'); console.timeEnd('vaccumming db');
} }
@ -2068,7 +2068,7 @@ function saveSeenMessageHash(data) {
hash, hash,
}); });
} catch (e) { } catch (e) {
console.warn('saveSeenMessageHash failed:', e); console.error('saveSeenMessageHash failed:', e.message);
} }
} }
@ -2271,7 +2271,7 @@ function getMessagesByConversation(conversationId, { messageId = null } = {}) {
return map(rows, row => jsonToObject(row.json)); return map(rows, row => jsonToObject(row.json));
} }
console.warn( console.info(
`getMessagesByConversation: Could not find messageId ${messageId} in db with conversationId: ${conversationId}. Just fetching the convo as usual.` `getMessagesByConversation: Could not find messageId ${messageId} in db with conversationId: ${conversationId}. Just fetching the convo as usual.`
); );
} }
@ -3019,7 +3019,7 @@ function updateExistingClosedGroupV1ToClosedGroupV2(db) {
}; };
addClosedGroupEncryptionKeyPair(groupId, keyPair, db); addClosedGroupEncryptionKeyPair(groupId, keyPair, db);
} catch (e) { } catch (e) {
console.warn(e); console.error(e);
} }
}); });
} }
@ -3171,7 +3171,7 @@ function removeOneOpenGroupV1Message() {
if (toRemoveCount <= 0) { if (toRemoveCount <= 0) {
return 0; return 0;
} }
console.warn('left opengroupv1 message to remove: ', toRemoveCount); console.info('left opengroupv1 message to remove: ', toRemoveCount);
const rowMessageIds = globalInstance const rowMessageIds = globalInstance
.prepare( .prepare(
`SELECT id from ${MESSAGES_TABLE} WHERE conversationId LIKE 'publicChat:1@%' ORDER BY id LIMIT 1;` `SELECT id from ${MESSAGES_TABLE} WHERE conversationId LIKE 'publicChat:1@%' ORDER BY id LIMIT 1;`
@ -3237,8 +3237,8 @@ function fillWithTestData(numConvosToAdd, numMsgsToAdd) {
'count(*)' 'count(*)'
]; ];
console.warn('==== fillWithTestData ===='); console.info('==== fillWithTestData ====');
console.warn({ console.info({
convoBeforeCount, convoBeforeCount,
msgBeforeCount, msgBeforeCount,
convoToAdd: numConvosToAdd, convoToAdd: numConvosToAdd,
@ -3264,7 +3264,6 @@ function fillWithTestData(numConvosToAdd, numMsgsToAdd) {
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
} catch (e) {} } catch (e) {}
} }
console.warn('convosIdsAdded', convosIdsAdded);
// eslint-disable-next-line no-plusplus // eslint-disable-next-line no-plusplus
for (let index = 0; index < numMsgsToAdd; index++) { for (let index = 0; index < numMsgsToAdd; index++) {
const activeAt = Date.now() - index; const activeAt = Date.now() - index;
@ -3308,7 +3307,7 @@ function fillWithTestData(numConvosToAdd, numMsgsToAdd) {
saveMessage(msgObjToAdd); saveMessage(msgObjToAdd);
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
} catch (e) { } catch (e) {
console.warn(e); console.error(e);
} }
} }
@ -3320,6 +3319,6 @@ function fillWithTestData(numConvosToAdd, numMsgsToAdd) {
'count(*)' 'count(*)'
]; ];
console.warn({ convoAfterCount, msgAfterCount }); console.info({ convoAfterCount, msgAfterCount });
return convosIdsAdded; return convosIdsAdded;
} }

10
js/util_worker_tasks.js
Unescape Escape View File

@ -86,13 +86,13 @@ async function verifySignature(senderPubKey, messageBase64, signatureBase64) {
signature signature
); );
if (verifyRet) { if (verifyRet) {
console.warn('Invalid signature'); console.error('Invalid signature');
return false; return false;
} }
return true; return true;
} catch (e) { } catch (e) {
console.warn('verifySignature got an error:', e); console.error('verifySignature got an error:', e);
return false; return false;
} }
} }
@ -156,7 +156,7 @@ async function encryptForPubkey(pubkeyX25519str, payloadBytes) {
return { ciphertext, symmetricKey, ephemeralKey: ephemeral.pubKey }; return { ciphertext, symmetricKey, ephemeralKey: ephemeral.pubKey };
} catch (e) { } catch (e) {
console.warn('encryptForPubkey got an error:', e); console.error('encryptForPubkey got an error:', e);
return null; return null;
} }
} }
@ -229,7 +229,7 @@ async function decryptAttachmentBuffer(encryptingKey, bufferIn) {
return messageTag.message; return messageTag.message;
} }
} catch (e) { } catch (e) {
console.warn('Failed to load the file as an encrypted one', e); console.error('Failed to load the file as an encrypted one', e);
} }
return new Uint8Array(); return new Uint8Array();
} }
@ -257,7 +257,7 @@ async function encryptAttachmentBuffer(encryptingKey, bufferIn) {
return { encryptedBufferWithHeader, header }; return { encryptedBufferWithHeader, header };
} catch (e) { } catch (e) {
console.warn('encryptAttachmentBuffer error: ', e); console.error('encryptAttachmentBuffer error: ', e);
return null; return null;
} }

4
main.js
Unescape Escape View File

@ -663,12 +663,12 @@ async function removeDB() {
await sql.removeDB(userDir); await sql.removeDB(userDir);
try { try {
console.warn('Remove DB: removing.', userDir); console.error('Remove DB: removing.', userDir);
userConfig.remove(); userConfig.remove();
ephemeralConfig.remove(); ephemeralConfig.remove();
} catch (e) { } catch (e) {
console.warn('Remove DB: Failed to remove configs.', e); console.error('Remove DB: Failed to remove configs.', e);
} }
} }

4
ts/data/data.ts
Unescape Escape View File

@ -764,7 +764,6 @@ export async function getMessagesByConversation(
message.skipTimerInit = skipTimerInit; message.skipTimerInit = skipTimerInit;
} }
} }
console.warn(`messages length got: ${messages.length} for ${conversationId}:${messageId}`);
return new MessageCollection(messages); return new MessageCollection(messages);
} }
@ -1029,9 +1028,6 @@ export async function fillWithTestData(convs: number, msgs: number) {
} }
for (let msgsAddedCount = 0; msgsAddedCount < msgs; msgsAddedCount++) { for (let msgsAddedCount = 0; msgsAddedCount < msgs; msgsAddedCount++) {
if (msgsAddedCount % 100 === 0) {
console.warn(msgsAddedCount);
}
// tslint:disable: insecure-random // tslint:disable: insecure-random
const convoToChoose = newConvos[Math.floor(Math.random() * newConvos.length)]; const convoToChoose = newConvos[Math.floor(Math.random() * newConvos.length)];
await convoToChoose.addSingleMessage({ await convoToChoose.addSingleMessage({

9
ts/state/ducks/conversations.ts
Unescape Escape View File

@ -873,7 +873,6 @@ export async function openConversationWithMessages(args: {
messageId: string | null; messageId: string | null;
}) { }) {
const { conversationKey, messageId } = args; const { conversationKey, messageId } = args;
console.warn('openConversationWithMessages', conversationKey);
const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(conversationKey); const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(conversationKey);
const initialMessages = await getMessages({ const initialMessages = await getMessages({
@ -890,23 +889,17 @@ export async function openConversationWithMessages(args: {
); );
} }
export async function openConversationOnQuoteClick(args: { export async function openConversationToSpecificMessage(args: {
conversationKey: string; conversationKey: string;
messageIdToNavigateTo: string; messageIdToNavigateTo: string;
}) { }) {
const { conversationKey, messageIdToNavigateTo } = args; const { conversationKey, messageIdToNavigateTo } = args;
console.warn('openConversationOnQuoteClick', { conversationKey, messageIdToNavigateTo });
const messagesAroundThisMessage = await getMessages({ const messagesAroundThisMessage = await getMessages({
conversationKey, conversationKey,
messageId: messageIdToNavigateTo, messageId: messageIdToNavigateTo,
}); });
console.warn(
'position of navigate to message is ',
messagesAroundThisMessage.findIndex(m => m.propsForMessage.id === messageIdToNavigateTo)
);
window.inboxStore?.dispatch( window.inboxStore?.dispatch(
actions.navigateInConversationToMessageId({ actions.navigateInConversationToMessageId({
conversationKey, conversationKey,

Write Preview
Loading…
Cancel
Save