Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix response parsing in UpdatingMessages #131

Merged
merged 1 commit into from
Dec 24, 2022
Merged

Fix response parsing in UpdatingMessages #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/Telegram/Bot/API/UpdatingMessages.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ import Telegram.Bot.API.MakingRequests
import Telegram.Bot.API.Methods
import Telegram.Bot.API.Types

data EditMessageResponse
= EditedInlineMessage Bool
| EditedMessage Message
deriving (Show, Generic)

instance FromJSON EditMessageResponse where
parseJSON (Data.Aeson.Bool b) = pure (EditedInlineMessage b)
parseJSON o@(Data.Aeson.Object _) = EditedMessage <$> parseJSON o
parseJSON _ = fail "Unable to parse EditMessageResponse: expected either a Bool or a Message"

-- ** 'editMessageText'

-- | Request parameters for 'editMessageText'.
Expand Down Expand Up @@ -79,26 +89,26 @@ foldMap deriveJSON'
type EditMessageText
= "editMessageText"
:> ReqBody '[JSON] EditMessageTextRequest
:> Post '[JSON] (Response (Either Bool Message))
:> Post '[JSON] (Response EditMessageResponse)

-- | Use this method to edit text and game messages. On success, if the edited message is not an inline message, the edited 'Message' is returned, otherwise 'True' is returned.
editMessageText :: EditMessageTextRequest -> ClientM (Response (Either Bool Message))
editMessageText :: EditMessageTextRequest -> ClientM (Response EditMessageResponse)
editMessageText = client (Proxy @EditMessageText)

type EditMessageCaption = "editMessageCaption"
:> ReqBody '[JSON] EditMessageCaptionRequest
:> Post '[JSON] (Response (Either Bool Message))
:> Post '[JSON] (Response EditMessageResponse)

-- | Use this method to edit captions of messages.
-- On success, if the edited message is not an
-- inline message, the edited Message is returned,
-- otherwise True is returned.
editMessageCaption :: EditMessageCaptionRequest -> ClientM (Response (Either Bool Message))
editMessageCaption :: EditMessageCaptionRequest -> ClientM (Response EditMessageResponse)
editMessageCaption = client (Proxy @EditMessageCaption)

type EditMessageMedia = "editMessageMedia"
:> ReqBody '[JSON] EditMessageMediaRequest
:> Post '[JSON] (Response (Either Bool Message))
:> Post '[JSON] (Response EditMessageResponse)

-- | Use this method to edit animation, audio,
-- document, photo, or video messages. If a
Expand All @@ -110,18 +120,18 @@ type EditMessageMedia = "editMessageMedia"
-- previously uploaded file via its file_id or specify a URL.
-- On success, if the edited message is not an inline
-- message, the edited Message is returned, otherwise True is returned.
editMessageMedia :: EditMessageMediaRequest -> ClientM (Response (Either Bool Message))
editMessageMedia :: EditMessageMediaRequest -> ClientM (Response EditMessageResponse)
editMessageMedia = client (Proxy @EditMessageMedia)


type EditMessageReplyMarkup = "editMessageReplyMarkup"
:> ReqBody '[JSON] EditMessageReplyMarkupRequest
:> Post '[JSON] (Response (Either Bool Message))
:> Post '[JSON] (Response EditMessageResponse)

-- | Use this method to edit only the reply markup of messages.
-- On success, if the edited message is not an inline message,
-- the edited Message is returned, otherwise True is returned.
editMessageReplyMarkup :: EditMessageReplyMarkupRequest -> ClientM (Response (Either Bool Message))
editMessageReplyMarkup :: EditMessageReplyMarkupRequest -> ClientM (Response EditMessageResponse)
editMessageReplyMarkup = client (Proxy @EditMessageReplyMarkup)

type StopPoll = "stopPoll"
Expand Down