lmika/weiro
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Have got asynchronous publishing working

Browse source
This commit is contained in:
Leon Mika 2026-02-23 21:35:12 +11:00
parent 3ea5823ca0
commit 4f7058bf36
9 changed files with 100 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
_test-site/posts/2026/02/23-be-a-comma.md Normal file
View file

@ -0,0 +1,10 @@
---
id: Uk11zptnUi3A
title: ""
date: 2026-02-23T10:28:37Z
tags: []
slug: /2026/02/23/be-a-comma
---
Be a comma than a full stop.
Also, this will be deleted soon.

6
main.go
View file

@ -1,6 +1,7 @@
package main
import (
"context"
"html"
"html/template"
"log"
@ -27,8 +28,11 @@ func main() {
defer dbp.Close()
publisherSvc := publisher.New(dbp)
publisherQueue := publisher.NewQueue(publisherSvc)
postService := posts.New(dbp, publisherSvc)
publisherQueue.Start(context.Background())
postService := posts.New(dbp, publisherQueue)
//user, err := dbp.SelectUserByUsername(context.Background(), "testuser")
//if err != nil {

5
services/posts/create.go
View file

@ -34,10 +34,7 @@ func (s *Service) PublishPost(ctx context.Context, params CreatePostParams) (*mo
return nil, err
}
// TODO: do on separate thread
if err := s.publisher.Publish(ctx, site); err != nil {
return nil, err
}
s.publisher.Queue(site)
return post, nil
}

45
services/posts/delete.go
View file

@ -12,16 +12,9 @@ const (
)
func (s *Service) DeletePost(ctx context.Context, pid int64, hardDelete bool) error {
site, ok := models.GetSite(ctx)
if !ok {
return models.SiteRequiredError
}
post, err := s.db.SelectPost(ctx, pid)
post, site, err := s.fetchPostAndSite(ctx, pid)
if err != nil {
return err
} else if post.SiteID != site.ID {
return models.NotFoundError
}
if hardDelete && post.DeletedAt.Unix() > 0 {
@ -30,17 +23,45 @@ func (s *Service) DeletePost(ctx context.Context, pid int64, hardDelete bool) er
return models.DeleteDebounceError
}
return s.db.HardDeletePost(ctx, post.ID)
if err := s.db.HardDeletePost(ctx, post.ID); err != nil {
return err
}
} else {
if err := s.db.SoftDeletePost(ctx, post.ID); err != nil {
return err
}
}
return s.db.SoftDeletePost(ctx, post.ID)
s.publisher.Queue(site)
return nil
}
func (s *Service) RestorePost(ctx context.Context, pid int64) error {
post, err := s.db.SelectPost(ctx, pid)
post, site, err := s.fetchPostAndSite(ctx, pid)
if err != nil {
return err
}
return s.db.RestorePost(ctx, post.ID)
if err := s.db.RestorePost(ctx, post.ID); err != nil {
return err
}
s.publisher.Queue(site)
return nil
}
func (s *Service) fetchPostAndSite(ctx context.Context, pid int64) (*models.Post, models.Site, error) {
site, ok := models.GetSite(ctx)
if !ok {
return nil, models.Site{}, models.SiteRequiredError
}
post, err := s.db.SelectPost(ctx, pid)
if err != nil {
return nil, models.Site{}, err
} else if post.SiteID != site.ID {
return nil, models.Site{}, models.NotFoundError
}
return post, site, nil
}

9
services/posts/list.go
View file

@ -21,16 +21,9 @@ func (s *Service) ListPosts(ctx context.Context, showDeleted bool) ([]*models.Po
}
func (s *Service) GetPost(ctx context.Context, pid int64) (*models.Post, error) {
site, ok := models.GetSite(ctx)
if !ok {
return nil, models.SiteRequiredError
}
post, err := s.db.SelectPost(ctx, pid)
post, _, err := s.fetchPostAndSite(ctx, pid)
if err != nil {
return nil, err
} else if post.SiteID != site.ID {
return nil, models.NotFoundError
}
return post, nil

4
services/posts/service.go
View file

@ -7,10 +7,10 @@ import (
type Service struct {
db *db.Provider
publisher *publisher.Publisher
publisher *publisher.Queue
}
func New(db *db.Provider, publisher *publisher.Publisher) *Service {
func New(db *db.Provider, publisher *publisher.Queue) *Service {
return &Service{
db: db,
publisher: publisher,

44
services/publisher/pqueue.go Normal file
View file

@ -0,0 +1,44 @@
package publisher
import (
"context"
"log"
"lmika.dev/lmika/weiro/models"
)
type Queue struct {
publisher *Publisher
pending chan models.Site
}
func NewQueue(publisher *Publisher) *Queue {
return &Queue{
publisher: publisher,
pending: make(chan models.Site, 1),
}
}
func (q *Queue) Queue(site models.Site) bool {
select {
case q.pending <- site:
return true
default:
return false
}
}
func (q *Queue) Start(ctx context.Context) {
go func() {
for {
select {
case site := <-q.pending:
if err := q.publisher.Publish(ctx, site); err != nil {
log.Printf("error publishing site: %v", err)
}
case <-ctx.Done():
return
}
}
}()
}

4
views/_common/nav.html
View file

@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid">
<a class="navbar-brand" href="#">Weiro</a>
<a class="navbar-brand" href="/">Weiro</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@ -8,7 +8,7 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Posts</a>
<a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/posts">Posts</a>
</li>
</ul>
<form class="d-flex align-items-center" role="search">

4
views/posts/index.html
View file

@ -33,11 +33,11 @@
</div>
{{ else }}
<div class="mb-3">
<a href="/sites/{{ $.site.ID }}/posts/{{ $p.ID }}/edit"
<a href="/sites/{{ $.site.ID }}/posts/{{ $p.ID }}/"
class="link-secondary link-offset-2 link-underline link-underline-opacity-0 link-underline-opacity-75-hover">Edit</a>
-
<a href="#" data-action="click->postlist#deletePost"
class="link-secondary link-offset-2 link-underline link-underline-opacity-0 link-underline-opacity-75-hover">Delete</a>
class="link-secondary link-offset-2 link-underline link-underline-opacity-0 link-underline-opacity-75-hover">Trash</a>
</div>
{{ end }}
</div>