diff --git a/plugin.json b/plugin.json index 2068b20..5be33a8 100644 --- a/plugin.json +++ b/plugin.json @@ -1,7 +1,7 @@ { "slug": "gruppen", "name": "Gruppen", - "version": "1.2.1", + "version": "1.3.0", "description": "Diskussionsgruppen wie bei Facebook: offen, geschlossen (Beitritt auf Anfrage) oder privat (nur auf Einladung). Beiträge mit Fotos, Dateien und Umfragen, Reaktionen, Kommentare mit Antworten, Anpinnen, Melden und Moderation.", "author": "Loheide", "namespace": "Inhaus\\Plugins\\Gruppen\\", diff --git a/src/GruppenPlugin.php b/src/GruppenPlugin.php index c27928e..9c7cf11 100644 --- a/src/GruppenPlugin.php +++ b/src/GruppenPlugin.php @@ -4,12 +4,15 @@ namespace Inhaus\Plugins\Gruppen; use App\Dashboard\Widgets; use App\Digest\Digest; +use App\Feed\Feed; use App\Models\User; use App\Plugins\Plugin; use App\Search\GlobalSearch; use App\Support\Abilities; use App\Support\Navigation; +use App\Tasks\Tasks; use Carbon\CarbonImmutable; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Inhaus\Plugins\Gruppen\Models\Group; @@ -40,6 +43,58 @@ class GruppenPlugin extends Plugin ])->all(); }, sort: 45); + // Feed der Mitarbeiter-App (Inhaus ab 0.54): Beiträge aus den eigenen Gruppen + if (class_exists(Feed::class)) { + $this->app->make(Feed::class)->add('gruppen', function (User $user, ?CarbonImmutable $before, int $limit) { + $ids = Member::query()->where('user_id', $user->id)->where('status', 'active')->pluck('group_id'); + + return Post::query()->with(['user', 'group', 'attachments'])->withCount('comments') + ->addSelect(['reactions_count' => DB::table('gruppen_reactions')->selectRaw('count(*)')->whereColumn('post_id', 'gruppen_posts.id')]) + ->whereIn('group_id', $ids->all() ?: [0]) + ->when($before, fn ($query) => $query->where('created_at', '<', $before)) + ->latest('id')->limit($limit)->get() + ->map(fn (Post $post) => [ + 'id' => 'gruppen-'.$post->id, + 'kind' => 'group-post', + 'time' => $post->created_at, + 'actor' => Feed::person($post->user), + 'context' => ['label' => $post->group->name, 'url' => route('gruppen.show', $post->group)], + 'text' => (string) ($post->body ?: ($post->poll ? 'Umfrage in der Gruppe' : '')), + 'images' => $post->attachments->filter->isImage()->take(4)->map(fn ($a) => route('gruppen.file', [$a, 'thumb']))->values()->all(), + 'url' => route('gruppen.post', [$post->group, $post]), + 'stats' => ['likes' => (int) $post->reactions_count, 'comments' => (int) $post->comments_count], + ]); + }); + } + + // Meine Aufgaben: Einladungen annehmen, Beitrittsanfragen beantworten + if (class_exists(Tasks::class)) { + $this->app->make(Tasks::class)->add('gruppen', function (User $user) { + $mine = Member::query()->with('group')->where('user_id', $user->id)->whereIn('status', ['invited', 'active'])->get(); + $tasks = $mine->where('status', 'invited')->map(fn (Member $m) => [ + 'title' => 'Einladung in „'.$m->group->name.'“ annehmen', + 'meta' => 'Gruppen', + 'url' => route('gruppen.show', $m->group), + 'icon' => 'users-round', + ])->values()->all(); + + $moderated = $mine->filter(fn (Member $m) => $m->isActive() && in_array($m->role, ['admin', 'moderator'], true))->pluck('group', 'group_id'); + $pending = Member::query()->whereIn('group_id', $moderated->keys()->all() ?: [0])->where('status', 'pending') + ->selectRaw('group_id, count(*) as total')->groupBy('group_id')->pluck('total', 'group_id'); + + foreach ($pending as $groupId => $count) { + $tasks[] = [ + 'title' => $count === 1 ? '1 Beitrittsanfrage in „'.$moderated[$groupId]->name.'“' : $count.' Beitrittsanfragen in „'.$moderated[$groupId]->name.'“', + 'meta' => 'Gruppen', + 'url' => route('gruppen.show', $moderated[$groupId]).'?tab=mitglieder', + 'icon' => 'user-plus', + ]; + } + + return $tasks; + }, sort: 40); + } + // Startseite: Neues aus den eigenen Gruppen $this->app->make(Widgets::class)->add('gruppen.feed', 'gruppen::Recent', 'aside', sort: 35, props: function (User $user) { $ids = Member::query()->where('user_id', $user->id)->where('status', 'active')->pluck('group_id'); diff --git a/tests/GruppenTest.php b/tests/GruppenTest.php index 5fd47b8..2269842 100644 --- a/tests/GruppenTest.php +++ b/tests/GruppenTest.php @@ -2,8 +2,10 @@ namespace Tests\Plugins\Gruppen; +use App\Feed\Feed; use App\Models\User; use App\Notifications\PortalNotification; +use App\Tasks\Tasks; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Notification; @@ -193,4 +195,28 @@ class GruppenTest extends TestCase $closedPost = Post::query()->where('group_id', $closed->id)->firstOrFail(); $this->getJson("/api/v1/gruppen/beitraege/{$closedPost->id}")->assertNotFound(); } + + public function test_posts_reach_the_feed_and_invitations_and_requests_become_tasks(): void + { + if (! class_exists(Feed::class)) { + $this->markTestSkipped('Inhaus ohne Feed'); + } + + [$ada, $bob, $eve] = User::factory()->count(3)->create()->all(); + $group = $this->group($ada, 'closed'); + $this->actingAs($ada)->postJson("/gruppen/{$group->slug}/beitraege", ['body' => 'Mittwoch 17 Uhr am Haupteingang?'])->assertCreated(); + + $feed = collect(app(Feed::class)->page($ada)['items'])->firstWhere('kind', 'group-post'); + $this->assertSame('Mittwoch 17 Uhr am Haupteingang?', $feed['text']); + $this->assertSame('Laufgruppe', $feed['context']['label']); + // Nicht-Mitglieder sehen den Beitrag nicht + $this->assertNull(collect(app(Feed::class)->page($eve)['items'])->firstWhere('kind', 'group-post')); + + // Einladung → Aufgabe für Bob; Beitrittsanfrage von Eve → Aufgabe für Ada + $this->actingAs($ada)->post("/gruppen/{$group->slug}/einladen", ['users' => [$bob->id]]); + $this->actingAs($eve)->post("/gruppen/{$group->slug}/beitreten"); + + $this->assertContains('Einladung in „Laufgruppe“ annehmen', array_column(app(Tasks::class)->forUser($bob), 'title')); + $this->assertContains('1 Beitrittsanfrage in „Laufgruppe“', array_column(app(Tasks::class)->forUser($ada), 'title')); + } }