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

Compare commits

base: lmika:feature/uploads
Branches Tags
lmika:main
lmika:feature/rss
lmika:feature/uploads
lmika:v0.1.0
..
compare: lmika:main
Branches Tags
lmika:main
lmika:feature/rss
lmika:feature/uploads
lmika:v0.1.0

6 commits
feature/up ... main

Author SHA1 Message Date
Leon Mika 76ed54f119 Added fallback if renaming cant move an upload 2026-03-05 22:48:38 +11:00
Leon Mika 891d904d9c Added error logging 2026-03-05 22:37:11 +11:00
Leon Mika 1b24386001 Added the scratch dir config 2026-03-05 22:27:14 +11:00
lmika 55b388d497 Merge pull request 'Added RSS and JSON feeds' (#2) from feature/rss into main 
Reviewed-on: #2
 2026-03-05 11:05:01 +00:00
Leon Mika 21f181f83d Added RSS and JSON feeds 2026-03-05 22:04:24 +11:00
lmika 65e5ce2733 Merge pull request 'Uploads' (#1) from feature/uploads into main 
Reviewed-on: #1
 2026-03-05 10:03:46 +00:00
19 changed files with 252 additions and 36 deletions
Show stats Expand all files Collapse all files

2
Dockerfile
View file

@ -25,6 +25,7 @@ FROM alpine:latest
RUN apk --no-cache add ca-certificates
RUN mkdir -p /data
RUN mkdir -p /scratch
WORKDIR /root/
@ -34,6 +35,7 @@ COPY --from=builder /app/static ./static
COPY --from=builder /app/views ./views
ENV DATA_DIR=/data
ENV SCRATCH_DIR=/scratch
EXPOSE 3000

2
cmds/server.go
View file

@ -116,7 +116,7 @@ Starting weiro without any arguments will start the server.
app.Post("/login", lh.DoLogin)
app.Post("/logout", lh.Logout)
siteGroup := app.Group("/sites/:siteID", middleware.RequireUser(svcs.Auth), middleware.RequiresSite(svcs.Sites))
siteGroup := app.Group("/sites/:siteID", middleware.LogErrors(), middleware.RequireUser(svcs.Auth), middleware.RequiresSite(svcs.Sites))
siteGroup.Get("/posts", ph.Index)
siteGroup.Get("/posts/new", ph.New)

2
config/config.go
View file

@ -9,7 +9,7 @@ import (
type Config struct {
DataDir string `env:"DATA_DIR"`
ScratchDir string `env:"SCRATCH_DIR"`
ScratchDir string `env:"SCRATCH_DIR,default=/tmp"`
SiteDomain string `env:"SITE_DOMAIN"`
LoginLocked bool `env:"LOGIN_LOCKED,default=false"`
Env string `env:"ENV,default=prod"`

1
go.mod
View file

@ -52,6 +52,7 @@ require (
github.com/gofiber/template/v2 v2.1.0 // indirect
github.com/gofiber/utils/v2 v2.0.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gopherlibs/feedhub v1.2.0 // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect

2
go.sum
View file

@ -279,6 +279,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherlibs/feedhub v1.2.0 h1:1nfM8gRoiA+VNjKc1FzrwiXkrBKsnAghA3PVvgAiSI0=
github.com/gopherlibs/feedhub v1.2.0/go.mod h1:vvQEZzTKr2KhO0mCdEUGfKLvUJFfO8U+WUpaMyoZttc=
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=

17
handlers/middleware/errlog.go Normal file
View file

@ -0,0 +1,17 @@
package middleware
import (
"log"
"github.com/gofiber/fiber/v3"
)
func LogErrors() func(c fiber.Ctx) error {
return func(c fiber.Ctx) error {
if err := c.Next(); err != nil {
log.Printf("error: %v\n", err)
return err
}
return nil
}
}

2
layouts/simplecss/layout_main.html
View file

@ -4,6 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ .Site.Title }}</title>
<link rel="alternate" type="application/rss+xml" title="RSS Feed" href="{{ url_abs "/feed.xml" }}"/>
<link rel="alternate" type="application/json" title="JSON feed" href="{{ url_abs "/feed.json" }}"/>
<link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
</head>
<body>

10
models/iters.go Normal file
View file

@ -0,0 +1,10 @@
package models
type Maybe[T any] struct {
Value T
Err error
}
func (m Maybe[T]) Get() (T, error) {
return m.Value, m.Err
}

7
models/pubmodel/sites.go
View file

@ -1,7 +1,9 @@
package pubmodel
import (
"context"
"io"
"iter"
"lmika.dev/lmika/weiro/models"
)
@ -9,8 +11,11 @@ import (
type Site struct {
models.Site
BaseURL string
Posts []*models.Post
//Posts []*models.Post
Uploads []models.Upload
OpenUpload func(u models.Upload) (io.ReadCloser, error)
// PostItr returns a new post iterator
PostIter func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]]
}

13
providers/db/gen/sqlgen/posts.sql.go
View file

@ -123,21 +123,28 @@ func (q *Queries) SelectPostByGUID(ctx context.Context, guid string) (Post, erro
const selectPostsOfSite = `-- name: SelectPostsOfSite :many
SELECT id, site_id, state, guid, title, body, slug, created_at, updated_at, published_at, deleted_at
FROM posts
WHERE site_id = ? AND (
WHERE site_id = ?1 AND (
CASE CAST (?2 AS TEXT)
WHEN 'deleted' THEN deleted_at > 0
ELSE deleted_at = 0
END
) ORDER BY created_at DESC LIMIT 10
) ORDER BY created_at DESC LIMIT ?4 OFFSET ?3
`
type SelectPostsOfSiteParams struct {
SiteID int64
PostFilter string
Offset int64
Limit int64
}
func (q *Queries) SelectPostsOfSite(ctx context.Context, arg SelectPostsOfSiteParams) ([]Post, error) {
rows, err := q.db.QueryContext(ctx, selectPostsOfSite, arg.SiteID, arg.PostFilter)
rows, err := q.db.QueryContext(ctx, selectPostsOfSite,
arg.SiteID,
arg.PostFilter,
arg.Offset,
arg.Limit,
)
if err != nil {
return nil, err
}

9
providers/db/posts.go
View file

@ -8,7 +8,12 @@ import (
"lmika.dev/lmika/weiro/providers/db/gen/sqlgen"
)
func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDeleted bool) ([]*models.Post, error) {
type PagingParams struct {
Limit int64
Offset int64
}
func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDeleted bool, pp PagingParams) ([]*models.Post, error) {
var filter = ""
if showDeleted {
filter = "deleted"
@ -17,6 +22,8 @@ func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDel
rows, err := db.queries.SelectPostsOfSite(ctx, sqlgen.SelectPostsOfSiteParams{
SiteID: siteID,
PostFilter: filter,
Limit: pp.Limit,
Offset: pp.Offset,
})
if err != nil {
return nil, err

102
providers/sitebuilder/builder.go
View file

@ -6,11 +6,13 @@ import (
"fmt"
"html/template"
"io"
"iter"
"os"
"path/filepath"
"sort"
"strings"
"time"
"github.com/gopherlibs/feedhub/feedhub"
"golang.org/x/sync/errgroup"
"lmika.dev/lmika/weiro/models"
"lmika.dev/lmika/weiro/models/pubmodel"
@ -47,10 +49,14 @@ func (b *Builder) BuildSite(outDir string) error {
return err
}
eg := errgroup.Group{}
eg, ctx := errgroup.WithContext(context.Background())
eg.Go(func() error {
for _, post := range b.site.Posts {
for mp := range b.site.PostIter(ctx) {
post, err := mp.Get()
if err != nil {
return err
}
if err := b.writePost(buildCtx, post); err != nil {
return err
}
@ -59,7 +65,14 @@ func (b *Builder) BuildSite(outDir string) error {
})
eg.Go(func() error {
if err := b.renderPostList(buildCtx, b.site.Posts); err != nil {
if err := b.renderPostList(buildCtx, b.site.PostIter(ctx)); err != nil {
return err
}
return nil
})
eg.Go(func() error {
if err := b.renderFeeds(buildCtx, b.site.PostIter(ctx)); err != nil {
return err
}
return nil
@ -79,14 +92,16 @@ func (b *Builder) BuildSite(outDir string) error {
return nil
}
func (b *Builder) renderPostList(ctx buildContext, postList []*models.Post) error {
func (b *Builder) renderPostList(ctx buildContext, postIter iter.Seq[models.Maybe[*models.Post]]) error {
// TODO: paging
postCopy := make([]*models.Post, len(postList))
copy(postCopy, postList)
sort.Slice(postCopy, func(i, j int) bool {
return postCopy[i].PublishedAt.After(postCopy[j].PublishedAt)
})
postCopy := make([]*models.Post, 0)
for mp := range postIter {
post, err := mp.Get()
if err != nil {
return err
}
postCopy = append(postCopy, post)
}
pl := postListData{
commonData: commonData{Site: b.site},
@ -104,6 +119,68 @@ func (b *Builder) renderPostList(ctx buildContext, postList []*models.Post) erro
})
}
func (b *Builder) renderFeeds(ctx buildContext, postIter iter.Seq[models.Maybe[*models.Post]]) error {
now := time.Now()
feed := &feedhub.Feed{
Title: b.site.Title,
Link: &feedhub.Link{Href: b.site.BaseURL},
Description: b.site.Tagline,
// TO FIX: Author
Created: now,
}
items := 0
for mp := range postIter {
post, err := mp.Get()
if err != nil {
return fmt.Errorf("failed to get post: %w", err)
}
renderedPost, err := b.renderPost(post)
if err != nil {
return err
}
feed.Items = append(feed.Items, &feedhub.Item{
Id: filepath.Join(b.site.BaseURL, post.GUID),
Title: post.Title,
Link: &feedhub.Link{Href: renderedPost.PostURL},
Content: string(renderedPost.HTML),
// TO FIX: Created should be first published
Created: post.PublishedAt,
Updated: post.UpdatedAt,
})
items++
if items >= b.opts.FeedItems {
break
}
}
if err := b.createAtPath(ctx, "/feed.xml", func(f io.Writer) error {
rss, err := feed.ToRss()
if err != nil {
return fmt.Errorf("failed to convert feed to RSS: %w", err)
}
_, err = io.WriteString(f, rss)
return err
}); err != nil {
return err
}
if err := b.createAtPath(ctx, "/feed.json", func(f io.Writer) error {
rss, err := feed.ToJSON()
if err != nil {
return fmt.Errorf("failed to convert feed to JSON feed: %w", err)
}
_, err = io.WriteString(f, rss)
return err
}); err != nil {
return err
}
return nil
}
func (b *Builder) renderPost(post *models.Post) (postSingleData, error) {
postPath := post.Slug
if b.opts.BasePosts != "" {
@ -115,10 +192,13 @@ func (b *Builder) renderPost(post *models.Post) (postSingleData, error) {
return postSingleData{}, fmt.Errorf("failed to write post %s: %w", post.Slug, err)
}
postURL := strings.TrimSuffix(b.site.BaseURL, "/") + "/" + strings.TrimPrefix(postPath, "/")
return postSingleData{
commonData: commonData{Site: b.site},
Path: postPath,
Post: post,
PostURL: postURL,
HTML: template.HTML(md.String()),
}, nil
}

10
providers/sitebuilder/tmpls.go
View file

@ -29,6 +29,9 @@ type Options struct {
// TemplatesFS provides the raw templates for rendering the site.
TemplatesFS fs.FS
// FeedItems holds the number of posts to show in the feed.
FeedItems int
RenderTZ *time.Location
}
@ -38,9 +41,10 @@ type commonData struct {
type postSingleData struct {
commonData
Post *models.Post
HTML template.HTML
Path string
Post *models.Post
HTML template.HTML
Path string
PostURL string
}
type postListData struct {

36
providers/uploadfiles/provider.go
View file

@ -26,12 +26,46 @@ func (p *Provider) AdoptFile(site models.Site, up models.Upload, filename string
return err
}
if err := os.Rename(filename, fullPath); err != nil {
if err := os.Rename(filename, fullPath); err == nil {
return nil
}
// Can't rename, possibly because of a cross-link device issue. So copy instead
if err := moveFile(filename, fullPath); err != nil {
return err
}
return nil
}
func moveFile(src, dst string) error {
if err := copyFile(src, dst); err != nil {
_ = os.Remove(dst)
return err
}
_ = os.Remove(src)
return nil
}
func copyFile(src, dst string) error {
in, err := os.Open(src)
if err != nil {
return err
}
defer in.Close()
out, err := os.Create(dst)
if err != nil {
return err
}
defer out.Close()
if _, err = io.Copy(out, in); err != nil {
return err
}
return err
}
func (p *Provider) OpenUpload(site models.Site, up models.Upload) (io.ReadCloser, error) {
fullPath := p.uploadFileName(site, up)
return os.Open(fullPath)

6
services/posts/create.go
View file

@ -17,6 +17,8 @@ type CreatePostParams struct {
}
func (s *Service) UpdatePost(ctx context.Context, params CreatePostParams) (*models.Post, error) {
now := time.Now()
site, ok := models.GetSite(ctx)
if !ok {
return nil, models.SiteRequiredError
@ -29,14 +31,14 @@ func (s *Service) UpdatePost(ctx context.Context, params CreatePostParams) (*mod
post.Title = params.Title
post.Body = params.Body
post.UpdatedAt = time.Now()
post.UpdatedAt = now
post.Slug = post.BestSlug()
oldState := post.State
switch strings.ToLower(params.Action) {
case "publish":
post.State = models.StatePublished
post.PublishedAt = time.Now()
post.PublishedAt = now
case "save draft":
post.State = models.StateDraft
post.PublishedAt = time.Time{}

6
services/posts/list.go
View file

@ -4,6 +4,7 @@ import (
"context"
"lmika.dev/lmika/weiro/models"
"lmika.dev/lmika/weiro/providers/db"
)
func (s *Service) ListPosts(ctx context.Context, showDeleted bool) ([]*models.Post, error) {
@ -12,7 +13,10 @@ func (s *Service) ListPosts(ctx context.Context, showDeleted bool) ([]*models.Po
return nil, models.SiteRequiredError
}
posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted)
posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted, db.PagingParams{
Offset: 0,
Limit: 25,
})
if err != nil {
return nil, err
}

37
services/publisher/iter.go Normal file
View file

@ -0,0 +1,37 @@
package publisher
import (
"context"
"iter"
"lmika.dev/lmika/weiro/models"
"lmika.dev/lmika/weiro/providers/db"
)
// PostIter returns a post iterator which returns posts in reverse chronological order.
func (s *Publisher) postIter(ctx context.Context, site int64) iter.Seq[models.Maybe[*models.Post]] {
return func(yield func(models.Maybe[*models.Post]) bool) {
paging := db.PagingParams{Offset: 0, Limit: 50}
page, err := s.db.SelectPostsOfSite(ctx, site, false, paging)
if err != nil {
yield(models.Maybe[*models.Post]{Err: err})
return
}
for {
for _, post := range page {
if !yield(models.Maybe[*models.Post]{Value: post}) {
return
}
}
paging.Offset += paging.Limit
page, err = s.db.SelectPostsOfSite(ctx, site, false, paging)
if err != nil {
yield(models.Maybe[*models.Post]{Err: err})
return
} else if len(page) == 0 {
return
}
}
}
}

20
services/publisher/service.go
View file

@ -3,6 +3,7 @@ package publisher
import (
"context"
"io"
"iter"
"log"
"os"
@ -38,12 +39,6 @@ func (p *Publisher) Publish(ctx context.Context, site models.Site) error {
return err
}
// Fetch all content of site
posts, err := p.db.SelectPostsOfSite(ctx, site.ID, false)
if err != nil {
return err
}
// Fetch all uploads of site
uploads, err := p.db.SelectUploadsOfSite(ctx, site.ID)
if err != nil {
@ -56,8 +51,10 @@ func (p *Publisher) Publish(ctx context.Context, site models.Site) error {
}
pubSite := pubmodel.Site{
Site: site,
Posts: posts,
Site: site,
PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] {
return p.postIter(ctx, site.ID)
},
BaseURL: target.BaseURL,
Uploads: uploads,
OpenUpload: func(u models.Upload) (io.ReadCloser, error) {
@ -77,6 +74,7 @@ func (p *Publisher) publishSite(ctx context.Context, pubSite pubmodel.Site, targ
sb, err := sitebuilder.New(pubSite, sitebuilder.Options{
BasePosts: "/posts",
TemplatesFS: simplecss.FS,
FeedItems: 30,
})
if err != nil {
return err
@ -88,7 +86,11 @@ func (p *Publisher) publishSite(ctx context.Context, pubSite pubmodel.Site, targ
if err := exporter.WriteSiteYAML(); err != nil {
return err
}
for _, p := range pubSite.Posts {
for mp := range pubSite.PostIter(ctx) {
p, err := mp.Get()
if err != nil {
return err
}
if err := exporter.WritePost(p); err != nil {
return err
}

4
sql/queries/posts.sql
View file

@ -1,12 +1,12 @@
-- name: SelectPostsOfSite :many
SELECT *
FROM posts
WHERE site_id = ? AND (
WHERE site_id = sqlc.arg(site_id) AND (
CASE CAST (sqlc.arg(post_filter) AS TEXT)
WHEN 'deleted' THEN deleted_at > 0
ELSE deleted_at = 0
END
) ORDER BY created_at DESC LIMIT 10;
) ORDER BY created_at DESC LIMIT sqlc.arg(limit) OFFSET sqlc.arg(offset);
-- name: SelectPost :one
SELECT * FROM posts WHERE id = ? LIMIT 1;