From 52c01b6bd5a63d514ca083edf2f10d25c03d6cb0 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 27 May 2018 11:26:34 +0200 Subject: Add SPLUS_CONFIG env var --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/index.ts b/src/index.ts index 3d7e588..7348f6d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -54,4 +54,4 @@ async function main(configPath) { await sink.commit(); } -main(process.argv[2] || './config-example.json').catch(console.log); +main(process.env.SPLUS_CONFIG || process.argv[2] || './config-example.json').catch(console.log); -- cgit v1.3.1 From b1ca29140b641adc83e16bca5e21d8e31fd56ecd Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 27 May 2018 11:59:00 +0200 Subject: Remove todo - ICS can't conflict if it's rewritten 💩 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sinks/IcalSink.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/sinks/IcalSink.ts b/src/sinks/IcalSink.ts index efb94ac..dd94ac5 100644 --- a/src/sinks/IcalSink.ts +++ b/src/sinks/IcalSink.ts @@ -20,7 +20,6 @@ export class IcalSink implements ISink { } createEvent(event: IEvent): Promise { - // TODO better duplicate detection and resolve conflicts lol const eventId = sha256(JSON.stringify(event)).substr(0, 16); const icalEvent = this._cal.createEvent({ -- cgit v1.3.1