Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions config/activity-log.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
declare(strict_types=1);

return [
'activity_model' => \Spatie\Activitylog\Models\Activity::class,

'default_per_page' => 20,
'pagination_buffer' => 2,
'deduplicate_by_default' => true,
Expand Down
12 changes: 11 additions & 1 deletion src/Timeline/Sources/ActivityLogSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,21 @@

final class ActivityLogSource extends AbstractTimelineSource
{
/**
* Get the activity model class from config or use default
*/
private function getActivityModelClass(): string
{
return config('activity-log.activity_model', ActivityModel::class);
}

public function resolve(Model $subject, Window $window): iterable
{
throw_if($subject->getKey() === null, DomainException::class, 'ActivityLogSource cannot resolve entries for an unsaved subject.');

$query = ActivityModel::query()
$modelClass = $this->getActivityModelClass();

$query = $modelClass::query()
->with(['causer', 'subject'])
->where('subject_type', $subject->getMorphClass())
->where('subject_id', $subject->getKey())->latest()
Expand Down
14 changes: 12 additions & 2 deletions src/Timeline/Sources/RelatedActivityLogSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@

final class RelatedActivityLogSource extends AbstractTimelineSource
{
/**
* Get the activity model class from config or use default
*/
private function getActivityModelClass(): string
{
return config('activity-log.activity_model', ActivityModel::class);
}

/**
* @param array<int, string> $relations
*/
Expand All @@ -33,7 +41,7 @@ public function resolve(Model $subject, Window $window): iterable
$morphClass = (new $relatedClass)->getMorphClass();

/** @var EloquentCollection<int, Model> $rows */
$rows = $subject->{$relation}()->limit($window->cap)->get();
$rows = $subject->{$relation}()->get();

foreach ($rows as $row) {
$subjectPairs[] = [$morphClass, (string) $row->getKey()];
Expand All @@ -45,7 +53,9 @@ public function resolve(Model $subject, Window $window): iterable
return;
}

$query = ActivityModel::query()
$modelClass = $this->getActivityModelClass();

$query = $modelClass::query()
->with(['causer', 'subject'])
->where(function (Builder $q) use ($subjectPairs): void {
foreach ($subjectPairs as [$type, $id]) {
Expand Down
Loading