diff --git a/src/Utils/Message.hs b/src/Utils/Message.hs index 4302dac79..d72d065bf 100644 --- a/src/Utils/Message.hs +++ b/src/Utils/Message.hs @@ -1,13 +1,12 @@ module Utils.Message - ( MessageStatus(..), MessageIconStatus(..) - , UnknownMessageStatus(..) + ( MessageStatus(..) + -- , UnknownMessageStatus(..) , getMessages , addMessage',addMessageIcon, addMessageIconI -- messages with special icons (needs registering in alert-icons.js) , addMessage, addMessageI, addMessageIHamlet, addMessageFile, addMessageWidget , statusToUrgencyClass , Message(..) , messageI, messageIHamlet, messageFile, messageWidget - , encodeMessageIconStatus, decodeMessageIconStatus, decodeMessageIconStatus' ) where import Data.Universe @@ -45,13 +44,11 @@ deriveJSON defaultOptions nullaryPathPiece ''MessageStatus camelToPathPiece derivePersistField "MessageStatus" -newtype UnknownMessageStatus = UnknownMessageStatus Text +newtype UnknownMessageStatus = UnknownMessageStatus Text -- kann das weg? deriving (Eq, Ord, Read, Show, Generic, Typeable) instance Exception UnknownMessageStatus --- ms2mis :: MessageStatus -> MessageIconStatus --- ms2mis s = def { misStatus= s} data MessageIconStatus = MIS { misStatus :: MessageStatus, misIcon :: Maybe Icon } deriving (Eq, Ord, Show, Read, Lift) @@ -72,23 +69,23 @@ encodeMessageIconStatus = decodeUtf8 . toStrict . encode decodeMessageIconStatus :: Text -> Maybe MessageIconStatus decodeMessageIconStatus = decode' . fromStrict . encodeUtf8 -decodeMessageIconStatus' :: Text -> MessageIconStatus -decodeMessageIconStatus' t - | Just mis <- decodeMessageIconStatus t = mis - | otherwise = def +-- decodeMessageIconStatus' :: Text -> MessageIconStatus +-- decodeMessageIconStatus' t +-- | Just mis <- decodeMessageIconStatus t = mis +-- | otherwise = def decodeMessage :: (Text, Html) -> Message decodeMessage (mis, msgContent) | Just MIS{ misStatus=messageStatus, misIcon=messageIcon } <- decodeMessageIconStatus mis = let messageContent = msgContent in Message{..} - | Just messageStatus <- fromPathPiece mis - = let messageIcon = Nothing -- legacy case, should no longer occur ($logDebug ???) - messageContent = msgContent <> "!!!" + | Just messageStatus <- fromPathPiece mis -- should not happen + = let messageIcon = Nothing + messageContent = msgContent <> "!!" -- mark legacy case, should no longer occur ($logDebug instead ???) in Message{..} - | otherwise -- should not happen, if refactored correctly ($logDebug ???) - = let messageStatus = Utils.Message.Warning - messageContent = msgContent <> "!!!!" - messageIcon = Nothing + | otherwise -- should not happen + = let messageStatus = Utils.Message.Error + messageContent = msgContent <> "!!!" -- mark legacy case, should no longer occur ($logDebug instead ???) + messageIcon = Nothing in Message{..}