@@ -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