Support: WIP: Add support agent name customization

Web/Models/Entities/SupportAlias.php

@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+namespace openvk\Web\Models\Entities;
+use openvk\Web\Models\RowModel;
+use openvk\Web\Models\Repositories\Users;
+
+class SupportAlias extends RowModel
+{
+    protected $tableName = "support_names";
+    
+    function getUser(): User
+    {
+        return (new Users)->get($this->getRecord()->agent);
+    }
+    
+    function getName(): string
+    {
+        return $this->getRecord()->name;
+    }
+    
+    function getIcon(): ?string
+    {
+        return $this->getRecord()->icon;
+    }
+    
+    function shouldAppendNumber(): bool
+    {
+        return (bool) $this->getRecord()->numerate;
+    }
+    
+    function setAgent(User $agent): void
+    {
+        $this->stateChanges("agent", $agent->getId());
+    }
+    
+    function setNumeration(bool $numerate): void
+    {
+        $this->stateChanges("numerate", $numerate);
+    }
+}

Web/Models/Entities/TicketComment.php

@@ -4,7 +4,7 @@ use openvk\Web\Util\DateTime;
 use Nette\Database\Table\ActiveRow;
 use openvk\Web\Models\RowModel;
 use Chandler\Database\DatabaseConnection;
-use openvk\Web\Models\Repositories\Users;
+use openvk\Web\Models\Repositories\{Users, SupportAliases};
 use Chandler\Database\DatabaseConnection as DB;
 use Nette\InvalidStateException as ISE;
 use Nette\Database\Table\Selection;
@@ -12,7 +12,12 @@ use Nette\Database\Table\Selection;
 class TicketComment extends RowModel
 {
     protected $tableName = "tickets_comments";
-
+    
+    private function getSupportAlias(): ?SupportAlias
+    {
+        return (new SupportAliases)->get($this->getUser()->getId());
+    }
+    
     function getId(): int
     {
         return $this->getRecord()->id;
@@ -26,7 +31,34 @@ class TicketComment extends RowModel
     function getUser(): User 
     { 
         return (new Users)->get($this->getRecord()->user_id);
-    } 
+    }
+    
+    function getAuthorName(): string
+    {
+        if($this->getUType() === 0)
+            return $this->getUser()->getCanonicalName();
+        
+        $alias = $this->getSupportAlias();
+        if(!$alias)
+            return OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["supportName"] . " №" . $this->getAgentNumber();
+        
+        $name = $alias->getName();
+        if($alias->shouldAppendNumber())
+            $name .= " №" . $this->getAgentNumber();
+        
+        return $name;
+    }
+    
+    function getAvatar(): string
+    {
+        if($this->getUType() === 0)
+            return $this->getUser()->getAvatarUrl();
+        
+        $default = "/assets/packages/static/openvk/img/support.jpeg";
+        $alias   = $this->getSupportAlias();
+        
+        return is_null($alias) ? $default : ($alias->getIcon() ?? $default);
+    }
     
     function getAgentNumber(): ?string
     {
@@ -46,6 +78,9 @@ class TicketComment extends RowModel
         if(is_null($agent = $this->getAgentNumber()))
             return NULL;
         
+        if(!is_null($this->getSupportAlias()))
+            return 0;
+        
         $agent    = (int) $agent;
         $rotation = $agent > 500 ? ( ($agent * 360) / 999 ) : $agent; # cap at 360deg
         $values   = [0, 45, 160, 220, 310, 345]; # good looking colors

Web/Models/Repositories/SupportAliases.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+namespace openvk\Web\Models\Repositories;
+
+class SupportAliases extends Repository
+{
+    protected $tableName = "support_names";
+    protected $modelName = "SupportAlias";
+    
+    function get(int $agent)
+    {
+        return $this->toEntity($this->table->where("agent", $agent)->fetch());
+    }
+}

Web/Presenters/templates/Support/AnswerTicket.xml

@@ -15,7 +15,7 @@
     <br></b>Автор: <a href="/id{$ticket->getUser()->getId()}">{$ticket->getUser()->getFullName()}</a> | {$ticket->getUser()->getRegistrationIP()} | Статус: {$ticket->getStatus()}
 </div>
 <div class="text" style="padding-top: 10px;border-bottom: #ECECEC solid 1px;">
-    {$ticket->getContext()}
+    {$ticket->getContext()|noescape}
     <br></br>
 </div>
 <div style="padding-top: 5px;">
@@ -50,7 +50,7 @@
          {else}
          <td width="54" valign="top">
             <img
-                src="https://avatars.mds.yandex.net/get-zen_doc/164147/pub_5b60816e2dc67000a862253e_5b6081d4e9151400a9f48625/scale_1200"
+                src="{$comment->getAvatar()}"
                 style="max-width: 50px; filter: hue-rotate({$comment->getColorRotation()}deg);" />
          </td>
          {/if}
@@ -66,7 +66,7 @@
             <div class="post-author">
                <a href="javascript:false">
                    <b>
-                       {=OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["supportName"]} №{$comment->getAgentNumber()}
+                       {$comment->getAuthorName()}
                    </b>
                </a>
                {if $thisUser->getChandlerUser()->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)}

Web/Presenters/templates/Support/View.xml

@@ -49,7 +49,7 @@
          {else}
          <td width="54" valign="top">
             <img
-                src="https://avatars.mds.yandex.net/get-zen_doc/164147/pub_5b60816e2dc67000a862253e_5b6081d4e9151400a9f48625/scale_1200"
+                src="{$comment->getAvatar()}"
                 style="max-width: 50px; filter: hue-rotate({$comment->getColorRotation()}deg);" />
          </td>
          {/if}
@@ -63,9 +63,12 @@
             </div>
             {elseif ($comment->getUType() === 1)}
             <div class="post-author">
-               <a href="#"><b>
+               <a href="javascript:false">
-               {=OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["supportName"]} №{$comment->getAgentNumber()}
+                   <b>
-               </b></a> написал<br>
+                       {$comment->getAuthorName()}
+                   </b>
+               </a>
+               написал<br>
                <a href="#" class="date">{$comment->getTime()}</a>
             </div>
             {/if}

install/sqls/00002-support-aliases.sql

@@ -0,0 +1 @@
+CREATE TABLE `support_names` ( `agent` BIGINT UNSIGNED NOT NULL , `name` VARCHAR(512) NOT NULL , `icon` VARCHAR(1024) NULL DEFAULT NULL , `numerate` BOOLEAN NOT NULL DEFAULT FALSE , PRIMARY KEY (`agent`)) ENGINE = InnoDB;