brian/tangmo_fxtwitter_bot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Support vx multi-pic refresh

Browse Source
This commit is contained in:
TangMo
2023-05-05 23:01:11 +00:00
parent a89c59cf76
commit e2f42de8cc
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Commands/CallbackqueryCommand.php
View File

@@ -56,11 +56,22 @@ class CallbackqueryCommand extends SystemCommand
$attemptLimit = 3; $attemptLimit = 3;
$query = '?tmfx'; $query = '?tmfx';
$parts = explode($query, $callbackQuery->getMessage()->getText()); preg_match('/status\/\d+(?:\/photo\/(\d))?(?:\?tmfx(\d))?/', $callbackQuery->getMessage()->getText(), $matches);
$currentAttempt = isset($parts[1]) ? intval($parts[1])+1 : 1; $currentAttempt = empty($matches[2]) ? 1 : intval($matches[2])+1;
$photoNo = $matches[1] ?? null;
// The proper way to refresh to a URL is to talk to @WebpageBot // The proper way to refresh to a URL is to talk to @WebpageBot
// A workaround is to just add a query string // A workaround is to just add a query string
$newUrl = $parts[0] . $query . $currentAttempt; // But VXTwitter check for /photo/1, /photo/2, ... by looking at URI (including query string) ending with /1, /2
// To maintain compatibility with both fx/vx, we will use https://vxtwitter.com/aaa/status/1234567890/photo/3?tmfx1/3
$newUrl = explode($query, $callbackQuery->getMessage()->getText())[0];
$newUrl = explode('/photo/', $newUrl)[0];
if ($photoNo) {
$newUrl .= '/photo/' . $photoNo;
}
$newUrl .= $query . $currentAttempt;
if ($photoNo) {
$newUrl .= '/' . $photoNo;
}
$keyboard = $callbackQuery->getMessage()->getReplyMarkup(); $keyboard = $callbackQuery->getMessage()->getReplyMarkup();
if ($currentAttempt >= $attemptLimit) { if ($currentAttempt >= $attemptLimit) {

13
src/Commands/GenericmessageCommand.php
View File

@@ -39,11 +39,13 @@ class GenericmessageCommand extends SystemCommand
} }
$author = $matches[1]; $author = $matches[1];
$tweetId = $matches[2]; $tweetId = $matches[2];
$photoNo = ''; $photoNo = null;
$photoNoText = '';
if (!empty($matches[3])) { if (!empty($matches[3])) {
preg_match('/(\/\d)$/', $matches[3], $photoNoMatches); preg_match('/(\/\d)$/', $matches[3], $photoNoMatches);
if (isset($photoNoMatches[1])) { if (isset($photoNoMatches[1])) {
$photoNo = '/photo' . $photoNoMatches[1]; $photoNo = intval($photoNoMatches[1]);
$photoNoText = '/photo' . $photoNoMatches[1];
} }
} }
@@ -61,17 +63,16 @@ class GenericmessageCommand extends SystemCommand
]), ]),
]); ]);
} }
// VXTwitter /photo/n doesn't work with any query string, will revert to multiple images
if ($photoNo === '') {
$buttons []= new InlineKeyboardButton([ $buttons []= new InlineKeyboardButton([
'text' => '🔄 Refresh', 'text' => '🔄 Refresh',
'callback_data' => json_encode(['action' => 'REFRESH']), 'callback_data' => json_encode(['action' => 'REFRESH']),
]); ]);
}
if (!empty($buttons)) { if (!empty($buttons)) {
$data['reply_markup'] = new InlineKeyboard($buttons); $data['reply_markup'] = new InlineKeyboard($buttons);
} }
return $this->replyToChat("https://vxtwitter.com/$author/status/$tweetId$photoNo", $data); return $this->replyToChat("https://vxtwitter.com/$author/status/$tweetId$photoNoText", $data);
} }
} }