46 changed files with 48 additions and 1390 deletions
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@ -31,24 +31,19 @@ $container-max-widths: (
    font-size: 0.9rem;
 }

-// Large editor
-//
-// Used for edit canvases which take up the entire window
+// Post form

-.large-editor {
+// Post edit page styling
+.post-edit-page {
    height: 100vh;
 }

-.large-editor main {
+.post-edit-page main {
    display: flex;
    flex-direction: column;
    overflow: hidden;
 }

-// Post form
-
-// Post edit page styling
-
 .post-edit-page .post-form {
    flex: 1;
    display: flex;
--- a/assets/js/controllers/edit_upload.js
+++ b/assets/js/controllers/edit_upload.js
@ -1,233 +0,0 @@
-import feather from "feather-icons/dist/feather.js";
-import Handlebars from "handlebars";
-import {Controller} from "@hotwired/stimulus";
-
-Handlebars.registerHelper("submit_on", function (id, event) {
-    return `data-action="${event}->edit-upload#updateProcessor" data-edit-upload-id-param="${id}"`
-});
-
-const processorFrame = Handlebars.compile(`
-    <div class="card mb-3">
-      <div class="card-header d-flex justify-content-between align-items-center">
-        <span>{{name}}</span>
-        <a href="#" class="float-end"
-          data-action="edit-upload#removeProcessor"
-          data-edit-upload-id-param="{{id}}"
-        ><i data-feather="x" width="18" height="18"></i></a>
-      </div>
-      <div class="card-body">
-        <form data-role="processor-params" data-params-id="{{id}}">{{{props}}}</form>
-      </div>
-    </div>
-`);
-
-const processorUIs = {
-    "shadow": {
-        label: "Shadow",
-        template: Handlebars.compile(`
-            <div class="row mb-3 align-items-center">
-              <label for="{{id}}_color" class="col-sm col-form-label">Colour</label>
-              <div class="col-sm">
-                <input name="color" class="form-control" id="{{id}}_color" type="color" value="{{props.color}}" {{{submit_on id 'change'}}}>
-              </div>
-            </div>
-            <div class="row mb-3">
-              <label for="{{id}}_offset_y" class="col-sm col-form-label">Offset Y</label>
-              <div class="col-sm">
-                <input name="offset_y" class="form-control" id="{{id}}_{{props.color}}" type="number" value="{{props.offset_y}}" {{{submit_on id 'blur'}}}>
-              </div>
-            </div>
-        `),
-    },
-    "resize": {
-        label: "Resize",
-        template: Handlebars.compile(`
-            <div class="mb-3">
-              <label for="{{id}}_width" class="form-label">Width</label>
-              <input name="width" class="form-control" id="{{id}}_width">
-            </div>
-            <div class="mb-3">
-              <label for="{{id}}_height" class="form-label">Height</label>
-              <input name="width" class="form-control" id="{{id}}_width">
-            </div>
-        `),
-    },
-};
-
-export default class UploadEditController extends Controller {
-    static targets = ['processList', 'preview'];
-    static values = {
-        uploadId: Number,
-        siteId: Number,
-    };
-
-    connect() {
-        this._rebuildProcessList();
-        this._createSession();
-    }
-
-    async addProcessor(ev) {
-        ev.preventDefault();
-        await this._addProcessor({
-            type: "shadow"
-        });
-    }
-
-    async removeProcessor(ev) {
-        ev.preventDefault();
-        let id = ev.params.id;
-        await this._removeProcessor(id);
-    }
-
-    async saveUpload(ev) {
-        ev.preventDefault();
-        await this._save("replace");
-    }
-
-    async saveNewUpload(ev) {
-        ev.preventDefault();
-        await this._save("copy");
-    }
-
-    async updateProcessor(ev) {
-        ev.preventDefault();
-        let id = ev.params.id;
-
-        let paramParentEl = ev.target.closest('[data-role="processor-params"]');
-        let params = Object.fromEntries(new FormData(paramParentEl).entries());
-
-        await this._updateProcessor(id, params);
-    }
-
-    _rebuildProcessList() {
-        let el = this.processListTarget;
-
-        if ((!this._state) || (!this._state.session) || (!this._state.session.processors)) {
-            return;
-        }
-
-        el.innerHTML = "";
-        for (let p of this._state.session.processors) {
-            let ui = processorUIs[p.type];
-            if (!ui) {
-                continue;
-            }
-            let cardOuter = processorFrame({
-                id: p.id,
-                name: ui.label,
-                props: ui.template(p),
-            });
-            el.innerHTML += cardOuter;
-        }
-
-        feather.replace();
-    }
-
-    async _createSession() {
-        try {
-            let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/`, {
-                method: 'POST',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    "base_upload": this.uploadIdValue,
-                })
-            });
-
-            this._state = await resp.json();
-
-            this._rebuildProcessList();
-            this.previewTarget.src = this._state.preview_url;
-        } catch (e) {
-            console.error(e);
-        }
-    }
-
-    async _addProcessor(processor) {
-        try {
-            let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/processors`, {
-                method: 'POST',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(processor)
-            });
-
-            this._state = await resp.json();
-
-            this._rebuildProcessList();
-            this.previewTarget.src = this._state.preview_url;
-        } catch (e) {
-            console.error(e);
-        }
-    }
-
-    async _updateProcessor(processorID, params) {
-        await this._doReturningState(async () => {
-            return (await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}`, {
-                method: 'PATCH',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    processor: {
-                        id: processorID,
-                        props: params,
-                    }
-                })
-            })).json();
-        })
-    }
-
-
-    async _removeProcessor(processorID) {
-        await this._doReturningState(async () => {
-            return (await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/processors/${processorID}`, {
-                method: 'DELETE',
-            })).json();
-        })
-    }
-
-    async _save(mode) {
-        if (!this._state || !this._state.session) {
-            return;
-        }
-
-        try {
-            let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/save`, {
-                method: 'POST',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({ mode })
-            });
-
-            if (!resp.ok) {
-                console.error("Save failed:", resp.statusText);
-                return;
-            }
-
-            let result = await resp.json();
-            window.location.href = `/sites/${this.siteIdValue}/uploads/${result.upload_id}`;
-        } catch (e) {
-            console.error(e);
-        }
-    }
-
-    async _doReturningState(fn) {
-        try {
-            this._state = await fn();
-
-            this._rebuildProcessList();
-            this.previewTarget.src = this._state.preview_url;
-        } catch (e) {
-            console.error(e);
-        }
-
-    }
-}
--- a/assets/js/controllers/postedit.js
+++ b/assets/js/controllers/postedit.js
@ -60,16 +60,6 @@ export default class PosteditController extends Controller {
        try {
            const formData = new FormData(this.element);
            let data = Object.fromEntries(formData.entries());
-
-            // Special handling for categories
-            let categoryIDs = [];
-            for (let i of formData.entries()) {
-                if (i[0] === "category_ids") {
-                    categoryIDs.push(parseInt(i[1]))
-                }
-            }
-
-            data["category_ids"] = categoryIDs;
            data = {...data, action: action || 'save'};

            const response = await fetch(this.element.getAttribute("action"), {
--- a/assets/js/main.js
+++ b/assets/js/main.js
@ -8,7 +8,6 @@ import LogoutController from "./controllers/logout";
 import FirstRunController from "./controllers/firstrun";
 import UploadController from "./controllers/upload";
 import ShowUploadController from "./controllers/show_upload";
-import EditUploadController from "./controllers/edit_upload";
 import PagelistController from "./controllers/pagelist";

 window.Stimulus = Application.start()
@ -19,7 +18,6 @@ Stimulus.register("logout", LogoutController);
 Stimulus.register("first-run", FirstRunController);
 Stimulus.register("upload", UploadController);
 Stimulus.register("show-upload", ShowUploadController);
-Stimulus.register("edit-upload", EditUploadController);
 Stimulus.register("pagelist", PagelistController);

 feather.replace();
--- a/cmds/server.go
+++ b/cmds/server.go
@ -111,7 +111,6 @@ Starting weiro without any arguments will start the server.
 			lh := handlers.LoginHandler{Config: cfg, AuthService: svcs.Auth}
 			ph := handlers.PostsHandler{PostService: svcs.Posts, CategoryService: svcs.Categories}
 			uh := handlers.UploadsHandler{UploadsService: svcs.Uploads}
-			ieh := handlers.ImageEditHandlers{ImageEditService: svcs.ImageEdit}
 			ssh := handlers.SiteSettingsHandler{SiteService: svcs.Sites}
 			ch := handlers.CategoriesHandler{CategoryService: svcs.Categories}
 			pgh := handlers.PagesHandler{PageService: svcs.Pages}
@ -150,14 +149,6 @@ Starting weiro without any arguments will start the server.
 			siteGroup.Post("/uploads/pending/:guid", uh.UploadPart)
 			siteGroup.Post("/uploads/pending/:guid/finalize", uh.UploadComplete)
 			siteGroup.Delete("/uploads/:uploadID", uh.Delete)
-			siteGroup.Get("/uploads/:uploadID/edit", uh.Edit)
-
-			siteGroup.Post("/imageedit", ieh.Create)
-			siteGroup.Patch("/imageedit/:sessionID", ieh.PatchSession)
-			siteGroup.Post("/imageedit/:sessionID/processors", ieh.AddProcessor)
-			siteGroup.Delete("/imageedit/:sessionID/processors/:processorID", ieh.DeleteProcessor)
-			siteGroup.Post("/imageedit/:sessionID/save", ieh.Save)
-			siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview)

 			siteGroup.Get("/settings", ssh.General)
 			siteGroup.Post("/settings", ssh.UpdateGeneral)
--- a/handlers/imageedit.go
+++ b/handlers/imageedit.go
@ -1,165 +0,0 @@
-package handlers
-
-import (
-	"bufio"
-	"io"
-	"log"
-	"net/http"
-
-	"github.com/gofiber/fiber/v3"
-	"lmika.dev/lmika/weiro/models"
-	"lmika.dev/lmika/weiro/services/imgedit"
-)
-
-type ImageEditHandlers struct {
-	ImageEditService *imgedit.Service
-}
-
-type sessionResponse struct {
-	Session    *models.ImageEditSession `json:"session"`
-	PreviewURL string                   `json:"preview_url"`
-}
-
-func (ieh ImageEditHandlers) Create(c fiber.Ctx) error {
-	var req struct {
-		BaseUploadID int64 `json:"base_upload"`
-	}
-
-	if err := c.Bind().JSON(&req); err != nil {
-		return err
-	}
-
-	res, err := ieh.ImageEditService.NewSession(c.Context(), req.BaseUploadID)
-	if err != nil {
-		return err
-	}
-
-	var resp = sessionResponse{
-		Session:    res,
-		PreviewURL: res.PreviewURL(),
-	}
-
-	return c.Status(http.StatusCreated).JSON(resp)
-}
-
-func (ieh ImageEditHandlers) Preview(c fiber.Ctx) error {
-	log.Printf("Previewing image edit session %v/%v", c.Params("sessionID"), c.Params("versionID"))
-	sessionID := c.Params("sessionID")
-	versionID := c.Params("versionID")
-
-	mimeTime, rw, err := ieh.ImageEditService.LoadImageVersion(c.Context(), sessionID, versionID)
-	if err != nil {
-		return err
-	}
-
-	c.Set("Content-Type", mimeTime)
-	c.Status(http.StatusOK)
-	return c.SendStreamWriter(func(w *bufio.Writer) {
-		rw, err := rw()
-		if err != nil {
-			return
-		}
-		defer rw.Close()
-
-		_, err = io.Copy(w, rw)
-		if err != nil {
-			return
-		}
-	})
-}
-
-func (ieh ImageEditHandlers) AddProcessor(c fiber.Ctx) error {
-	sessionID := c.Params("sessionID")
-	if sessionID == "" {
-		log.Println("No session ID")
-		return fiber.ErrBadRequest
-	}
-
-	var req imgedit.AddProcessorReq
-	if err := c.Bind().Body(&req); err != nil {
-		log.Printf("Failed to parse request body: %v", err)
-		return fiber.ErrBadRequest
-	}
-
-	res, err := ieh.ImageEditService.AddProcessor(c.Context(), sessionID, req)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(http.StatusOK).JSON(sessionResponse{
-		Session:    res,
-		PreviewURL: res.PreviewURL(),
-	})
-}
-
-func (ieh ImageEditHandlers) DeleteProcessor(c fiber.Ctx) error {
-	sessionID := c.Params("sessionID")
-	if sessionID == "" {
-		return fiber.ErrBadRequest
-	}
-
-	processorID := c.Params("processorID")
-	if processorID == "" {
-		return fiber.ErrBadRequest
-	}
-
-	res, err := ieh.ImageEditService.DeleteProcessor(c.Context(), sessionID, processorID)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(http.StatusOK).JSON(sessionResponse{
-		Session:    res,
-		PreviewURL: res.PreviewURL(),
-	})
-}
-
-func (ieh ImageEditHandlers) Save(c fiber.Ctx) error {
-	sessionID := c.Params("sessionID")
-	if sessionID == "" {
-		return fiber.ErrBadRequest
-	}
-
-	var req struct {
-		Mode string `json:"mode"`
-	}
-	if err := c.Bind().JSON(&req); err != nil {
-		return fiber.ErrBadRequest
-	}
-
-	result, err := ieh.ImageEditService.Save(c.Context(), sessionID, req.Mode)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(http.StatusOK).JSON(result)
-}
-
-func (ieh ImageEditHandlers) PatchSession(c fiber.Ctx) error {
-	var req struct {
-		UpdateProc *imgedit.UpdateProcessorReq `json:"processor"`
-	}
-
-	sessionID := c.Params("sessionID")
-	if sessionID == "" {
-		return fiber.ErrBadRequest
-	}
-
-	if err := c.Bind().Body(&req); err != nil {
-		return err
-	}
-	log.Printf("Got request: %v", *req.UpdateProc)
-
-	if req.UpdateProc != nil {
-		res, err := ieh.ImageEditService.UpdateProcessor(c.Context(), sessionID, *req.UpdateProc)
-		if err != nil {
-			return err
-		}
-		return c.Status(http.StatusOK).JSON(sessionResponse{
-			Session:    res,
-			PreviewURL: res.PreviewURL(),
-		})
-	}
-
-	return fiber.ErrBadRequest
-}
--- a/handlers/index.go
+++ b/handlers/index.go
@ -2,7 +2,6 @@ package handlers

 import (
 	"fmt"
-	"log"
 	"net/url"
 	"regexp"

@ -38,13 +37,6 @@ func (h IndexHandler) Index(c fiber.Ctx) error {
 		}
 	}

-	sess := session.FromContext(c)
-	lastSiteID, ok := sess.Get("last_site_id").(int64)
-	log.Printf("last site id: %v", lastSiteID)
-	if ok {
-		return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", lastSiteID))
-	}
-
 	site, err := h.SiteService.BestSite(c.Context(), user)
 	if err != nil {
 		return err
--- a/handlers/login.go
+++ b/handlers/login.go
@ -39,6 +39,7 @@ func (lh *LoginHandler) DoLogin(c fiber.Ctx) error {
 	var req struct {
 		Username       string `form:"username"`
 		Password       string `form:"password"`
+		LoginChallenge string `form:"_login_challenge"`
 	}
 	if err := c.Bind().Body(&req); err != nil {
 		return c.Status(fiber.StatusBadRequest).SendString("Failed to parse request body")
@ -50,6 +51,11 @@ func (lh *LoginHandler) DoLogin(c fiber.Ctx) error {

 	sess := session.FromContext(c)

+	challenge, _ := sess.Get("_login_challenge").(string)
+	if challenge != req.LoginChallenge {
+		return c.Redirect().To("/login")
+	}
+
 	user, err := lh.AuthService.Login(c.Context(), req.Username, req.Password)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).SendString("Failed to login")
--- a/handlers/middleware/site.go
+++ b/handlers/middleware/site.go
@ -5,7 +5,6 @@ import (

 	"emperror.dev/errors"
 	"github.com/gofiber/fiber/v3"
-	"github.com/gofiber/fiber/v3/middleware/session"
 	"lmika.dev/lmika/weiro/models"
 	"lmika.dev/lmika/weiro/providers/db"
 	"lmika.dev/lmika/weiro/services/sites"
@ -42,9 +41,6 @@ func RequiresSite(sites *sites.Service) func(c fiber.Ctx) error {
 		}
 		c.Locals("allSites", sitesOwnedByUser)

-		sess := session.FromContext(c)
-		sess.Set("last_site_id", siteID)
-
 		if pubTargets, err := sites.BestPubTarget(c.Context(), site); err == nil {
 			c.Locals("pubTarget", pubTargets)
 		}
--- a/handlers/posts.go
+++ b/handlers/posts.go
@ -75,7 +75,7 @@ func (ph PostsHandler) New(c fiber.Ctx) error {
 		"post":               p,
 		"categories":         cats,
 		"selectedCategories": map[int64]bool{},
-		"bodyClass":          "large-editor",
+		"bodyClass":          "post-edit-page",
 	})
 }

@ -116,7 +116,7 @@ func (ph PostsHandler) Edit(c fiber.Ctx) error {
 			"post":               post,
 			"categories":         cats,
 			"selectedCategories": selectedCategories,
-			"bodyClass":          "large-editor",
+			"bodyClass":          "post-edit-page",
 		})
 	}))
 }
--- a/handlers/uploads.go
+++ b/handlers/uploads.go
@ -162,24 +162,3 @@ func (uh UploadsHandler) UploadComplete(c fiber.Ctx) error {

 	return c.Status(fiber.StatusAccepted).JSON(fiber.Map{})
 }
-
-func (uh UploadsHandler) Edit(c fiber.Ctx) error {
-	uploadIDStr := c.Params("uploadID")
-	if uploadIDStr == "" {
-		return fiber.ErrBadRequest
-	}
-	uploadID, err := strconv.ParseInt(uploadIDStr, 10, 64)
-	if err != nil {
-		return fiber.ErrBadRequest
-	}
-
-	upload, err := uh.UploadsService.FetchUpload(c.Context(), uploadID)
-	if err != nil {
-		return err
-	}
-
-	return c.Render("uploads/edit", fiber.Map{
-		"upload":    upload,
-		"bodyClass": "large-editor",
-	})
-}
--- a/models/errors.go
+++ b/models/errors.go
@ -8,4 +8,3 @@ var NotFoundError = errors.New("not found")
 var SiteRequiredError = errors.New("site required")
 var DeleteDebounceError = errors.New("permanent delete too soon, try again in a few seconds")
 var SlugConflictError = errors.New("a record with this slug already exists")
-var UnsupportedImageFormat = errors.New("unsupported image format")
--- a/models/imgedit.go
+++ b/models/imgedit.go
@ -1,62 +0,0 @@
-package models
-
-import (
-	"crypto/md5"
-	"encoding/json"
-	"fmt"
-	"strings"
-	"time"
-)
-
-type ImageEditSession struct {
-	GUID         string               `json:"guid"`
-	SiteID       int64                `json:"siteId"`
-	UserID       int64                `json:"userId"`
-	BaseUploadID int64                `json:"baseUploadId"`
-	ImageExt     string               `json:"imageExt"`
-	CreatedAt    time.Time            `json:"createdAt"`
-	UpdatedAt    time.Time            `json:"updatedAt"`
-	Processors   []ImageEditProcessor `json:"processors"`
-}
-
-func (ieh ImageEditSession) PreviewURL() string {
-	return fmt.Sprintf("/sites/%v/imageedit/%v/preview/%v", ieh.SiteID, ieh.GUID, ieh.Processors[len(ieh.Processors)-1].VersionID)
-}
-
-func (ieh *ImageEditSession) RecalcVersionIDs() {
-	for i, p := range ieh.Processors {
-		if i == 0 {
-			p.SetVersionID("")
-		} else {
-			p.SetVersionID(ieh.Processors[i-1].VersionID)
-		}
-
-		ieh.Processors[i] = p
-	}
-}
-
-type ImageEditProcessor struct {
-	ID    string          `json:"id"`
-	Type  string          `json:"type"`
-	Props json.RawMessage `json:"props"`
-
-	// VersionID is a unique hash of the particular processor. This includes the version ID of the previous processor,
-	// thereby causing a change of one processor to affect the version IDs of processors down the line.
-	VersionID string `json:"versionId"`
-}
-
-func (ieh *ImageEditProcessor) SetVersionID(previousVersionID string) {
-	var sb strings.Builder
-	sb.WriteString(ieh.ID)
-	sb.WriteString("-")
-	sb.WriteString(previousVersionID)
-	sb.WriteString("-")
-	sb.WriteString(ieh.Type)
-	sb.WriteString("-")
-	sb.WriteString(string(ieh.Props))
-	ieh.VersionID = fmt.Sprintf("%x", md5.Sum([]byte(sb.String())))
-}
-
-type CopyUploadProps struct {
-	UploadID int64 `json:"uploadId"`
-}
--- a/package-lock.json
+++ b/package-lock.json
@ -8,8 +8,7 @@
        "@hotwired/stimulus": "^3.2.2",
        "bootstrap": "^5.3.8",
        "esbuild-sass-plugin": "^3.6.0",
-        "feather-icons": "^4.29.2",
-        "handlebars": "^4.7.8"
+        "feather-icons": "^4.29.2"
      },
      "devDependencies": {
        "esbuild": "0.27.3"
@ -893,27 +892,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
    "node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@ -980,21 +958,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "license": "MIT"
-    },
    "node_modules/node-addon-api": {
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
@ -1432,15 +1395,6 @@
        "node": ">=14.0.0"
      }
    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/source-map-js": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@ -1508,31 +1462,12 @@
      "license": "0BSD",
      "peer": true
    },
-    "node_modules/uglify-js": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
    "node_modules/varint": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
      "license": "MIT",
      "peer": true
-    },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "license": "MIT"
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -6,7 +6,6 @@
    "@hotwired/stimulus": "^3.2.2",
    "bootstrap": "^5.3.8",
    "esbuild-sass-plugin": "^3.6.0",
-    "feather-icons": "^4.29.2",
-    "handlebars": "^4.7.8"
+    "feather-icons": "^4.29.2"
  }
 }
--- a/providers/db/categories.go
+++ b/providers/db/categories.go
@ -82,8 +82,8 @@ func (db *Provider) SelectCategoriesOfPost(ctx context.Context, postID int64) ([
 	return cats, nil
 }

-func (db *Provider) SelectPublishedPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) {
-	rows, err := db.queries.SelectPublishedPostsOfCategory(ctx, sqlgen.SelectPublishedPostsOfCategoryParams{
+func (db *Provider) SelectPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) {
+	rows, err := db.queries.SelectPostsOfCategory(ctx, sqlgen.SelectPostsOfCategoryParams{
 		CategoryID: categoryID,
 		Limit:      pp.Limit,
 		Offset:     pp.Offset,
--- a/providers/db/gen/sqlgen/categories.sql.go
+++ b/providers/db/gen/sqlgen/categories.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: categories.sql

 package sqlgen
@ -227,7 +227,7 @@ func (q *Queries) SelectCategoryBySlugAndSite(ctx context.Context, arg SelectCat
 	return i, err
 }

-const selectPublishedPostsOfCategory = `-- name: SelectPublishedPostsOfCategory :many
+const selectPostsOfCategory = `-- name: SelectPostsOfCategory :many
 SELECT p.id, p.site_id, p.state, p.guid, p.title, p.body, p.slug, p.created_at, p.updated_at, p.published_at, p.deleted_at FROM posts p
 INNER JOIN post_categories pc ON pc.post_id = p.id
 WHERE pc.category_id = ? AND p.state = 0 AND p.deleted_at = 0
@ -235,14 +235,14 @@ ORDER BY p.published_at DESC
 LIMIT ? OFFSET ?
 `

-type SelectPublishedPostsOfCategoryParams struct {
+type SelectPostsOfCategoryParams struct {
 	CategoryID int64
 	Limit      int64
 	Offset     int64
 }

-func (q *Queries) SelectPublishedPostsOfCategory(ctx context.Context, arg SelectPublishedPostsOfCategoryParams) ([]Post, error) {
-	rows, err := q.db.QueryContext(ctx, selectPublishedPostsOfCategory, arg.CategoryID, arg.Limit, arg.Offset)
+func (q *Queries) SelectPostsOfCategory(ctx context.Context, arg SelectPostsOfCategoryParams) ([]Post, error) {
+	rows, err := q.db.QueryContext(ctx, selectPostsOfCategory, arg.CategoryID, arg.Limit, arg.Offset)
 	if err != nil {
 		return nil, err
 	}
--- a/providers/db/gen/sqlgen/db.go
+++ b/providers/db/gen/sqlgen/db.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0

 package sqlgen

--- a/providers/db/gen/sqlgen/models.go
+++ b/providers/db/gen/sqlgen/models.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0

 package sqlgen

--- a/providers/db/gen/sqlgen/pages.sql.go
+++ b/providers/db/gen/sqlgen/pages.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: pages.sql

 package sqlgen
--- a/providers/db/gen/sqlgen/pending_uploads.sql.go
+++ b/providers/db/gen/sqlgen/pending_uploads.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: pending_uploads.sql

 package sqlgen
--- a/providers/db/gen/sqlgen/posts.sql.go
+++ b/providers/db/gen/sqlgen/posts.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: posts.sql

 package sqlgen
@ -200,54 +200,6 @@ func (q *Queries) SelectPostsOfSite(ctx context.Context, arg SelectPostsOfSitePa
 	return items, nil
 }

-const selectPublishedPostsOfSite = `-- name: SelectPublishedPostsOfSite :many
-SELECT id, site_id, state, guid, title, body, slug, created_at, updated_at, published_at, deleted_at
-FROM posts
-WHERE site_id = ?1 AND state = 0 AND deleted_at = 0
-ORDER BY published_at DESC LIMIT ?3 OFFSET ?2
-`
-
-type SelectPublishedPostsOfSiteParams struct {
-	SiteID int64
-	Offset int64
-	Limit  int64
-}
-
-func (q *Queries) SelectPublishedPostsOfSite(ctx context.Context, arg SelectPublishedPostsOfSiteParams) ([]Post, error) {
-	rows, err := q.db.QueryContext(ctx, selectPublishedPostsOfSite, arg.SiteID, arg.Offset, arg.Limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []Post
-	for rows.Next() {
-		var i Post
-		if err := rows.Scan(
-			&i.ID,
-			&i.SiteID,
-			&i.State,
-			&i.Guid,
-			&i.Title,
-			&i.Body,
-			&i.Slug,
-			&i.CreatedAt,
-			&i.UpdatedAt,
-			&i.PublishedAt,
-			&i.DeletedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const softDeletePost = `-- name: SoftDeletePost :exec
 UPDATE posts SET deleted_at = ? WHERE id = ?
 `
--- a/providers/db/gen/sqlgen/pubtargets.sql.go
+++ b/providers/db/gen/sqlgen/pubtargets.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: pubtargets.sql

 package sqlgen
--- a/providers/db/gen/sqlgen/sites.sql.go
+++ b/providers/db/gen/sqlgen/sites.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: sites.sql

 package sqlgen
--- a/providers/db/gen/sqlgen/uploads.sql.go
+++ b/providers/db/gen/sqlgen/uploads.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: uploads.sql

 package sqlgen
@ -18,7 +18,7 @@ func (q *Queries) DeleteUpload(ctx context.Context, id int64) error {
 	return err
 }

-const insertUpload = `-- name: InsertUpload :one
+const insertUpload = `-- name: InsertUpload :exec
 INSERT INTO uploads (
    site_id,
    guid,
@ -43,8 +43,8 @@ type InsertUploadParams struct {
 	CreatedAt int64
 }

-func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) (int64, error) {
-	row := q.db.QueryRowContext(ctx, insertUpload,
+func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) error {
+	_, err := q.db.ExecContext(ctx, insertUpload,
 		arg.SiteID,
 		arg.Guid,
 		arg.MimeType,
@ -54,9 +54,7 @@ func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) (int
 		arg.Alt,
 		arg.CreatedAt,
 	)
-	var id int64
-	err := row.Scan(&id)
-	return id, err
+	return err
 }

 const selectUploadByID = `-- name: SelectUploadByID :one
@ -156,17 +154,3 @@ func (q *Queries) UpdateUpload(ctx context.Context, arg UpdateUploadParams) erro
 	_, err := q.db.ExecContext(ctx, updateUpload, arg.Alt, arg.ID)
 	return err
 }
-
-const updateUploadFileSize = `-- name: UpdateUploadFileSize :exec
-UPDATE uploads SET file_size = ? WHERE id = ?
-`
-
-type UpdateUploadFileSizeParams struct {
-	FileSize int64
-	ID       int64
-}
-
-func (q *Queries) UpdateUploadFileSize(ctx context.Context, arg UpdateUploadFileSizeParams) error {
-	_, err := q.db.ExecContext(ctx, updateUploadFileSize, arg.FileSize, arg.ID)
-	return err
-}
--- a/providers/db/gen/sqlgen/users.sql.go
+++ b/providers/db/gen/sqlgen/users.sql.go
@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: users.sql

 package sqlgen
--- a/providers/db/posts.go
+++ b/providers/db/posts.go
@ -47,23 +47,6 @@ func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDel
 	return posts, nil
 }

-func (db *Provider) SelectPublishedPostsOfSite(ctx context.Context, siteID int64, pp PagingParams) ([]*models.Post, error) {
-	rows, err := db.queries.SelectPublishedPostsOfSite(ctx, sqlgen.SelectPublishedPostsOfSiteParams{
-		SiteID: siteID,
-		Limit:  pp.Limit,
-		Offset: pp.Offset,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	posts := make([]*models.Post, len(rows))
-	for i, row := range rows {
-		posts[i] = dbPostToPost(row)
-	}
-	return posts, nil
-}
-
 func (db *Provider) SelectPost(ctx context.Context, postID int64) (*models.Post, error) {
 	row, err := db.queries.SelectPost(ctx, postID)
 	if err != nil {
--- a/providers/db/uploads.go
+++ b/providers/db/uploads.go
@ -44,7 +44,7 @@ func (db *Provider) SelectUploadBySiteIDAndSlug(ctx context.Context, siteID int6

 func (db *Provider) SaveUpload(ctx context.Context, upload *models.Upload) error {
 	if upload.ID == 0 {
-		newID, err := db.queries.InsertUpload(ctx, sqlgen.InsertUploadParams{
+		if err := db.queries.InsertUpload(ctx, sqlgen.InsertUploadParams{
 			SiteID:    upload.SiteID,
 			Guid:      upload.GUID,
 			MimeType:  upload.MIMEType,
@ -53,11 +53,9 @@ func (db *Provider) SaveUpload(ctx context.Context, upload *models.Upload) error
 			Slug:      upload.Slug,
 			Alt:       upload.Alt,
 			CreatedAt: upload.CreatedAt.Unix(),
-		})
-		if err != nil {
+		}); err != nil {
 			return err
 		}
-		upload.ID = newID
 		return nil
 	}

@ -67,13 +65,6 @@ func (db *Provider) SaveUpload(ctx context.Context, upload *models.Upload) error
 	})
 }

-func (db *Provider) UpdateUploadFileSize(ctx context.Context, id int64, fileSize int64) error {
-	return db.queries.UpdateUploadFileSize(ctx, sqlgen.UpdateUploadFileSizeParams{
-		FileSize: fileSize,
-		ID:       id,
-	})
-}
-
 func (db *Provider) DeleteUpload(ctx context.Context, id int64) error {
 	return db.queries.DeleteUpload(ctx, id)
 }
--- a/providers/markdown/renderer.go
+++ b/providers/markdown/renderer.go
@ -22,7 +22,7 @@ type Renderer struct {

 func NewRendererForUI() *Renderer {
 	mdParser := goldmark.New(
-		goldmark.WithExtensions(extension.GFM, extension.Footnote),
+		goldmark.WithExtensions(extension.GFM),
 		goldmark.WithRendererOptions(
 			gm_html.WithUnsafe(),
 		),
@ -48,7 +48,7 @@ func NewRendererForUI() *Renderer {

 func NewRendererForSite() *Renderer {
 	mdParser := goldmark.New(
-		goldmark.WithExtensions(extension.GFM, extension.Footnote),
+		goldmark.WithExtensions(extension.GFM),
 		goldmark.WithParserOptions(
 			parser.WithAutoHeadingID(),
 		),
--- a/providers/sitebuilder/builder.go
+++ b/providers/sitebuilder/builder.go
@ -49,7 +49,6 @@ func New(site pubmodel.Site, opts Options) (*Builder, error) {
 		mdRenderer: markdown.NewRendererForSite(),
 		postMDProcessors: []postMDProcessor{
 			uploadAbsoluteURL,
-			removeFootnoteHRs,
 		},
 	}, nil
 }
--- a/providers/sitebuilder/processors.go
+++ b/providers/sitebuilder/processors.go
@ -35,8 +35,3 @@ func uploadAbsoluteURL(site pubmodel.Site, dom *goquery.Document) error {
 	})
 	return nil
 }
-
-func removeFootnoteHRs(site pubmodel.Site, dom *goquery.Document) error {
-	dom.Find("div.footnotes > hr").Remove()
-	return nil
-}
--- a/providers/uploadfiles/provider.go
+++ b/providers/uploadfiles/provider.go
@ -66,11 +66,6 @@ func copyFile(src, dst string) error {
 	return err
 }

-func (p *Provider) ReplaceFile(site models.Site, up models.Upload, srcPath string) error {
-	fullPath := p.uploadFileName(site, up)
-	return copyFile(srcPath, fullPath)
-}
-
 func (p *Provider) OpenUpload(site models.Site, up models.Upload) (io.ReadCloser, error) {
 	fullPath := p.uploadFileName(site, up)
 	return os.Open(fullPath)
--- a/services/imgedit/processing.go
+++ b/services/imgedit/processing.go
@ -1,171 +0,0 @@
-package imgedit
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"image"
-	"image/color"
-	"os"
-	"path/filepath"
-
-	"github.com/disintegration/imaging"
-	"lmika.dev/lmika/weiro/models"
-)
-
-type imageProcessor struct {
-	newParams    func() any
-	processImage func(ctx context.Context, srcImg image.Image, params any) (image.Image, error)
-}
-
-type shadowProcessorArgs struct {
-	Color   string `json:"color"`
-	OffsetY int    `json:"offset_y,string"`
-}
-
-var processors = map[string]imageProcessor{
-	"shadow": {
-		newParams: func() any {
-			return &shadowProcessorArgs{
-				Color:   "#000000",
-				OffsetY: 0,
-			}
-		},
-		processImage: func(ctx context.Context, srcImg image.Image, params any) (image.Image, error) {
-			p := params.(*shadowProcessorArgs)
-
-			shadowColor, err := parseHexColor(p.Color)
-			if err != nil {
-				return nil, fmt.Errorf("invalid shadow color: %w", err)
-			}
-
-			shadow := makeBoxShadow(srcImg, shadowColor, 4, 10, p.OffsetY)
-			composit := imaging.OverlayCenter(shadow, srcImg, 1.0)
-			return composit, nil
-		},
-	},
-}
-
-func (s *Service) reprocess(ctx context.Context, session *models.ImageEditSession) (imageSource, error) {
-	var img imageSource
-
-	for _, p := range session.Processors {
-		// Check if there's currently a cached image of this processor
-		cachedImageFile := filepath.Join(s.scratchDir, session.GUID, fmt.Sprintf("%v.%v", p.VersionID, session.ImageExt))
-		if s, err := os.Stat(cachedImageFile); err == nil && !s.IsDir() {
-			img = fileImageSource(cachedImageFile)
-			continue
-		}
-
-		// Need to process the image
-		var srcImg image.Image
-		if img != nil {
-			var err error
-			srcImg, err = img.image()
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		resImg, err := s.processImage(ctx, srcImg, p)
-		if err != nil {
-			return nil, err
-		}
-
-		// Cache the processed image
-		if err := imaging.Save(resImg, cachedImageFile); err != nil {
-			return nil, err
-		}
-		img = imageImageSource{resImg}
-	}
-
-	return img, nil
-}
-
-func (s *Service) processImage(ctx context.Context, srcImg image.Image, processor models.ImageEditProcessor) (image.Image, error) {
-	switch processor.Type {
-	case "copy-upload":
-		var p models.CopyUploadProps
-		if err := json.Unmarshal(processor.Props, &p); err != nil {
-			return nil, err
-		}
-
-		_, rc, err := s.uploadService.OpenUpload(ctx, p.UploadID)
-		if err != nil {
-			return nil, err
-		}
-
-		f, err := rc()
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-
-		return imaging.Decode(f)
-	}
-
-	proc, ok := processors[processor.Type]
-	if !ok {
-		return nil, fmt.Errorf("unknown processor type: %v", processor.Type)
-	}
-
-	paramType := proc.newParams()
-	if err := json.Unmarshal(processor.Props, paramType); err != nil {
-		return nil, err
-	}
-	return proc.processImage(ctx, srcImg, paramType)
-}
-
-type imageSource interface {
-	image() (image.Image, error)
-}
-
-type fileImageSource string
-
-func (f fileImageSource) image() (image.Image, error) {
-	return imaging.Open(string(f))
-}
-
-type imageImageSource struct {
-	img image.Image
-}
-
-func (i imageImageSource) image() (image.Image, error) {
-	return i.img, nil
-}
-
-func parseHexColor(s string) (color.Color, error) {
-	// Remove leading hash if present
-	if len(s) > 0 && s[0] == '#' {
-		s = s[1:]
-	}
-
-	// Parse based on length
-	var r, g, b, a uint8
-	switch len(s) {
-	case 6:
-		// RGB format
-		var rgb uint32
-		if _, err := fmt.Sscanf(s, "%06x", &rgb); err != nil {
-			return nil, fmt.Errorf("invalid hex color format: %w", err)
-		}
-		r = uint8((rgb >> 16) & 0xFF)
-		g = uint8((rgb >> 8) & 0xFF)
-		b = uint8(rgb & 0xFF)
-		a = 0xFF
-	case 8:
-		// RGBA format
-		var rgba uint32
-		if _, err := fmt.Sscanf(s, "%08x", &rgba); err != nil {
-			return nil, fmt.Errorf("invalid hex color format: %w", err)
-		}
-		r = uint8((rgba >> 24) & 0xFF)
-		g = uint8((rgba >> 16) & 0xFF)
-		b = uint8((rgba >> 8) & 0xFF)
-		a = uint8(rgba & 0xFF)
-	default:
-		return nil, fmt.Errorf("invalid hex color length: expected 6 or 8 characters, got %d", len(s))
-	}
-
-	return color.RGBA{R: r, G: g, B: b, A: a}, nil
-}
--- a/services/imgedit/service.go
+++ b/services/imgedit/service.go
@ -1,266 +0,0 @@
-package imgedit
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"time"
-
-	"lmika.dev/lmika/weiro/models"
-	"lmika.dev/lmika/weiro/services/uploads"
-	"lmika.dev/pkg/modash/moslice"
-)
-
-type Service struct {
-	scratchDir    string
-	uploadService *uploads.Service
-	sessionStore  *sessionStore
-}
-
-func New(
-	uploadService *uploads.Service,
-	scratchDir string,
-) *Service {
-	return &Service{
-		scratchDir:    scratchDir,
-		uploadService: uploadService,
-		sessionStore:  &sessionStore{baseDir: scratchDir},
-	}
-}
-
-func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (*models.ImageEditSession, error) {
-	site, user, err := s.fetchSiteAndUser(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	upload, _, err := s.uploadService.OpenUpload(ctx, baseUploadID)
-	if err != nil {
-		return nil, err
-	}
-
-	var ext string
-	switch upload.MIMEType {
-	case "image/jpeg":
-		ext = "jpg"
-	case "image/png":
-		ext = "png"
-	default:
-		return nil, models.UnsupportedImageFormat
-	}
-
-	newSession := models.ImageEditSession{
-		GUID:         models.NewNanoID(),
-		SiteID:       site.ID,
-		UserID:       user.ID,
-		BaseUploadID: baseUploadID,
-		ImageExt:     ext,
-		CreatedAt:    time.Now().UTC(),
-		UpdatedAt:    time.Now().UTC(),
-		Processors: []models.ImageEditProcessor{
-			{
-				ID:    models.NewNanoID(),
-				Type:  "copy-upload",
-				Props: mustToJSON(models.CopyUploadProps{UploadID: baseUploadID}),
-			},
-		},
-	}
-
-	newSession.RecalcVersionIDs()
-	if err := s.sessionStore.save(&newSession); err != nil {
-		return nil, err
-	}
-
-	if _, err := s.reprocess(ctx, &newSession); err != nil {
-		return nil, err
-	}
-
-	return &newSession, nil
-}
-
-func (s *Service) LoadImageVersion(ctx context.Context, sessionID string, versionID string) (mimeType string, rw func() (io.ReadCloser, error), err error) {
-	session, err := s.loadAndVerifySession(ctx, sessionID)
-	if err != nil {
-		return "", nil, err
-	}
-
-	return s.sessionStore.getImage(session, versionID+"."+session.ImageExt)
-}
-
-type AddProcessorReq struct {
-	Type string `json:"type"`
-}
-
-func (s *Service) AddProcessor(ctx context.Context, sessionID string, req AddProcessorReq) (*models.ImageEditSession, error) {
-	session, err := s.loadAndVerifySession(ctx, sessionID)
-	if err != nil {
-		return nil, err
-	}
-
-	proc, ok := processors[req.Type]
-	if !ok {
-		return nil, fmt.Errorf("unknown processor type: %v", req.Type)
-	}
-
-	paramType := proc.newParams()
-	paramBytes, err := json.Marshal(paramType)
-	if err != nil {
-		return nil, err
-	}
-
-	session.Processors = append(session.Processors, models.ImageEditProcessor{
-		ID:    models.NewNanoID(),
-		Type:  req.Type,
-		Props: paramBytes,
-	})
-
-	session.RecalcVersionIDs()
-	if err := s.sessionStore.save(session); err != nil {
-		return nil, err
-	}
-
-	if _, err := s.reprocess(ctx, session); err != nil {
-		return nil, err
-	}
-
-	return session, nil
-}
-
-func (s *Service) DeleteProcessor(ctx context.Context, sessionID, processorID string) (*models.ImageEditSession, error) {
-	session, err := s.loadAndVerifySession(ctx, sessionID)
-	if err != nil {
-		return nil, err
-	}
-
-	session.Processors = moslice.Filter(session.Processors, func(p models.ImageEditProcessor) bool { return p.ID != processorID })
-	session.RecalcVersionIDs()
-	if err := s.sessionStore.save(session); err != nil {
-		return nil, err
-	}
-
-	if _, err := s.reprocess(ctx, session); err != nil {
-		return nil, err
-	}
-
-	return session, nil
-}
-
-type UpdateProcessorReq struct {
-	ID    string          `json:"id"`
-	Props json.RawMessage `json:"props"`
-}
-
-func (s *Service) UpdateProcessor(ctx context.Context, sessionID string, req UpdateProcessorReq) (*models.ImageEditSession, error) {
-	session, err := s.loadAndVerifySession(ctx, sessionID)
-	if err != nil {
-		return nil, err
-	}
-
-	for i, p := range session.Processors {
-		if p.ID == req.ID {
-			session.Processors[i].Props = req.Props
-			break
-		}
-	}
-
-	session.RecalcVersionIDs()
-	if err := s.sessionStore.save(session); err != nil {
-		return nil, err
-	}
-	if _, err := s.reprocess(ctx, session); err != nil {
-		return nil, err
-	}
-
-	return session, nil
-}
-
-type SaveResult struct {
-	UploadID int64 `json:"upload_id"`
-}
-
-func (s *Service) Save(ctx context.Context, sessionID string, mode string) (*SaveResult, error) {
-	session, err := s.loadAndVerifySession(ctx, sessionID)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(session.Processors) == 0 {
-		return nil, fmt.Errorf("no processors in session")
-	}
-
-	lastProc := session.Processors[len(session.Processors)-1]
-	finalImagePath := fmt.Sprintf("%v/%v/%v.%v", s.scratchDir, session.GUID, lastProc.VersionID, session.ImageExt)
-
-	var mimeType string
-	switch session.ImageExt {
-	case "jpg", "jpeg":
-		mimeType = "image/jpeg"
-	case "png":
-		mimeType = "image/png"
-	}
-
-	var uploadID int64
-	switch mode {
-	case "replace":
-		upload, err := s.uploadService.ReplaceUploadFile(ctx, session.BaseUploadID, finalImagePath)
-		if err != nil {
-			return nil, err
-		}
-		uploadID = upload.ID
-	case "copy":
-		baseUpload, _, err := s.uploadService.OpenUpload(ctx, session.BaseUploadID)
-		if err != nil {
-			return nil, err
-		}
-		upload, err := s.uploadService.CreateUploadFromFile(ctx, finalImagePath, baseUpload.Filename, mimeType)
-		if err != nil {
-			return nil, err
-		}
-		uploadID = upload.ID
-	default:
-		return nil, fmt.Errorf("unknown save mode: %v", mode)
-	}
-
-	s.sessionStore.delete(session.GUID)
-
-	return &SaveResult{UploadID: uploadID}, nil
-}
-
-func (s *Service) loadAndVerifySession(ctx context.Context, sessionID string) (*models.ImageEditSession, error) {
-	site, user, err := s.fetchSiteAndUser(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	session, err := s.sessionStore.get(sessionID)
-	if err != nil {
-		return nil, err
-	} else if session.SiteID != site.ID || session.UserID != user.ID {
-		return nil, models.PermissionError
-	}
-	return session, nil
-}
-
-func (s *Service) fetchSiteAndUser(ctx context.Context) (models.Site, models.User, error) {
-	user, ok := models.GetUser(ctx)
-	if !ok {
-		return models.Site{}, models.User{}, models.UserRequiredError
-	}
-
-	site, ok := models.GetSite(ctx)
-	if !ok {
-		return models.Site{}, models.User{}, models.SiteRequiredError
-	}
-
-	if site.OwnerID != user.ID {
-		return models.Site{}, models.User{}, models.PermissionError
-	}
-
-	return site, user, nil
-}
-
-func mustToJSON(a any) json.RawMessage {
-	b, _ := json.Marshal(a)
-	return b
-}
--- a/services/imgedit/shadow.go
+++ b/services/imgedit/shadow.go
@ -1,35 +0,0 @@
-package imgedit
-
-import (
-	"image"
-	"image/color"
-
-	"github.com/disintegration/imaging"
-)
-
-func makeBoxShadow(maskImg image.Image, shadowColor color.Color, sigma float64, shadowMargin, offsetY int) image.Image {
-	w, h := maskImg.Bounds().Dx(), maskImg.Bounds().Dy()
-	cr, cg, cb, _ := shadowColor.RGBA()
-	cr8, cg8, cb8 := uint8(cr>>8), uint8(cg>>8), uint8(cb>>8)
-
-	// New box image
-	backing := image.NewNRGBA(image.Rect(0, 0, w+shadowMargin*2, h+shadowMargin*2+offsetY))
-	newImg := image.NewNRGBA(image.Rect(0, 0, w+shadowMargin*2, h+shadowMargin*2+offsetY))
-	for x := 0; x < w+shadowMargin*2; x++ {
-		for y := 0; y < h+shadowMargin*2; y++ {
-			var c = color.NRGBA{R: 255, G: 255, B: 255, A: 0}
-			if x >= shadowMargin-4 && y >= shadowMargin-4 && x <= w+shadowMargin+4 && y <= h+shadowMargin+4 {
-				_, _, _, a := maskImg.At(x-shadowMargin, y-shadowMargin).RGBA()
-				c = color.NRGBA{R: cr8, G: cg8, B: cb8, A: uint8(a >> 8)}
-			}
-			backing.SetNRGBA(x, y, color.NRGBA{R: 255, G: 255, B: 255, A: 0})
-			newImg.SetNRGBA(x, y+offsetY, c)
-		}
-	}
-
-	// Blur
-	blurredImage := imaging.Blur(newImg, sigma)
-	backing = imaging.OverlayCenter(backing, blurredImage, 0.6)
-
-	return backing
-}
--- a/services/imgedit/store.go
+++ b/services/imgedit/store.go
@ -1,70 +0,0 @@
-package imgedit
-
-import (
-	"encoding/json"
-	"io"
-	"os"
-	"path/filepath"
-
-	"lmika.dev/lmika/weiro/models"
-)
-
-type sessionStore struct {
-	baseDir string
-}
-
-func (ss *sessionStore) save(newSession *models.ImageEditSession) error {
-	sessionMeta, err := json.Marshal(newSession)
-	if err != nil {
-		return err
-	}
-
-	if err := os.MkdirAll(filepath.Join(ss.baseDir, newSession.GUID), 0755); err != nil {
-		return err
-	}
-	if err := os.WriteFile(filepath.Join(ss.baseDir, newSession.GUID, "session.json"), sessionMeta, 0644); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (ss *sessionStore) get(guid string) (*models.ImageEditSession, error) {
-	sessionDataBts, err := os.ReadFile(filepath.Join(ss.baseDir, guid, "session.json"))
-	if err != nil {
-		return nil, err
-	}
-
-	sessionData := models.ImageEditSession{}
-	if err := json.Unmarshal(sessionDataBts, &sessionData); err != nil {
-		return nil, err
-	}
-
-	return &sessionData, nil
-}
-
-func (ss *sessionStore) delete(guid string) {
-	os.RemoveAll(filepath.Join(ss.baseDir, guid))
-}
-
-func (ss *sessionStore) getImage(session *models.ImageEditSession, imageFilename string) (string, func() (io.ReadCloser, error), error) {
-	fullPath := filepath.Join(ss.baseDir, session.GUID, imageFilename)
-	if s, err := os.Stat(fullPath); err != nil {
-		return "", nil, err
-	} else if s.IsDir() {
-		return "", nil, os.ErrNotExist
-	}
-
-	var mimeType string
-	switch filepath.Ext(imageFilename) {
-	case ".jpg", ".jpeg":
-		mimeType = "image/jpeg"
-	case ".png":
-		mimeType = "image/png"
-	default:
-		return "", nil, models.UnsupportedImageFormat
-	}
-
-	return mimeType, func() (io.ReadCloser, error) {
-		return os.Open(fullPath)
-	}, nil
-}
--- a/services/publisher/iter.go
+++ b/services/publisher/iter.go
@ -9,10 +9,10 @@ import (
 )

 // postIter returns a post iterator which returns posts in reverse chronological order.
-func (s *Publisher) publishedPostIter(ctx context.Context, site int64) iter.Seq[models.Maybe[*models.Post]] {
+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.SelectPublishedPostsOfSite(ctx, site, paging)
+		page, err := s.db.SelectPostsOfSite(ctx, site, false, paging)
 		if err != nil {
 			yield(models.Maybe[*models.Post]{Err: err})
 			return
@ -45,7 +45,7 @@ func (s *Publisher) postIterByCategory(ctx context.Context, categoryID int64) it
 	return func(yield func(models.Maybe[*models.Post]) bool) {
 		paging := db.PagingParams{Offset: 0, Limit: 50}
 		for {
-			page, err := s.db.SelectPublishedPostsOfCategory(ctx, categoryID, paging)
+			page, err := s.db.SelectPostsOfCategory(ctx, categoryID, paging)
 			if err != nil {
 				yield(models.Maybe[*models.Post]{Err: err})
 				return
--- a/services/publisher/service.go
+++ b/services/publisher/service.go
@ -79,7 +79,7 @@ func (p *Publisher) Publish(ctx context.Context, site models.Site) error {
 		pubSite := pubmodel.Site{
 			Site: site,
 			PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] {
-				return p.publishedPostIter(ctx, site.ID)
+				return p.postIter(ctx, site.ID)
 			},
 			BaseURL:    target.BaseURL,
 			Uploads:    uploads,
--- a/services/services.go
+++ b/services/services.go
@ -8,7 +8,6 @@ import (
 	"lmika.dev/lmika/weiro/providers/uploadfiles"
 	"lmika.dev/lmika/weiro/services/auth"
 	"lmika.dev/lmika/weiro/services/categories"
-	"lmika.dev/lmika/weiro/services/imgedit"
 	"lmika.dev/lmika/weiro/services/pages"
 	"lmika.dev/lmika/weiro/services/posts"
 	"lmika.dev/lmika/weiro/services/publisher"
@ -24,7 +23,6 @@ type Services struct {
 	Posts          *posts.Service
 	Sites          *sites.Service
 	Uploads        *uploads.Service
-	ImageEdit      *imgedit.Service
 	Categories     *categories.Service
 	Pages          *pages.Service
 }
@ -43,7 +41,6 @@ func New(cfg config.Config) (*Services, error) {
 	postService := posts.New(dbp, publisherQueue)
 	siteService := sites.New(dbp)
 	uploadService := uploads.New(dbp, ufp, filepath.Join(cfg.ScratchDir, "uploads", "pending"))
-	imageEditService := imgedit.New(uploadService, filepath.Join(cfg.ScratchDir, "imageedit"))
 	categoriesService := categories.New(dbp, publisherQueue)
 	pagesService := pages.New(dbp, publisherQueue)

@ -55,7 +52,6 @@ func New(cfg config.Config) (*Services, error) {
 		Posts:          postService,
 		Sites:          siteService,
 		Uploads:        uploadService,
-		ImageEdit:      imageEditService,
 		Categories:     categoriesService,
 		Pages:          pagesService,
 	}, nil
--- a/services/uploads/manage.go
+++ b/services/uploads/manage.go
@ -6,10 +6,7 @@ import (
 	"html/template"
 	"io"
 	"log"
-	"os"
-	"path/filepath"
 	"strings"
-	"time"

 	"lmika.dev/lmika/weiro/models"
 )
@ -70,75 +67,6 @@ func (s *Service) renderCopyTemplate(upload models.Upload) string {
 	return sb.String()
 }

-func (s *Service) ReplaceUploadFile(ctx context.Context, uploadID int64, srcPath string) (models.Upload, error) {
-	site, _, err := s.fetchSiteAndUser(ctx)
-	if err != nil {
-		return models.Upload{}, err
-	}
-
-	upload, err := s.db.SelectUploadByID(ctx, uploadID)
-	if err != nil {
-		return models.Upload{}, err
-	} else if upload.SiteID != site.ID {
-		return models.Upload{}, models.NotFoundError
-	}
-
-	if err := s.up.ReplaceFile(site, upload, srcPath); err != nil {
-		return models.Upload{}, err
-	}
-
-	stat, err := os.Stat(srcPath)
-	if err != nil {
-		return models.Upload{}, err
-	}
-	upload.FileSize = stat.Size()
-
-	if err := s.db.UpdateUploadFileSize(ctx, upload.ID, upload.FileSize); err != nil {
-		return models.Upload{}, err
-	}
-
-	return upload, nil
-}
-
-func (s *Service) CreateUploadFromFile(ctx context.Context, srcPath string, filename string, mimeType string) (models.Upload, error) {
-	site, _, err := s.fetchSiteAndUser(ctx)
-	if err != nil {
-		return models.Upload{}, err
-	}
-
-	stat, err := os.Stat(srcPath)
-	if err != nil {
-		return models.Upload{}, err
-	}
-
-	newUploadGUID := models.NewNanoID()
-	newTime := time.Now().UTC()
-	newSlug := filepath.Join(
-		fmt.Sprintf("%04d", newTime.Year()),
-		fmt.Sprintf("%02d", newTime.Month()),
-		newUploadGUID+filepath.Ext(filename),
-	)
-
-	newUpload := models.Upload{
-		SiteID:    site.ID,
-		GUID:      models.NewNanoID(),
-		FileSize:  stat.Size(),
-		MIMEType:  mimeType,
-		Filename:  filename,
-		CreatedAt: newTime,
-		Slug:      newSlug,
-	}
-	if err := s.db.SaveUpload(ctx, &newUpload); err != nil {
-		return models.Upload{}, err
-	}
-
-	if err := s.up.AdoptFile(site, newUpload, srcPath); err != nil {
-		return models.Upload{}, err
-	}
-
-	return newUpload, nil
-}
-
 func (s *Service) ListUploads(ctx context.Context) (res []UploadWithURL, _ error) {
 	site, _, err := s.fetchSiteAndUser(ctx)
 	if err != nil {
--- a/sql/queries/categories.sql
+++ b/sql/queries/categories.sql
@ -17,7 +17,7 @@ INNER JOIN post_categories pc ON pc.category_id = c.id
 WHERE pc.post_id = ?
 ORDER BY c.name ASC;

-- name: SelectPublishedPostsOfCategory :many
+-- name: SelectPostsOfCategory :many
 SELECT p.* FROM posts p
 INNER JOIN post_categories pc ON pc.post_id = p.id
 WHERE pc.category_id = ? AND p.state = 0 AND p.deleted_at = 0
--- a/sql/queries/posts.sql
+++ b/sql/queries/posts.sql
@ -17,12 +17,6 @@ WHERE site_id = sqlc.arg(site_id) AND (
    END
 ) ORDER BY created_at DESC LIMIT sqlc.arg(limit) OFFSET sqlc.arg(offset);

-- name: SelectPublishedPostsOfSite :many
-SELECT *
-FROM posts
-WHERE site_id = sqlc.arg(site_id) AND state = 0 AND deleted_at = 0
-ORDER BY published_at DESC LIMIT sqlc.arg(limit) OFFSET sqlc.arg(offset);
-
 -- name: SelectPost :one
 SELECT * FROM posts WHERE id = ? LIMIT 1;

--- a/sql/queries/uploads.sql
+++ b/sql/queries/uploads.sql
@ -7,7 +7,7 @@ SELECT * FROM uploads WHERE id = ? LIMIT 1;
 -- name: SelectUploadBySiteIDAndSlug :one
 SELECT * FROM uploads WHERE site_id = ? AND slug = ? LIMIT 1;

-- name: InsertUpload :one
+-- name: InsertUpload :exec
 INSERT INTO uploads (
    site_id,
    guid,
@ -23,8 +23,5 @@ RETURNING id;
 -- name: UpdateUpload :exec
 UPDATE uploads SET alt = ? WHERE id = ?;

-- name: UpdateUploadFileSize :exec
-UPDATE uploads SET file_size = ? WHERE id = ?;
-
 -- name: DeleteUpload :exec
 DELETE FROM uploads WHERE id = ?;
--- a/views/posts/edit.html
+++ b/views/posts/edit.html
@ -1,5 +1,5 @@
 {{ $isPublished := ne .post.State 1 }}
-<main class="flex-grow-1 position-relative post-edit-page">
+<main class="flex-grow-1 position-relative">
  <form action="/sites/{{.site.ID}}/posts" method="post" class="container-fluid post-form py-2"
    data-controller="postedit"
        data-action="keydown.meta+s->postedit#save keydown.meta+enter->postedit#publish"
--- a/views/uploads/edit.html
+++ b/views/uploads/edit.html
@ -1,31 +0,0 @@
-<main class="flex-grow-1 flex-shrink-1"
-    data-controller="edit-upload"
-    data-edit-upload-site-id-value="{{ .site.ID }}"
-    data-edit-upload-upload-id-value="{{ .upload.Upload.ID }}"
->
-  <div class="flex-grow-1 flex-shrink-1 d-flex flex-column">
-    <div class="row flex-grow-1 flex-shrink-1 m-0">
-      <figure class="col-md-9 p-3">
-        <img data-edit-upload-target="preview" src="{{ .upload.URL }}" alt="{{ .upload.Upload.Alt }}" class="img-fluid" style="max-height: 80vw;">
-      </figure>
-      <div class="col-md-3 p-3">
-        <div data-edit-upload-target="processList"></div>
-
-        <div class="text-center">
-          <div class="dropdown">
-            <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-              Add Processor
-            </button>
-            <ul class="dropdown-menu">
-              <li><a class="dropdown-item" href="#" data-action="edit-upload#addProcessor">Shadow</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="col-md-9 m-3">
-    <button class="btn btn-primary" data-action="edit-upload#saveUpload">Save</button>
-    <button class="btn btn-secondary" data-action="edit-upload#saveNewUpload">Save as Copy</button>
-  </div>
-</main>
--- a/views/uploads/show.html
+++ b/views/uploads/show.html
@ -5,10 +5,7 @@
       data-show-upload-site-id-value="{{ .upload.Upload.SiteID }}"
       data-show-upload-upload-id-value="{{ .upload.Upload.ID }}">
    <button class="btn btn-outline-dark" data-action="show-upload#copy">Copy HTML</button>
-    <span>
-      <a href="/sites/{{ .site.ID }}/uploads/{{ .upload.Upload.ID }}/edit" class="btn btn-secondary">Edit</a>
    <button class="btn btn-danger" data-action="show-upload#delete">Delete</button>
-    </span>
  </div>

  <figure>