Skip to content
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

🚑 Only log status when all relevant fields have been updated + make moderation_notes nullable again #3160

Merged
merged 1 commit into from
Jan 16, 2025
Merged

🚑 Only log status when all relevant fields have been updated + make moderation_notes nullable again #3160

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
5 changes: 3 additions & 2 deletions app/Http/Controllers/Frontend/Admin/StatusEditController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ public function edit(Request $request): RedirectResponse {
StatusUpdateEvent::dispatch($status->refresh());

$payload = [
'visibility' => $validated['visibility'],
'event_id' => $validated['event_id'],
'visibility' => $validated['visibility'],
'event_id' => $validated['event_id'],
'moderation_notes' => null,
];

if ($status->body !== $validated['body']) {
Expand Down
14 changes: 9 additions & 5 deletions app/Models/Status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ class Status extends Model

use HasFactory, LogsActivity;

protected $fillable = [
protected $fillable = [
'user_id', 'body', 'business', 'visibility', 'event_id', 'mastodon_post_id', 'client_id',
'moderation_notes', 'lock_visibility', 'hide_body',
];
protected $hidden = ['user_id', 'business'];
protected $appends = ['favorited', 'statusInvisibleToMe', 'description'];
protected $casts = [
protected $hidden = ['user_id', 'business'];
protected $appends = ['favorited', 'statusInvisibleToMe', 'description'];
protected $casts = [
'id' => 'integer',
'user_id' => 'integer',
'business' => Business::class,
Expand All @@ -63,6 +63,7 @@ class Status extends Model
'lock_visibility' => 'boolean',
'hide_body' => 'boolean'
];
protected static array $recordEvents = ['updated'];

public function user(): BelongsTo {
return $this->belongsTo(User::class);
Expand Down Expand Up @@ -130,6 +131,9 @@ public function getStatusInvisibleToMeAttribute(): bool {
}

public function getActivitylogOptions(): LogOptions {
return LogOptions::defaults()->logOnly(['moderation_notes', 'lock_visibility', 'hide_body']);
return LogOptions::defaults()
->logOnly(['moderation_notes', 'lock_visibility', 'hide_body'])
->logOnlyDirty()
->dontSubmitEmptyLogs();
}
}
Loading