bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Reports: The reporting contact id is added

Browse source
This commit is contained in:
Michael 2022-12-24 08:03:37 +00:00
parent e9c6611965
commit 4c945850f4
9 changed files with 82 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2023.03-dev (Giant Rhubarb) -- Friendica 2023.03-dev (Giant Rhubarb)
-- DB_UPDATE_VERSION 1503 -- DB_UPDATE_VERSION 1504
-- ------------------------------------------ -- ------------------------------------------
@ -1674,6 +1674,7 @@ CREATE TABLE IF NOT EXISTS `register` (
CREATE TABLE IF NOT EXISTS `report` ( CREATE TABLE IF NOT EXISTS `report` (
`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
`uid` mediumint unsigned COMMENT 'Reporting user', `uid` mediumint unsigned COMMENT 'Reporting user',
`reporter-id` int unsigned COMMENT 'Reporting contact',
`cid` int unsigned NOT NULL COMMENT 'Reported contact', `cid` int unsigned NOT NULL COMMENT 'Reported contact',
`comment` text COMMENT 'Report', `comment` text COMMENT 'Report',
`forward` boolean COMMENT 'Forward the report to the remote server', `forward` boolean COMMENT 'Forward the report to the remote server',
@ -1682,7 +1683,9 @@ CREATE TABLE IF NOT EXISTS `report` (
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `uid` (`uid`), INDEX `uid` (`uid`),
INDEX `cid` (`cid`), INDEX `cid` (`cid`),
INDEX `reporter-id` (`reporter-id`),
FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
FOREIGN KEY (`reporter-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';

31
doc/database/db_report.md
View file

@ -6,24 +6,26 @@ Table report
Fields Fields
------ ------
| Field | Description | Type | Null | Key | Default | Extra | | Field | Description | Type | Null | Key | Default | Extra |
| ------- | --------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- | | ----------- | --------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |
| uid | Reporting user | mediumint unsigned | YES | | NULL | | | uid | Reporting user | mediumint unsigned | YES | | NULL | |
| cid | Reported contact | int unsigned | NO | | NULL | | | reporter-id | Reporting contact | int unsigned | YES | | NULL | |
| comment | Report | text | YES | | NULL | | | cid | Reported contact | int unsigned | NO | | NULL | |
| forward | Forward the report to the remote server | boolean | YES | | NULL | | | comment | Report | text | YES | | NULL | |
| created | | datetime | NO | | 0001-01-01 00:00:00 | | | forward | Forward the report to the remote server | boolean | YES | | NULL | |
| status | Status of the report | tinyint unsigned | YES | | NULL | | | created | | datetime | NO | | 0001-01-01 00:00:00 | |
| status | Status of the report | tinyint unsigned | YES | | NULL | |
Indexes Indexes
------------ ------------
| Name | Fields | | Name | Fields |
| ------- | ------ | | ----------- | ----------- |
| PRIMARY | id | | PRIMARY | id |
| uid | uid | | uid | uid |
| cid | cid | | cid | cid |
| reporter-id | reporter-id |
Foreign Keys Foreign Keys
------------ ------------
@ -31,6 +33,7 @@ Foreign Keys
| Field | Target Table | Target Field | | Field | Target Table | Target Field |
|-------|--------------|--------------| |-------|--------------|--------------|
| uid | [user](help/database/db_user) | uid | | uid | [user](help/database/db_user) | uid |
| reporter-id | [contact](help/database/db_contact) | id |
| cid | [contact](help/database/db_contact) | id | | cid | [contact](help/database/db_contact) | id |
Return to [database documentation](help/database) Return to [database documentation](help/database)

5
src/Moderation/Entity/Report.php
View file

@ -35,6 +35,8 @@ class Report extends \Friendica\BaseEntity
/** @var int|null */ /** @var int|null */
protected $id; protected $id;
/** @var int ID of the user making a moderation report*/ /** @var int ID of the user making a moderation report*/
protected $reporterId;
/** @var int ID of the contact making a moderation report*/
protected $uid; protected $uid;
/** @var int ID of the contact being reported*/ /** @var int ID of the contact being reported*/
protected $cid; protected $cid;
@ -47,9 +49,10 @@ class Report extends \Friendica\BaseEntity
/** @var array Optional list of URI IDs of posts supporting the report*/ /** @var array Optional list of URI IDs of posts supporting the report*/
protected $postUriIds; protected $postUriIds;
public function __construct(int $uid, int $cid, \DateTime $created, string $comment = '', bool $forward = false, array $postUriIds = [], int $id = null) public function __construct(int $uid = null, int $reporterId, int $cid, \DateTime $created, string $comment = '', bool $forward = false, array $postUriIds = [], int $id = null)
{ {
$this->uid = $uid; $this->uid = $uid;
$this->reporterId = $reporterId;
$this->cid = $cid; $this->cid = $cid;
$this->created = $created; $this->created = $created;
$this->comment = $comment; $this->comment = $comment;

5
src/Moderation/Factory/Report.php
View file

@ -36,6 +36,7 @@ class Report extends \Friendica\BaseFactory implements ICanCreateFromTableRow
{ {
return new Entity\Report( return new Entity\Report(
$row['uid'], $row['uid'],
$row['reporter-id'],
$row['cid'], $row['cid'],
new \DateTime($row['created'] ?? 'now', new \DateTimeZone('UTC')), new \DateTime($row['created'] ?? 'now', new \DateTimeZone('UTC')),
$row['comment'], $row['comment'],
@ -51,6 +52,7 @@ class Report extends \Friendica\BaseFactory implements ICanCreateFromTableRow
* @see \Friendica\Module\Api\Mastodon\Reports::post() * @see \Friendica\Module\Api\Mastodon\Reports::post()
* *
* @param int $uid * @param int $uid
* @param int $reporterId
* @param int $cid * @param int $cid
* @param string $comment * @param string $comment
* @param bool $forward * @param bool $forward
@ -58,10 +60,11 @@ class Report extends \Friendica\BaseFactory implements ICanCreateFromTableRow
* @return Entity\Report * @return Entity\Report
* @throws \Exception * @throws \Exception
*/ */
public function createFromReportsRequest(int $uid, int $cid, string $comment = '', bool $forward = false, array $postUriIds = []): Entity\Report public function createFromReportsRequest(int $uid = null, int $reporterId, int $cid, string $comment = '', bool $forward = false, array $postUriIds = []): Entity\Report
{ {
return new Entity\Report( return new Entity\Report(
$uid, $uid,
$reporterId,
$cid, $cid,
new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime('now', new \DateTimeZone('UTC')),
$comment, $comment,

9
src/Moderation/Repository/Report.php
View file

@ -53,10 +53,11 @@ class Report extends \Friendica\BaseRepository
public function save(\Friendica\Moderation\Entity\Report $Report) public function save(\Friendica\Moderation\Entity\Report $Report)
{ {
$fields = [ $fields = [
'uid' => $Report->uid, 'uid' => $Report->uid,
'cid' => $Report->cid, 'reporter-id' => $Report->reporterId,
'comment' => $Report->comment, 'cid' => $Report->cid,
'forward' => $Report->forward, 'comment' => $Report->comment,
'forward' => $Report->forward,
]; ];
$postUriIds = $Report->postUriIds; $postUriIds = $Report->postUriIds;

2
src/Module/Api/Mastodon/Reports.php
View file

@ -65,7 +65,7 @@ class Reports extends BaseApi
throw new HTTPException\NotFoundException('Account ' . $request['account_id'] . ' not found'); throw new HTTPException\NotFoundException('Account ' . $request['account_id'] . ' not found');
} }
$report = $this->reportFactory->createFromReportsRequest(self::getCurrentUserID(), $request['account_id'], $request['comment'], $request['forward'], $request['status_ids']); $report = $this->reportFactory->createFromReportsRequest(self::getCurrentUserID(), Contact::getPublicIdByUserId(self::getCurrentUserID()), $request['account_id'], $request['comment'], $request['forward'], $request['status_ids']);
$this->reportRepo->save($report); $this->reportRepo->save($report);

12
src/Protocol/ActivityPub/Processor.php
View file

@ -1837,6 +1837,13 @@ class Processor
return; return;
} }
$reporter_id = Contact::getIdForURL($activity['actor']);
if (empty($account_id)) {
Logger::info('Unknown actor', ['activity' => $activity]);
Queue::remove($activity);
return;
}
$status_ids = $activity['object_ids']; $status_ids = $activity['object_ids'];
array_shift($status_ids); array_shift($status_ids);
@ -1848,11 +1855,10 @@ class Processor
} }
} }
// @todo We should store the actor $report = DI::reportFactory()->createFromReportsRequest(null, $reporter_id, $account_id, $activity['content'], false, $uri_ids);
$report = DI::reportFactory()->createFromReportsRequest(0, $account_id, $activity['content'], false, $uri_ids);
DI::report()->save($report); DI::report()->save($report);
Logger::info('Stored report', ['account_id' => $account_id, 'comment' => $activity['content'], 'status_ids' => $status_ids]); Logger::info('Stored report', ['reporter' => $reporter_id, 'account_id' => $account_id, 'comment' => $activity['content'], 'status_ids' => $status_ids]);
} }
/** /**

4
static/dbstructure.config.php
View file

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1503); define('DB_UPDATE_VERSION', 1504);
} }
return [ return [
@ -1673,6 +1673,7 @@ return [
"fields" => [ "fields" => [
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
"uid" => ["type" => "mediumint unsigned", "foreign" => ["user" => "uid"], "comment" => "Reporting user"], "uid" => ["type" => "mediumint unsigned", "foreign" => ["user" => "uid"], "comment" => "Reporting user"],
"reporter-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Reporting contact"],
"cid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["contact" => "id"], "comment" => "Reported contact"], "cid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["contact" => "id"], "comment" => "Reported contact"],
"comment" => ["type" => "text", "comment" => "Report"], "comment" => ["type" => "text", "comment" => "Report"],
"forward" => ["type" => "boolean", "comment" => "Forward the report to the remote server"], "forward" => ["type" => "boolean", "comment" => "Forward the report to the remote server"],
@ -1683,6 +1684,7 @@ return [
"PRIMARY" => ["id"], "PRIMARY" => ["id"],
"uid" => ["uid"], "uid" => ["uid"],
"cid" => ["cid"], "cid" => ["cid"],
"reporter-id" => ["reporter-id"],
] ]
], ],
"report-post" => [ "report-post" => [

61
tests/src/Moderation/Factory/ReportTest.php
View file

@ -33,16 +33,18 @@ class ReportTest extends MockedTest
return [ return [
'default' => [ 'default' => [
'row' => [ 'row' => [
'id' => 11, 'id' => 11,
'uid' => 12, 'uid' => 12,
'cid' => 13, 'reporter-id' => 14,
'comment' => '', 'cid' => 13,
'forward' => false, 'comment' => '',
'created' => null 'forward' => false,
'created' => null
], ],
'postUriIds' => [], 'postUriIds' => [],
'assertion' => new Entity\Report( 'assertion' => new Entity\Report(
12, 12,
14,
13, 13,
new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime('now', new \DateTimeZone('UTC')),
'', '',
@ -53,16 +55,18 @@ class ReportTest extends MockedTest
], ],
'full' => [ 'full' => [
'row' => [ 'row' => [
'id' => 11, 'id' => 11,
'uid' => 12, 'uid' => 12,
'cid' => 13, 'reporter-id' => 14,
'comment' => 'Report', 'cid' => 13,
'forward' => true, 'comment' => 'Report',
'created' => '2021-10-12 12:23:00' 'forward' => true,
'created' => '2021-10-12 12:23:00'
], ],
'postUriIds' => [89, 90], 'postUriIds' => [89, 90],
'assertion' => new Entity\Report( 'assertion' => new Entity\Report(
12, 12,
14,
13, 13,
new \DateTime('2021-10-12 12:23:00', new \DateTimeZone('UTC')), new \DateTime('2021-10-12 12:23:00', new \DateTimeZone('UTC')),
'Report', 'Report',
@ -81,6 +85,7 @@ class ReportTest extends MockedTest
$report->id $report->id
); );
self::assertEquals($assertion->uid, $report->uid); self::assertEquals($assertion->uid, $report->uid);
self::assertEquals($assertion->reporterId, $report->reporterId);
self::assertEquals($assertion->cid, $report->cid); self::assertEquals($assertion->cid, $report->cid);
self::assertEquals($assertion->comment, $report->comment); self::assertEquals($assertion->comment, $report->comment);
self::assertEquals($assertion->forward, $report->forward); self::assertEquals($assertion->forward, $report->forward);
@ -103,13 +108,15 @@ class ReportTest extends MockedTest
{ {
return [ return [
'default' => [ 'default' => [
'uid' => 12, 'uid' => 12,
'cid' => 13, 'reporter-id' => 14,
'comment' => '', 'cid' => 13,
'forward' => false, 'comment' => '',
'postUriIds' => [], 'forward' => false,
'assertion' => new Entity\Report( 'postUriIds' => [],
'assertion' => new Entity\Report(
12, 12,
14,
13, 13,
new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime('now', new \DateTimeZone('UTC')),
'', '',
@ -119,13 +126,15 @@ class ReportTest extends MockedTest
), ),
], ],
'full' => [ 'full' => [
'uid' => 12, 'uid' => 12,
'cid' => 13, 'reporter-id' => 14,
'comment' => 'Report', 'cid' => 13,
'forward' => true, 'comment' => 'Report',
'postUriIds' => [89, 90], 'forward' => true,
'assertion' => new Entity\Report( 'postUriIds' => [89, 90],
'assertion' => new Entity\Report(
12, 12,
14,
13, 13,
new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime('now', new \DateTimeZone('UTC')),
'Report', 'Report',
@ -140,10 +149,10 @@ class ReportTest extends MockedTest
/** /**
* @dataProvider dataCreateFromReportsRequest * @dataProvider dataCreateFromReportsRequest
*/ */
public function testCreateFromReportsRequest(int $uid, int $cid, string $comment, bool $forward, array $postUriIds, Entity\Report $assertion) public function testCreateFromReportsRequest(int $uid, int $reporter, int $cid, string $comment, bool $forward, array $postUriIds, Entity\Report $assertion)
{ {
$factory = new Factory\Report(new NullLogger()); $factory = new Factory\Report(new NullLogger());
$this->assertReport($factory->createFromReportsRequest($uid, $cid, $comment, $forward, $postUriIds), $assertion); $this->assertReport($factory->createFromReportsRequest($uid, $reporter, $cid, $comment, $forward, $postUriIds), $assertion);
} }
} }