UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update MediaPathService, fix story path

Browse source
This commit is contained in:
Daniel Supernault 2023-04-02 05:15:38 -06:00
parent 4d72b9e3ae
commit aebbad964b
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Services/HashidService.php
View file

@ -9,11 +9,16 @@ class HashidService {
public const MIN_LIMIT = 15; public const MIN_LIMIT = 15;
public const CMAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'; public const CMAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
public static function encode($id) public static function encode($id, $minLimit = true)
{ {
if(!is_numeric($id) || $id > PHP_INT_MAX || strlen($id) < self::MIN_LIMIT) { if(!is_numeric($id) || $id > PHP_INT_MAX) {
return null; return null;
} }
if($minLimit && strlen($id) < self::MIN_LIMIT) {
return null;
}
$key = "hashids:{$id}"; $key = "hashids:{$id}";
return Cache::remember($key, now()->hours(48), function() use($id) { return Cache::remember($key, now()->hours(48), function() use($id) {
$cmap = self::CMAP; $cmap = self::CMAP;

2
app/Services/MediaPathService.php
View file

@ -52,7 +52,7 @@ class MediaPathService {
public static function story($account, $version = 1) public static function story($account, $version = 1)
{ {
$mh = hash('sha256', date('Y').'-.-'.date('m')); $mh = hash('sha256', date('Y').'-.-'.date('m'));
$monthHash = HashidService::encode(date('Y').date('m')); $monthHash = HashidService::encode(date('Y').date('m'), false);
$random = date('d').Str::random(32); $random = date('d').Str::random(32);
if($account instanceOf User) { if($account instanceOf User) {