From 094aafecddc61f36de178205ba9bfd592dc3481f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 25 Aug 2019 20:22:57 +0100
Subject: chore(tazblog): Remove 'read more' feature

---
 services/tazblog/src/Blog.hs      | 14 ++++----------
 services/tazblog/src/BlogStore.hs |  6 ++----
 services/tazblog/src/RSS.hs       |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/services/tazblog/src/Blog.hs b/services/tazblog/src/Blog.hs
index 15ac9993eb..6c61c2ce26 100644
--- a/services/tazblog/src/Blog.hs
+++ b/services/tazblog/src/Blog.hs
@@ -82,13 +82,9 @@ $forall entry <- entries
     <aside .date>
       #{pack $ formatTime defaultTimeLocale "%Y-%m-%d" $ edate entry}
     $if (isEntryMarkdown entry)
-      ^{renderEntryMarkdown $ btext entry}
+      ^{renderEntryMarkdown $ text entry}
     $else
-      ^{preEscapedToHtml $ btext entry}
-    $if ((/=) (mtext entry) empty)
-      <p>
-        <a .uncoloured-link href=#{linkElems entry}>
-          #{readMore $ lang entry}
+      ^{preEscapedToHtml $ text entry}
   <hr>
 $maybe links <- pageLinks
   ^{links}
@@ -126,11 +122,9 @@ renderEntry e@Entry {..} =
   <aside .date>
     #{pack $ formatTime defaultTimeLocale "%Y-%m-%d" edate}
   $if (isEntryMarkdown e)
-    ^{renderEntryMarkdown btext}
-    <p>^{renderEntryMarkdown $ mtext}
+    ^{renderEntryMarkdown text}
   $else
-    ^{preEscapedToHtml $ btext}
-    <p>^{preEscapedToHtml $ mtext}
+    ^{preEscapedToHtml $ text}
 <hr>
 |]
 
diff --git a/services/tazblog/src/BlogStore.hs b/services/tazblog/src/BlogStore.hs
index 0472fef56b..4e5171252e 100644
--- a/services/tazblog/src/BlogStore.hs
+++ b/services/tazblog/src/BlogStore.hs
@@ -57,8 +57,7 @@ data Entry
         lang :: BlogLang,
         author :: Text,
         title :: Text,
-        btext :: Text,
-        mtext :: Text,
+        text :: Text,
         edate :: Day
         }
   deriving (Eq, Ord, Show)
@@ -170,8 +169,7 @@ entryFromDNS cache eid = do
                   lang = EN,
                   author = "tazjin",
                   title = t,
-                  btext = text,
-                  mtext = "",
+                  text = text,
                   edate = d
                   }
               )
diff --git a/services/tazblog/src/RSS.hs b/services/tazblog/src/RSS.hs
index d3e78ba0fb..0ee9a6e435 100644
--- a/services/tazblog/src/RSS.hs
+++ b/services/tazblog/src/RSS.hs
@@ -29,7 +29,7 @@ createItem :: Entry -> Item
 createItem Entry {..} =
   [ Title $ T.unpack title,
     Link $ makeLink lang entryId,
-    Description $ T.unpack btext,
+    Description $ T.unpack text,
     PubDate $ UTCTime edate $ secondsToDiffTime 0
     ]
 
-- 
cgit 1.4.1