diff --git a/bot.php b/bot.php index 8667402..6bc3672 100644 --- a/bot.php +++ b/bot.php @@ -37,7 +37,7 @@ function ellipse($str,$n_chars,$crop_str='[...]') $cut_index = max((int) $cut_index_a, (int) $cut_index_b); $buff=substr($buff,0,($cut_index===false? $n_chars: $cut_index+1)).$crop_str; } - return $buff; + return trim($buff); } function formatdsc($description) { @@ -95,7 +95,8 @@ foreach ($articles as $article) { continue; } $title = $article['title']; - $link = 'https://t.me/iv?url='.urlencode($article['link']).'&rhash=2db6db1261cc57'; + $link_mastodon = $article['link']; + $link_telegram = 'https://t.me/iv?url='.urlencode($article['link']).'&rhash=2db6db1261cc57'; $description = $article['description']; $image = NULL; preg_match('/.+?)[\'"].*>/i', $description, $image); @@ -111,16 +112,17 @@ foreach ($articles as $article) { $description = formatdsc($description); } */ - $limit = 500 - strlen($link) - strlen($title) - 5; + $limit = 500 - strlen($link_telegram) - strlen($title) - 20; $description = "$title\n\n".ellipse($description, $limit); - $description .= "\n$link"; + $description_mastodon = $description."\nГолосовать: $link_mastodon"; + $description_telegram = $description."\nГолосовать: $link_telegram"; if (!$config['DRY_RUN']) { if ($config['TELEGRAM'] === true) { try { $result = \Longman\TelegramBot\Request::sendMessage([ 'chat_id' => $config['TELEGRAM_CHAT_ID'], - 'text' => $description, + 'text' => $description_telegram, 'parse_mode' => 'Markdown' ]); unset($tdescription); @@ -143,7 +145,7 @@ foreach ($articles as $article) { unlink('./'.basename($image)); $mdescription .= $attachment->url; }*/ - $mastodon->createStatus($description, [ + $mastodon->createStatus($description_mastodon, [ 'language' => 'ru' ]); if (!$config['DRY_RUN']) {