From 44676ea947327e432e624a36d7fb403237c0c203 Mon Sep 17 00:00:00 2001 From: wgroeneveld Date: Fri, 5 Mar 2021 11:48:19 +0100 Subject: [PATCH] getHours() is local time, use getUTCHours() --- src/masto-feed-parser.js | 4 ++-- test/{expected-01h20m3s35.md => expected-01h19m3s35.md} | 2 +- test/masto-feed-parser.test.js | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) rename test/{expected-01h20m3s35.md => expected-01h19m3s35.md} (95%) diff --git a/src/masto-feed-parser.js b/src/masto-feed-parser.js index 454d6ca..cad66ca 100644 --- a/src/masto-feed-parser.js +++ b/src/masto-feed-parser.js @@ -27,7 +27,7 @@ function convertAtomItemToMd(item, opts) { source: "${item.url}" context: "${item.context}" title: "${item.title}" -date: "${item.year}-${item.month}-${item.day}T${strpad(item.date.getHours())}:${strpad(item.date.getMinutes())}:${strpad(item.date.getSeconds())}" +date: "${item.year}-${item.month}-${item.day}T${strpad(item.date.getUTCHours())}:${strpad(item.date.getMinutes())}:${strpad(item.date.getSeconds())}" --- ${item.content} @@ -69,7 +69,7 @@ async function parseMastoFeed(opts) { url: item.id, // format: https://chat.brainbaking.com/objects/0707fd54-185d-4ee7-9204-be370d57663c context, id: stripBeforeLastSlash(item.id), - hash: `${day}h${date.getHours()}m${date.getMinutes()}s${date.getSeconds()}`, + hash: `${day}h${date.getUTCHours()}m${date.getMinutes()}s${date.getSeconds()}`, date, // format: 2021-03-02T16:18:46.658056Z year, month, diff --git a/test/expected-01h20m3s35.md b/test/expected-01h19m3s35.md similarity index 95% rename from test/expected-01h20m3s35.md rename to test/expected-01h19m3s35.md index 1159fae..406932a 100644 --- a/test/expected-01h20m3s35.md +++ b/test/expected-01h19m3s35.md @@ -2,7 +2,7 @@ source: "https://chat.brainbaking.com/objects/77a3ecfb-47e1-4d7a-a24a-8b779d80a8ac" context: "" title: "I pulled the Google plug and installed LineageOS: https://brainbaking.com/post/2021/03/getting-ri..." -date: "2021-03-01T20:03:35" +date: "2021-03-01T19:03:35" --- I pulled the Google plug and installed LineageOS: https://brainbaking.com/post/2021/03/getting-rid-of-tracking-using-lineageos/ Very impressed so far! Also rely on my own CalDAV server to replace GCalendar. Any others here running #lineageos for privacy reasons? diff --git a/test/masto-feed-parser.test.js b/test/masto-feed-parser.test.js index 7b0e28e..def72f0 100644 --- a/test/masto-feed-parser.test.js +++ b/test/masto-feed-parser.test.js @@ -26,7 +26,6 @@ describe("mastodon feed parser tests", () => { let dir = await fsp.readdir(`${dumpdir}/2021/02`, { withFileTypes: true }) expect(dir.length).toBe(8) dir = await fsp.readdir(`${dumpdir}/2021/03`, { withFileTypes: true }) - console.log(dir) expect(dir.length).toBe(4) }) @@ -36,8 +35,8 @@ describe("mastodon feed parser tests", () => { notesdir: dumpdir }) - const actualMd = await fsp.readFile(`${dumpdir}/2021/03/01h20m3s35.md`).toString() - const expectedMd = await fsp.readFile(`${__dirname}/expected-01h20m3s35.md`).toString() + const actualMd = await fsp.readFile(`${dumpdir}/2021/03/01h19m3s35.md`).toString() + const expectedMd = await fsp.readFile(`${__dirname}/expected-01h19m3s35.md`).toString() expect(actualMd).toEqual(expectedMd) }) @@ -49,7 +48,7 @@ describe("mastodon feed parser tests", () => { notesdir: dumpdir }) - const actualMd = await fsp.readFile(`${dumpdir}/2021/03/02h17m18s46.md`) + const actualMd = await fsp.readFile(`${dumpdir}/2021/03/02h16m18s46.md`) const expectedReplyTo = "https://social.linux.pizza/users/StampedingLonghorn/statuses/105821099684887793" const md = frontMatterParser.parseSync(actualMd.toString())