Add Say#sayf

Author: DaveRandom

src/Chat/Client/ChatClient.php

@@ -73,6 +73,11 @@ private function checkAndNormaliseEncoding(string $text): string
         return $text;
     }
 
+    public function stripPingsFromText(string $text): string
+    {
+        return preg_replace('#@((?:\p{L}|\p{N})(?:\p{L}|\p{N}|\.|-|_|\')*)#u', "@\u{2060}$1", $text);
+    }
+
     private function applyPostFlagsToText(string $text, int $flags): string
     {
         $text = rtrim($this->checkAndNormaliseEncoding($text));
@@ -84,7 +89,7 @@ private function applyPostFlagsToText(string $text, int $flags): string
             $text = preg_replace('#(^|\r?\n)#', '$1    ', $text);
         }
         if (!($flags & PostFlags::ALLOW_PINGS)) {
-            $text = preg_replace('#@((?:\p{L}|\p{N})(?:\p{L}|\p{N}|\.|-|_|\')*)#u', "@\u{2060}$1", $text);
+            $text = $this->stripPingsFromText($text);
         }
         if (!($flags & PostFlags::ALLOW_REPLIES)) {
             $text = preg_replace('#^:([0-9]+)\s*#', '', $text);

src/Plugins/Say.php

@@ -3,7 +3,9 @@
 namespace Room11\Jeeves\Plugins;
 
 use Room11\Jeeves\Chat\Client\ChatClient;
+use Room11\Jeeves\Chat\Client\PostFlags;
 use Room11\Jeeves\Chat\Message\Command;
+use Room11\Jeeves\Chat\Room\Room as ChatRoom;
 use Room11\Jeeves\System\PluginCommandEndpoint;
 
 class Say extends BasePlugin
@@ -20,6 +22,78 @@ public function say(Command $command)
         return $this->chatClient->postMessage($command, implode(' ', $command->getParameters()));
     }
 
+    public function sayf(Command $command)
+    {
+        $current = '';
+        $components = [];
+
+        foreach ($command->getParameters() as $parameter) {
+            if ($parameter !== '/') {
+                $current .= str_replace('\\/', '/', $parameter) . ' ';
+            } else if ($current !== '') {
+                $components[] = trim($current);
+                $current = '';
+            }
+        }
+
+        if ($current !== '') {
+            $components[] = trim($current);
+        }
+
+        list($string, $args) = yield from $this->processPingFormatSpecifiers($command->getRoom(), $components);
+        $string = $this->chatClient->stripPingsFromText($string);
+
+        if (false === $result = @\vsprintf($string, $args)) {
+            return $this->chatClient->postReply($command, 'printf() failed, check your format string and arguments');
+        }
+
+        return $this->chatClient->postMessage($command, $result, PostFlags::ALLOW_PINGS);
+    }
+
+    private function processPingFormatSpecifiers(ChatRoom $room, array $components)
+    {
+        static $expr = /** @lang RegExp */ "/
+          %
+          (?:([0-9]+)\\$)? # position
+          ([-+])?          # sign
+          (\\x20|0|'.)?    # padding char
+          (-)?             # alignment
+          ([0-9]+)?        # padding width
+          (\\.[0-9]*)?     # precision
+          (.)              # type
+        /x";
+
+        $string = $components[0];
+        $args = array_slice($components, 1);
+
+        if (0 === $count = preg_match_all($expr, $string, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+            return [$string, $args];
+        }
+
+        foreach ($matches as $i => $match) {
+            if ($match[7][0] !== 'p') {
+                continue;
+            }
+
+            $string = substr_replace($string, 's', $match[7][1], 1);
+            $argIndex = $match[1][0] !== ''
+                ? $match[1][0] - 1
+                : $i;
+
+            if (!isset($args[$argIndex])) {
+                continue;
+            }
+
+            if ($args[$argIndex][0] === '@') {
+                $args[$argIndex] = $this->chatClient->stripPingsFromText($args[$argIndex]);
+            } else if (null !== $pingable = yield $this->chatClient->getPingableName($room, $args[$argIndex])) {
+                $args[$argIndex] = '@' . $pingable;
+            }
+        }
+
+        return [$string, $args];
+    }
+
     public function getDescription(): string
     {
         return 'Mindlessly parrots whatever crap you want';
@@ -28,7 +102,8 @@ public function getDescription(): string
     public function getCommandEndpoints(): array
     {
         return [
-            new PluginCommandEndpoint('say', [$this, 'say'])
+            new PluginCommandEndpoint('say', [$this, 'say']),
+            new PluginCommandEndpoint('sayf', [$this, 'sayf'], 'Same as say with printf-style formatting, separate format string and args with / slashes')
         ];
     }
 }