Refactor snowflake id generation to improve randomness

app/Collection.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
+use App\HasSnowflakePrimary;
 
 class Collection extends Model
 {

app/CollectionItem.php

@@ -3,7 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
+use App\HasSnowflakePrimary;
 
 class CollectionItem extends Model
 {

app/HasSnowflakePrimary.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App;
+
+use App\Services\SnowflakeService;
+
+trait HasSnowflakePrimary
+{
+	public static function bootHasSnowflakePrimary()
+	{
+		static::saving(function ($model) {
+			if (is_null($model->getKey())) {
+				$keyName = $model->getKeyName();
+				$id = SnowflakeService::next();
+				$model->setAttribute($keyName, $id);
+			}
+		});
+	}
+}

app/Models/Poll.php

@@ -4,7 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
+use App\HasSnowflakePrimary;
 
 class Poll extends Model
 {

app/Place.php

@@ -3,7 +3,6 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
 
 class Place extends Model
 {

app/Profile.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Auth, Cache, DB, Storage;
 use App\Util\Lexer\PrettyNumber;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
+use App\HasSnowflakePrimary;
 use Illuminate\Database\Eloquent\{Model, SoftDeletes};
 use App\Services\FollowerService;
 

app/Services/SnowflakeService.php

@@ -8,6 +8,20 @@ use Cache;
 class SnowflakeService {
 
 	public static function byDate(Carbon $ts = null)
+	{
+		if($ts instanceOf Carbon) {
+			$ts = now()->parse($ts)->timestamp;
+		} else {
+			return self::next();
+		}
+
+		return ((round($ts * 1000) - 1549756800000) << 22)
+		| (random_int(1,31) << 17)
+		| (random_int(1,31) << 12)
+		| $seq;
+	}
+
+	public static function next()
 	{
 		$seq = Cache::get('snowflake:seq');
 
@@ -19,19 +33,11 @@ class SnowflakeService {
 		}
 
 		if($seq >= 4095) {
-			$seq = 0;
 			Cache::put('snowflake:seq', 0);
+			$seq = 0;
 		}
 
-		if($ts == null) {
+		return ((round(microtime(true) * 1000) - 1549756800000) << 22)
-			$ts = microtime(true);
-		}
-
-		if($ts instanceOf Carbon) {
-			$ts = now()->parse($ts)->timestamp;
-		}
-
-		return ((round($ts * 1000) - 1549756800000) << 22)
 		| (random_int(1,31) << 17)
 		| (random_int(1,31) << 12)
 		| $seq;

app/Status.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Auth, Cache, Hashids, Storage;
 use Illuminate\Database\Eloquent\Model;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
+use App\HasSnowflakePrimary;
 use App\Http\Controllers\StatusController;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Models\Poll;

app/Story.php

@@ -5,7 +5,7 @@ namespace App;
 use Auth;
 use Storage;
 use Illuminate\Database\Eloquent\Model;
-use Pixelfed\Snowflake\HasSnowflakePrimary;
+use App\HasSnowflakePrimary;
 use App\Util\Lexer\Bearcap;
 
 class Story extends Model