Version bump

- Fix log on redirection
- Move page handlers to its own file
- Add version to admin area footer
- Move generator to HttpContext extension property

src/MyWebLog.Data/MyWebLog.Data.fsproj

@@ -11,7 +11,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.6" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.7" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
 		<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.7" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

src/MyWebLog.Domain/DataTypes.fs

@@ -405,11 +405,6 @@ module WebLog =
         TimeZoneInfo.ConvertTimeFromUtc
             (DateTime (date.Ticks, DateTimeKind.Utc), TimeZoneInfo.FindSystemTimeZoneById webLog.timeZone) 
 
-    /// Convert a date/time in the web log's local date/time to UTC
-    let utcTime webLog (date : DateTime) =
-        TimeZoneInfo.ConvertTimeToUtc
-            (DateTime (date.Ticks, DateTimeKind.Unspecified), TimeZoneInfo.FindSystemTimeZoneById webLog.timeZone)
-
 
 /// A user of the web log
 [<CLIMutable; NoComparison; NoEquality>]

src/MyWebLog.Domain/ViewModels.fs

@@ -147,6 +147,28 @@ type DisplayPage =
         }
 
 
+/// Information about a revision used for display
+[<CLIMutable; NoComparison; NoEquality>]
+type DisplayRevision =
+    {   /// The as-of date/time for the revision
+        asOf : DateTime
+        
+        /// The as-of date/time for the revision in the web log's local time zone
+        asOfLocal : DateTime
+        
+        /// The format of the text of the revision
+        format : string
+    }
+with
+
+    /// Create a display revision from an actual revision
+    static member fromRevision webLog (rev : Revision) =
+        { asOf      = rev.asOf
+          asOfLocal = WebLog.localTime webLog rev.asOf
+          format    = MarkupText.sourceType rev.text
+        }
+
+
 open System.IO
 
 /// Information about an uploaded file used for display
@@ -766,6 +788,39 @@ type ManagePermalinksModel =
         }
 
 
+/// View model to manage revisions
+[<CLIMutable; NoComparison; NoEquality>]
+type ManageRevisionsModel =
+    {   /// The ID for the entity being edited
+        id : string
+        
+        /// The type of entity being edited ("page" or "post")
+        entity : string
+        
+        /// The current title of the page or post
+        currentTitle : string
+        
+        /// The revisions for the page or post
+        revisions : DisplayRevision[]
+    }
+    
+    /// Create a revision model from a page
+    static member fromPage webLog (pg : Page) =
+        { id           = PageId.toString pg.id
+          entity       = "page"
+          currentTitle = pg.title
+          revisions    = pg.revisions |> List.map (DisplayRevision.fromRevision webLog) |> Array.ofList
+        }
+
+    /// Create a revision model from a post
+    static member fromPost webLog (post : Post) =
+        { id           = PostId.toString post.id
+          entity       = "post"
+          currentTitle = post.title
+          revisions    = post.revisions |> List.map (DisplayRevision.fromRevision webLog) |> Array.ofList
+        }
+
+
 /// View model for posts in a list
 [<NoComparison; NoEquality>]
 type PostListItem =

src/MyWebLog/Caches.fs

@@ -7,16 +7,45 @@ open MyWebLog.Data
 [<AutoOpen>]
 module Extensions =
     
+    open System.Security.Claims
+    open Microsoft.AspNetCore.Antiforgery
+    open Microsoft.Extensions.Configuration
     open Microsoft.Extensions.DependencyInjection
     
+    /// Hold variable for the configured generator string
+    let mutable private generatorString : string option = None
+    
     type HttpContext with
-        /// The web log for the current request
-        member this.WebLog = this.Items["webLog"] :?> WebLog
         
+        /// The anti-CSRF service
+        member this.AntiForgery = this.RequestServices.GetRequiredService<IAntiforgery> ()
+        
+        /// The cross-site request forgery token set for this request
+        member this.CsrfTokenSet = this.AntiForgery.GetAndStoreTokens this
+
         /// The data implementation
         member this.Data = this.RequestServices.GetRequiredService<IData> ()
-
         
+        /// The generator string
+        member this.Generator =
+            match generatorString with
+            | Some gen -> gen
+            | None ->
+                let cfg = this.RequestServices.GetRequiredService<IConfiguration> ()
+                generatorString <-
+                    match Option.ofObj cfg["Generator"] with
+                    | Some gen -> Some gen
+                    | None -> Some "generator not configured"
+                generatorString.Value
+
+        /// The user ID for the current request
+        member this.UserId =
+            WebLogUserId (this.User.Claims |> Seq.find (fun c -> c.Type = ClaimTypes.NameIdentifier)).Value
+
+        /// The web log for the current request
+        member this.WebLog = this.Items["webLog"] :?> WebLog
+
+
 open System.Collections.Concurrent
 
 /// <summary>

src/MyWebLog/DotLiquidBespoke.fs

@@ -222,17 +222,17 @@ let register () =
     Template.RegisterTag<PageFootTag>  "page_foot"
     Template.RegisterTag<UserLinksTag> "user_links"
     
