diff --git a/controller/blog.go b/controller/blog.go deleted file mode 100644 index 7fb201e..0000000 --- a/controller/blog.go +++ /dev/null @@ -1,83 +0,0 @@ -package controller - -import ( - "arimelody-web/model" - - "github.com/jmoiron/sqlx" -) - -func GetBlogPost(db *sqlx.DB, id string) (*model.BlogPost, error) { - var blog = model.BlogPost{} - - err := db.Get(&blog, "SELECT * FROM blogpost WHERE id=$1", id) - if err != nil { - return nil, err - } - - return &blog, nil -} - -func GetBlogPosts(db *sqlx.DB, onlyVisible bool, limit int, offset int) ([]*model.BlogPost, error) { - var blogs = []*model.BlogPost{} - - query := "SELECT * FROM blogpost ORDER BY created_at" - if onlyVisible { - query = "SELECT * FROM blogpost WHERE visible=true ORDER BY created_at" - } - - var err error - if limit < 0 { - err = db.Select(&blogs, query) - } else { - err = db.Select(&blogs, query + " LIMIT $1 OFFSET $2", limit, offset) - } - if err != nil { - return nil, err - } - - // for range 4 { - // blog := *blogs[len(blogs)-1] - // blog.CreatedAt = blog.CreatedAt.Add(time.Hour * -5000) - // blogs = append(blogs, &blog) - // } - - return blogs, nil -} - -func CreateBlogPost(db *sqlx.DB, post *model.BlogPost) error { - _, err := db.Exec( - "INSERT INTO blogpost (id,title,description,visible,author,markdown,html,bluesky_actor,bluesky_post) " + - "VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)", - post.ID, - post.Title, - post.Description, - post.Visible, - post.AuthorID, - post.Markdown, - post.HTML, - post.BlueskyActorID, - post.BlueskyPostID, - ) - - return err -} - -func UpdateBlogPost(db *sqlx.DB, postID string, post *model.BlogPost) error { - _, err := db.Exec( - "UPDATE blogpost SET " + - "id=$2,title=$3,description=$4,visible=$5,author=$6,markdown=$7,html=$8,bluesky_actor=$9,bluesky_post=$10,modified_at=CURRENT_TIMESTAMP " + - "WHERE id=$1", - postID, - post.ID, - post.Title, - post.Description, - post.Visible, - post.AuthorID, - post.Markdown, - post.HTML, - post.BlueskyActorID, - post.BlueskyPostID, - ) - - return err -} diff --git a/controller/migrator.go b/controller/migrator.go index ac3c419..4b99b9c 100644 --- a/controller/migrator.go +++ b/controller/migrator.go @@ -8,7 +8,7 @@ import ( "github.com/jmoiron/sqlx" ) -const DB_VERSION int = 5 +const DB_VERSION int = 4 func CheckDBVersionAndMigrate(db *sqlx.DB) { db.MustExec("CREATE SCHEMA IF NOT EXISTS arimelody") @@ -49,10 +49,6 @@ func CheckDBVersionAndMigrate(db *sqlx.DB) { ApplyMigration(db, "003-fail-lock") oldDBVersion = 4 - case 4: - ApplyMigration(db, "004-blog") - oldDBVersion = 5 - } } diff --git a/model/blog.go b/model/blog.go index d341154..7f0c87b 100644 --- a/model/blog.go +++ b/model/blog.go @@ -1,7 +1,6 @@ package model import ( - "database/sql" "fmt" "html/template" "regexp" @@ -10,22 +9,20 @@ import ( ) type ( - BlogPost struct { - ID string `db:"id"` - Title string `db:"title"` - Description string `db:"description"` - Visible bool `db:"visible"` - CreatedAt time.Time `db:"created_at"` - ModifiedAt sql.NullTime `db:"modified_at"` - AuthorID string `db:"author"` - Markdown string `db:"markdown"` - HTML template.HTML `db:"html"` - BlueskyActorID *string `db:"bluesky_actor"` - BlueskyPostID *string `db:"bluesky_post"` + Blog struct { + Title string `db:"title"` + Description string `db:"description"` + Visible bool `db:"visible"` + Date time.Time `db:"date"` + AuthorID string `db:"author"` + Markdown string `db:"markdown"` + HTML template.HTML `db:"html"` + BlueskyActorID string `db:"bsky_actor"` + BlueskyPostID string `db:"bsky_post"` } ) -func (b *BlogPost) TitleNormalised() string { +func (b *Blog) TitleNormalised() string { rgx := regexp.MustCompile(`[^a-z0-9\-]`) return rgx.ReplaceAllString( strings.ReplaceAll( @@ -35,17 +32,10 @@ func (b *BlogPost) TitleNormalised() string { ) } -func (b *BlogPost) GetMonth() string { - return fmt.Sprintf("%02d", int(b.CreatedAt.Month())) +func (b *Blog) GetMonth() string { + return fmt.Sprintf("%02d", int(b.Date.Month())) } -func (b *BlogPost) PrintDate() string { - return b.CreatedAt.Format("2 January 2006, 03:04") -} - -func (b *BlogPost) PrintModifiedDate() string { - if !b.ModifiedAt.Valid { - return "" - } - return b.ModifiedAt.Time.Format("2 January 2006, 03:04") +func (b *Blog) PrintDate() string { + return b.Date.Format("02 January 2006") } diff --git a/model/bluesky.go b/model/bluesky.go index f04d9db..dd8391e 100644 --- a/model/bluesky.go +++ b/model/bluesky.go @@ -55,7 +55,7 @@ type ( func (record *Record) CreatedAtPrint() (string, error) { t, err := record.CreatedAtTime() if err != nil { return "", err } - return t.Format("2 Jan 2006, 15:04"), nil + return t.Format("15:04, 2 February 2006"), nil } func (record *Record) CreatedAtTime() (time.Time, error) { diff --git a/public/img/blog/bluesky-dark.svg b/public/img/blog/bluesky-dark.svg deleted file mode 100644 index e3fe1a9..0000000 --- a/public/img/blog/bluesky-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/bluesky-light.svg b/public/img/blog/bluesky-light.svg deleted file mode 100644 index f0eea97..0000000 --- a/public/img/blog/bluesky-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/boost-dark.svg b/public/img/blog/boost-dark.svg deleted file mode 100644 index 7d0a7bb..0000000 --- a/public/img/blog/boost-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/boost-light.svg b/public/img/blog/boost-light.svg deleted file mode 100644 index be2d14f..0000000 --- a/public/img/blog/boost-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/comment-dark.svg b/public/img/blog/comment-dark.svg deleted file mode 100644 index 79f0de5..0000000 --- a/public/img/blog/comment-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/comment-light.svg b/public/img/blog/comment-light.svg deleted file mode 100644 index 2e3e8f7..0000000 --- a/public/img/blog/comment-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/copy-link-dark.svg b/public/img/blog/copy-link-dark.svg deleted file mode 100644 index 5155a70..0000000 --- a/public/img/blog/copy-link-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/copy-link-light.svg b/public/img/blog/copy-link-light.svg deleted file mode 100644 index b6fa5a6..0000000 --- a/public/img/blog/copy-link-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/like-dark.svg b/public/img/blog/like-dark.svg deleted file mode 100644 index 634bf6f..0000000 --- a/public/img/blog/like-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/blog/like-light.svg b/public/img/blog/like-light.svg deleted file mode 100644 index fb5c7ea..0000000 --- a/public/img/blog/like-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/script/blog.js b/public/script/blog.js index 73d34a3..6b9fee4 100644 --- a/public/script/blog.js +++ b/public/script/blog.js @@ -1,15 +1,19 @@ -import { hijackClickEvent } from "./main.js"; +document.addEventListener('DOMContentLoaded', () => { + document.querySelectorAll('.comment-hover').forEach((/** @type {HTMLDivElement} */ comment) => { + /** @type {HTMLLinkElement} */ + const commentBody = comment.querySelector('a.comment-body'); -document.querySelectorAll('article.blog-post').forEach(element => { - const link = element.querySelector('.blog-title a'); - hijackClickEvent(element, link); -}); -document.querySelectorAll('article.blog-post').forEach(element => { - const link = element.querySelector('.blog-title a'); - hijackClickEvent(element, link); -}); + comment.querySelectorAll('a').forEach((/** @type {HTMLLinkElement} */ element) => { + element.addEventListener('click', event => { + event.stopPropagation(); + }); + }); -document.getElementById('load-more').addEventListener('click', event => { - event.preventDefault(); - alert('ok'); + comment.addEventListener('click', () => { + commentBody.click(); + }); + + comment.style.cursor = 'pointer'; + comment.role = 'link'; + }); }); diff --git a/public/script/blogpost.js b/public/script/blogpost.js deleted file mode 100644 index fac626e..0000000 --- a/public/script/blogpost.js +++ /dev/null @@ -1,16 +0,0 @@ -import { hijackClickEvent } from "./main.js"; - -document.querySelectorAll('.comment-hover').forEach((/** @type {HTMLDivElement} */ comment) => { - /** @type {HTMLLinkElement} */ - const commentDate = comment.querySelector('.comment-date'); - hijackClickEvent(comment, commentDate); -}); - -document.getElementById('blog-copy-link').addEventListener('click', event => { - event.preventDefault(); - if (navigator.clipboard === undefined) { - console.error("clipboard is not supported by this browser!"); - return; - } - navigator.clipboard.writeText(location.protocol + "//" + location.host + location.pathname); -}); diff --git a/public/style/blog.css b/public/style/blog.css index 07b8089..19d87b4 100644 --- a/public/style/blog.css +++ b/public/style/blog.css @@ -1,70 +1,216 @@ -article.blog-post { - margin-bottom: 1rem; - padding: 1.5rem; - border: 1px solid #8882; - border-radius: 4px; - background-color: #ffffff08; - transition: background-color .1s; - text-decoration: none; - cursor: pointer; +:root { + --like: rgb(223, 104, 104); + --repost: rgb(162, 223, 73); + --bluesky: rgb(16, 131, 254); + --mastodon: rgb(86, 58, 204); } -.blog-post h2:hover, -.blog-post p:hover { - background: none; +main { + width: min(calc(100% - 4rem), 1200px); + margin: 0 auto 1rem auto; } -.blog-title { - margin: 0; -} -.blog-title a { - display: inherit; - text-wrap: nowrap; - text-overflow: ellipsis; - overflow: hidden; +.blog p:hover, +.comment p:hover { + background: inherit; } -.blog-meta { - margin: 0; -} - -.blog-author { - margin: 0; - font-size: .8em; -} -.blog-author img { - width: 1.3em; - height: 1.3em; - display: inline-block; - transform: translate(0, 4px); - border-radius: 4px; +article.blog { + font-family: 'Lora', serif; + font-size: 24px; } .blog-date { - margin: 0; - font-size: .8em; + margin-top: -1em; opacity: .75; } -.blog-description { - margin: .5em 0 0 0; - display: -webkit-box; - font-size: .8em; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - overflow: hidden; +.blog p { + line-height: 1.5em; } -#load-more { - margin: 0 auto; - padding: .5em 2em; +.blog sub { + opacity: .75; +} + +.blog pre { + max-height: 15em; + padding: .5em; + font-size: .9em; + border: 1px solid #8884; + border-radius: 2px; + overflow: scroll; + background: var(--background-alt); +} + +.blog p code { + padding: .2em .3em; + font-size: .9em; + border: 1px solid #8884; + border-radius: 2px; + background: var(--background-alt); +} + +.blog img { + max-height: 50%; + max-width: 100%; + display: block; - font-family: inherit; - font-size: inherit; } -@media screen and (max-width: 1500px) { - #blog-sidebar { - display: none; - } +.blog i.end-mark { + width: 1.2em; + height: 1.2em; + margin-top: -.2em; + + display: inline-block; + transform: translateY(.2em); + + background: url("/img/aridoodle.png"); + background-size: contain; + background-repeat: no-repeat; + background-position: center; +} + + + +/* COMMENTS */ + +.interactions { + margin: 1em 0; + display: flex; + flex-direction: row; + gap: .5em; + flex-wrap: wrap; +} + +.btn { + display: inline-block; + padding: .4em .6em; + border: 1px solid var(--on-background); + border-radius: 2px; + color: inherit; + text-decoration: none; + font-weight: 600; +} + +.interactions .likes, +.interactions .reposts { + padding: 0 .5em; + min-width: fit-content; + font-family: monospace; + text-align: center; + line-height: 2em; + border: 1px solid var(--on-background); + border-radius: 2px; + text-wrap: nowrap; +} + +.interactions .likes { + border-color: var(--on-background); +} +.interactions .reposts { + border-color: var(--on-background); +} + +.comment-callout { + padding: 1em; + background: var(--background-alt); + border-radius: 2px; + border: 1px solid #8884; + text-align: center; +} +.comment-callout:hover { + background: var(--background-alt); +} + +.btn.bluesky, +.btn.mastodon { + font-family: monospace; + text-wrap: nowrap; + text-decoration: none; + transition-property: color background-color; + transition-duration: .1s; +} + +.btn.bluesky { + color: var(--bluesky); + border-color: var(--bluesky); +} +.btn.bluesky:hover { + background-color: var(--bluesky); + color: #fff; +} + +.btn.mastodon { + color: var(--mastodon); + border-color: var(--mastodon); +} +.btn.mastodon:hover { + background-color: var(--mastodon); + color: #fff; +} + +.comment { + font-family: 'Inter', 'Arial', sans-serif; + font-size: 1em; +} + +.comment .comment-hover { + padding: 1em; + transition: background-color .1s; +} + +.comment .comment-hover:hover { + background-color: #8881; +} + +.comment .comment-header a { + display: flex; + gap: .5em; + font-weight: 600; + color: var(--primary); + text-decoration: none; + align-items: center; + overflow: hidden; + text-overflow: ellipsis; +} + +.comment .comment-header a .display-name { + overflow: inherit; + text-overflow: inherit; +} + +.comment .comment-header a .handle { + opacity: .5; + font-family: monospace; + font-size: .9em; + overflow: inherit; + text-overflow: inherit; +} + +.comment .comment-header img.avatar { + width: 1.5em; + height: 1.5em; +} + +.comment .comment-body { + color: inherit; + text-decoration: none; +} + +.comment p.comment-text { + margin: .5em 0; + white-space: break-spaces; +} + +.comment .comment-footer { + margin: 0; + font-size: .8em; + opacity: .5; +} + +.comment .comment-replies { + margin-left: 1em; + border-left: 2px solid #8884; } diff --git a/public/style/blogpost.css b/public/style/blogpost.css deleted file mode 100644 index 47145fe..0000000 --- a/public/style/blogpost.css +++ /dev/null @@ -1,314 +0,0 @@ -:root { - --like: rgb(223, 104, 104); - --boost: rgb(162, 223, 73); - --bluesky: rgb(16, 131, 254); - --mastodon: rgb(86, 58, 204); -} - -main { - width: min(calc(100% - 4rem), 1200px); - margin: 0 auto 1rem auto; -} - -#blog-sidebar { - position: fixed; - width: 3em; - padding: 3em; - transform: translate(-9em, -1em); - overflow: clip; - opacity: .5; - transition: opacity .2s; -} -#blog-sidebar:hover { - opacity: 1; -} - -#blog-sidebar ul { - margin: 0; - padding: .3em; - list-style: none; - display: flex; - flex-direction: column; - gap: .3em; - border-radius: 4px; - border: 1px solid var(--on-background); - box-shadow: 4px 4px 4px #0001; -} - -#blog-sidebar a { - width: 35px; - height: 35px; - display: block; - padding: .2em; - border-radius: 2px; - text-decoration: none; -} -#blog-sidebar a:hover { - background: #0001; -} -#blog-sidebar a:active { - background: #0002; -} - -#blog-sidebar a img { - display: block; - width: 100%; - height: 100%; - object-fit: contain; -} - -#blog-sidebar span { - width: 100%; - height: 100%; - display: flex; - justify-content: center; - align-items: center; - font-size: 1.5em; -} - -#blog-sidebar hr { - margin: 0; -} - -.blog p:hover, -.comment p:hover { - background: inherit; -} - -article.blog { - font-size: 22px; -} - -.blog h1 { - margin-bottom: 0; - font-size: 1.8em; -} - -.blog-author { - margin: .2em 0; -} -.blog .blog-author img { - width: 1.3em; - height: 1.3em; - display: inline-block; - transform: translate(0, 6px); - border-radius: 4px; -} - -.blog-date { - margin: .5em 0; - font-size: .7em; -} -.blog-modified-date { - font-style: italic; - opacity: .75; -} - -#blog-content { - font-family: 'Lora', serif; -} - -.blog p { - line-height: 1.5em; -} - -.blog sub { - opacity: .75; -} - -.blog pre { - max-height: 15em; - padding: .5em; - font-size: .9em; - border: 1px solid #8884; - border-radius: 2px; - overflow: scroll; - background: var(--background-alt); -} - -.blog p code { - padding: .2em .3em; - font-size: .9em; - border: 1px solid #8884; - border-radius: 2px; - background: var(--background-alt); -} - -.blog img { - max-height: 50%; - max-width: 100%; - - display: block; -} - -.blog i.end-mark { - width: 1.2em; - height: 1.2em; - margin-top: -.2em; - - display: inline-block; - transform: translateY(.2em); - - background: url("/img/aridoodle.png"); - background-size: contain; - background-repeat: no-repeat; - background-position: center; -} - - - -/* COMMENTS */ - -#interactions { - margin: 1em 0; - display: flex; - flex-direction: row; - gap: .5em; - flex-wrap: wrap; - align-items: center; -} - -.btn { - display: inline-block; - padding: .4em .6em; - border: 1px solid var(--on-background); - border-radius: 2px; - color: inherit; - text-decoration: none; - font-weight: 600; -} - -#interactions button { - min-width: fit-content; - padding: 0 .75em 0 .5em; - - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - gap: .5em; - - font-family: monospace; - font-size: inherit; - text-align: center; - line-height: 2em; - text-wrap: nowrap; - - color: inherit; - background: none; - border: 1px solid var(--on-background); - border-radius: 4px; -} -#interactions button:hover { - background: #0001; -} -#interactions button:active { - background: #0002; -} - -#interactions img { - width: 1.5em; - height: 1.5em; - display: inline-block; -} - -.comment-callout { - margin: 0 0 0 1em; -} -.comment-callout:hover { - background: none; -} - -.bluesky { - color: var(--bluesky); -} - -.mastodon { - color: var(--mastodon); -} - -.comment { - font-family: 'Inter', 'Arial', sans-serif; - font-size: 1em; -} - -.comment .comment-hover { - padding: 1em; - transition: background-color .1s; - cursor: pointer; -} - -.comment .comment-hover:hover { - background-color: #8881; -} - -.comment .comment-header a { - display: flex; - gap: .5em; - font-weight: 600; - color: var(--primary); - text-decoration: none; - align-items: center; - overflow: hidden; - text-overflow: ellipsis; -} - -.comment .comment-header a .display-name { - overflow: inherit; - text-overflow: inherit; -} - -.comment .comment-header a .handle { - opacity: .5; - font-family: monospace; - font-size: .9em; - overflow: inherit; - text-overflow: inherit; -} - -.comment .comment-header img.avatar { - width: 1.5em; - height: 1.5em; - border-radius: 4px; -} - -.comment .comment-body { - color: inherit; - text-decoration: none; -} - -.comment p.comment-text { - margin: .5em 0; - white-space: break-spaces; -} - -.comment .comment-footer { - margin: 0; - font-size: .8em; -} - -.comment .comment-footer .comment-footer-static { - opacity: .5; -} - -.comment .comment-replies { - margin-left: 1em; - border-left: 2px solid #8884; -} - -.comment .comment-date { - transition: opacity .2s; -} - -@media screen and (prefers-color-scheme: dark) { - #blog-sidebar a:hover { - background: #fff2; - } - #blog-sidebar a:active { - background: #fff4; - } - - .comment-date { - opacity: .5; - } -} diff --git a/public/style/main.css b/public/style/main.css index 0a4bc95..680ee2b 100644 --- a/public/style/main.css +++ b/public/style/main.css @@ -38,7 +38,7 @@ a:hover { text-decoration: underline; } -.link-button { +a.link-button { padding: .3em .5em; border: 1px solid var(--links); color: var(--links); @@ -51,7 +51,7 @@ a:hover { opacity: 0; } -.link-button:hover { +a.link-button:hover { color: #eee; border-color: #eee; background-color: var(--links) !important; @@ -141,23 +141,8 @@ a#backtotop:hover { } } -.light-only { - display: none; -} - -.dark-only { - display: inherit; -} @media (prefers-color-scheme: light) { - .light-only { - display: inherit; - } - - .dark-only { - display: none; - } - a.link-button:hover { box-shadow: none; } @@ -176,14 +161,6 @@ a#backtotop:hover { } @media (prefers-color-scheme: dark) { - .light-only { - display: none; - } - - .dark-only { - display: inherit; - } - body.crt { text-shadow: 0 0 3em; } diff --git a/schema-migration/000-init.sql b/schema-migration/000-init.sql index 42dbd63..90385ac 100644 --- a/schema-migration/000-init.sql +++ b/schema-migration/000-init.sql @@ -127,39 +127,17 @@ ALTER TABLE arimelody.musicreleasetrack ADD CONSTRAINT musicreleasetrack_pk PRIM -CREATE TABLE arimelody.blogpost ( - id TEXT NOT NULL UNIQUE, - title TEXT NOT NULL, - description TEXT NOT NULL, - visible BOOLEAN NOT NULL DEFAULT FALSE, - created_at TIMESTAMP NOT NULL DEFAULT current_timestamp, - modified_at TIMESTAMP, - author UUID NOT NULL, - markdown TEXT NOT NULL, - html TEXT NOT NULL, - bluesky_actor TEXT, - bluesky_post TEXT -); -ALTER TABLE arimelody.blogpost ADD CONSTRAINT blogpost_pk PRIMARY KEY (id); - - - -- -- Foreign keys -- --- Account ALTER TABLE arimelody.privilege ADD CONSTRAINT privilege_account_fk FOREIGN KEY (account) REFERENCES account(id) ON DELETE CASCADE; ALTER TABLE arimelody.session ADD CONSTRAINT session_account_fk FOREIGN KEY (account) REFERENCES account(id) ON DELETE CASCADE; ALTER TABLE arimelody.session ADD CONSTRAINT session_attempt_account_fk FOREIGN KEY (account) REFERENCES account(id) ON DELETE CASCADE; ALTER TABLE arimelody.totp ADD CONSTRAINT totp_account_fk FOREIGN KEY (account) REFERENCES account(id) ON DELETE CASCADE; --- Music ALTER TABLE arimelody.musiccredit ADD CONSTRAINT musiccredit_artist_fk FOREIGN KEY (artist) REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE arimelody.musiccredit ADD CONSTRAINT musiccredit_release_fk FOREIGN KEY (release) REFERENCES musicrelease(id) ON DELETE CASCADE; ALTER TABLE arimelody.musiclink ADD CONSTRAINT musiclink_release_fk FOREIGN KEY (release) REFERENCES musicrelease(id) ON UPDATE CASCADE ON DELETE CASCADE; ALTER TABLE arimelody.musicreleasetrack ADD CONSTRAINT music_pair_trackref_fk FOREIGN KEY (release) REFERENCES musicrelease(id) ON DELETE CASCADE; ALTER TABLE arimelody.musicreleasetrack ADD CONSTRAINT music_pair_releaseref_fk FOREIGN KEY (track) REFERENCES musictrack(id) ON DELETE CASCADE; - --- Blog -ALTER TABLE arimelody.blogpost ADD CONSTRAINT blogpost_author_fk FOREIGN KEY (author) REFERENCES account(id) ON DELETE CASCADE; diff --git a/schema-migration/004-blog.sql b/schema-migration/004-blog.sql deleted file mode 100644 index 6e613f0..0000000 --- a/schema-migration/004-blog.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE arimelody.blogpost ( - id TEXT NOT NULL UNIQUE, - title TEXT NOT NULL, - description TEXT NOT NULL, - visible BOOLEAN NOT NULL DEFAULT FALSE, - created_at TIMESTAMP NOT NULL DEFAULT current_timestamp, - modified_at TIMESTAMP, - author UUID NOT NULL, - markdown TEXT NOT NULL, - html TEXT NOT NULL, - bluesky_actor TEXT, - bluesky_post TEXT -); -ALTER TABLE arimelody.blogpost ADD CONSTRAINT blogpost_pk PRIMARY KEY (id); -ALTER TABLE arimelody.blogpost ADD CONSTRAINT blogpost_author_fk FOREIGN KEY (author) REFERENCES account(id) ON DELETE CASCADE; diff --git a/templates/templates.go b/templates/templates.go index 9cfbd23..7e344fb 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -33,10 +33,3 @@ var BlogTemplate = template.Must(template.ParseFiles( filepath.Join("view", "prideflag.html"), filepath.Join("view", "blog.html"), )) -var BlogPostTemplate = template.Must(template.ParseFiles( - filepath.Join("view", "layout.html"), - filepath.Join("view", "header.html"), - filepath.Join("view", "footer.html"), - filepath.Join("view", "prideflag.html"), - filepath.Join("view", "blogpost.html"), -)) diff --git a/view/blog.go b/view/blog.go index 3567818..1f3bb1d 100644 --- a/view/blog.go +++ b/view/blog.go @@ -5,9 +5,7 @@ import ( "html/template" "net/http" "os" - "slices" - "strconv" - "strings" + "time" "arimelody-web/controller" "arimelody-web/model" @@ -18,26 +16,14 @@ import ( "github.com/gomarkdown/markdown/parser" ) -type ( - BlogView struct { - Collections []*BlogViewPostCollection - } - - BlogViewPostCollection struct { - Name string - Posts []*BlogPostView - } - - BlogPostView struct { - *model.BlogPost - Author *model.Account - Comments []*model.ThreadViewPost - Likes int - Boosts int - BlueskyURL string - MastodonURL string - } -) +type BlogView struct { + *model.Blog + Comments []*model.ThreadViewPost + Likes int + Reposts int + BlueskyURL string + MastodonURL string +} var mdRenderer = html.NewRenderer(html.RendererOptions{ Flags: html.CommonFlags | html.HrefTargetBlank, @@ -45,105 +31,78 @@ var mdRenderer = html.NewRenderer(html.RendererOptions{ func BlogHandler(app *model.AppState) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if strings.Count(r.URL.Path, "/") > 1 { - http.NotFound(w, r) - return - } + blog := model.Blog{ + Title: "hello world!", + Description: "lorem ipsum yadda yadda something boobies babababababababa", + Visible: true, + Date: time.Now(), + AuthorID: "ari", + Markdown: +` +**i'm ari!** - if len(r.URL.Path) > 1 { - ServeBlogPost(app, r.URL.Path[1:]).ServeHTTP(w, r) - return - } +she/her 🏳️‍⚧️🏳️‍🌈💫🦆🇮🇪 - dbPosts, err := controller.GetBlogPosts(app.DB, true, -1, 0) - if err != nil { - if strings.Contains(err.Error(), "no rows") { - http.NotFound(w, r) - return - } - fmt.Fprintf(os.Stderr, "WARN: Failed to fetch blog posts: %v\n", err) - http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) - return - } +i'm a musician, developer, streamer, youtuber, and probably a bunch of other things i forgot to mention! - collections := []*BlogViewPostCollection{} - posts := []*BlogPostView{} - collectionYear := 0 - for i, post := range dbPosts { - author, err := controller.GetAccountByID(app.DB, post.AuthorID) - if err != nil { - fmt.Fprintf(os.Stderr, "WARN: Failed to retrieve author of blog %s: %v\n", post.ID, err) - continue - } +you're very welcome to take a look around my little space on the internet here, or explore any of the other parts i inhabit! - if i == 0 { - collectionYear = post.CreatedAt.Year() - } +if you're looking to support me financially, that's so cool of you!! if you like, you can buy some of my music over on bandcamp so you can at least get something for your money. thank you very much either way!! 💕 - if post.CreatedAt.Year() != collectionYear || i == len(dbPosts) - 1 { - if i == len(dbPosts) - 1 { - posts = append(posts, &BlogPostView{ - BlogPost: post, - Author: author, - }) - } - postsCopy := slices.Clone(posts) - collections = append(collections, &BlogViewPostCollection{ - Name: strconv.Itoa(collectionYear), - Posts: postsCopy, - }) - posts = []*BlogPostView{} - collectionYear = post.CreatedAt.Year() - } +for anything else, you can reach me for any and all communications through ari@arimelody.me. if your message contains anything beyond a silly gag, i strongly recommend encrypting your message using my public pgp key, listed below! - posts = append(posts, &BlogPostView{ - BlogPost: post, - Author: author, - }) - } +thank you for stopping by- i hope you have a lovely rest of your day! 💫 - err = templates.BlogTemplate.Execute(w, BlogView{ - Collections: collections, - }) - if err != nil { - fmt.Fprintf(os.Stderr, "WARN: Error rendering blog post: %v\n", err) - http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) - return - } - }) +## metadata + +**my colours 🌈** + +- primary: #b7fd49 +- secondary: #f8e05b +- tertiary: #f788fe + +**my keys 🔑** + +- pgp: [[link]](/keys/ari%20melody_0x92678188_public.asc) +- ssh (ed25519): [[link]](/keys/id_ari_ed25519.pub) + +**where to find me 🛰️** + +- youtube +- twitch +- spotify +- bandcamp +- github + +**projects i've worked on 🛠️** + +- catdance +- pride flag +- ipaddrgen +- impact meme +- OpenTerminal +- Silver.js + +### code block test + +~~~ c +#include + +int main(int argc, char *argv[]) { + printf("hello world!~\n"); + return 0; } +~~~ -func ServeBlogPost(app *model.AppState, blogPostID string) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - blog, err := controller.GetBlogPost(app.DB, blogPostID) - if err != nil { - if strings.Contains(err.Error(), "no rows") { - http.NotFound(w, r) - return - } - fmt.Fprintf(os.Stderr, "WARN: Failed to fetch blog post Bluesky thread: %v\n", err) - http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) - return - } +### aridoodle - if !blog.Visible { - session, err := controller.GetSessionFromRequest(app, r) - if err != nil { - fmt.Fprintf(os.Stderr, "WARN: Failed to retrieve session: %v\n", err) - http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) - return - } +this is `+"`"+`aridoodle`+"`"+`. please take care of her. - if session == nil || session.Account == nil { - http.NotFound(w, r) - return - } - } - - author, err := controller.GetAccountByID(app.DB, blog.AuthorID) - if err != nil { - fmt.Fprintf(os.Stderr, "WARN: Failed to retrieve author of blog %s: %v\n", blog.ID, err) - } +![aridoodle](/img/aridoodle.png) +`, + BlueskyActorID: "did:plc:yct6cvgfipngizry5umzkxr3", + BlueskyPostID: "3llsudsx7pc2u", + } // blog.Markdown += " " @@ -152,32 +111,23 @@ func ServeBlogPost(app *model.AppState, blogPostID string) http.Handler { blog.HTML = template.HTML(markdown.Render(md, mdRenderer)) comments := []*model.ThreadViewPost{} - likeCount := 0 - boostCount := 0 - var blueskyURL string - var blueskyPost *model.ThreadViewPost - if blog.BlueskyActorID != nil && blog.BlueskyPostID != nil { - blueskyPost, err = controller.FetchThreadViewPost(*blog.BlueskyActorID, *blog.BlueskyPostID) - if err != nil { - fmt.Fprintf(os.Stderr, "WARN: Failed to fetch blog post Bluesky thread: %v\n", err) - } else { - comments = append(comments, blueskyPost.Replies...) - likeCount += blueskyPost.Post.LikeCount - boostCount += blueskyPost.Post.RepostCount - blueskyURL = fmt.Sprintf("https://bsky.app/profile/%s/post/%s", blueskyPost.Post.Author.Handle, *blog.BlueskyPostID) - } - } + blueskyPost, err := controller.FetchThreadViewPost(blog.BlueskyActorID, blog.BlueskyPostID) + if err != nil { + fmt.Fprintf(os.Stderr, "WARN: Failed to fetch blog post Bluesky thread: %v\n", err) + } else { + comments = append(comments, blueskyPost.Replies...) + } - err = templates.BlogPostTemplate.Execute(w, BlogPostView{ - BlogPost: blog, - Author: author, - Comments: comments, - Likes: likeCount, - Boosts: boostCount, - BlueskyURL: blueskyURL, + err = templates.BlogTemplate.Execute(w, BlogView{ + Blog: &blog, + Comments: blueskyPost.Replies, + Likes: blueskyPost.Post.LikeCount, + Reposts: blueskyPost.Post.RepostCount, + BlueskyURL: fmt.Sprintf("https://bsky.app/profile/%s/post/%s", blog.BlueskyActorID, blog.BlueskyPostID), + MastodonURL: "#", }) if err != nil { - fmt.Fprintf(os.Stderr, "WARN: Error rendering blog post: %v\n", err) + fmt.Fprintf(os.Stderr, "Error rendering blog post: %v\n", err) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) return } diff --git a/view/blog.html b/view/blog.html index d1bf56d..eb8c4a1 100644 --- a/view/blog.html +++ b/view/blog.html @@ -1,15 +1,15 @@ {{define "head"}} -blog - ari melody 💫 +{{.Title}} - ari melody 💫 - + - + - - + + - + @@ -18,34 +18,78 @@ {{define "content"}}
-

# blog

-

thoughts from your local SPACEGIRL 💫

+
+

{{.Title}}

+

Posted by {{.AuthorID}} @ {{.PrintDate}}

+ +
+ {{.HTML}} + +
-
- {{if eq (len .Collections) 0}} -

there are no posts! 🍃

- {{end}} - {{range .Collections}} -

{{.Name}}

- {{range .Posts}} -
-

{{.Title}}

-

- {{.Author.Username}}'s avatar {{.Author.Username}} - • {{.PrintDate}} -

- {{if ne .Description ""}} -

{{.Description}}

- {{end}} -
- {{end}} +
+ + 🔁 {{.Reposts}} +
+ +

+ join the conversation on + Bluesky 🦋 + + +

+ +
+ {{range .Comments}} + {{template "comment" .}} {{end}}
- - - +
{{end}} + +{{define "comment"}} +
+
+
+ + {{.Post.Author.DisplayName}}'s avatar + {{.Post.Author.DisplayName}} + @{{.Post.Author.Handle}} + +
+ +
+

{{.Post.Record.Text}}

+ {{if .Post.HasImage}} +

+ {{range .Post.Embed.Media.Images}} + [image] + {{end}} +

+ {{end}} +
+
+ {{.Post.LikeCount}} like{{if ne .Post.LikeCount 1}}s{{end}} + • + {{.Post.RepostCount}} repost{{if ne .Post.RepostCount 1}}s{{end}} + • + {{.Post.Record.CreatedAtPrint}} +
+ +
+ +
+ {{range .Replies}} + {{template "comment" .}} + {{end}} +
+
+{{end}} + diff --git a/view/blogpost.html b/view/blogpost.html deleted file mode 100644 index 6126eda..0000000 --- a/view/blogpost.html +++ /dev/null @@ -1,178 +0,0 @@ -{{define "head"}} -{{.Title}} - ari melody 💫 - - - - - - - - - - - - - - -{{end}} - -{{define "content"}} -
-
- -
-
-
-
-

# {{.Title}}

-

by {{.Author.Username}} {{.Author.Username}}'s avatar

-

posted {{.PrintDate}}{{if .ModifiedAt.Valid}} • updated {{.PrintModifiedDate}}{{end}}

-
- -
- -
- {{.HTML}} -
-
- - {{if ne .BlueskyURL ""}} -
- -
- - - -

- join the conversation on - Bluesky 🦋 - - -

-
- -
- {{range .Comments}} - {{template "comment" .}} - {{end}} -
- {{end}} - - -
-
-{{end}} - -{{define "comment"}} -
-
-
- - {{.Post.Author.DisplayName}}'s avatar - {{.Post.Author.DisplayName}} - @{{.Post.Author.Handle}} - -
-
-
-

{{.Post.Record.Text}}

- {{if .Post.HasImage}} -

- {{range .Post.Embed.Media.Images}} - [image] - {{end}} -

- {{end}} -
-
- - {{.Post.LikeCount}} like{{if ne .Post.LikeCount 1}}s{{end}} - • - {{.Post.RepostCount}} boost{{if ne .Post.RepostCount 1}}s{{end}} - • - - {{.Post.Record.CreatedAtPrint}} -
-
-
- -
- {{range .Replies}} - {{template "comment" .}} - {{end}} -
-
-{{end}} diff --git a/view/header.html b/view/header.html index 2457197..03a8384 100644 --- a/view/header.html +++ b/view/header.html @@ -21,11 +21,11 @@ home
  • - music + music
  • - blog + blog