Jonas_Jones/blog.jonasjones.dev
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/blog.jonasjones.dev.git synced 2025-10-22 21:29:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from JonasunderscoreJones/us-fix-apparently

Browse source 
Fixed issue with fetching posts in different time zones
This commit is contained in:
Jonas_Jones 2024-06-28 02:59:21 +02:00 • committed by GitHub
commit 62fc36d2c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/routes/Post.svelte
View file

@ -4,6 +4,7 @@
import Loading from '../components/Loading.svelte';
import NotFound from "./Error.svelte";
import navigate from 'svelte-spa-router';
import { parse } from "svelte/compiler";
export let params: {year: string, month: string, day: string, title: string} = {
year: "",
@ -12,15 +13,6 @@
title: ""
};
let posts: { id: any; }[] = [];
let post: {id: string, date: string, title: string, author: string, description: string} = {
id: '',
date: '',
title: '',
author: '',
description: ''
};
let postTitle = "";
let postAuthor = "";
let postDate = "";
@ -41,20 +33,6 @@
onMount(async () => {
redirectUrl()
try {
const response = await fetch('https://cdn.jonasjones.dev/blog/index.json');
posts = await response.json();
post = await findPostByDate(posts, params);
if (await !post) {
loading = false;
error404 = true;
const markdowncontentElement = document.getElementById('markdowncontent');
if (markdowncontentElement) {
markdowncontentElement.style.display = "none";
}
}
if (params.month?.toString().length === 1) {
params.month = "0" + params.month
@ -67,15 +45,17 @@
if (await content.ok) {
let markdowncontent = await content.text();
markdowncontent = await marked.parse(removePostVars(markdowncontent));
const parsedContent = removeAndParsePostVars(markdowncontent);
markdowncontent = await marked.parse(parsedContent[0]);
const markdowncontentElement = document.getElementById('markdowncontent');
if (markdowncontentElement) {
markdowncontentElement.innerHTML = await markdowncontent;
}
loading = false;
postTitle = post.title;
postAuthor = post.author;
postDate = post.date;
postTitle = parsedContent[1];
postAuthor = parsedContent[2];
postDate = parsedContent[3];
} else {
loading = false
error404 = true
@ -88,9 +68,19 @@
}
function removePostVars(content: string) {
function extractMarkdownValue(content: string, key: string) {
const match = content.match(new RegExp(`^\\[${key}\\]: (.*)$`, 'm'));
return match ? match[1] : '';
}
function removeAndParsePostVars(content: string) {
const title = extractMarkdownValue(content, 'title');
const author = extractMarkdownValue(content, 'author');
const date = extractMarkdownValue(content, 'date');
const description = extractMarkdownValue(content, 'description');
// with regex if the line begins with a markdown variable declaration, remove it
return content.replace(/^\[.*?\]: .*$(?:\r?\n)?/gm, '');
return [content.replace(/^\[.*?\]: .*$(?:\r?\n)?/gm, ''), title, author, date, description];
}
});
@ -104,26 +94,6 @@
}
}
function findPostByDate(posts: any[], params: { year: any; month: any; day: any; title: any; }) {
return posts.find(post => {
// Create a Date object from the post's date string
const postDate = new Date(post.date);
// Extract the year, month, and day from the Date object
const postYear = postDate.getFullYear();
const postMonth = postDate.getMonth() + 1; // Months are zero-based
const postDay = postDate.getDate();
// Compare the extracted year, month, and day with params, and the title
return (
postYear === parseInt(params.year) &&
postMonth === parseInt(params.month) &&
postDay === parseInt(params.day) &&
post.id === params.title
);
});
}
function copyLink() {
navigator.clipboard.writeText(location.href).then(() => {
clickText = "Copied!";