From fdd9b8fd2bf1688187dda2cb801232c744fe26e0 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Mon, 19 Oct 2020 06:51:23 +0000
Subject: Add setting for default format

---
 service/service.go   | 9 ++++++---
 service/transport.go | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'service')

diff --git a/service/service.go b/service/service.go
index 447f186..23685c4 100644
--- a/service/service.go
+++ b/service/service.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"mime/multipart"
 	"html/template"
+	"mime/multipart"
 	"net/url"
 	"strings"
 
@@ -198,6 +198,7 @@ func (svc *service) ServeNavPage(c *model.Client) (err error) {
 
 	postContext := model.PostContext{
 		DefaultVisibility: c.Session.Settings.DefaultVisibility,
+		DefaultFormat:     c.Session.Settings.DefaultFormat,
 		Formats:           svc.postFormats,
 	}
 
@@ -326,6 +327,7 @@ func (svc *service) ServeThreadPage(c *model.Client, id string, reply bool) (err
 
 		postContext = model.PostContext{
 			DefaultVisibility: visibility,
+			DefaultFormat:     c.Session.Settings.DefaultFormat,
 			Formats:           svc.postFormats,
 			ReplyContext: &model.ReplyContext{
 				InReplyToID:     id,
@@ -686,8 +688,9 @@ func (svc *service) ServeSearchPage(c *model.Client,
 func (svc *service) ServeSettingsPage(c *model.Client) (err error) {
 	commonData := svc.getCommonData(c, "settings")
 	data := &renderer.SettingsData{
-		CommonData: commonData,
-		Settings:   &c.Session.Settings,
+		CommonData:  commonData,
+		Settings:    &c.Session.Settings,
+		PostFormats: svc.postFormats,
 	}
 
 	rCtx := getRendererContext(c)
diff --git a/service/transport.go b/service/transport.go
index 4f73c5e..6c0975d 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -584,6 +584,7 @@ func NewHandler(s Service, staticDir string) http.Handler {
 	settings := func(w http.ResponseWriter, req *http.Request) {
 		c := newClient(w, req, req.FormValue("csrf_token"))
 		visibility := req.FormValue("visibility")
+		format := req.FormValue("format")
 		copyScope := req.FormValue("copy_scope") == "true"
 		threadInNewTab := req.FormValue("thread_in_new_tab") == "true"
 		hideAttachments := req.FormValue("hide_attachments") == "true"
@@ -595,6 +596,7 @@ func NewHandler(s Service, staticDir string) http.Handler {
 
 		settings := &model.Settings{
 			DefaultVisibility:        visibility,
+			DefaultFormat:            format,
 			CopyScope:                copyScope,
 			ThreadInNewTab:           threadInNewTab,
 			HideAttachments:          hideAttachments,
-- 
cgit v1.2.3