git.iko.soy/denis
on master help sign in
Merge pull request #134 from ilyakooo0/develop
6bdc236iko
denis/src/Data/Query.hs+2−2
compare with master
unifiedsplit
@@ -90,7 +90,7 @@ import Data.Text (Text)
90import qualified Data.Text as T
90import qualified Data.Text as T
91import Data.Channel.NamedChannel
91import Data.Channel.NamedChannel
92import Data.Channel.AnonymousChannel
92import Data.Channel.AnonymousChannel
93−import Data.Maybe (fromMaybe)
93+import Data.Maybe (fromMaybe, catMaybes)
94import Squeal.PostgreSQL.Render
94import Squeal.PostgreSQL.Render
95import Data.GroupChat
95import Data.GroupChat
96import Data.Message
96import Data.Message
@@ -975,7 +975,7 @@ getMessagesInGroupChat
975getMessagesInGroupChat selfId gId mId lim dir = do
975getMessagesInGroupChat selfId gId mId lim dir = do
976 _ <- getGroupChatForUser selfId gId
976 _ <- getGroupChatForUser selfId gId
977 resp <- runQueryParams (getGroupMessagesQ lim dir) (gId, mId) >>= getRows
977 resp <- runQueryParams (getGroupMessagesQ lim dir) (gId, mId) >>= getRows
978− (return . sequence . map restoreMessage $ resp) >>= fromMaybe500
978+ return . catMaybes . map restoreMessage $ resp
979
979
980sendMessage :: UserId -> MessageCreation -> StaticPQ MessageId
980sendMessage :: UserId -> MessageCreation -> StaticPQ MessageId
981sendMessage selfId (MessageCreation (Just gId) uId@Nothing body) = do
981sendMessage selfId (MessageCreation (Just gId) uId@Nothing body) = do
denis/src/Server/Auth/HTML.hs+1−1
@@ -38,7 +38,7 @@ genPage :: Markup -> Markup
38genPage pageContent = html $ do
38genPage pageContent = html $ do
39 H.head $ do
39 H.head $ do
40 meta ! name "viewport" ! content "width=device-width, initial-scale=1"
40 meta ! name "viewport" ! content "width=device-width, initial-scale=1"
41− body ! A.style "font-family: sans-serif; background-color: #e8e8e8" $ do
41+ body ! A.style "font-family: sans-serif; background-color: #f8f8f8" $ do
42 H.div ! A.style "text-align: center; margin-top: 20vh; margin-left: 10%; margin-right: 10%" $ do
42 H.div ! A.style "text-align: center; margin-top: 20vh; margin-left: 10%; margin-right: 10%" $ do
43 H.div ! A.style "font-size: 40px; font-weight: bold;" $ pageContent
43 H.div ! A.style "font-size: 40px; font-weight: bold;" $ pageContent
44
44