Include user settings when rendering

Planetable · Apr 25, 2024 · 5006e93 · 5006e93
1 parent 2c1074e
commit 5006e93
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Planet/Labs/Quick Post/QuickPostView.swift b/Planet/Labs/Quick Post/QuickPostView.swift
@@ -28,7 +28,7 @@ struct QuickPostView: View {
 
                 TextEditor(text: $content)
                     .font(.system(size: 14, weight: .regular, design: .default))
-                    .lineSpacing(8)
+                    .lineSpacing(7)
                     .disableAutocorrection(true)
                     .padding(.top, 10)
                     .padding(.bottom, 10)
@@ -60,7 +60,8 @@ struct QuickPostView: View {
                     dismiss()
                 } label: {
                     Text("Post")
-                }.keyboardShortcut(.defaultAction)
+                }
+                .keyboardShortcut(.defaultAction)
                 .keyboardShortcut("d", modifiers: [.command, .shift])
                     .buttonStyle(.borderedProminent)
                     .buttonBorderShape(.roundedRectangle)

diff --git a/Planet/TemplateBrowser/Template.swift b/Planet/TemplateBrowser/Template.swift
@@ -229,6 +229,8 @@ class Template: Codable, Identifiable {
             "has_podcast": hasPodcast,
             "planet_ipns": article.planet.ipns,
             "assets_prefix": "../",
+            "template_settings": self.settings,
+            "user_settings": planet.templateSettings(),
             "article_id": article.id.uuidString,
             "article": article.publicArticle,
             "article_type": article.articleType?.rawValue ?? 0,
@@ -279,6 +281,8 @@ class Template: Codable, Identifiable {
         let pageAboutHTML = CMarkRenderer.renderMarkdownHTML(markdown: planet.about) ?? planet.about
         var contextForRendering: [String: Any] = [
             "assets_prefix": "./",
+            "template_settings": self.settings,
+            "user_settings": myPlanet.templateSettings(),
             "page_title": planet.name,
             "page_description": planet.about,
             "page_description_html": pageAboutHTML,
@@ -312,6 +316,8 @@ class Template: Codable, Identifiable {
         let pageAboutHTML = CMarkRenderer.renderMarkdownHTML(markdown: planet.about) ?? planet.about
         var contextForRendering: [String: Any] = [
             "assets_prefix": "./",
+            "template_settings": self.settings,
+            "user_settings": myPlanet.templateSettings(),
             "page_title": "\(planet.name) - Tags",
             "page_description": planet.about,
             "page_description_html": pageAboutHTML,
@@ -340,6 +346,8 @@ class Template: Codable, Identifiable {
         let pageAboutHTML = CMarkRenderer.renderMarkdownHTML(markdown: planet.about) ?? planet.about
         var contextForRendering: [String: Any] = [
             "assets_prefix": "./",
+            "template_settings": self.settings,
+            "user_settings": myPlanet.templateSettings(),
             "page_title": "\(planet.name) - Archive",
             "page_description": planet.about,
             "page_description_html": pageAboutHTML,
@@ -504,6 +512,8 @@ class Template: Codable, Identifiable {
         // render stencil template
         let context: [String: Any] = [
             "assets_prefix": "../",
+            "template_settings": self.settings,
+            "user_settings": [:],
             "article": article,
             "articles": [article],
             "content_html": content_html,