Skip to content

Commit f077ca8

Browse files
miaulalalanickvergessen
authored andcommitted
fix(scheduled): use SnowflakeAwareEntity
Signed-off-by: Anna Larch <anna@nextcloud.com>
1 parent cea7048 commit f077ca8

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

lib/Model/ScheduledMessage.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111

1212
use OCA\Talk\Chat\ChatManager;
1313
use OCA\Talk\ResponseDefinitions;
14-
use OCP\AppFramework\Db\Entity;
14+
use OCP\AppFramework\Db\SnowflakeAwareEntity;
1515
use OCP\Comments\MessageTooLongException;
1616
use OCP\DB\Types;
1717

1818
/**
19-
* @method string getId()
20-
* @method void setId(string $id)
2119
* @method void setRoomId(int $roomId)
2220
* @method int getRoomId()
2321
* @method void setActorId(string $actorId)
@@ -38,7 +36,7 @@
3836
*
3937
* @psalm-import-type TalkScheduledMessage from ResponseDefinitions
4038
*/
41-
class ScheduledMessage extends Entity {
39+
class ScheduledMessage extends SnowflakeAwareEntity {
4240
public const METADATA_THREAD_TITLE = 'threadTitle';
4341
public const METADATA_THREAD_ID = 'threadId';
4442
public const METADATA_SILENT = 'silent';

lib/Model/ScheduledMessageMapper.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010

1111
use OCA\Talk\Room;
1212
use OCP\AppFramework\Db\DoesNotExistException;
13-
use OCP\AppFramework\Db\Entity;
1413
use OCP\AppFramework\Db\QBMapper;
1514
use OCP\DB\QueryBuilder\IQueryBuilder;
1615
use OCP\IDBConnection;
17-
use OCP\Snowflake\IGenerator;
1816

1917
/**
2018
* @method ScheduledMessage mapRowToEntity(array $row)
@@ -27,7 +25,6 @@
2725
class ScheduledMessageMapper extends QBMapper {
2826
public function __construct(
2927
IDBConnection $db,
30-
protected IGenerator $generator,
3128
) {
3229
parent::__construct($db, 'talk_scheduled_msg', ScheduledMessage::class);
3330
}
@@ -125,11 +122,4 @@ public function getMessagesDue(\DateTimeInterface $dateTime): array {
125122

126123
return $this->findEntities($query);
127124
}
128-
129-
#[\Override]
130-
public function insert(Entity $entity): Entity {
131-
/** @psalm-suppress InvalidArgument */
132-
$entity->setId($this->generator->nextId());
133-
return parent::insert($entity);
134-
}
135125
}

0 commit comments

Comments
 (0)