A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: user metadata change log does not include username
aminnausind518f9a36a1c
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.phpindex 57eda973..27a3e2c2 100644--- a/app/Http/Controllers/Api/V1/MetadataController.php+++ b/app/Http/Controllers/Api/V1/MetadataController.php@@ -63,9 +63,10 @@ class MetadataController extends Controller {$tagsChanged = $this->generateTagRelationships($metadata->id, $request->video_tags, $request->deleted_tags, 'metadata_id', VideoTag::class);if ($metadata->isDirty() || $tagsChanged) {- $metadata->fill(['editor_id' => Auth::id(), 'edited_at' => now()]);+ $user = Auth::user();+ $metadata->fill(['editor_id' => $user->id, 'edited_at' => now()]);- $this->logModelChanges($metadata, ['tags_changed' => $tagsChanged]);+ $this->logModelChanges($metadata, ['tags_changed' => $tagsChanged], $user);$metadata->save();}@@ -84,8 +85,9 @@ class MetadataController extends Controller {$metadata->fill($validated);if ($metadata->isDirty()) {- $metadata->fill(['editor_id' => Auth::id(), 'edited_at' => now()]);- $this->logModelChanges($metadata);+ $user = Auth::user();+ $metadata->fill(['editor_id' => $user?->id, 'edited_at' => now()]);+ $this->logModelChanges($metadata, [], $user);$metadata->save();}diff --git a/app/Traits/LogsModelChanges.php b/app/Traits/LogsModelChanges.phpindex 8531ff62..fbef0fa6 100644--- a/app/Traits/LogsModelChanges.php+++ b/app/Traits/LogsModelChanges.php@@ -2,16 +2,19 @@namespace App\Traits;+use App\Models\User;use Illuminate\Database\Eloquent\Model;use Illuminate\Support\Facades\Log;trait LogsModelChanges {- protected function logModelChanges(Model $model, array $context = []): void {+ protected function logModelChanges(Model $model, array $context = [], ?User $user = null): void {$diff = collect($model->getDirty())->map(- fn ($new, $field) => "{$field}: '{$model->getOriginal($field)}' → '{$new}'"+ fn($new, $field) => "{$field}: '{$model->getOriginal($field)}' → '{$new}'")->values()->toArray();- Log::info(class_basename($model) . ' changed by user', [+ $username = $user?->email ?? 'user';++ Log::info(class_basename($model) . ' changed by ' . $username, ['id' => $model->getKey(),'diff' => $diff,...$context,