Skip to content

feat: add button limit test command #4

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

Open
keyp-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add button limit test command #4

Show file tree
Hide file tree
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
52 changes: 52 additions & 0 deletions packages/examples/src/example-bot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,55 @@ const TodoApp = () => {
);
};

const ButtonLimitTestApp = () => {
return (
<>
<b>🚫 Button Limit Test</b>
<br />
<br />
This command creates too many buttons to test the button limit error.
<br />
<br />
<row>
<button onClick={() => {}}>Button 1</button>
<button onClick={() => {}}>Button 2</button>
<button onClick={() => {}}>Button 3</button>
<button onClick={() => {}}>Button 4</button>
<button onClick={() => {}}>Button 5</button>
<button onClick={() => {}}>Button 6</button>
<button onClick={() => {}}>Button 7</button>
<button onClick={() => {}}>Button 8</button>
<button onClick={() => {}}>Button 9</button>
<button onClick={() => {}}>Button 10</button>
</row>
<row>
<button onClick={() => {}}>Button 11</button>
<button onClick={() => {}}>Button 12</button>
<button onClick={() => {}}>Button 13</button>
<button onClick={() => {}}>Button 14</button>
<button onClick={() => {}}>Button 15</button>
<button onClick={() => {}}>Button 16</button>
<button onClick={() => {}}>Button 17</button>
<button onClick={() => {}}>Button 18</button>
<button onClick={() => {}}>Button 19</button>
<button onClick={() => {}}>Button 20</button>
</row>
<row>
<button onClick={() => {}}>Button 21</button>
<button onClick={() => {}}>Button 22</button>
<button onClick={() => {}}>Button 23</button>
<button onClick={() => {}}>Button 24</button>
<button onClick={() => {}}>Button 25</button>
<button onClick={() => {}}>Button 26</button>
<button onClick={() => {}}>Button 27</button>
<button onClick={() => {}}>Button 28</button>
<button onClick={() => {}}>Button 29</button>
<button onClick={() => {}}>Button 30</button>
</row>
</>
);
};

const HelpApp = () => {
const [section, setSection] = useState<'main' | 'formatting' | 'features'>('main');

Expand Down Expand Up @@ -142,6 +191,8 @@ const HelpApp = () => {
<br />
/todo - Todo list manager
<br />
/buttontest - Test button limit error
<br />
/help - This help message
<br />
<br />
Expand Down Expand Up @@ -175,6 +226,7 @@ async function main() {
adapter.onCommand('help', () => <HelpApp />);
adapter.onCommand('counter', () => <CounterApp />);
adapter.onCommand('todo', () => <TodoApp />);
adapter.onCommand('buttontest', () => <ButtonLimitTestApp />);

// Start the bot
await adapter.start(config.botToken);
Expand Down
49 changes: 31 additions & 18 deletions packages/mtcute-adapter/src/mtcute-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,19 @@ export class MtcuteAdapter {
if (rows.length === 0) return undefined;

const keyboard: tl.TypeKeyboardButton[][] = rows.map(row =>
row.children.map(button => ({
{
const rowButtons = row.children.map(button => ({
_: 'keyboardButtonCallback',
text: button.text,
data: Buffer.from(`${containerId}:${button.id}`)
}) as tl.TypeKeyboardButton)

if (rowButtons.length >8) {
throw new Error('Row has more than 8 buttons');
};

return rowButtons;
}
);

return { _: 'replyInlineMarkup', rows: keyboard.map(row => ({ _: 'keyboardButtonRow', buttons: row })) };
Expand All @@ -248,23 +256,28 @@ export class MtcuteAdapter {

// Set up re-render callback
container.container.onRenderContainer = async (root) => {
const textWithEntities = this.rootNodeToTextWithEntities(root);
const replyMarkup = this.rootNodeToInlineKeyboard(root, containerId);

if (messageId === null) {
// First render: send a new message
const sentMessage = await this.client.sendText(chatId, textWithEntities, {
replyMarkup
});
messageId = sentMessage.id;
} else {
// Subsequent renders: edit the existing message
await this.client.editMessage({
chatId,
message: messageId,
text: textWithEntities,
replyMarkup
});
try {
const textWithEntities = this.rootNodeToTextWithEntities(root);
const replyMarkup = this.rootNodeToInlineKeyboard(root, containerId);

if (messageId === null) {
// First render: send a new message
const sentMessage = await this.client.sendText(chatId, textWithEntities, {
replyMarkup
});
messageId = sentMessage.id;
} else {
// Subsequent renders: edit the existing message
await this.client.editMessage({
chatId,
message: messageId,
text: textWithEntities,
replyMarkup
});
}
} catch (err) {
console.error('Error sending message:', err);
await this.client.sendText(chatId, 'Error sending message, please try again later.');
}
};

Expand Down