diff --git a/app/Http/Controllers/Api/V2/Rsi/CommLink/ImageController.php b/app/Http/Controllers/Api/V2/Rsi/CommLink/ImageController.php index 6a1f68085..d03cf444d 100644 --- a/app/Http/Controllers/Api/V2/Rsi/CommLink/ImageController.php +++ b/app/Http/Controllers/Api/V2/Rsi/CommLink/ImageController.php @@ -6,6 +6,8 @@ use App\Http\Controllers\Api\V2\AbstractApiV2Controller; use App\Http\Filters\ImageTagFilter; +use App\Http\Requests\AbstractSearchRequest; +use App\Http\Requests\Rsi\CommLink\Image\ImageSearchRequest; use App\Http\Resources\AbstractBaseResource; use App\Http\Resources\Rsi\CommLink\CommLinkResource; use App\Http\Resources\Rsi\CommLink\Image\ImageResource; @@ -85,4 +87,38 @@ public function random(Request $request): AnonymousResourceCollection return ImageResource::collection($query); } + + #[OA\Post( + path: '/api/v2/comm-link-images/search', + tags: ['Comm-Links', 'RSI-Website', 'Images', 'Search'], + parameters: [ + new OA\Parameter(ref: '#/components/parameters/limit'), + new OA\Parameter(name: 'filter[tags]', in: 'query', schema: new OA\Schema(type: 'string')), + ], + responses: [ + new OA\Response( + response: 200, + description: 'Search for a Comm-Link Image by its filename.', + content: new OA\JsonContent( + type: 'array', + items: new OA\Items(ref: '#/components/schemas/comm_link_image_v2') + ) + ) + ] + )] + public function search(ImageSearchRequest $request): AnonymousResourceCollection + { + $query = QueryBuilder::for(Image::class, $request) + ->allowedFilters([ + AllowedFilter::partial('tags', 'tags.name'), + ]) + ->whereNull('base_image_id') + ->whereRaw("LOWER(src) LIKE ?", [sprintf('%%%s%%', strtolower($request->get('query')))]) + ->whereRelation('metadata', 'size', '>', 0) + ->limit($this->limit) + ->orderByDesc('created_at') + ->get(); + + return ImageResource::collection($query); + } } diff --git a/app/Http/Controllers/Web/User/Rsi/CommLink/Image/ImageController.php b/app/Http/Controllers/Web/User/Rsi/CommLink/Image/ImageController.php index fcbdd03e7..8119eb686 100644 --- a/app/Http/Controllers/Web/User/Rsi/CommLink/Image/ImageController.php +++ b/app/Http/Controllers/Web/User/Rsi/CommLink/Image/ImageController.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Api\V2\Rsi\CommLink\CommLinkSearchController; use App\Http\Controllers\Controller; use App\Http\Requests\Rsi\CommLink\Image\AddImageTagsRequest; +use App\Http\Requests\Rsi\CommLink\Image\ImageSearchRequest; use App\Http\Requests\Rsi\CommLink\Image\ImageUploadRequest; use App\Models\Rsi\CommLink\Image\Image; use App\Models\Rsi\CommLink\Image\ImageMetadata; @@ -61,7 +62,6 @@ function (Builder $query) use ($request) { 'user.rsi.comm_links.images.index', [ 'images' => $query - ->where('local', 1) ->orderByDesc('id') ->groupBy('src') ->paginate(50), @@ -183,4 +183,22 @@ public function saveTags(Image $image, AddImageTagsRequest $request): RedirectRe return redirect()->back(); } + + /** + * Search for images by filename + * + * @param ImageSearchRequest $request + * @return View + */ + public function search(ImageSearchRequest $request): View { + $request->query->set('limit', 250); + $controller = new \App\Http\Controllers\Api\V2\Rsi\CommLink\ImageController($request); + + return view( + 'user.rsi.comm_links.images.index', + [ + 'images' => $controller->search($request), + ] + ); + } } diff --git a/app/Http/Requests/Rsi/CommLink/Image/ImageSearchRequest.php b/app/Http/Requests/Rsi/CommLink/Image/ImageSearchRequest.php new file mode 100644 index 000000000..606f75489 --- /dev/null +++ b/app/Http/Requests/Rsi/CommLink/Image/ImageSearchRequest.php @@ -0,0 +1,12 @@ +where('size', '>=', 250 * 1024) ->where('comm_link_images.id', '!=', $this->id) + ->where('comm_link_images.base_image_id', 'IS NULL') ->orderBy('pdq_distance') ->limit($limit) ->get() diff --git a/lang/en.json b/lang/en.json index 2874782d2..30bff7cd2 100644 --- a/lang/en.json +++ b/lang/en.json @@ -79,16 +79,16 @@ "Comm-Link bearbeiten": "Edit Comm-Link", "Comm-Link Benachrichtigungen erhalten": "Comm-Link notifications received", "Comm-Link Bild": "Comm-Link image", - "Comm-Link Bild URL": "Comm-Link image URL", + "Comm-Link Bild URL": "Comm-Link media URL", "Comm-Link Bilder": "Comm-Link images", "Comm-Link Bildlinksuche": "Comm-Link Image Link Search", "Comm-Link Bildsuche": "Comm-Link Image Search", "Comm-Link Channel": "Comm-Link Channel", - "Comm-Link Inhalt": "Comm-Link content", "Comm-Link Kategorien": "Comm-Link categories", "Comm-Link Metadaten": "Comm-Link Metadata", "Comm-Link Rückwärtssuche": "Comm-Link Reverse Search", "Comm-Link Serien": "Comm-Link Series", + "Comm-Link Titelsuche": "Search Comm-Links by Title", "Comm-Links": "Comm-Links", "Comm-Links mit geändertem Inhalt": "Comm-Links with modified content", "Comm-Links mit neuem Inhalt": "Comm-Links with new content", @@ -299,12 +299,16 @@ "Suche nach Bildern": "Search for images", "Suche nach Comm-Links mit Bild": "Search for Comm-Links with image", "Suche nach Comm-Links mit Bildlink": "Search for Comm-Links with image link", + "Suche nach Comm-Links mit Medienurl": "Search for Comm-Links containing a media url", + "Suche nach Comm-Link mit Text": "Search for Comm-Links containing some text", + "Suche nach Comm-Link mit Bild": "Reverse search a Comm-Link by an image", + "Suche nach Comm-Link Bildern": "Search for Comm-Link images by name", "Systeme": "Systems", "Tabelle leeren": "Empty table", "Tags": "Tags", "Textänderungen": "Text changes", - "Text, welcher in einem Comm-Link vorkommt": "Text which occurs in a Comm-Link", + "Text, welcher in einem Comm-Link vorkommt": "Text which occurs in the body of a Comm-Link", "Titel": "Title", "Transkript": "Transcript", "Transkripte": "Transcripts", diff --git a/resources/views/components/forms/form-group.blade.php b/resources/views/components/forms/form-group.blade.php index 86bbbbb6e..eaacb1376 100644 --- a/resources/views/components/forms/form-group.blade.php +++ b/resources/views/components/forms/form-group.blade.php @@ -42,6 +42,7 @@ class="{{ $inputClass ?? 'form-control' }} {{ $errors->has($id) ? 'is-invalid' : class="{{ $inputClass ?? 'form-control' }} {{ $errors->has($id) ? 'is-invalid' : '' }}" @if(isset($required) && $required == '1') required @endif @if(isset($autofocus) && $autofocus == '1') autofocus @endif + @if(isset($placeholder)) placeholder="{{ $placeholder }}" @endif {{ $inputOptions ?? '' }} /> @endif {{ $slot }} diff --git a/resources/views/user/rsi/comm_links/components/image_info_card.blade.php b/resources/views/user/rsi/comm_links/components/image_info_card.blade.php index 621b7a2c9..8abc728c7 100644 --- a/resources/views/user/rsi/comm_links/components/image_info_card.blade.php +++ b/resources/views/user/rsi/comm_links/components/image_info_card.blade.php @@ -20,10 +20,11 @@ @endunless {{ $image->metadata->mime }} - {{ empty($image->alt) ? __('Kein alt Text verfügbar') : $image->alt }} + {{ $image->name }} @elseif(\Illuminate\Support\Str::contains($image->metadata->mime, 'audio'))