danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-27 03:14:39 +01:00
Code Issues Projects Releases Wiki Activity

Improve regex filter, add preg_match_all

Browse Source
This commit is contained in:
AhJ 2023-12-25 12:48:34 +03:30
parent 478c33ed2b
commit 26064d0d60
2 changed files with 85 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/EventHandler/Filter/FilterRegex.php
View File

@ -31,29 +31,37 @@ use Webmozart\Assert\Assert;
final class FilterRegex extends Filter
{
/** @param non-empty-string $regex */
public function __construct(private readonly string $regex)
public function __construct(
private readonly string $regex,
private readonly int $flags = 0,
private readonly int $offset = 0
)
{
preg_match($regex, '');
preg_match($regex, '', flags: $flags, offset: $offset);
Assert::eq(preg_last_error_msg(), 'No error');
}
public function apply(Update $update): bool
{
if ($update instanceof Message && preg_match($this->regex, $update->message, $matches)) {
if ($update instanceof Message && preg_match($this->regex, $update->message, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
if ($update instanceof ButtonQuery && preg_match($this->regex, $update->data, $matches)) {
if ($update instanceof ButtonQuery && preg_match($this->regex, $update->data, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
if ($update instanceof InlineQuery && preg_match($this->regex, $update->query, $matches)) {
if ($update instanceof InlineQuery && preg_match($this->regex, $update->query, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
if ($update instanceof Story && preg_match($this->regex, $update->caption, $matches)) {
if ($update instanceof Story && preg_match($this->regex, $update->caption, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;

71
src/EventHandler/Filter/FilterRegexAll.php Normal file
View File

@ -0,0 +1,71 @@
<?php declare(strict_types=1);
/**
* This file is part of MadelineProto.
* MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU Affero General Public License for more details.
* You should have received a copy of the GNU General Public License along with MadelineProto.
* If not, see <http://www.gnu.org/licenses/>.
*
* @author Daniil Gentili <daniil@daniil.it>
* @copyright 2016-2023 Daniil Gentili <daniil@daniil.it>
* @license https://opensource.org/licenses/AGPL-3.0 AGPLv3
* @link https://docs.madelineproto.xyz MadelineProto documentation
*/
namespace danog\MadelineProto\EventHandler\Filter;
use Attribute;
use danog\MadelineProto\EventHandler\InlineQuery;
use danog\MadelineProto\EventHandler\Message;
use danog\MadelineProto\EventHandler\Query\ButtonQuery;
use danog\MadelineProto\EventHandler\Story\Story;
use danog\MadelineProto\EventHandler\Update;
use Webmozart\Assert\Assert;
/**
* Allow only messages or button queries matching the specified regex.
*/
#[Attribute(Attribute::TARGET_METHOD)]
final class FilterRegexAll extends Filter
{
/** @param non-empty-string $regex */
public function __construct(
private readonly string $regex,
private readonly int $flags = 0,
private readonly int $offset = 0
)
{
preg_match_all($regex, '', flags: $flags, offset: $offset);
Assert::eq(preg_last_error_msg(), 'No error');
}
public function apply(Update $update): bool
{
if ($update instanceof Message && preg_match_all($this->regex, $update->message, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
if ($update instanceof ButtonQuery && preg_match_all($this->regex, $update->data, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
if ($update instanceof InlineQuery && preg_match_all($this->regex, $update->query, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
if ($update instanceof Story && preg_match_all($this->regex, $update->caption, $matches, $this->flags, $this->offset)) {
/** @psalm-suppress InaccessibleProperty */
$update->matches = $matches;
return true;
}
return false;
}
}