Skip to content
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

Jump to bottom

move wordwrap to helper class #187

Merged
merged 1 commit into from
Aug 6, 2022
Merged

move wordwrap to helper class #187

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
79 changes: 79 additions & 0 deletions src/Support/StrUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?php

namespace SergiX44\Nutgram\Support;

use InvalidArgumentException;

class StrUtils
{
/**
* @param string $string
* @param int $width
* @param string $break
* @param bool $cut
* @return string
*/
public static function wordWrap(string $string, int $width = 75, string $break = "\n", bool $cut = false): string
{
if ($string === '') {
return '';
}

if ($break === '') {
throw new InvalidArgumentException('Break string cannot be empty');
}

if ($width === 0 && $cut) {
throw new InvalidArgumentException('Cannot force cut when width is zero');
}

$stringWidth = grapheme_strlen($string);
$breakWidth = grapheme_strlen($break);

$result = '';
$lastStart = $lastSpace = 0;

for ($current = 0; $current < $stringWidth; $current++) {
$char = grapheme_substr($string, $current, 1);

$possibleBreak = $char;
if ($breakWidth !== 1) {
$possibleBreak = grapheme_substr($string, $current, $breakWidth);
}

if ($possibleBreak === $break) {
$result .= grapheme_substr($string, $lastStart, $current - $lastStart + $breakWidth);
$current += $breakWidth - 1;
$lastStart = $lastSpace = $current + 1;
continue;
}

if ($char === ' ') {
if ($current - $lastStart >= $width) {
$result .= grapheme_substr($string, $lastStart, $current - $lastStart).$break;
$lastStart = $current + 1;
}

$lastSpace = $current;
continue;
}

if ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) {
$result .= grapheme_substr($string, $lastStart, $current - $lastStart).$break;
$lastStart = $lastSpace = $current;
continue;
}

if ($current - $lastStart >= $width && $lastStart < $lastSpace) {
$result .= grapheme_substr($string, $lastStart, $lastSpace - $lastStart).$break;
$lastStart = ++$lastSpace;
}
}

if ($lastStart !== $current) {
$result .= grapheme_substr($string, $lastStart, $current - $lastStart);
}

return $result;
}
}
115 changes: 7 additions & 108 deletions src/Telegram/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
use Illuminate\Support\Traits\Macroable;
use JsonException;
use JsonSerializable;
use Laminas\Stdlib\StringUtils;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\ResponseInterface;
use RuntimeException;
use SergiX44\Nutgram\Nutgram;
use SergiX44\Nutgram\Support\StrUtils;
use SergiX44\Nutgram\Telegram\Endpoints\AvailableMethods;
use SergiX44\Nutgram\Telegram\Endpoints\Games;
use SergiX44\Nutgram\Telegram\Endpoints\InlineMode;
Expand Down Expand Up @@ -53,10 +52,8 @@ trait Client
* @see https://en.wikipedia.org/wiki/Push_technology#Long_polling
* @param array{offset?: int, limit?: int, timeout?: int, allowed_updates?: array<string>} $parameters
* @return array|null
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
public function getUpdates(array $parameters = []): ?array
Expand All @@ -71,10 +68,8 @@ public function getUpdates(array $parameters = []): ?array
* @param null|array{certificate?: mixed, ip_address?: string, max_connections?: int,
* allowed_updates?:array<string>, drop_pending_updates?: bool} $opt
* @return bool|null
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
public function setWebhook(string $url, ?array $opt = []): ?bool
Expand All @@ -86,10 +81,8 @@ public function setWebhook(string $url, ?array $opt = []): ?bool
/**
* @param null|array{drop_pending_updates?: bool} $opt
* @return bool|null
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
public function deleteWebhook(?array $opt = []): ?bool
Expand All @@ -99,10 +92,8 @@ public function deleteWebhook(?array $opt = []): ?bool

/**
* @return WebhookInfo|null
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
public function getWebhookInfo(): ?WebhookInfo
Expand All @@ -115,10 +106,8 @@ public function getWebhookInfo(): ?WebhookInfo
* @param array|null $parameters
* @param array|null $options
* @return mixed
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
public function sendRequest(string $endpoint, ?array $parameters = [], ?array $options = []): mixed
Expand All @@ -133,10 +122,8 @@ public function sendRequest(string $endpoint, ?array $parameters = [], ?array $o
* @param array $opt
* @param array $clientOpt
* @return Message|null
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
protected function sendAttachment(
Expand Down Expand Up @@ -164,7 +151,9 @@ protected function sendAttachment(
* @param string $path
* @param array $clientOpt
* @return bool|null
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws NotFoundExceptionInterface
*/
public function downloadFile(File $file, string $path, array $clientOpt = []): ?bool
{
Expand All @@ -187,6 +176,8 @@ public function downloadFile(File $file, string $path, array $clientOpt = []): ?
/**
* @param File $file
* @return string|null
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function downloadUrl(File $file): string|null
{
Expand All @@ -208,10 +199,8 @@ public function downloadUrl(File $file): string|null
* @param string $mapTo
* @param array|null $options
* @return mixed
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
protected function requestMultipart(
Expand Down Expand Up @@ -253,10 +242,8 @@ protected function requestMultipart(
* @param string $mapTo
* @param array|null $options
* @return mixed
* @throws ContainerExceptionInterface
* @throws GuzzleException
* @throws JsonException
* @throws NotFoundExceptionInterface
* @throws TelegramException
*/
protected function requestJson(
Expand Down Expand Up @@ -317,7 +304,7 @@ protected function mapResponse(ResponseInterface $response, string $mapTo, Excep
* @param array $opt
* @return array
*/
private function targetChatMessageOrInlineMessageId(array $opt = []): array
protected function targetChatMessageOrInlineMessageId(array $opt = []): array
{
$inlineMessageId = $this->inlineMessageId();

Expand All @@ -339,94 +326,6 @@ private function targetChatMessageOrInlineMessageId(array $opt = []): array
*/
protected function chunkText(string $text, int $length = Limits::TEXT_LENGTH): array
{
return explode('%#TGMSG#%', $this->mb_wordwrap($text, $length, "%#TGMSG#%", true));
}

/**
* @return false|int
*
* @psalm-return 0|false|positive-int
*/
protected function g_strlen($str): int|false
{
$len = grapheme_strlen($str);
return $len ?? false;
}

protected function g_substr($str, $offset = 0, $length = null): bool|string
{
if ($length !== null) {
return grapheme_substr($str, $offset, $length);
}

return grapheme_substr($str, $offset);
}

protected function mb_wordwrap($string, $width = 75, $break = "\n", $cut = false): string
{
$string = (string)$string;
if ($string === '') {
return '';
}

$break = (string)$break;
if ($break === '') {
throw new \InvalidArgumentException('Break string cannot be empty');
}

$width = (int)$width;
if ($width === 0 && $cut) {
throw new \InvalidArgumentException('Cannot force cut when width is zero');
}

$stringWidth = $this->g_strlen($string);
$breakWidth = $this->g_strlen($break);

$result = '';
$lastStart = $lastSpace = 0;

for ($current = 0; $current < $stringWidth; $current++) {
$char = $this->g_substr($string, $current, 1);

$possibleBreak = $char;
if ($breakWidth !== 1) {
$possibleBreak = $this->g_substr($string, $current, $breakWidth);
}

if ($possibleBreak === $break) {
$result .= $this->g_substr($string, $lastStart, $current - $lastStart + $breakWidth);
$current += $breakWidth - 1;
$lastStart = $lastSpace = $current + 1;
continue;
}

if ($char === ' ') {
if ($current - $lastStart >= $width) {
$result .= $this->g_substr($string, $lastStart, $current - $lastStart).$break;
$lastStart = $current + 1;
}

$lastSpace = $current;
continue;
}

if ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) {
$result .= $this->g_substr($string, $lastStart, $current - $lastStart).$break;
$lastStart = $lastSpace = $current;
continue;
}

if ($current - $lastStart >= $width && $lastStart < $lastSpace) {
$result .= $this->g_substr($string, $lastStart, $lastSpace - $lastStart).$break;
$lastStart = $lastSpace += 1;
continue;
}
}

if ($lastStart !== $current) {
$result .= $this->g_substr($string, $lastStart, $current - $lastStart);
}

return $result;
return explode('%#TGMSG#%', StrUtils::wordWrap($text, $length, "%#TGMSG#%", true));
}
}