Skip to content

refactor: use SnowflakeAwareEntity #16595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
miaulalala wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −12
Draft

refactor: use SnowflakeAwareEntity #16595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/Model/ScheduledMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@

use OCA\Talk\Chat\ChatManager;
use OCA\Talk\ResponseDefinitions;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\SnowflakeAwareEntity;
use OCP\Comments\MessageTooLongException;
use OCP\DB\Types;

/**
* @method string getId()
* @method void setId(string $id)
* @method void setRoomId(int $roomId)
* @method int getRoomId()
* @method void setActorId(string $actorId)
Expand All @@ -38,7 +36,7 @@
*
* @psalm-import-type TalkScheduledMessage from ResponseDefinitions
*/
class ScheduledMessage extends Entity {
class ScheduledMessage extends SnowflakeAwareEntity {
public const METADATA_THREAD_TITLE = 'threadTitle';
public const METADATA_THREAD_ID = 'threadId';
public const METADATA_SILENT = 'silent';
Expand Down
8 changes: 0 additions & 8 deletions lib/Model/ScheduledMessageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

use OCA\Talk\Room;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
Expand Down Expand Up @@ -127,11 +126,4 @@ public function getMessagesDue(\DateTime $dateTime): array {

return $this->findEntities($query);
}

#[\Override]
public function insert(Entity $entity): Entity {
/** @psalm-suppress InvalidArgument */
$entity->setId($this->generator->nextId());
return parent::insert($entity);
}
}