-    [   // Domain types
+    [ // Domain types
-        typeof<CustomFeed>; typeof<Episode>; typeof<Episode option>;    typeof<MetaItem>; typeof<Page>
+      typeof<CustomFeed>; typeof<Episode>; typeof<Episode option>;    typeof<MetaItem>; typeof<Page>
-        typeof<RssOptions>; typeof<TagMap>;  typeof<UploadDestination>; typeof<WebLog>
+      typeof<RssOptions>; typeof<TagMap>;  typeof<UploadDestination>; typeof<WebLog>
-        // View models
+      // View models
-        typeof<DashboardModel>; typeof<DisplayCategory>;       typeof<DisplayCustomFeed>;   typeof<DisplayPage>
+      typeof<DashboardModel>;  typeof<DisplayCategory>;  typeof<DisplayCustomFeed>;     typeof<DisplayPage>
-        typeof<DisplayUpload>;  typeof<EditCategoryModel>;     typeof<EditCustomFeedModel>; typeof<EditPageModel>
+      typeof<DisplayRevision>; typeof<DisplayUpload>;    typeof<EditCategoryModel>;     typeof<EditCustomFeedModel>
-        typeof<EditPostModel>;  typeof<EditRssModel>;          typeof<EditTagMapModel>;     typeof<EditUserModel>
+      typeof<EditPageModel>;   typeof<EditPostModel>;    typeof<EditRssModel>;          typeof<EditTagMapModel>
-        typeof<LogOnModel>;     typeof<ManagePermalinksModel>; typeof<PostDisplay>;         typeof<PostListItem>
+      typeof<EditUserModel>;   typeof<LogOnModel>;       typeof<ManagePermalinksModel>; typeof<ManageRevisionsModel>
-        typeof<SettingsModel>;  typeof<UserMessage>
+      typeof<PostDisplay>;     typeof<PostListItem>;     typeof<SettingsModel>;         typeof<UserMessage>
-        // Framework types
+      // Framework types
-        typeof<AntiforgeryTokenSet>; typeof<DateTime option>; typeof<int option>;    typeof<KeyValuePair>
+      typeof<AntiforgeryTokenSet>; typeof<DateTime option>; typeof<int option>;    typeof<KeyValuePair>
-        typeof<MetaItem list>;       typeof<string list>;     typeof<string option>; typeof<TagMap list>
+      typeof<MetaItem list>;       typeof<string list>;     typeof<string option>; typeof<TagMap list>
     ]
     |> List.iter (fun it -> Template.RegisterSafeType (it, [| "*" |]))

src/MyWebLog/Handlers/Admin.fs

@@ -39,10 +39,10 @@ let dashboard : HttpHandler = fun next ctx -> task {
 let listCategories : HttpHandler = fun next ctx -> task {
     let! catListTemplate = TemplateCache.get "admin" "category-list-body" ctx.Data
     let hash = Hash.FromAnonymousObject {|
+        page_title = "Categories"
+        csrf       = ctx.CsrfTokenSet
         web_log    = ctx.WebLog
         categories = CategoryCache.get ctx
-        page_title = "Categories"
-        csrf       = csrfToken ctx
     |}
     hash.Add ("category_list", catListTemplate.Render hash)
     return! viewForTheme "admin" "category-list" next ctx hash
@@ -53,7 +53,7 @@ let listCategoriesBare : HttpHandler = fun next ctx -> task {
     return!
         Hash.FromAnonymousObject {|
             categories = CategoryCache.get ctx
-            csrf       = csrfToken ctx
+            csrf       = ctx.CsrfTokenSet
         |}
         |> bareForTheme "admin" "category-list-body" next ctx
 }
@@ -73,9 +73,9 @@ let editCategory catId : HttpHandler = fun next ctx -> task {
     | Some (title, cat) ->
         return!
             Hash.FromAnonymousObject {|
-                csrf       = csrfToken ctx
-                model      = EditCategoryModel.fromCategory cat
                 page_title = title
+                csrf       = ctx.CsrfTokenSet
+                model      = EditCategoryModel.fromCategory cat
                 categories = CategoryCache.get ctx
             |}
             |> bareForTheme "admin" "category-edit" next ctx
@@ -118,156 +118,16 @@ let deleteCategory catId : HttpHandler = fun next ctx -> task {
     return! listCategoriesBare next ctx
 }
 
-// -- PAGES --
+open Microsoft.AspNetCore.Http
-
-// GET /admin/pages
-// GET /admin/pages/page/{pageNbr}
-let listPages pageNbr : HttpHandler = fun next ctx -> task {
-    let  webLog = ctx.WebLog
-    let! pages  = ctx.Data.Page.findPageOfPages webLog.id pageNbr
-    return!
-        Hash.FromAnonymousObject {|
-            csrf       = csrfToken ctx
-            pages      = pages |> List.map (DisplayPage.fromPageMinimal webLog)
-            page_title = "Pages"
-            page_nbr   = pageNbr
-            prev_page  = if pageNbr = 2 then "" else $"/page/{pageNbr - 1}"
-            next_page  = $"/page/{pageNbr + 1}"
-        |}
-        |> viewForTheme "admin" "page-list" next ctx
-}
-
-// GET /admin/page/{id}/edit
-let editPage pgId : HttpHandler = fun next ctx -> task {
-    let! result = task {
-        match pgId with
-        | "new" -> return Some ("Add a New Page", { Page.empty with id = PageId "new" })
-        | _ ->
-            match! ctx.Data.Page.findFullById (PageId pgId) ctx.WebLog.id with
-            | Some page -> return Some ("Edit Page", page)
-            | None -> return None
-    }
-    match result with
-    | Some (title, page) ->
-        let  model     = EditPageModel.fromPage page
-        let! templates = templatesForTheme ctx "page"
-        return!
-            Hash.FromAnonymousObject {|
-                csrf       = csrfToken ctx
-                model      = model
-                metadata   = Array.zip model.metaNames model.metaValues
-                             |> Array.mapi (fun idx (name, value) -> [| string idx; name; value |])
-                page_title = title
-                templates  = templates
-            |}
-            |> viewForTheme "admin" "page-edit" next ctx
-    | None -> return! Error.notFound next ctx
-}
-
-// GET /admin/page/{id}/permalinks
-let editPagePermalinks pgId : HttpHandler = fun next ctx -> task {
-    match! ctx.Data.Page.findFullById (PageId pgId) ctx.WebLog.id with
-    | Some pg ->
-        return!
-            Hash.FromAnonymousObject {|
-                csrf       = csrfToken ctx
-                model      = ManagePermalinksModel.fromPage pg
-                page_title = $"Manage Prior Permalinks"
-            |}
-            |> viewForTheme "admin" "permalinks" next ctx
-    | None -> return! Error.notFound next ctx
-}
-
-// POST /admin/page/permalinks
-let savePagePermalinks : HttpHandler = fun next ctx -> task {
-    let  webLog = ctx.WebLog
-    let! model  = ctx.BindFormAsync<ManagePermalinksModel> ()
-    let  links  = model.prior |> Array.map Permalink |> List.ofArray
-    match! ctx.Data.Page.updatePriorPermalinks (PageId model.id) webLog.id links with
-    | true ->
-        do! addMessage ctx { UserMessage.success with message = "Page permalinks saved successfully" }
-        return! redirectToGet (WebLog.relativeUrl webLog (Permalink $"admin/page/{model.id}/permalinks")) next ctx
-    | false -> return! Error.notFound next ctx
-}
-
-// POST /admin/page/{id}/delete
-let deletePage pgId : HttpHandler = fun next ctx -> task {
-    let webLog = ctx.WebLog
-    match! ctx.Data.Page.delete (PageId pgId) webLog.id with
-    | true ->
-        do! PageListCache.update ctx
-        do! addMessage ctx { UserMessage.success with message = "Page deleted successfully" }
-    | false -> do! addMessage ctx { UserMessage.error with message = "Page not found; nothing deleted" }
-    return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin/pages")) next ctx
-}
-
-open System
-
-#nowarn "3511"
-
-// POST /admin/page/save
-let savePage : HttpHandler = fun next ctx -> task {
-    let! model  = ctx.BindFormAsync<EditPageModel> ()
-    let  webLog = ctx.WebLog
-    let  data   = ctx.Data
-    let  now    = DateTime.UtcNow
-    let! pg     = task {
-        match model.pageId with
-        | "new" ->
-            return Some
-                { Page.empty with
-                    id          = PageId.create ()
-                    webLogId    = webLog.id
-                    authorId    = userId ctx
-                    publishedOn = now
-                }
-        | pgId -> return! data.Page.findFullById (PageId pgId) webLog.id
-    }
-    match pg with
-    | Some page ->
-        let updateList = page.showInPageList <> model.isShownInPageList
-        let revision   = { asOf = now; text = MarkupText.parse $"{model.source}: {model.text}" }
-        // Detect a permalink change, and add the prior one to the prior list
-        let page =
-            match Permalink.toString page.permalink with
-            | "" -> page
-            | link when link = model.permalink -> page
-            | _ -> { page with priorPermalinks = page.permalink :: page.priorPermalinks }
-        let page =
-            { page with
-                title          = model.title
-                permalink      = Permalink model.permalink
-                updatedOn      = now
-                showInPageList = model.isShownInPageList
-                template       = match model.template with "" -> None | tmpl -> Some tmpl
-                text           = MarkupText.toHtml revision.text
-                metadata       = Seq.zip model.metaNames model.metaValues
-                                 |> Seq.filter (fun it -> fst it > "")
-                                 |> Seq.map (fun it -> { name = fst it; value = snd it })
-                                 |> Seq.sortBy (fun it -> $"{it.name.ToLower ()} {it.value.ToLower ()}")
-                                 |> List.ofSeq
-                revisions      = match page.revisions |> List.tryHead with
-                                 | Some r when r.text = revision.text -> page.revisions
-                                 | _ -> revision :: page.revisions
-            }
-        do! (if model.pageId = "new" then data.Page.add else data.Page.update) page
-        if updateList then do! PageListCache.update ctx
-        do! addMessage ctx { UserMessage.success with message = "Page saved successfully" }
-        return!
-            redirectToGet (WebLog.relativeUrl webLog (Permalink $"admin/page/{PageId.toString page.id}/edit")) next ctx
-    | None -> return! Error.notFound next ctx
-}
 
 // -- TAG MAPPINGS --
 
-open Microsoft.AspNetCore.Http
-
 /// Get the hash necessary to render the tag mapping list
 let private tagMappingHash (ctx : HttpContext) = task {
     let! mappings = ctx.Data.TagMap.findByWebLog ctx.WebLog.id
     return Hash.FromAnonymousObject {|
+        csrf        = ctx.CsrfTokenSet
         web_log     = ctx.WebLog
-        csrf        = csrfToken ctx
         mappings    = mappings
         mapping_ids = mappings |> List.map (fun it -> { name = it.tag; value = TagMapId.toString it.id })
     |}
@@ -302,9 +162,9 @@ let editMapping tagMapId : HttpHandler = fun next ctx -> task {
     | Some tm ->
         return!
             Hash.FromAnonymousObject {|
-                csrf       = csrfToken ctx
-                model      = EditTagMapModel.fromMapping tm
                 page_title = if isNew then "Add Tag Mapping" else $"Mapping for {tm.tag} Tag" 
+                csrf       = ctx.CsrfTokenSet
+                model      = EditTagMapModel.fromMapping tm
             |}
             |> bareForTheme "admin" "tag-mapping-edit" next ctx
     | None -> return! Error.notFound next ctx
@@ -337,6 +197,7 @@ let deleteMapping tagMapId : HttpHandler = fun next ctx -> task {
 
 // -- THEMES --
 
+open System
 open System.IO
 open System.IO.Compression
 open System.Text.RegularExpressions
@@ -346,8 +207,8 @@ open MyWebLog.Data
 let themeUpdatePage : HttpHandler = fun next ctx -> task {
     return!
         Hash.FromAnonymousObject {|
-            csrf       = csrfToken ctx
             page_title = "Upload Theme"
+            csrf       = ctx.CsrfTokenSet
         |}
         |> viewForTheme "admin" "upload-theme" next ctx
 }
@@ -442,13 +303,13 @@ let updateTheme : HttpHandler = fun next ctx -> task {
             do! ThemeAssetCache.refreshTheme (ThemeId themeName) data
             TemplateCache.invalidateTheme themeName
             do! addMessage ctx { UserMessage.success with message = "Theme updated successfully" }
-            return! redirectToGet (WebLog.relativeUrl ctx.WebLog (Permalink "admin/dashboard")) next ctx
+            return! redirectToGet "admin/dashboard" next ctx
         | Ok _ ->
             do! addMessage ctx { UserMessage.error with message = "You may not replace the admin theme" }
-            return! redirectToGet (WebLog.relativeUrl ctx.WebLog (Permalink "admin/theme/update")) next ctx
+            return! redirectToGet "admin/theme/update" next ctx
         | Error message ->
             do! addMessage ctx { UserMessage.error with message = message }
-            return! redirectToGet (WebLog.relativeUrl ctx.WebLog (Permalink "admin/theme/update")) next ctx
+            return! redirectToGet "admin/theme/update" next ctx
     else
         return! RequestErrors.BAD_REQUEST "Bad request" next ctx
 }
@@ -465,11 +326,12 @@ let settings : HttpHandler = fun next ctx -> task {
     let! themes   = data.Theme.all ()
     return!
         Hash.FromAnonymousObject {|
-            csrf  = csrfToken ctx
+            page_title = "Web Log Settings"
-            model = SettingsModel.fromWebLog webLog
+            csrf       = ctx.CsrfTokenSet
-            pages =
+            web_log    = webLog
-                seq {
+            model      = SettingsModel.fromWebLog webLog
-                    KeyValuePair.Create ("posts", "- First Page of Posts -")
+            pages      = seq
+                {   KeyValuePair.Create ("posts", "- First Page of Posts -")
                     yield! allPages
                            |> List.sortBy (fun p -> p.title.ToLower ())
                            |> List.map (fun p -> KeyValuePair.Create (PageId.toString p.id, p.title))
@@ -480,12 +342,10 @@ let settings : HttpHandler = fun next ctx -> task {
                  |> Seq.ofList
                  |> Seq.map (fun it -> KeyValuePair.Create (ThemeId.toString it.id, $"{it.name} (v{it.version})"))
                  |> Array.ofSeq
-            upload_values =
+            upload_values = [|
-                [|  KeyValuePair.Create (UploadDestination.toString Database, "Database")
+                    KeyValuePair.Create (UploadDestination.toString Database, "Database")
                     KeyValuePair.Create (UploadDestination.toString Disk,     "Disk")
                 |]
-            web_log    = webLog
-            page_title = "Web Log Settings"
         |}
         |> viewForTheme "admin" "settings" next ctx
 }
@@ -511,6 +371,6 @@ let saveSettings : HttpHandler = fun next ctx -> task {
             if Directory.Exists oldDir then Directory.Move (oldDir, Path.Combine (uploadRoot, webLog.slug))
     
         do! addMessage ctx { UserMessage.success with message = "Web log settings saved successfully" }
-        return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin/settings")) next ctx
+        return! redirectToGet "admin/settings" next ctx
     | None -> return! Error.notFound next ctx
 }

src/MyWebLog/Handlers/Error.fs

@@ -2,21 +2,20 @@
 module MyWebLog.Handlers.Error
 
 open System.Net
-open System.Threading.Tasks
 open Giraffe
-open Microsoft.AspNetCore.Http
 open MyWebLog
 
 /// Handle unauthorized actions, redirecting to log on for GETs, otherwise returning a 401 Not Authorized response
-let notAuthorized : HttpHandler = fun next ctx -> task {
+let notAuthorized : HttpHandler =
-    if ctx.Request.Method = "GET" then
+    handleContext (fun ctx ->
-        let returnUrl = WebUtility.UrlEncode ctx.Request.Path
+        if ctx.Request.Method = "GET" then
-        return!
+            let returnUrl = WebUtility.UrlEncode ctx.Request.Path
-            redirectTo false (WebLog.relativeUrl ctx.WebLog (Permalink $"user/log-on?returnUrl={returnUrl}")) next ctx
+            redirectTo false (WebLog.relativeUrl ctx.WebLog (Permalink $"user/log-on?returnUrl={returnUrl}"))
-    else
+                earlyReturn ctx
-        return! (setStatusCode 401 >=> fun _ _ -> Task.FromResult<HttpContext option> None) next ctx
+        else
-}
+            setStatusCode 401 earlyReturn ctx)
+
 
 /// Handle 404s from the API, sending known URL paths to the Vue app so that they can be handled there
-let notFound : HttpHandler =
+let notFound : HttpHandler = fun _ ->
-    setStatusCode 404 >=> text "Not found"
+    (setStatusCode 404 >=> text "Not found") earlyReturn

src/MyWebLog/Handlers/Feed.fs

@@ -382,7 +382,7 @@ let createFeed (feedType : FeedType) posts : HttpHandler = fun next ctx -> backg
     setTitleAndDescription feedType webLog cats feed
     
     feed.LastUpdatedTime <- (List.head posts).updatedOn |> DateTimeOffset
-    feed.Generator       <- generator ctx
+    feed.Generator       <- ctx.Generator
     feed.Items           <- posts |> Seq.ofList |> Seq.map toItem
     feed.Language        <- "en"
     feed.Id              <- WebLog.absoluteUrl webLog link
@@ -423,9 +423,9 @@ let editSettings : HttpHandler = fun next ctx -> task {
         webLog.rss.customFeeds
         |> List.map (DisplayCustomFeed.fromFeed (CategoryCache.get ctx))
         |> Array.ofList
-    return! Hash.FromAnonymousObject
+    return! Hash.FromAnonymousObject {|
-        {|  csrf         = csrfToken ctx
             page_title   = "RSS Settings"
+            csrf         = ctx.CsrfTokenSet
             model        = EditRssModel.fromRssOptions webLog.rss
             custom_feeds = feeds
         |}
@@ -442,7 +442,7 @@ let saveSettings : HttpHandler = fun next ctx -> task {
         do! data.WebLog.updateRssOptions webLog
         WebLogCache.set webLog
         do! addMessage ctx { UserMessage.success with message = "RSS settings updated successfully" }
-        return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin/settings/rss")) next ctx
+        return! redirectToGet "admin/settings/rss" next ctx
     | None -> return! Error.notFound next ctx
 }
 
@@ -454,9 +454,9 @@ let editCustomFeed feedId : HttpHandler = fun next ctx -> task {
         | _     -> ctx.WebLog.rss.customFeeds |> List.tryFind (fun f -> f.id = CustomFeedId feedId)
     match customFeed with
     | Some f ->
-        return! Hash.FromAnonymousObject
+        return! Hash.FromAnonymousObject {|
-            {|  csrf          = csrfToken ctx
                 page_title    = $"""{if feedId = "new" then "Add" else "Edit"} Custom RSS Feed"""
+                csrf          = ctx.CsrfTokenSet
                 model         = EditCustomFeedModel.fromFeed f
                 categories    = CategoryCache.get ctx
                 medium_values = [|
@@ -494,8 +494,7 @@ let saveCustomFeed : HttpHandler = fun next ctx -> task {
                 UserMessage.success with
                   message = $"""Successfully {if model.id = "new" then "add" else "sav"}ed custom feed"""
             }
-            let nextUrl = $"admin/settings/rss/{CustomFeedId.toString feed.id}/edit" 
+            return! redirectToGet $"admin/settings/rss/{CustomFeedId.toString feed.id}/edit" next ctx
-            return! redirectToGet (WebLog.relativeUrl webLog (Permalink nextUrl)) next ctx
         | None -> return! Error.notFound next ctx
     | None -> return! Error.notFound next ctx
 }
@@ -519,6 +518,6 @@ let deleteCustomFeed feedId : HttpHandler = fun next ctx -> task {
             do! addMessage ctx { UserMessage.success with message = "Custom feed deleted successfully" }
         else
             do! addMessage ctx { UserMessage.warning with message = "Custom feed not found; no action taken" }
-        return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin/settings/rss")) next ctx
+        return! redirectToGet "admin/settings/rss" next ctx
     | None -> return! Error.notFound next ctx
 }

src/MyWebLog/Handlers/Helpers.fs

@@ -52,24 +52,6 @@ let messages (ctx : HttpContext) = task {
     | None -> return [||]
 }
 
-/// Hold variable for the configured generator string
-let mutable private generatorString : string option = None
-
-open Microsoft.Extensions.Configuration
-open Microsoft.Extensions.DependencyInjection
-
-/// Get the generator string
-let generator (ctx : HttpContext) =
-    match generatorString with
-    | Some gen -> gen
-    | None ->
-        let cfg = ctx.RequestServices.GetRequiredService<IConfiguration> ()
-        generatorString <-
-            match Option.ofObj cfg["Generator"] with
-            | Some gen -> Some gen
-            | None -> Some "generator not configured"
-        generatorString.Value
-
 open MyWebLog
 open DotLiquid
 
@@ -94,14 +76,14 @@ let private populateHash hash ctx = task {
     hash.Add ("page_list",    PageListCache.get ctx)
     hash.Add ("current_page", ctx.Request.Path.Value.Substring 1)
     hash.Add ("messages",     messages)
-    hash.Add ("generator",    generator ctx)
+    hash.Add ("generator",    ctx.Generator)
     hash.Add ("htmx_script",  htmxScript)
     
     do! commitSession ctx
 }
 
 /// Render a view for the specified theme, using the specified template, layout, and hash
-let viewForTheme theme template next ctx = fun (hash : Hash) -> task {
+let viewForTheme theme template next ctx (hash : Hash) = task {
     do! populateHash hash ctx
     
     // NOTE: DotLiquid does not support {% render %} or {% include %} in its templates, so we will do a 2-pass render;
@@ -119,13 +101,14 @@ let viewForTheme theme template next ctx = fun (hash : Hash) -> task {
 }
 
 /// Render a bare view for the specified theme, using the specified template and hash
-let bareForTheme theme template next ctx = fun (hash : Hash) -> task {
+let bareForTheme theme template next ctx (hash : Hash) = task {
     do! populateHash hash ctx
     
-    // Bare templates are rendered with layout-bare
+    if not (hash.ContainsKey "content") then
-    let! contentTemplate = TemplateCache.get theme template ctx.Data
+        let! contentTemplate = TemplateCache.get theme template ctx.Data
-    hash.Add ("content", contentTemplate.Render hash)
+        hash.Add ("content", contentTemplate.Render hash)
     
+    // Bare templates are rendered with layout-bare
     let! layoutTemplate = TemplateCache.get theme "layout-bare" ctx.Data
     
     // add messages as HTTP headers
@@ -138,7 +121,7 @@ let bareForTheme theme template next ctx = fun (hash : Hash) -> task {
                 | Some detail -> $"{m.level}|||{m.message}|||{detail}"
                 | None -> $"{m.level}|||{m.message}"
                 |> setHttpHeader "X-Message")
-        withHxNoPush
+        withHxNoPushUrl
         htmlString (layoutTemplate.Render hash)
         }
     
@@ -146,36 +129,21 @@ let bareForTheme theme template next ctx = fun (hash : Hash) -> task {
 }
 
 /// Return a view for the web log's default theme
-let themedView template next ctx = fun (hash : Hash) -> task {
+let themedView template next ctx hash =
-    return! viewForTheme (deriveWebLogFromHash hash ctx).themePath template next ctx hash
+    viewForTheme (deriveWebLogFromHash hash ctx).themePath template next ctx hash
-}
+
 
 /// Redirect after doing some action; commits session and issues a temporary redirect
-let redirectToGet url : HttpHandler = fun next ctx -> task {
+let redirectToGet url : HttpHandler = fun _ ctx -> task {
     do! commitSession ctx
-    return! redirectTo false url next ctx
+    return! redirectTo false (WebLog.relativeUrl ctx.WebLog (Permalink url)) earlyReturn ctx
 }
 
-open System.Security.Claims
-
-/// Get the user ID for the current request
-let userId (ctx : HttpContext) =
-    WebLogUserId (ctx.User.Claims |> Seq.find (fun c -> c.Type = ClaimTypes.NameIdentifier)).Value
-
-open Microsoft.AspNetCore.Antiforgery
-
-/// Get the Anti-CSRF service
-let private antiForgery (ctx : HttpContext) = ctx.RequestServices.GetRequiredService<IAntiforgery> ()
-
-/// Get the cross-site request forgery token set
-let csrfToken (ctx : HttpContext) =
-    (antiForgery ctx).GetAndStoreTokens ctx
-
 /// Validate the cross-site request forgery token in the current request
 let validateCsrf : HttpHandler = fun next ctx -> task {
-    match! (antiForgery ctx).IsRequestValidAsync ctx with
+    match! ctx.AntiForgery.IsRequestValidAsync ctx with
     | true -> return! next ctx
-    | false -> return! RequestErrors.BAD_REQUEST "CSRF token invalid" next ctx
+    | false -> return! RequestErrors.BAD_REQUEST "CSRF token invalid" earlyReturn ctx
 }
 
 /// Require a user to be logged on
@@ -226,6 +194,14 @@ let getCategoryIds slug ctx =
     |> Seq.map (fun c -> CategoryId c.id)
     |> List.ofSeq
 
+open System
+open System.Globalization
+
+/// Parse a date/time to UTC 
+let parseToUtc (date : string) =
+    DateTime.Parse (date, null, DateTimeStyles.AdjustToUniversal)
+
+open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.Logging
 
 /// Log level for debugging

src/MyWebLog/Handlers/Page.fs

@@ -0,0 +1,221 @@
+/// Handlers to manipulate pages
+module MyWebLog.Handlers.Page
+
+open DotLiquid
+open Giraffe
+open MyWebLog
+open MyWebLog.ViewModels
+
+// GET /admin/pages
+// GET /admin/pages/page/{pageNbr}
+let all pageNbr : HttpHandler = fun next ctx -> task {
+    let  webLog = ctx.WebLog
+    let! pages  = ctx.Data.Page.findPageOfPages webLog.id pageNbr
+    return!
+        Hash.FromAnonymousObject {|
+            page_title = "Pages"
+            csrf       = ctx.CsrfTokenSet
+            pages      = pages |> List.map (DisplayPage.fromPageMinimal webLog)
+            page_nbr   = pageNbr
+            prev_page  = if pageNbr = 2 then "" else $"/page/{pageNbr - 1}"
+            next_page  = $"/page/{pageNbr + 1}"
+        |}
+        |> viewForTheme "admin" "page-list" next ctx
+}
+
+// GET /admin/page/{id}/edit
+let edit pgId : HttpHandler = fun next ctx -> task {
+    let! result = task {
+        match pgId with
+        | "new" -> return Some ("Add a New Page", { Page.empty with id = PageId "new" })
+        | _ ->
+            match! ctx.Data.Page.findFullById (PageId pgId) ctx.WebLog.id with
+            | Some page -> return Some ("Edit Page", page)
+            | None -> return None
+    }
+    match result with
+    | Some (title, page) ->
+        let  model     = EditPageModel.fromPage page
+        let! templates = templatesForTheme ctx "page"
+        return!
+            Hash.FromAnonymousObject {|
+                page_title = title
+                csrf       = ctx.CsrfTokenSet
+                model      = model
+                metadata   = Array.zip model.metaNames model.metaValues
+                             |> Array.mapi (fun idx (name, value) -> [| string idx; name; value |])
+                templates  = templates
+            |}
+            |> viewForTheme "admin" "page-edit" next ctx
+    | None -> return! Error.notFound next ctx
+}
+
+// POST /admin/page/{id}/delete
+let delete pgId : HttpHandler = fun next ctx -> task {
+    let webLog = ctx.WebLog
+    match! ctx.Data.Page.delete (PageId pgId) webLog.id with
+    | true ->
+        do! PageListCache.update ctx
+        do! addMessage ctx { UserMessage.success with message = "Page deleted successfully" }
+    | false -> do! addMessage ctx { UserMessage.error with message = "Page not found; nothing deleted" }
+    return! redirectToGet "admin/pages" next ctx
+}
+
+// GET /admin/page/{id}/permalinks
+let editPermalinks pgId : HttpHandler = fun next ctx -> task {
+    match! ctx.Data.Page.findFullById (PageId pgId) ctx.WebLog.id with
+    | Some pg ->
+        return!
+            Hash.FromAnonymousObject {|
+                page_title = "Manage Prior Permalinks"
+                csrf       = ctx.CsrfTokenSet
+                model      = ManagePermalinksModel.fromPage pg
+            |}
+            |> viewForTheme "admin" "permalinks" next ctx
+    | None -> return! Error.notFound next ctx
+}
+
+// POST /admin/page/permalinks
+let savePermalinks : HttpHandler = fun next ctx -> task {
+    let  webLog = ctx.WebLog
+    let! model  = ctx.BindFormAsync<ManagePermalinksModel> ()
+    let  links  = model.prior |> Array.map Permalink |> List.ofArray
+    match! ctx.Data.Page.updatePriorPermalinks (PageId model.id) webLog.id links with
+    | true ->
+        do! addMessage ctx { UserMessage.success with message = "Page permalinks saved successfully" }
+        return! redirectToGet $"admin/page/{model.id}/permalinks" next ctx
+    | false -> return! Error.notFound next ctx
+}
+
+// GET /admin/page/{id}/revisions
+let editRevisions pgId : HttpHandler = fun next ctx -> task {
+    let webLog = ctx.WebLog
+    match! ctx.Data.Page.findFullById (PageId pgId) webLog.id with
+    | Some pg ->
+        return!
+            Hash.FromAnonymousObject {|
+                page_title = "Manage Page Revisions"
+                csrf       = ctx.CsrfTokenSet
+                model      = ManageRevisionsModel.fromPage webLog pg
+            |}
+            |> viewForTheme "admin" "revisions" next ctx
+    | None -> return! Error.notFound next ctx
+}
+
+// GET /admin/page/{id}/revisions/purge
+let purgeRevisions pgId : HttpHandler = fun next ctx -> task {
+    let webLog = ctx.WebLog
+    let data   = ctx.Data
+    match! data.Page.findFullById (PageId pgId) webLog.id with
+    | Some pg ->
+        do! data.Page.update { pg with revisions = [ List.head pg.revisions ] }
+        do! addMessage ctx { UserMessage.success with message = "Prior revisions purged successfully" }
+        return! redirectToGet $"admin/page/{pgId}/revisions" next ctx
+    | None -> return! Error.notFound next ctx
+}
+
+open Microsoft.AspNetCore.Http
+
+/// Find the page and the requested revision
+let private findPageRevision pgId revDate (ctx : HttpContext) = task {
+    match! ctx.Data.Page.findFullById (PageId pgId) ctx.WebLog.id with
+    | Some pg ->
+        let asOf = parseToUtc revDate
+        return Some pg, pg.revisions |> List.tryFind (fun r -> r.asOf = asOf)
+    | None -> return None, None
+}
+
+// GET /admin/page/{id}/revision/{revision-date}/preview
+let previewRevision (pgId, revDate) : HttpHandler = fun next ctx -> task {
+    match! findPageRevision pgId revDate ctx with
+    | Some _, Some rev ->
+        return!
+            Hash.FromAnonymousObject {|
+                content = $"""<div class="mwl-revision-preview mb-3">{MarkupText.toHtml rev.text}</div>"""
+            |}
+            |> bareForTheme "admin" "" next ctx
+    | None, _
+    | _, None -> return! Error.notFound next ctx
+}
+
+open System
+
+// POST /admin/page/{id}/revision/{revision-date}/restore
+let restoreRevision (pgId, revDate) : HttpHandler = fun next ctx -> task {
+    match! findPageRevision pgId revDate ctx with
+    | Some pg, Some rev ->
+        do! ctx.Data.Page.update
+                { pg with
+                    revisions = { rev with asOf = DateTime.UtcNow }
+                                  :: (pg.revisions |> List.filter (fun r -> r.asOf <> rev.asOf))
+                }
+        do! addMessage ctx { UserMessage.success with message = "Revision restored successfully" }
+        return! redirectToGet $"admin/page/{pgId}/revisions" next ctx
+    | None, _
+    | _, None -> return! Error.notFound next ctx
+}
+
+// POST /admin/page/{id}/revision/{revision-date}/delete
+let deleteRevision (pgId, revDate) : HttpHandler = fun next ctx -> task {
+    match! findPageRevision pgId revDate ctx with
+    | Some pg, Some rev ->
+        do! ctx.Data.Page.update { pg with revisions = pg.revisions |> List.filter (fun r -> r.asOf <> rev.asOf) }
+        do! addMessage ctx { UserMessage.success with message = "Revision deleted successfully" }
+        return! bareForTheme "admin" "" next ctx (Hash.FromAnonymousObject {| content = "" |})
+    | None, _
+    | _, None -> return! Error.notFound next ctx
+}
+
+#nowarn "3511"
+
+// POST /admin/page/save
+let save : HttpHandler = fun next ctx -> task {
+    let! model  = ctx.BindFormAsync<EditPageModel> ()
+    let  webLog = ctx.WebLog
+    let  data   = ctx.Data
+    let  now    = DateTime.UtcNow
+    let! pg     = task {
+        match model.pageId with
+        | "new" ->
+            return Some
+                { Page.empty with
+                    id          = PageId.create ()
+                    webLogId    = webLog.id
+                    authorId    = ctx.UserId
+                    publishedOn = now
+                }
+        | pgId -> return! data.Page.findFullById (PageId pgId) webLog.id
+    }
+    match pg with
+    | Some page ->
+        let updateList = page.showInPageList <> model.isShownInPageList
+        let revision   = { asOf = now; text = MarkupText.parse $"{model.source}: {model.text}" }
+        // Detect a permalink change, and add the prior one to the prior list
+        let page =
+            match Permalink.toString page.permalink with
+            | "" -> page
+            | link when link = model.permalink -> page
+            | _ -> { page with priorPermalinks = page.permalink :: page.priorPermalinks }
+        let page =
+            { page with
+                title          = model.title
+                permalink      = Permalink model.permalink
+                updatedOn      = now
+                showInPageList = model.isShownInPageList
+                template       = match model.template with "" -> None | tmpl -> Some tmpl
+                text           = MarkupText.toHtml revision.text
+                metadata       = Seq.zip model.metaNames model.metaValues
+                                 |> Seq.filter (fun it -> fst it > "")
+                                 |> Seq.map (fun it -> { name = fst it; value = snd it })
+                                 |> Seq.sortBy (fun it -> $"{it.name.ToLower ()} {it.value.ToLower ()}")
+                                 |> List.ofSeq
+                revisions      = match page.revisions |> List.tryHead with
+                                 | Some r when r.text = revision.text -> page.revisions
+                                 | _ -> revision :: page.revisions
+            }
+        do! (if model.pageId = "new" then data.Page.add else data.Page.update) page
+        if updateList then do! PageListCache.update ctx
+        do! addMessage ctx { UserMessage.success with message = "Page saved successfully" }
+        return! redirectToGet $"admin/page/{PageId.toString page.id}/edit" next ctx
+    | None -> return! Error.notFound next ctx
+}

src/MyWebLog/Handlers/Post.fs

@@ -198,9 +198,9 @@ let home : HttpHandler = fun next ctx -> task {
         | Some page ->
             return!
                 Hash.FromAnonymousObject {|
+                    page_title = page.title
                     page       = DisplayPage.fromPage webLog page
                     categories = CategoryCache.get ctx
-                    page_title = page.title
                     is_home    = true
                 |}
                 |> themedView (defaultArg page.template "single-page") next ctx
@@ -215,7 +215,7 @@ let all pageNbr : HttpHandler = fun next ctx -> task {
     let! posts  = data.Post.findPageOfPosts webLog.id pageNbr 25
     let! hash   = preparePostList webLog posts AdminList "" pageNbr 25 ctx data
     hash.Add ("page_title", "Posts")
-    hash.Add ("csrf", csrfToken ctx)
+    hash.Add ("csrf", ctx.CsrfTokenSet)
     return! viewForTheme "admin" "post-list" next ctx hash
 }
 
@@ -238,11 +238,11 @@ let edit postId : HttpHandler = fun next ctx -> task {
         let  model     = EditPostModel.fromPost webLog post
         return!
             Hash.FromAnonymousObject {|
-                csrf            = csrfToken ctx
+                page_title      = title
+                csrf            = ctx.CsrfTokenSet
                 model           = model
                 metadata        = Array.zip model.metaNames model.metaValues
                                   |> Array.mapi (fun idx (name, value) -> [| string idx; name; value |])
-                page_title      = title
                 templates       = templates
                 categories      = cats
                 explicit_values = [|
@@ -256,15 +256,24 @@ let edit postId : HttpHandler = fun next ctx -> task {
     | None -> return! Error.notFound next ctx
 }
 
+// POST /admin/post/{id}/delete
+let delete postId : HttpHandler = fun next ctx -> task {
+    let webLog = ctx.WebLog
+    match! ctx.Data.Post.delete (PostId postId) webLog.id with
+    | true  -> do! addMessage ctx { UserMessage.success with message = "Post deleted successfully" }
+    | false -> do! addMessage ctx { UserMessage.error with message = "Post not found; nothing deleted" }
+    return! redirectToGet "admin/posts" next ctx
+}
+
 // GET /admin/post/{id}/permalinks
 let editPermalinks postId : HttpHandler = fun next ctx -> task {
     match! ctx.Data.Post.findFullById (PostId postId) ctx.WebLog.id with
     | Some post ->
         return!
             Hash.FromAnonymousObject {|
-                csrf       = csrfToken ctx
+                page_title = "Manage Prior Permalinks"
+                csrf       = ctx.CsrfTokenSet
                 model      = ManagePermalinksModel.fromPost post
-                page_title = $"Manage Prior Permalinks"
             |}
             |> viewForTheme "admin" "permalinks" next ctx
     | None -> return! Error.notFound next ctx
@@ -278,17 +287,83 @@ let savePermalinks : HttpHandler = fun next ctx -> task {
     match! ctx.Data.Post.updatePriorPermalinks (PostId model.id) webLog.id links with
     | true ->
         do! addMessage ctx { UserMessage.success with message = "Post permalinks saved successfully" }
-        return! redirectToGet (WebLog.relativeUrl webLog (Permalink $"admin/post/{model.id}/permalinks")) next ctx
+        return! redirectToGet $"admin/post/{model.id}/permalinks" next ctx
     | false -> return! Error.notFound next ctx
 }
 
-// POST /admin/post/{id}/delete
+// GET /admin/post/{id}/revisions
-let delete postId : HttpHandler = fun next ctx -> task {
+let editRevisions postId : HttpHandler = fun next ctx -> task {
-    let webLog = ctx.WebLog
+    match! ctx.Data.Post.findFullById (PostId postId) ctx.WebLog.id with
-    match! ctx.Data.Post.delete (PostId postId) webLog.id with
+    | Some post ->
-    | true  -> do! addMessage ctx { UserMessage.success with message = "Post deleted successfully" }
+        return!
-    | false -> do! addMessage ctx { UserMessage.error with message = "Post not found; nothing deleted" }
+            Hash.FromAnonymousObject {|
-    return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin/posts")) next ctx
+                page_title = "Manage Post Revisions"
+                csrf       = ctx.CsrfTokenSet
+                model      = ManageRevisionsModel.fromPost ctx.WebLog post
+            |}
+            |> viewForTheme "admin" "revisions" next ctx
+    | None -> return! Error.notFound next ctx
+}
+
+// GET /admin/post/{id}/revisions/purge
+let purgeRevisions postId : HttpHandler = fun next ctx -> task {
+    let data = ctx.Data
+    match! data.Post.findFullById (PostId postId) ctx.WebLog.id with
+    | Some post ->
+        do! data.Post.update { post with revisions = [ List.head post.revisions ] }
+        do! addMessage ctx { UserMessage.success with message = "Prior revisions purged successfully" }
+        return! redirectToGet $"admin/post/{postId}/revisions" next ctx
+    | None -> return! Error.notFound next ctx
+}
+
+open Microsoft.AspNetCore.Http
+
+/// Find the post and the requested revision
+let private findPostRevision postId revDate (ctx : HttpContext) = task {
+    match! ctx.Data.Post.findFullById (PostId postId) ctx.WebLog.id with
+    | Some post ->
+        let asOf = parseToUtc revDate
+        return Some post, post.revisions |> List.tryFind (fun r -> r.asOf = asOf)
+    | None -> return None, None
+}
+
+// GET /admin/post/{id}/revision/{revision-date}/preview
+let previewRevision (postId, revDate) : HttpHandler = fun next ctx -> task {
+    match! findPostRevision postId revDate ctx with
+    | Some _, Some rev ->
+        return!
+            Hash.FromAnonymousObject {|
+                content = $"""<div class="mwl-revision-preview mb-3">{MarkupText.toHtml rev.text}</div>"""
+            |}
+            |> bareForTheme "admin" "" next ctx
+    | None, _
+    | _, None -> return! Error.notFound next ctx
+}
+
+// POST /admin/post/{id}/revision/{revision-date}/restore
+let restoreRevision (postId, revDate) : HttpHandler = fun next ctx -> task {
+    match! findPostRevision postId revDate ctx with
+    | Some post, Some rev ->
+        do! ctx.Data.Post.update
+                { post with
+                    revisions = { rev with asOf = DateTime.UtcNow }
+                                  :: (post.revisions |> List.filter (fun r -> r.asOf <> rev.asOf))
+                }
+        do! addMessage ctx { UserMessage.success with message = "Revision restored successfully" }
+        return! redirectToGet $"admin/post/{postId}/revisions" next ctx
+    | None, _
+    | _, None -> return! Error.notFound next ctx
+}
+
+// POST /admin/post/{id}/revision/{revision-date}/delete
+let deleteRevision (postId, revDate) : HttpHandler = fun next ctx -> task {
+    match! findPostRevision postId revDate ctx with
+    | Some post, Some rev ->
+        do! ctx.Data.Post.update { post with revisions = post.revisions |> List.filter (fun r -> r.asOf <> rev.asOf) }
+        do! addMessage ctx { UserMessage.success with message = "Revision deleted successfully" }
+        return! bareForTheme "admin" "" next ctx (Hash.FromAnonymousObject {| content = "" |})
+    | None, _
+    | _, None -> return! Error.notFound next ctx
 }
 
 #nowarn "3511"
@@ -306,7 +381,7 @@ let save : HttpHandler = fun next ctx -> task {
                 { Post.empty with
                     id        = PostId.create ()
                     webLogId  = webLog.id
-                    authorId  = userId ctx
+                    authorId  = ctx.UserId
                 }
         | postId -> return! data.Post.findFullById (PostId postId) webLog.id
     }
@@ -323,7 +398,7 @@ let save : HttpHandler = fun next ctx -> task {
         let post =
             match model.setPublished with
             | true ->
-                let dt = WebLog.utcTime webLog model.pubOverride.Value
+                let dt = parseToUtc (model.pubOverride.Value.ToString "o")
                 match model.setUpdated with
                 | true ->
                     { post with
@@ -342,7 +417,6 @@ let save : HttpHandler = fun next ctx -> task {
                    |> List.length = List.length pst.Value.categoryIds) then
             do! CategoryCache.update ctx
         do! addMessage ctx { UserMessage.success with message = "Post saved successfully" }
-        return!
+        return! redirectToGet $"admin/post/{PostId.toString post.id}/edit" next ctx
-            redirectToGet (WebLog.relativeUrl webLog (Permalink $"admin/post/{PostId.toString post.id}/edit")) next ctx
     | None -> return! Error.notFound next ctx
 }

src/MyWebLog/Handlers/Routes.fs

@@ -29,7 +29,7 @@ module CatchAll =
             // Current post
             match data.Post.findByPermalink permalink webLog.id |> await with
             | Some post ->
-                debug (fun () -> $"Found post by permalink")
+                debug (fun () -> "Found post by permalink")
                 let model = Post.preparePostList webLog [ post ] Post.ListType.SinglePost "" 1 1 ctx data |> await
                 model.Add ("page_title", post.title)
                 yield fun next ctx -> themedView (defaultArg post.template "single-post") next ctx model
@@ -37,12 +37,12 @@ module CatchAll =
             // Current page
             match data.Page.findByPermalink permalink webLog.id |> await with
             | Some page ->
-                debug (fun () -> $"Found page by permalink")
+                debug (fun () -> "Found page by permalink")
                 yield fun next ctx ->
                     Hash.FromAnonymousObject {|
+                        page_title = page.title
                         page       = DisplayPage.fromPage webLog page
                         categories = CategoryCache.get ctx
-                        page_title = page.title
                         is_page    = true
                     |}
                     |> themedView (defaultArg page.template "single-page") next ctx
@@ -50,7 +50,7 @@ module CatchAll =
             // RSS feed
             match Feed.deriveFeedType ctx textLink with
             | Some (feedType, postCount) ->
-                debug (fun () -> $"Found RSS feed")
+                debug (fun () -> "Found RSS feed")
                 yield Feed.generate feedType postCount 
             | None -> ()
             // Post differing only by trailing slash
@@ -58,28 +58,28 @@ module CatchAll =
                 Permalink (if textLink.EndsWith "/" then textLink[1..textLink.Length - 2] else $"{textLink[1..]}/")
             match data.Post.findByPermalink altLink webLog.id |> await with
             | Some post ->
-                debug (fun () -> $"Found post by trailing-slash-agnostic permalink")
+                debug (fun () -> "Found post by trailing-slash-agnostic permalink")
                 yield redirectTo true (WebLog.relativeUrl webLog post.permalink)
             | None -> ()
             // Page differing only by trailing slash
             match data.Page.findByPermalink altLink webLog.id |> await with
             | Some page ->
-                debug (fun () -> $"Found page by trailing-slash-agnostic permalink")
+                debug (fun () -> "Found page by trailing-slash-agnostic permalink")
                 yield redirectTo true (WebLog.relativeUrl webLog page.permalink)
             | None -> ()
             // Prior post
             match data.Post.findCurrentPermalink [ permalink; altLink ] webLog.id |> await with
             | Some link ->
-                debug (fun () -> $"Found post by prior permalink")
+                debug (fun () -> "Found post by prior permalink")
                 yield redirectTo true (WebLog.relativeUrl webLog link)
             | None -> ()
             // Prior page
             match data.Page.findCurrentPermalink [ permalink; altLink ] webLog.id |> await with
             | Some link ->
-                debug (fun () -> $"Found page by prior permalink")
+                debug (fun () -> "Found page by prior permalink")
                 yield redirectTo true (WebLog.relativeUrl webLog link)
             | None -> ()
-            debug (fun () -> $"No content found")
+            debug (fun () -> "No content found")
         }
 
     // GET {all-of-the-above}
@@ -119,16 +119,20 @@ let router : HttpHandler = choose [
             ])
             route    "/dashboard" >=> Admin.dashboard
             subRoute "/page" (choose [
-                route  "s"              >=> Admin.listPages 1
+                route  "s"                       >=> Page.all 1
-                routef "s/page/%i"          Admin.listPages
+                routef "s/page/%i"                   Page.all
-                routef "/%s/edit"           Admin.editPage
+                routef "/%s/edit"                    Page.edit
-                routef "/%s/permalinks"     Admin.editPagePermalinks
+                routef "/%s/permalinks"              Page.editPermalinks
+                routef "/%s/revision/%s/preview"     Page.previewRevision
+                routef "/%s/revisions"               Page.editRevisions
             ])
             subRoute "/post" (choose [
-                route  "s"              >=> Post.all 1
+                route  "s"                       >=> Post.all 1
-                routef "s/page/%i"          Post.all
+                routef "s/page/%i"                   Post.all
-                routef "/%s/edit"           Post.edit
+                routef "/%s/edit"                    Post.edit
-                routef "/%s/permalinks"     Post.editPermalinks
+                routef "/%s/permalinks"              Post.editPermalinks
+                routef "/%s/revision/%s/preview"     Post.previewRevision
+                routef "/%s/revisions"               Post.editRevisions
             ])
             subRoute "/settings" (choose [
                 route ""     >=> Admin.settings
@@ -155,14 +159,20 @@ let router : HttpHandler = choose [
                 routef "/%s/delete"     Admin.deleteCategory
             ])
             subRoute "/page" (choose [
-                route  "/save"       >=> Admin.savePage
+                route  "/save"                   >=> Page.save
-                route  "/permalinks" >=> Admin.savePagePermalinks
+                route  "/permalinks"             >=> Page.savePermalinks
-                routef "/%s/delete"      Admin.deletePage
+                routef "/%s/delete"                  Page.delete
+                routef "/%s/revision/%s/delete"      Page.deleteRevision
+                routef "/%s/revision/%s/restore"     Page.restoreRevision
+                routef "/%s/revisions/purge"         Page.purgeRevisions
             ])
             subRoute "/post" (choose [
-                route  "/save"       >=> Post.save
+                route  "/save"                   >=> Post.save
-                route  "/permalinks" >=> Post.savePermalinks
+                route  "/permalinks"             >=> Post.savePermalinks
-                routef "/%s/delete"      Post.delete
+                routef "/%s/delete"                  Post.delete
+                routef "/%s/revision/%s/delete"      Post.deleteRevision
+                routef "/%s/revision/%s/restore"     Post.restoreRevision
+                routef "/%s/revisions/purge"         Post.purgeRevisions
             ])
             subRoute "/settings" (choose [
                 route ""     >=> Admin.saveSettings

src/MyWebLog/Handlers/Upload.fs

@@ -118,8 +118,8 @@ let list : HttpHandler = fun next ctx -> task {
 
     return!
         Hash.FromAnonymousObject {|
-            csrf       = csrfToken ctx
             page_title = "Uploaded Files"
+            csrf       = ctx.CsrfTokenSet
             files      = allFiles
         |}
         |> viewForTheme "admin" "upload-list" next ctx
@@ -129,17 +129,16 @@ let list : HttpHandler = fun next ctx -> task {
 let showNew : HttpHandler = fun next ctx -> task {
     return!
         Hash.FromAnonymousObject {|
-            csrf        = csrfToken ctx
-            destination = UploadDestination.toString ctx.WebLog.uploads
             page_title  = "Upload a File"
+            csrf        = ctx.CsrfTokenSet
+            destination = UploadDestination.toString ctx.WebLog.uploads
         |}
         |> viewForTheme "admin" "upload-new" next ctx
 }
 
 /// Redirect to the upload list
-let showUploads : HttpHandler = fun next ctx -> task {
+let showUploads : HttpHandler =
-    return! redirectToGet (WebLog.relativeUrl ctx.WebLog (Permalink "admin/uploads")) next ctx
+    redirectToGet "admin/uploads"
-}
 
 // POST /admin/upload/save
 let save : HttpHandler = fun next ctx -> task {

src/MyWebLog/Handlers/User.fs

@@ -13,6 +13,7 @@ let hashedPassword (plainText : string) (email : string) (salt : Guid) =
 
 open DotLiquid
 open Giraffe
+open MyWebLog
 open MyWebLog.ViewModels
 
 // GET /user/log-on
@@ -26,9 +27,9 @@ let logOn returnUrl : HttpHandler = fun next ctx -> task {
             | false -> None
     return!
         Hash.FromAnonymousObject {|
-            model      = { LogOnModel.empty with returnTo = returnTo }
             page_title = "Log On"
-            csrf       = csrfToken ctx
+            csrf       = ctx.CsrfTokenSet
+            model      = { LogOnModel.empty with returnTo = returnTo }
         |}
         |> viewForTheme "admin" "log-on" next ctx
 }
@@ -36,13 +37,11 @@ let logOn returnUrl : HttpHandler = fun next ctx -> task {
 open System.Security.Claims
 open Microsoft.AspNetCore.Authentication
 open Microsoft.AspNetCore.Authentication.Cookies
-open MyWebLog
 
 // POST /user/log-on
 let doLogOn : HttpHandler = fun next ctx -> task {
-    let! model  = ctx.BindFormAsync<LogOnModel> ()
+    let! model = ctx.BindFormAsync<LogOnModel> ()
-    let  webLog = ctx.WebLog
+    match! ctx.Data.WebLogUser.findByEmail model.emailAddress ctx.WebLog.id with 
-    match! ctx.Data.WebLogUser.findByEmail model.emailAddress webLog.id with 
     | Some user when user.passwordHash = hashedPassword model.password user.userName user.salt ->
         let claims = seq {
             Claim (ClaimTypes.NameIdentifier, WebLogUserId.toString user.id)
@@ -55,9 +54,8 @@ let doLogOn : HttpHandler = fun next ctx -> task {
         do! ctx.SignInAsync (identity.AuthenticationType, ClaimsPrincipal identity,
             AuthenticationProperties (IssuedUtc = DateTimeOffset.UtcNow))
         do! addMessage ctx
-                { UserMessage.success with message = $"Logged on successfully | Welcome to {webLog.name}!" }
+                { UserMessage.success with message = $"Logged on successfully | Welcome to {ctx.WebLog.name}!" }
-        return! redirectToGet (defaultArg model.returnTo (WebLog.relativeUrl webLog (Permalink "admin/dashboard")))
+        return! redirectToGet (defaultArg (model.returnTo |> Option.map (fun it -> it[1..])) "admin/dashboard") next ctx
-                    next ctx
     | _ ->
         do! addMessage ctx { UserMessage.error with message = "Log on attempt unsuccessful" }
         return! logOn model.returnTo next ctx
@@ -67,19 +65,19 @@ let doLogOn : HttpHandler = fun next ctx -> task {
 let logOff : HttpHandler = fun next ctx -> task {
     do! ctx.SignOutAsync CookieAuthenticationDefaults.AuthenticationScheme
     do! addMessage ctx { UserMessage.info with message = "Log off successful" }
-    return! redirectToGet (WebLog.relativeUrl ctx.WebLog Permalink.empty) next ctx
+    return! redirectToGet "" next ctx
 }
 
 /// Display the user edit page, with information possibly filled in
 let private showEdit (hash : Hash) : HttpHandler = fun next ctx -> task {
     hash.Add ("page_title", "Edit Your Information")
-    hash.Add ("csrf", csrfToken ctx)
+    hash.Add ("csrf", ctx.CsrfTokenSet)
     return! viewForTheme "admin" "user-edit" next ctx hash
 }
 
 // GET /admin/user/edit
 let edit : HttpHandler = fun next ctx -> task {
-    match! ctx.Data.WebLogUser.findById (userId ctx) ctx.WebLog.id with
+    match! ctx.Data.WebLogUser.findById ctx.UserId ctx.WebLog.id with
     | Some user -> return! showEdit (Hash.FromAnonymousObject {| model = EditUserModel.fromUser user |}) next ctx
     | None -> return! Error.notFound next ctx
 }
@@ -89,7 +87,7 @@ let save : HttpHandler = requireUser >=> validateCsrf >=> fun next ctx -> task {
     let! model = ctx.BindFormAsync<EditUserModel> ()
     if model.newPassword = model.newPasswordConfirm then
         let data = ctx.Data
-        match! data.WebLogUser.findById (userId ctx) ctx.WebLog.id with
+        match! data.WebLogUser.findById ctx.UserId ctx.WebLog.id with
         | Some user ->
             let pw, salt =
                 if model.newPassword = "" then
@@ -108,7 +106,7 @@ let save : HttpHandler = requireUser >=> validateCsrf >=> fun next ctx -> task {
             do! data.WebLogUser.update user
             let pwMsg = if model.newPassword = "" then "" else " and updated your password"
             do! addMessage ctx { UserMessage.success with message = $"Saved your information{pwMsg} successfully" }
-            return! redirectToGet (WebLog.relativeUrl ctx.WebLog (Permalink "admin/user/edit")) next ctx
+            return! redirectToGet "admin/user/edit" next ctx
         | None -> return! Error.notFound next ctx
     else
         do! addMessage ctx { UserMessage.error with message = "Passwords did not match; no updates made" }

src/MyWebLog/MyWebLog.fsproj

@@ -16,6 +16,7 @@
     <Compile Include="Handlers\Helpers.fs" />
     <Compile Include="Handlers\Admin.fs" />
     <Compile Include="Handlers\Feed.fs" />
+    <Compile Include="Handlers\Page.fs" />
     <Compile Include="Handlers\Post.fs" />
     <Compile Include="Handlers\User.fs" />
     <Compile Include="Handlers\Upload.fs" />
@@ -28,8 +29,8 @@
   <ItemGroup>
     <PackageReference Include="DotLiquid" Version="2.2.656" />
     <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.7.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.8.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.7.0" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.0" />
     <PackageReference Include="NeoSmart.Caching.Sqlite" Version="6.0.1" />
     <PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5" />

src/MyWebLog/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "Generator": "myWebLog 2.0-beta03",
+  "Generator": "myWebLog 2.0-beta04",
   "Logging": {
     "LogLevel": {
       "MyWebLog.Handlers": "Information"

src/admin-theme/_layout.liquid

@@ -48,6 +48,8 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-xs-12 text-end">
+        {%- assign version = generator | split: " " -%}
+        <small class="me-1 align-baseline">v{{ version[1] }}</small>
         <img src="{{ "themes/admin/logo-light.png" | relative_link }}" alt="myWebLog" width="120" height="34">
       </div>
     </div>

src/admin-theme/page-edit.liquid

@@ -16,8 +16,15 @@
                    value="{{ model.permalink }}">
             <label for="permalink">Permalink</label>
             {%- if model.page_id != "new" %}
-              {%- capture perm_edit %}admin/page/{{ model.page_id }}/permalinks{% endcapture -%}
+              <span class="form-text">
-              <span class="form-text"><a href="{{ perm_edit | relative_link }}">Manage Permalinks</a></span>
+                <a href="{{ "admin/page/" | append: model.page_id | append: "/permalinks" | relative_link }}">
+                  Manage Permalinks
+                </a>
+                <span class="text-muted"> &bull; </span>
+                <a href="{{ "admin/page/" | append: model.page_id | append: "/revisions" | relative_link }}">
+                  Manage Revisions
+                </a>
+              </span>
             {% endif -%}
           </div>
           <div class="mb-2">

src/admin-theme/post-edit.liquid

@@ -16,8 +16,15 @@
                    value="{{ model.permalink }}">
             <label for="permalink">Permalink</label>
             {%- if model.post_id != "new" %}
-              {%- capture perm_edit %}admin/post/{{ model.post_id }}/permalinks{% endcapture -%}
+              <span class="form-text">
-              <span class="form-text"><a href="{{ perm_edit | relative_link }}">Manage Permalinks</a></span>
+                <a href="{{ "admin/post/" | append: model.post_id | append: "/permalinks" | relative_link }}">
+                  Manage Permalinks
+                </a>
+                <span class="text-muted"> &bull; </span>
+                <a href="{{ "admin/post/" | append: model.post_id | append: "/revisions" | relative_link }}">
+                  Manage Revisions
+                </a>
+              </span>
             {% endif -%}
           </div>
           <div class="mb-2">

src/admin-theme/revisions.liquid

@@ -0,0 +1,68 @@
+<h2 class="my-3">{{ page_title }}</h2>
+<article>
+  <form method="post" hx-target="body">
+    <input type="hidden" name="{{ csrf.form_field_name }}" value="{{ csrf.request_token }}">
+    <input type="hidden" name="id" value="{{ model.id }}">
+    <div class="container mb-3">
+      <div class="row">
+        <div class="col">
+          <p style="line-height:1.2rem;">
+            <strong>{{ model.current_title }}</strong><br>
+            <small class="text-muted">
+              <a href="{{ "admin/" | append: model.entity | append: "/" | append: model.id | append: "/edit" | relative_link }}">
+                &laquo; Back to Edit {{ model.entity | capitalize }}
+              </a>
+            </small>
+          </p>
+        </div>
+      </div>
+      {%- assign revision_count = model.revisions | size -%}
+      {%- assign rev_url_base = "admin/" | append: model.entity | append: "/" | append: model.id | append: "/revision" -%}
+      {%- if revision_count > 1 %}
+        <div class="row mb-3">
+          <div class="col">
+            <button type="button" class="btn btn-sm btn-danger"
+                    hx-post="{{ rev_url_base | append: "s/purge" | relative_link }}"
+                    hx-confirm="This will remove all revisions but the current one; are you sure this is what you wish to do?">
+              Delete All Prior Revisions
+            </button>
+          </div>
+        </div>
+      {%- endif %}
+      <div class="row mwl-table-heading">
+        <div class="col">Revision</div>
+      </div>
+      {% for rev in model.revisions %}
+        {%- assign as_of_string = rev.as_of | date: "o" -%}
+        {%- assign as_of_id = "rev_" | append: as_of_string | replace: "\.", "_" | replace: ":", "-" -%}
+        <div id="{{ as_of_id }}" class="row pb-3 mwl-table-detail">
+          <div class="col-12 mb-1">
+            {{ rev.as_of_local | date: "MMMM d, yyyy" }} at {{ rev.as_of_local | date: "h:mmtt" | downcase }}
+            <span class="badge bg-secondary text-uppercase ms-2">{{ rev.format }}</span>
+            {%- if forloop.first %}
+              <span class="badge bg-primary text-uppercase ms-2">Current Revision</span>
+            {%- endif %}<br>
+            {% unless forloop.first %}
+              {%- assign rev_url_prefix = rev_url_base | append: "/" | append: as_of_string -%}
+              {%- assign rev_restore = rev_url_prefix | append: "/restore" | relative_link -%}
+              {%- assign rev_delete  = rev_url_prefix | append: "/delete"  | relative_link -%}
+              <small>
+                <a href="{{ rev_url_prefix | append: "/preview" | relative_link }}" hx-target="#{{ as_of_id }}_preview">
+                  Preview
+                </a>
+                <span class="text-muted"> &bull; </span>
+                <a href="{{ rev_restore }}" hx-post="{{ rev_restore }}">Restore as Current</a>
+                <span class="text-muted"> &bull; </span>
+                <a href="{{ rev_delete }}" hx-post="{{ rev_delete }}" hx-target="#{{ as_of_id }}" hx-swap="outerHTML"
+                   class="text-danger">
+                  Delete
+                </a>
+              </small>
+            {% endunless %}
+          </div>
+          {% unless forloop.first %}<div id="{{ as_of_id }}_preview" class="col-12"></div>{% endunless %}
+        </div>
+      {% endfor %}
+    </div>
+  </form>
+</article>

src/admin-theme/wwwroot/admin.css

@@ -85,3 +85,10 @@ a.text-danger:link:hover, a.text-danger:visited:hover {
   background-color: var(--light-accent);
   color: var(--dark-gray);
 }
+.mwl-revision-preview {
+  max-height: 90vh;
+  overflow: auto;
+  border: solid 1px black;
+  border-radius: .5rem;
+  padding: .5rem;
+}