@@ -49,7 +49,6 @@ module Advent.API (

, RawText

-- * Internal

, processHTML

, processDivs

) where

import Advent.Types

@@ -94,10 +93,14 @@ instance Accept RawText where

instance MimeUnrender RawText Text where

mimeUnrender _ = first show . T.decodeUtf8' . BSL.toStrict

-- | Interpret repsonse as a list of HTML 'Text' in the given type of tag

-- | Interpret repsonse as a list of HTML 'Text' found in the given type of

-- tag

data HTMLTags (tag :: Symbol)

-- | Interpret a response as a list of HTML 'Text' found in @<article>@ tags.

type Articles = HTMLTags "article"

-- | Interpret a response as a list of HTML 'Text' found in @<div>@ tags.

type Divs = HTMLTags "div"

-- | Class for interpreting a list of 'Text' in tags to some desired

@@ -286,15 +289,3 @@ processHTML tag = mapMaybe getTag

x:xs -> x <> "</title>" <> T.intercalate "</span>" xs

[] -> "" -- this shouldn't ever happen because splitOn is always non-empty

processDivs :: String -> Text -> [Text]

processDivs cls = mapMaybe isDiv

. H.universeTree

. H.parseTree

where

isDiv :: TagTree Text -> Maybe Text

isDiv (TagBranch n attrs cld)

| n == "div"

, ("class", T.pack cls) `elem` attrs

= Just $ H.renderTree cld

isDiv _ = Nothing

@@ -173,6 +173,7 @@ data DailyLeaderboardMember = DLBM

}

deriving (Show, Eq, Ord, Typeable, Generic)

-- | Daily leaderboard, containing Star 1 and Star 2 completions

data DailyLeaderboard = DLB {

dlbStar1 :: Map Rank DailyLeaderboardMember

, dlbStar2 :: Map Rank DailyLeaderboardMember

@@ -190,6 +191,7 @@ data GlobalLeaderboardMember = GLBM

}

deriving (Show, Eq, Ord, Typeable, Generic)

-- | Global leaderboard for the entire event

newtype GlobalLeaderboard = GLB {

glbMap :: Map Rank (Integer, NonEmpty GlobalLeaderboardMember)

}