0
/
chandler-miso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move BoardType, ThreadType and SiteType modules into Common.Network

This commit is contained in:
towards-a-new-leftypol 2024-03-05 23:41:38 -05:00
parent 9588a24cb3
commit a7163e2dfd
9 changed files with 16 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chandlr.cabal
View File

@ -69,10 +69,10 @@ executable chandlr
Network.Client Network.Client
Common.Network.ClientTypes Common.Network.ClientTypes
Common.Network.CatalogPostType Common.Network.CatalogPostType
Network.BoardType Common.Network.BoardType
Network.SiteType Common.Network.SiteType
Common.Network.PostType Common.Network.PostType
Network.ThreadType Common.Network.ThreadType
Common.Component.ThreadView Common.Component.ThreadView
Component.Thread.Files Component.Thread.Files
Component.Thread.Intro Component.Thread.Intro

2
src/Common

@ -1 +1 @@
Subproject commit a97152853d42a4d334d6ab659f9a38792d648cda Subproject commit 5a418494d53a23792a458f85d7aa397928786e3b

8
src/Component/Thread/Files.hs
View File

@ -28,10 +28,10 @@ import qualified Data.Text as Text
import Miso.String (append, toMisoString) import Miso.String (append, toMisoString)
import qualified Data.Map as Map import qualified Data.Map as Map
import GHCJS.DOM.Types (JSString) import GHCJS.DOM.Types (JSString)
import Network.SiteType (Site) import Common.Network.SiteType (Site)
import qualified Network.SiteType as Site import qualified Common.Network.SiteType as Site
import qualified Network.BoardType as Board import qualified Common.Network.BoardType as Board
import qualified Network.ThreadType as Thread import qualified Common.Network.ThreadType as Thread
import qualified Common.Network.PostType as Post import qualified Common.Network.PostType as Post
import Common.Network.PostType (Post) import Common.Network.PostType (Post)
import Common.AttachmentType (Attachment, Dimension (..)) import Common.AttachmentType (Attachment, Dimension (..))

12
src/Component/Thread/Intro.hs
View File

@ -24,12 +24,12 @@ import Data.Time.Format (formatTime, defaultTimeLocale)
import Common.Network.PostType (Post) import Common.Network.PostType (Post)
import qualified Common.Network.PostType as Post import qualified Common.Network.PostType as Post
import Network.SiteType (Site) import Common.Network.SiteType (Site)
import qualified Network.SiteType as Site import qualified Common.Network.SiteType as Site
import Network.BoardType (Board) import Common.Network.BoardType (Board)
import qualified Network.BoardType as Board import qualified Common.Network.BoardType as Board
import qualified Network.ThreadType as Thread import qualified Common.Network.ThreadType as Thread
import Network.ThreadType (Thread) import Common.Network.ThreadType (Thread)
import Parsing.BodyParser (Backlinks) import Parsing.BodyParser (Backlinks)

2
src/Component/Thread/Model.hs
View File

@ -1,7 +1,7 @@
module Component.Thread.Model where module Component.Thread.Model where
import GHCJS.DOM.Types (JSString) import GHCJS.DOM.Types (JSString)
import Network.SiteType (Site) import Common.Network.SiteType (Site)
import Common.Network.PostType (Post) import Common.Network.PostType (Post)
import Parsing.PostPartType (PostPart) import Parsing.PostPartType (PostPart)
import Data.Time.Clock (UTCTime) import Data.Time.Clock (UTCTime)

18
src/Network/BoardType.hs
View File

@ -1,18 +0,0 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveAnyClass #-}
module Network.BoardType where
import GHC.Generics
import Data.Text (Text)
import Data.Aeson (FromJSON, ToJSON)
import Network.ThreadType (Thread)
data Board = Board
{ board_id :: Int
, name :: Maybe Text
, pathpart :: Text
, site_id :: Int
, threads :: [ Thread ]
} deriving (Show, Generic, FromJSON, ToJSON, Eq)

2
src/Network/Client.hs
View File

@ -30,7 +30,7 @@ import Miso.String (toMisoString)
import qualified Network.Http as Http import qualified Network.Http as Http
import Common.Network.CatalogPostType (CatalogPost) import Common.Network.CatalogPostType (CatalogPost)
import Network.SiteType (Site) import Common.Network.SiteType (Site)
import qualified Common.FrontEnd.Action as A import qualified Common.FrontEnd.Action as A
import Common.Network.ClientTypes import Common.Network.ClientTypes

16
src/Network/SiteType.hs
View File

@ -1,16 +0,0 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveAnyClass #-}
module Network.SiteType where
import GHC.Generics
import Data.Text (Text)
import Data.Aeson (FromJSON, ToJSON)
import Network.BoardType (Board)
data Site = Site
{ site_id :: Int
, name :: Text
, url :: Text
, boards :: [ Board ]
} deriving (Show, Generic, FromJSON, ToJSON, Eq)

17
src/Network/ThreadType.hs
View File

@ -1,17 +0,0 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveAnyClass #-}
module Network.ThreadType where
import GHC.Generics
import Data.Time.Clock (UTCTime)
import Data.Aeson (FromJSON, ToJSON)
import Common.Network.PostType (Post)
data Thread = Thread
{ thread_id :: Integer
, board_thread_id :: Integer
, creation_time :: UTCTime
, board_id :: Int
, posts :: [ Post ]
} deriving (Show, Generic, FromJSON, ToJSON, Eq)