Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 02:45:54 +01:00
Code Issues Packages Projects Releases Activity

option names now follow camelCase

Browse Source
This commit is contained in:
azivner
2018-04-02 21:47:46 -04:00
parent 429d3f518e
commit c6c76ba360
26 changed files with 77 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/sync.js
View File

@@ -71,14 +71,14 @@ async function sync() {
async function login() {
const timestamp = dateUtils.nowDate();
const documentSecret = await optionService.getOption('document_secret');
const documentSecret = await optionService.getOption('documentSecret');
const hash = utils.hmac(documentSecret, timestamp);
const syncContext = { cookieJar: rp.jar() };
const resp = await syncRequest(syncContext, 'POST', '/api/login/sync', {
timestamp: timestamp,
dbVersion: appInfo.db_version,
dbVersion: appInfo.dbVersion,
hash: hash
});
@@ -92,11 +92,11 @@ async function login() {
}
async function getLastSyncedPull() {
return parseInt(await optionService.getOption('last_synced_pull'));
return parseInt(await optionService.getOption('lastSyncedPull'));
}
async function setLastSyncedPull(syncId) {
await optionService.setOption('last_synced_pull', syncId);
await optionService.setOption('lastSyncedPull', syncId);
}
async function pullSync(syncContext) {
@@ -163,11 +163,11 @@ async function pullSync(syncContext) {
}
async function getLastSyncedPush() {
return parseInt(await optionService.getOption('last_synced_push'));
return parseInt(await optionService.getOption('lastSyncedPush'));
}
async function setLastSyncedPush(lastSyncedPush) {
await optionService.setOption('last_synced_push', lastSyncedPush);
await optionService.setOption('lastSyncedPush', lastSyncedPush);
}
async function pushSync(syncContext) {