From 9588a24cb3420d811f5159116c82bc59bfcd948b Mon Sep 17 00:00:00 2001
From: towards-a-new-leftypol <paul_cockshott@protonmail.com>
Date: Tue, 5 Mar 2024 21:38:48 -0500
Subject: [PATCH] Move Network.PostType to Common

---
 chandlr.cabal                 |  2 +-
 src/Common                    |  2 +-
 src/Component/Thread/Embed.hs |  4 ++--
 src/Component/Thread/Files.hs |  4 ++--
 src/Component/Thread/Intro.hs |  4 ++--
 src/Component/Thread/Model.hs |  2 +-
 src/Network/PostType.hs       | 25 -------------------------
 src/Network/ThreadType.hs     |  2 +-
 src/Parsing/BodyParser.hs     |  2 +-
 9 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 src/Network/PostType.hs

diff --git a/chandlr.cabal b/chandlr.cabal
index 1fb9afc..21e1afb 100644
--- a/chandlr.cabal
+++ b/chandlr.cabal
@@ -71,7 +71,7 @@ executable chandlr
                       Common.Network.CatalogPostType
                       Network.BoardType
                       Network.SiteType
-                      Network.PostType
+                      Common.Network.PostType
                       Network.ThreadType
                       Common.Component.ThreadView
                       Component.Thread.Files
diff --git a/src/Common b/src/Common
index cbc894b..a971528 160000
--- a/src/Common
+++ b/src/Common
@@ -1 +1 @@
-Subproject commit cbc894bcd57f6c693c0bf62df4e52fdbf076e840
+Subproject commit a97152853d42a4d334d6ab659f9a38792d648cda
diff --git a/src/Component/Thread/Embed.hs b/src/Component/Thread/Embed.hs
index 6acaa5d..76e2abc 100644
--- a/src/Component/Thread/Embed.hs
+++ b/src/Component/Thread/Embed.hs
@@ -20,8 +20,8 @@ import Data.Maybe (fromJust)
 import Data.Text (unpack)
 import Data.JSString (JSString, pack)
 
-import qualified Network.PostType as Post
-import Network.PostType (Post)
+import qualified Common.Network.PostType as Post
+import Common.Network.PostType (Post)
 import Parsing.EmbedParser (extractVideoId)
 
 embed :: Post -> View a
diff --git a/src/Component/Thread/Files.hs b/src/Component/Thread/Files.hs
index 327b451..d1f2335 100644
--- a/src/Component/Thread/Files.hs
+++ b/src/Component/Thread/Files.hs
@@ -32,8 +32,8 @@ import Network.SiteType (Site)
 import qualified Network.SiteType as Site
 import qualified Network.BoardType as Board
 import qualified Network.ThreadType as Thread
-import qualified Network.PostType as Post
-import Network.PostType (Post)
+import qualified Common.Network.PostType as Post
+import Common.Network.PostType (Post)
 import Common.AttachmentType (Attachment, Dimension (..))
 import qualified Common.AttachmentType as Attachment
 import Network.Units (bytesToHumanReadable)
diff --git a/src/Component/Thread/Intro.hs b/src/Component/Thread/Intro.hs
index 62cb9ae..5731b19 100644
--- a/src/Component/Thread/Intro.hs
+++ b/src/Component/Thread/Intro.hs
@@ -22,8 +22,8 @@ import Miso.String (toMisoString)
 import Data.Time.Clock (UTCTime, diffUTCTime)
 import Data.Time.Format (formatTime, defaultTimeLocale)
 
-import Network.PostType (Post)
-import qualified Network.PostType as Post
+import Common.Network.PostType (Post)
+import qualified Common.Network.PostType as Post
 import Network.SiteType (Site)
 import qualified Network.SiteType as Site
 import Network.BoardType (Board)
diff --git a/src/Component/Thread/Model.hs b/src/Component/Thread/Model.hs
index 8361c64..b530ffe 100644
--- a/src/Component/Thread/Model.hs
+++ b/src/Component/Thread/Model.hs
@@ -2,7 +2,7 @@ module Component.Thread.Model where
 
 import GHCJS.DOM.Types (JSString)
 import Network.SiteType (Site)
-import Network.PostType (Post)
+import Common.Network.PostType (Post)
 import Parsing.PostPartType (PostPart)
 import Data.Time.Clock (UTCTime)
 
diff --git a/src/Network/PostType.hs b/src/Network/PostType.hs
deleted file mode 100644
index 3269f8e..0000000
--- a/src/Network/PostType.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-
-module Network.PostType where
-
-import GHC.Generics
-import Data.Text (Text)
-import Data.Time.Clock (UTCTime)
-import Data.Aeson (FromJSON, ToJSON)
-import Common.AttachmentType (Attachment)
-
-data Post = Post
-  { post_id           :: Integer
-  , board_post_id     :: Integer
-  , creation_time     :: UTCTime
-  , body              :: Maybe Text
-  , subject           :: Maybe Text
-  , name              :: Maybe Text
-  , email             :: Maybe Text
-  , body_search_index :: Text
-  , thread_id         :: Integer
-  , embed             :: Maybe Text
-  , attachments       :: [ Attachment ]
-  } deriving (Show, Generic, FromJSON, ToJSON, Eq)
-
diff --git a/src/Network/ThreadType.hs b/src/Network/ThreadType.hs
index 592ae62..c7b4bbc 100644
--- a/src/Network/ThreadType.hs
+++ b/src/Network/ThreadType.hs
@@ -6,7 +6,7 @@ module Network.ThreadType where
 import GHC.Generics
 import Data.Time.Clock (UTCTime)
 import Data.Aeson (FromJSON, ToJSON)
-import Network.PostType (Post)
+import Common.Network.PostType (Post)
 
 data Thread = Thread
   { thread_id       :: Integer
diff --git a/src/Parsing/BodyParser.hs b/src/Parsing/BodyParser.hs
index 2aabaf1..ea5622a 100644
--- a/src/Parsing/BodyParser.hs
+++ b/src/Parsing/BodyParser.hs
@@ -29,7 +29,7 @@ import GHCJS.DOM.JSFFI.Generated.DOMTokenList (contains)
 import Data.Text (Text)
 import Miso (consoleLog)
 import Miso.String (fromMisoString)
-import qualified Network.PostType as Post
+import qualified Common.Network.PostType as Post
 import Component.Thread.Model (PostWithBody)
 
 import Parsing.PostPartType