Merge pull request #157 from fetsh-edu/inline-mode

Inline mode

README.md

@@ -13,7 +13,7 @@ The supplementary materials for the workshop is available at https://github.com/
 
 ## Examples
 
-See bot examples here: https://github.com/fizruk/telegram-bot-simple/tree/master/examples
+See bot examples here: https://github.com/fizruk/telegram-bot-simple/tree/master/telegram-bot-simple/examples
 
 Use `cabal build all -fexamples` to build it.
 If you are building with stack then use `stack build --flag telegram-bot-simple:examples`.

telegram-bot-api/src/Telegram/Bot/API/Internal/Utils.hs

@@ -106,9 +106,13 @@ instance (GSomeJSON f, GSomeJSON g) => GSomeJSON (f :+: g) where
     <|> R1 <$> gsomeParseJSON js
 
 addJsonFields :: Value -> [Pair] -> Value
-addJsonFields (Object obj) pairs = Object $  Map.union obj (Map.fromList pairs)
+addJsonFields (Object obj) pairs = Object $  Map.union obj $ Map.fromList (filter (not . isNull) pairs)
 addJsonFields x _ = x
 
+isNull :: Pair -> Bool
+isNull (_, Null) = True
+isNull _ = False
+
 addMultipartFields :: [Input] -> MultipartData tag -> MultipartData tag
 addMultipartFields newFields (MultipartData currenFields files)
       = MultipartData (newFields <> currenFields) files

telegram-bot-api/src/Telegram/Bot/API/Types/Chat.hs

@@ -57,6 +57,7 @@ data ChatType
   | ChatTypeGroup
   | ChatTypeSupergroup
   | ChatTypeChannel
+  | ChatTypeSender
   deriving (Generic, Show)
 
 instance ToJSON   ChatType where

telegram-bot-simple/README.md

@@ -13,7 +13,7 @@ The supplementary materials for the workshop is available at https://github.com/
 
 ## Examples
 
-See bot examples here: https://github.com/fizruk/telegram-bot-simple/tree/master/examples
+See bot examples here: https://github.com/fizruk/telegram-bot-simple/tree/master/telegram-bot-simple/examples
 
 Use `cabal build all -fexamples` to build it.
 If you are building with stack then use `stack build --flag telegram-bot-simple:examples`.