Skip to content

Commit da021c2

Browse files
committed
refactor: use SnowflakeAwareEntity
- [ ] needs nextcloud/server#56795 - [ ] needs #16508 Skipping CI for now, amend the commit message and remove the skip-ci param when ready to rebase and merge [skip ci] Signed-off-by: Anna Larch <[email protected]>
1 parent 10cd076 commit da021c2

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
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;
@@ -127,11 +126,4 @@ public function getMessagesDue(\DateTime $dateTime): array {
127126

128127
return $this->findEntities($query);
129128
}
130-
131-
#[\Override]
132-
public function insert(Entity $entity): Entity {
133-
/** @psalm-suppress InvalidArgument */
134-
$entity->setId($this->generator->nextId());
135-
return parent::insert($entity);
136-
}
137129
}

0 commit comments

Comments
 (0)