diff --git a/files/assets/js/bootstrap.js b/files/assets/js/bootstrap.js index 30a80beda..e043fc642 100644 --- a/files/assets/js/bootstrap.js +++ b/files/assets/js/bootstrap.js @@ -313,14 +313,27 @@ function showmore() { btn.innerHTML = 'SHOW LESS' } +function formatDate(d) { + var year = d.getFullYear(); + var monthAbbr = d.toLocaleDateString('en-us', {month: 'short'}); + var day = d.getDate(); + var hour = ("0" + d.getHours()).slice(-2); + var minute = ("0" + d.getMinutes()).slice(-2); + var second = ("0" + d.getSeconds()).slice(-2); + var tzAbbr = d.toLocaleTimeString('en-us', {timeZoneName: 'short'}).split(' ')[2]; + + return (day + " " + monthAbbr + " " + year + " " + + hour + ":" + minute + ":" + second + " " + tzAbbr); +} + const timestamps = document.querySelectorAll('[data-time]'); for (const e of timestamps) { const date = new Date(e.dataset.time*1000); - e.innerHTML = date.toString(); + e.innerHTML = formatDate(date); }; function timestamp(str, ti) { const date = new Date(ti*1000); - document.getElementById(str).setAttribute("data-bs-original-title", date.toString()); -}; \ No newline at end of file + document.getElementById(str).setAttribute("data-bs-original-title", formatDate(date)); +}; diff --git a/seed-db.sql b/seed-db.sql index fe8cb9b2b..965f4f7eb 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -1193,6 +1193,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseycarphug2',2,'fish love bottomfeeder carpathianflorist heart blow admin cute',NULL), ('marseycarpina',2,'carpathianflorist drag transgender admin jannie',NULL), ('marseycarplazy',2,'carpathianflorist fish couch sleeping slacker idc antiwork janitor',NULL), +('marseycarpler',2,'carp hitler nazi',1664137088), ('marseycarpmerchant',2,'jewish money redbubble merch carpathianflorist money yid heeb sheeny sheenie greedy handrubbery rubbing hands kike israeli',1663465891), ('marseycarpmerchant2',2,'jew fish greedy',1663548215), ('marseycarpmermaid',2,'carp mermaid merman mercarp siren sexy legs temptress',NULL), @@ -2544,6 +2545,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseyyeti',2,'scary monster myth winter ice mountain himalaya asia predator giant',NULL), ('marseyyikes',2,'reaction judgment disgust oof cringe',NULL), ('marseyyinzer',2,'pittsburgh pennsylvania pens penguins steelers stillers pirates buccos buckos terrible towel pierogo yuengling beer city hat baseball football hockey nfl mlb nhl happy',NULL), +('marseyyoshi',2,'super mario nintendo snes retro video game dinosaur italian plumber pipes',1664142051), ('marseyyugi',2,'yugioh yu-gi-oh! cards trap anime',NULL), ('marseyza',2,'antlers flowers',NULL), ('marseyzaku',2,'gundam mecha robot helmet mask',NULL),