git.iko.soy/denis
on master help sign in
Merge pull request #134 from ilyakooo0/develop

Develop

commit6bdc23681585caa101fef5f055116007dfa90c24 authoriko <ilyakooo0@gmail.com> dateSun 12 May 2019, 15:16 (7 years ago) parent2afcbc5d67e101
2 files changed+3−3
compare with master
unifiedsplit
denis/src/Data/Query.hs+2−2 denis/src/Server/Auth/HTML.hs+1−1
denis/src/Data/Query.hs+2−2
@@ -90,7 +90,7 @@ import Data.Text (Text)
9090import qualified Data.Text as T
9191import Data.Channel.NamedChannel
9292import Data.Channel.AnonymousChannel
93−import Data.Maybe (fromMaybe)
93+import Data.Maybe (fromMaybe, catMaybes)
9494import Squeal.PostgreSQL.Render
9595import Data.GroupChat
9696import Data.Message
@@ -975,7 +975,7 @@ getMessagesInGroupChat
975975getMessagesInGroupChat selfId gId mId lim dir = do
976976 _ <- getGroupChatForUser selfId gId
977977 resp <- runQueryParams (getGroupMessagesQ lim dir) (gId, mId) >>= getRows
978− (return . sequence . map restoreMessage $ resp) >>= fromMaybe500
978+ return . catMaybes . map restoreMessage $ resp
979979
980980sendMessage :: UserId -> MessageCreation -> StaticPQ MessageId
981981sendMessage selfId (MessageCreation (Just gId) uId@Nothing body) = do
denis/src/Server/Auth/HTML.hs+1−1
@@ -38,7 +38,7 @@ genPage :: Markup -> Markup
3838genPage pageContent = html $ do
3939 H.head $ do
4040 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
4242 H.div ! A.style "text-align: center; margin-top: 20vh; margin-left: 10%; margin-right: 10%" $ do
4343 H.div ! A.style "font-size: 40px; font-weight: bold;" $ pageContent
4444