teidesu/mtcute
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(client): remove explicit simple/non-simple webview type, change it automatically if needed

Browse source
This commit is contained in:
teidesu 2022-07-13 04:53:29 +03:00
parent 2c54751029
commit 2c6238798f
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
packages/client/src/types/bots/keyboards.ts
View file

@ -335,22 +335,17 @@ export namespace BotKeyboard {
/**
* Button to open webview
*
* Used for both inline keyboards and reply ones, but!
*
* For inline keyboards, `simple=false`
* For reply keyboards, `simple=true`
* Used for both inline keyboards and reply ones
*
* @param text Button label
* @param url WebView URL
* @param simple Whether to use simple WebView
*/
export function webView(
text: string,
url: string,
simple = false
): tl.RawKeyboardButtonWebView | tl.RawKeyboardButtonSimpleWebView {
url: string
): tl.RawKeyboardButtonWebView {
return {
_: simple ? 'keyboardButtonSimpleWebView' : 'keyboardButtonWebView',
_: 'keyboardButtonWebView',
text,
url,
}
@ -415,12 +410,24 @@ export namespace BotKeyboard {
/** @internal */
export function _2dToRows(
arr: tl.TypeKeyboardButton[][]
arr: tl.TypeKeyboardButton[][],
inline: boolean
): tl.RawKeyboardButtonRow[] {
return arr.map((row) => ({
_: 'keyboardButtonRow',
buttons: row,
}))
return arr.map((row) => {
if (!inline) {
// le cringe
row.forEach((btn) => {
if (btn._ === 'keyboardButtonWebView') {
;(btn as any)._ = 'keyboardButtonSimpleWebView'
}
})
}
return {
_: 'keyboardButtonRow',
buttons: row,
}
})
}
/** @internal */
@ -436,7 +443,7 @@ export namespace BotKeyboard {
resize: obj.resize,
singleUse: obj.singleUse,
selective: obj.selective,
rows: _2dToRows(obj.buttons),
rows: _2dToRows(obj.buttons, false),
}
case 'reply_hide':
return {
@ -452,7 +459,7 @@ export namespace BotKeyboard {
case 'inline':
return {
_: 'replyInlineMarkup',
rows: _2dToRows(obj.buttons),
rows: _2dToRows(obj.buttons, true),
}
default:
assertNever(obj)