X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModeration%2FEntity%2FReport.php;h=ffc60047a0fea1b416669a9804827d59168c0387;hb=3624792bd6942023ef24703cba9d82e4f67e73ed;hp=8d9a1cedca31954e0767de96ff3625fe0a78cd57;hpb=4eec2804de78a6aeb30f843b3b295a563f78a3fe;p=friendica.git

diff --git a/src/Moderation/Entity/Report.php b/src/Moderation/Entity/Report.php
index 8d9a1cedca..ffc60047a0 100644
--- a/src/Moderation/Entity/Report.php
+++ b/src/Moderation/Entity/Report.php
@@ -21,51 +21,126 @@
 
 namespace Friendica\Moderation\Entity;
 
+use Friendica\Moderation\Collection;
+
 /**
- * @property-read int            $id
- * @property-read int            $reporterId
- * @property-read int            $cid
- * @property-read string         $comment
- * @property-read string|null    $category
- * @property-read bool           $forward
- * @property-read array          $postUriIds
- * @property-read int            $uid
- * @property-read \DateTime|null $created
+ * @property-read int                     $id
+ * @property-read int                     $reporterCid
+ * @property-read int                     $cid
+ * @property-read int                     $gsid
+ * @property-read string                  $comment
+ * @property-read string                  $publicRemarks
+ * @property-read string                  $privateRemarks
+ * @property-read bool                    $forward
+ * @property-read int                     $category
+ * @property-read int                     $status
+ * @property-read int|null                $resolution
+ * @property-read int                     $reporterUid
+ * @property-read int|null                $lastEditorUid
+ * @property-read int|null                $assignedUid
+ * @property-read \DateTimeImmutable      $created
+ * @property-read \DateTimeImmutable|null $edited
+ * @property-read Collection\Report\Posts $posts
+ * @property-read Collection\Report\Rules $rules
  */
-class Report extends \Friendica\BaseEntity
+final class Report extends \Friendica\BaseEntity
 {
+	const CATEGORY_OTHER = 1;
+	const CATEGORY_SPAM = 2;
+	const CATEGORY_ILLEGAL = 4;
+	const CATEGORY_SAFETY = 8;
+	const CATEGORY_UNWANTED = 16;
+	const CATEGORY_VIOLATION = 32;
+
+	const CATEGORIES  = [
+		self::CATEGORY_OTHER,
+		self::CATEGORY_SPAM,
+		self::CATEGORY_ILLEGAL,
+		self::CATEGORY_SAFETY,
+		self::CATEGORY_UNWANTED,
+		self::CATEGORY_VIOLATION,
+	];
+
+	const STATUS_CLOSED = 0;
+	const STATUS_OPEN = 1;
+
+	const RESOLUTION_ACCEPTED = 0;
+	const RESOLUTION_REJECTED = 1;
+
 	/** @var int|null */
 	protected $id;
-	/** @var int ID of the contact making a moderation report*/
-	protected $reporterId;
-	/** @var int ID of the contact being reported*/
+	/** @var int ID of the contact making a moderation report */
+	protected $reporterCid;
+	/** @var int ID of the contact being reported */
 	protected $cid;
-	/** @var string Optional comment */
+	/** @var int ID of the gserver of the contact being reported */
+	protected $gsid;
+	/** @var string Reporter comment */
 	protected $comment;
-	/** @var string Optional category */
+	/** @var int One of CATEGORY_* */
 	protected $category;
-	/** @var string Violated rules */
-	protected $rules;
+	/** @var int ID of the user making a moderation report, null in case of an incoming forwarded report */
+	protected $reporterUid;
 	/** @var bool Whether this report should be forwarded to the remote server */
 	protected $forward;
-	/** @var \DateTime|null When the report was created */
+	/** @var \DateTimeImmutable When the report was created */
 	protected $created;
-	/** @var array Optional list of URI IDs of posts supporting the report*/
-	protected $postUriIds;
-	/** @var int ID of the user making a moderation report*/
-	protected $uid;
+	/** @var Collection\Report\Rules List of terms of service rule lines being possibly violated */
+	protected $rules;
+	/** @var Collection\Report\Posts List of URI IDs of posts supporting the report */
+	protected $posts;
+	/** @var string Remarks shared with the reporter */
+	protected $publicRemarks;
+	/** @var string Remarks shared with the moderation team */
+	protected $privateRemarks;
+	/** @var \DateTimeImmutable|null When the report was last edited */
+	protected $edited;
+	/** @var int One of STATUS_* */
+	protected $status;
+	/** @var int|null One of RESOLUTION_* if any */
+	protected $resolution;
+	/** @var int|null Assigned moderator user id if any */
+	protected $assignedUid;
+	/** @var int|null Last editor user ID if any */
+	protected $lastEditorUid;
 
-	public function __construct(int $reporterId, int $cid, \DateTime $created, string $comment = '', string $category = null, string $rules = '', bool $forward = false, array $postUriIds = [], int $uid = null, int $id = null)
-	{
-		$this->reporterId = $reporterId;
-		$this->cid        = $cid;
-		$this->created    = $created;
-		$this->comment    = $comment;
-		$this->category   = $category;
-		$this->rules      = $rules;
-		$this->forward    = $forward;
-		$this->postUriIds = $postUriIds;
-		$this->uid        = $uid;
-		$this->id         = $id;
+	public function __construct(
+		int $reporterCid,
+		int $cid,
+		int $gsid,
+		\DateTimeImmutable $created,
+		int $category,
+		int $reporterUid = null,
+		string $comment = '',
+		bool $forward = false,
+		Collection\Report\Posts $posts = null,
+		Collection\Report\Rules $rules = null,
+		string $publicRemarks = '',
+		string $privateRemarks = '',
+		\DateTimeImmutable $edited = null,
+		int $status = self::STATUS_OPEN,
+		int $resolution = null,
+		int $assignedUid = null,
+		int $lastEditorUid = null,
+		int $id = null
+	) {
+		$this->reporterCid    = $reporterCid;
+		$this->cid            = $cid;
+		$this->gsid           = $gsid;
+		$this->created        = $created;
+		$this->category       = $category;
+		$this->reporterUid    = $reporterUid;
+		$this->comment        = $comment;
+		$this->forward        = $forward;
+		$this->posts          = $posts ?? new Collection\Report\Posts();
+		$this->rules          = $rules ?? new Collection\Report\Rules();
+		$this->publicRemarks  = $publicRemarks;
+		$this->privateRemarks = $privateRemarks;
+		$this->edited         = $edited;
+		$this->status         = $status;
+		$this->resolution     = $resolution;
+		$this->assignedUid    = $assignedUid;
+		$this->lastEditorUid  = $lastEditorUid;
+		$this->id             = $id;
 	}
 }