fixup! feat(snowflake): extend Entity class to support snowflakes

Author: miaulalala

lib/private/Snowflake/SnowflakeDecoder.php

@@ -23,7 +23,7 @@
  */
 final class SnowflakeDecoder implements ISnowflakeDecoder {
 	#[Override]
-	public function decode(string $snowflakeId): array {
+	public function decode(string $snowflakeId): Snowflake {
 		if (!ctype_digit($snowflakeId)) {
 			throw new \Exception('Invalid Snowflake ID: ' . $snowflakeId);
 		}
@@ -41,7 +41,14 @@ public function decode(string $snowflakeId): array {
 			)
 		);
 
-		return $data;
+		return new Snowflake(
+			$data['serverId'],
+			$data['sequenceId'],
+			$data['isCli'],
+			$data['seconds'],
+			$data['milliseconds'],
+			$data['createdAt'],
+		);
 	}
 
 	private function decode64bits(int $snowflakeId): array {
@@ -120,16 +127,4 @@ private function convertBase16(string $decimal): string {
 
 		return str_pad($hex, 16, '0', STR_PAD_LEFT);
 	}
-
-	public function decodeToSnowflake(string $snowflakeId): Snowflake {
-		$data = $this->decode($snowflakeId);
-		return new Snowflake(
-			$data['serverId'],
-			$data['sequenceId'],
-			$data['isCli'],
-			$data['seconds'],
-			$data['milliseconds'],
-			$data['createdAt'],
-		);
-	}
 }

lib/public/AppFramework/Db/SnowflakeAwareEntity.php

@@ -15,6 +15,8 @@
 use OCP\Snowflake\Snowflake;
 
 /**
+ * Entity with snowflake support
+ *
  * @since 33.0.0
  */
 #[Consumable(since: '33.0.0')]
@@ -50,9 +52,6 @@ public function getId(): string {
 	}
 
 	public function getCreatedAt(): ?\DateTimeImmutable {
-		if (empty($this->id)) {
-			return null;
-		}
 		return $this->getSnowflake()?->getCreatedAt();
 	}
 
@@ -61,8 +60,8 @@ public function getSnowflake(): ?Snowflake {
 			return null;
 		}
 
-		if (empty($this->snowflake)) {
-			$this->snowflake = Server::get(ISnowflakeDecoder::class)->decodeToSnowflake($this->id);
+		if ($this->snowflake === null) {
+			$this->snowflake = Server::get(ISnowflakeDecoder::class)->decode($this->id);
 		}
 
 		return $this->snowflake;

lib/public/Snowflake/ISnowflakeDecoder.php

@@ -28,10 +28,8 @@ interface ISnowflakeDecoder {
 	 *  - createdAt: timestamp at which ID was generated
 	 *  - isCli: if ID was generated using CLI or not
 	 *
-	 * @return array{createdAt: \DateTimeImmutable, serverId: int<0,1023>, sequenceId: int<0,4095>, isCli: bool, seconds: positive-int, milliseconds: int<0,999>}
+	 * @return Snowflake
 	 * @since 33.0
 	 */
-	public function decode(string $snowflakeId): array;
-
-	public function decodeToSnowflake(string $snowflakeId): Snowflake;
+	public function decode(string $snowflakeId): Snowflake;
 }

lib/public/Snowflake/Snowflake.php

@@ -17,7 +17,7 @@
  * @since 33.0.0
  */
 #[Consumable(since: '33.0.0')]
-final class Snowflake {
+final readonly class Snowflake {
 	/**
 	 * @psalm-param int<0,1023> $serverId
 	 * @psalm-param int<0,4095> $sequenceId
@@ -34,17 +34,6 @@ public function __construct(
 	) {
 	}
 
-	public function toArray(): array {
-		return [
-			'serverId' => $this->getServerId(),
-			'sequenceId' => $this->getSequenceId(),
-			'isCli' => $this->isCli(),
-			'seconds' => $this->getSeconds(),
-			'milliseconds' => $this->getMilliseconds(),
-			'createdAt' => $this->getCreatedAt(),
-		];
-	}
-
 	/**
 	 * @psalm-return int<0,1023>
 	 */