From 657132814d4e3adfe803e92f424ccdd43acbc257 Mon Sep 17 00:00:00 2001
From: "Bill St. Clair" <billstclair@gmail.com>
Date: Mon, 10 Dec 2018 07:38:40 -0500
Subject: [PATCH] Use hecrj/html-parser to handle strong, em, u, and
 blockquote.

---
 elm.json     |   4 +-
 src/Main.elm | 119 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/elm.json b/elm.json
index b8dcf00..bbe5182 100644
--- a/elm.json
+++ b/elm.json
@@ -21,6 +21,7 @@
             "elm/url": "1.0.0",
             "elm-community/list-extra": "8.1.0",
             "elm-community/string-extra": "4.0.0",
+            "hecrj/html-parser": "2.0.0",
             "mdgriffith/elm-ui": "1.1.0",
             "melon-love/elm-gab-api": "7.0.0",
             "rtfeldman/elm-iso8601-date-strings": "1.1.2",
@@ -32,6 +33,7 @@
             "elm/regex": "1.0.0",
             "elm/virtual-dom": "1.0.2",
             "elm-community/dict-extra": "2.4.0",
+            "rtfeldman/elm-hex": "1.0.0",
             "truqu/elm-base64": "2.0.4"
         }
     },
@@ -39,4 +41,4 @@
         "direct": {},
         "indirect": {}
     }
-}
+}
\ No newline at end of file
diff --git a/src/Main.elm b/src/Main.elm
index 961537a..816992c 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -13,7 +13,7 @@
 ----------------------------------------------------------------------
 
 
-module Main exposing (main)
+module Main exposing (htmlBodyElements, main)
 
 import Browser exposing (Document, UrlRequest(..))
 import Browser.Dom as Dom exposing (Viewport)
@@ -110,6 +110,7 @@ import GabDecker.Types as Types
 import Html exposing (Html)
 import Html.Attributes as Attributes exposing (class, href, rel)
 import Html.Events exposing (onClick)
+import Html.Parser as HP
 import Http exposing (Error(..))
 import Iso8601
 import Json.Decode as JD exposing (Decoder, Value)
@@ -3472,8 +3473,8 @@ postRow settings feed isToplevel log idx =
             , postUserRow style colwp settings.here post
             , row []
                 [ Element.textColumn
-                    [ paragraphSpacing baseFontSize
-                    , colwp
+                    [ --paragraphSpacing baseFontSize
+                      colwp
                     ]
                   <|
                     case post.body_html of
@@ -4255,11 +4256,6 @@ paragraphPadding =
     paddingEach <| { zeroes | top = 4, bottom = 4 }
 
 
-paragraphPaddingNoTop : Attribute msg
-paragraphPaddingNoTop =
-    paddingEach <| { zeroes | bottom = 4 }
-
-
 paragraphSpacingAmount : Float -> Int
 paragraphSpacingAmount baseFontSize =
     round (0.6 * baseFontSize)
@@ -4278,13 +4274,114 @@ paragraphLineSpacing baseFontSize =
 newlinesToPs : String -> String
 newlinesToPs string =
     String.split "\n\n" string
-        |> String.join "<p>"
-        |> String.split "\n"
-        |> String.join "<br />"
+        |> wrapPs
+
+
+wrapPs : List String -> String
+wrapPs strings =
+    newlinesToBrs <|
+        case strings of
+            [] ->
+                ""
+
+            _ ->
+                "<p>" ++ String.join "</p><p>" strings ++ "</p>"
+
+
+newlinesToBrs : String -> String
+newlinesToBrs string =
+    String.split "\n" string
+        |> String.join "<br/>"
 
 
 htmlBodyElements : Style -> Float -> String -> List (Element Msg)
 htmlBodyElements style baseFontSize html =
+    case HP.run <| fixBareHtml html of
+        Ok res ->
+            List.map (nodeToElements style baseFontSize) res
+                |> List.concat
+
+        Err _ ->
+            oldHtmlBodyElements style baseFontSize (Debug.log "oldHtmlBodyElements" html)
+
+
+{-| The Popular feed currently doesn't really ship Html in body\_html.
+-}
+fixBareHtml : String -> String
+fixBareHtml html =
+    if String.startsWith "<p>" html then
+        html
+
+    else
+        ("<p>" ++ html ++ "</p>")
+            |> String.split "\n"
+            |> String.join "</p>\n<p>"
+            |> Debug.log "fixBareHtml"
+
+
+nodeToElements : Style -> Float -> HP.Node -> List (Element msg)
+nodeToElements style baseFontSize theNode =
+    let
+        recurse node =
+            case node of
+                HP.Text string ->
+                    -- Shouldn't get these from the parser
+                    if string == "\n" then
+                        [ text "" ]
+
+                    else
+                        Parsers.parseElements style string
+
+                HP.Element element attributes nodes ->
+                    let
+                        mappedNodes =
+                            List.map recurse nodes
+                                |> List.concat
+                    in
+                    case element of
+                        "p" ->
+                            [ paragraph
+                                [ --paragraphPadding
+                                  paragraphLineSpacing baseFontSize
+                                ]
+                                mappedNodes
+                            ]
+
+                        "br" ->
+                            -- probably wrong
+                            [ row [] mappedNodes ]
+
+                        "blockquote" ->
+                            -- Needs a background color
+                            [ row
+                                [ paddingEach { zeroes | left = 10, right = 10 }
+                                , Border.width 2
+                                , Border.color colors.black
+                                ]
+                                mappedNodes
+                            ]
+
+                        "strong" ->
+                            List.map (\n -> el [ Font.bold ] n) mappedNodes
+
+                        "em" ->
+                            List.map (\n -> el [ Font.italic ] n) mappedNodes
+
+                        "u" ->
+                            List.map (\n -> el [ Font.underline ] n) mappedNodes
+
+                        _ ->
+                            -- Shouldn't happen
+                            mappedNodes
+
+                _ ->
+                    []
+    in
+    recurse theNode
+
+
+oldHtmlBodyElements : Style -> Float -> String -> List (Element Msg)
+oldHtmlBodyElements style baseFontSize html =
     let
         par : List (Element Msg) -> Element Msg
         par elements =