Merge branch 'master' into merge_modes

LycheeOrg · Oct 23, 2022 · 7c92d41 · 7c92d41
2 parents 368ee0e + b4cbfc4
commit 7c92d41
Show file tree

Hide file tree

Showing 27 changed files with 157 additions and 4,326 deletions.
diff --git a/app/Http/Controllers/PhotoController.php b/app/Http/Controllers/PhotoController.php
@@ -219,9 +219,14 @@ public function setPublic(SetPhotoPublicRequest $request): void
 	public function setTags(SetPhotosTagsRequest $request): void
 	{
 		$tags = $request->tags();
+
 		/** @var Photo $photo */
 		foreach ($request->photos() as $photo) {
-			$photo->tags = $tags;
+			if ($request->shallOverride) {
+				$photo->tags = $tags;
+			} else {
+				$photo->tags = array_unique(array_merge($photo->tags, $tags));
+			}
 			$photo->save();
 		}
 	}

diff --git a/app/Http/Requests/Photo/SetPhotosTagsRequest.php b/app/Http/Requests/Photo/SetPhotosTagsRequest.php
@@ -17,12 +17,17 @@ class SetPhotosTagsRequest extends BaseApiRequest implements HasPhotos, HasTags
 	use HasTagsTrait;
 	use AuthorizeCanEditPhotosTrait;
 
+	public const SHALL_OVERRIDE_ATTRIBUTE = 'shall_override';
+
+	public bool $shallOverride;
+
 	/**
 	 * {@inheritDoc}
 	 */
 	public function rules(): array
 	{
 		return [
+			self::SHALL_OVERRIDE_ATTRIBUTE => 'required|boolean',
 			HasPhotos::PHOTO_IDS_ATTRIBUTE => 'required|array|min:1',
 			HasPhotos::PHOTO_IDS_ATTRIBUTE . '.*' => ['required', new RandomIDRule(false)],
 			HasTags::TAGS_ATTRIBUTE => 'present|array',
@@ -37,5 +42,6 @@ protected function processValidatedValues(array $values, array $files): void
 	{
 		$this->photos = Photo::query()->findOrFail($values[HasPhotos::PHOTO_IDS_ATTRIBUTE]);
 		$this->tags = $values[HasTags::TAGS_ATTRIBUTE];
+		$this->shallOverride = $values[self::SHALL_OVERRIDE_ATTRIBUTE];
 	}
 }
diff --git a/app/Locale/ChineseSimplified.php b/app/Locale/ChineseSimplified.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => '搜索功能已在设置中停用。',
 			'SUCCESS' => 'OK',
 			'RETRY' => '重试',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => '登录信息已更新.',
 			'SETTINGS_SUCCESS_SORT' => '排序顺序已更新。',

diff --git a/app/Locale/ChineseTraditional.php b/app/Locale/ChineseTraditional.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => '搜索功能已在設為停用。',
 			'SUCCESS' => '好',
 			'RETRY' => '重試',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => '登錄信息已更新',
 			'SETTINGS_SUCCESS_SORT' => '排序順序已更新。',

diff --git a/app/Locale/Czech.php b/app/Locale/Czech.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Funkce hledání byla v nastavení deaktivována.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Opakovat',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Přihlašovací údaje byly aktualizovány.',
 			'SETTINGS_SUCCESS_SORT' => 'Stav řazení byl aktulizován.',

diff --git a/app/Locale/Dutch.php b/app/Locale/Dutch.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Probeer opnieuw',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Login Info updated.',
 			'SETTINGS_SUCCESS_SORT' => 'Sorting order updated.',

diff --git a/app/Locale/English.php b/app/Locale/English.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Retry',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Login Info updated.',
 			'SETTINGS_SUCCESS_SORT' => 'Sorting order updated.',

diff --git a/app/Locale/French.php b/app/Locale/French.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'La recherche a été désactivée dans les paramètres.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Réessayer',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Informations de connexions mise à jour.',
 			'SETTINGS_SUCCESS_SORT' => 'Ordre d’affichage mis à jour.',

diff --git a/app/Locale/German.php b/app/Locale/German.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Suchfunktion wurde unter Einstellungen deaktiviert.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Noch einmal versuchen',
+			'OVERRIDE' => 'Überschreiben',
+			'TAGS_OVERRIDE_INFO' => 'Wenn das nicht aktiviert ist, werden die Tags zu den vorhandenen Tags des Fotos hinzugefügt.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Benutzerdaten aktualisiert',
 			'SETTINGS_SUCCESS_SORT' => 'Sortierreihenfolge aktualisiert',

diff --git a/app/Locale/Greek.php b/app/Locale/Greek.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Προσπάθεια ξανά',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Τα στοιχεία εισόδου ενημερώθηκαν.',
 			'SETTINGS_SUCCESS_SORT' => 'Η Ταξινόμηση ενημερώθηκε.',

diff --git a/app/Locale/Italian.php b/app/Locale/Italian.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Riprova',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Informazioni di Login Aggiornate.',
 			'SETTINGS_SUCCESS_SORT' => 'Modalità di ordinamento aggiornate.',

diff --git a/app/Locale/NorwegianBokmal.php b/app/Locale/NorwegianBokmal.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Søkefunksjoner har blitt deaktivert under innstillinger',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Prøv igjen',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Innlogging oppdatert.',
 			'SETTINGS_SUCCESS_SORT' => 'Sorteringsrekkefølge oppdatert.',

diff --git a/app/Locale/Polish.php b/app/Locale/Polish.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Funkcja wyszkukiwania została wyłączona w ustawieniach.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Ponów',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Zaktualizowano informacje o loginie.',
 			'SETTINGS_SUCCESS_SORT' => 'Zaktualizowano kolejność sortowania.',

diff --git a/app/Locale/Portuguese.php b/app/Locale/Portuguese.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'A funcionalidade de procura foi desativada nas configurações.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Tentar de novo',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Informação de Login atualizada.',
 			'SETTINGS_SUCCESS_SORT' => 'Ordenação atualizada.',

diff --git a/app/Locale/Russian.php b/app/Locale/Russian.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'Ок',
 			'RETRY' => 'Повторить',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Учётные данные обновлены.',
 			'SETTINGS_SUCCESS_SORT' => 'Порядок сортировки обновлён.',

diff --git a/app/Locale/Slovak.php b/app/Locale/Slovak.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Opakovať',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Užívateľské dáta aktualizované',
 			'SETTINGS_SUCCESS_SORT' => 'Triedenie aktualizované',

diff --git a/app/Locale/Spanish.php b/app/Locale/Spanish.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'La función de búsqueda se ha desactivado en la configuración.',
 			'SUCCESS' => 'Vale',
 			'RETRY' => 'Procesar de nuevo',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Información de inicio de sesión actualizada',
 			'SETTINGS_SUCCESS_SORT' => 'Orden de clasificación actualizado',

diff --git a/app/Locale/Swedish.php b/app/Locale/Swedish.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Search functionality has been deactivated under settings.',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Försök igen',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Login Info updated.',
 			'SETTINGS_SUCCESS_SORT' => 'Sorting order updated.',

diff --git a/app/Locale/Vietnamese.php b/app/Locale/Vietnamese.php
@@ -297,6 +297,8 @@ public function get_locale(): array
 			'ERROR_SEARCH_DEACTIVATED' => 'Tính năng tìm kiếm đã tắt trong phần cài đặt',
 			'SUCCESS' => 'OK',
 			'RETRY' => 'Thử lại',
+			'OVERRIDE' => 'Override',
+			'TAGS_OVERRIDE_INFO' => 'If this is unchecked, the tags will be added to the existing tags of the photo.',
 
 			'SETTINGS_SUCCESS_LOGIN' => 'Thông tin đăng nhập đã được cập nhật.',
 			'SETTINGS_SUCCESS_SORT' => 'Thứ tự sắp xếp đã được cập nhật.',

diff --git a/public/Lychee-front b/public/Lychee-front
diff --git a/public/dist/frontend.css b/public/dist/frontend.css
diff --git a/public/dist/frontend.html b/public/dist/frontend.html
@@ -384,6 +384,5 @@
 	</div>
 
 	<script async defer type="text/javascript" src="dist/frontend.js"></script>
-	<script async defer type="text/javascript" src="dist/Larapass.js"></script>
 </body>
 </html>
diff --git a/public/dist/frontend.js b/public/dist/frontend.js
diff --git a/public/dist/main.css b/public/dist/main.css
diff --git a/public/dist/view.js b/public/dist/view.js
diff --git a/tests/Feature/Lib/PhotosUnitTest.php b/tests/Feature/Lib/PhotosUnitTest.php
@@ -204,18 +204,21 @@ public function set_star(
 	 *
 	 * @param string[]    $ids
 	 * @param string[]    $tags
+	 * @param bool        $override
 	 * @param int         $expectedStatusCode
 	 * @param string|null $assertSee
 	 */
 	public function set_tag(
 		array $ids,
 		array $tags,
+		bool $override = true,
 		int $expectedStatusCode = 204,
 		?string $assertSee = null
 	): void {
 		$response = $this->testCase->postJson('/api/Photo::setTags', [
 			'photoIDs' => $ids,
 			'tags' => $tags,
+			'shall_override' => $override,
 		]);
 		$response->assertStatus($expectedStatusCode);
 		if ($assertSee) {

diff --git a/tests/Feature/PhotosOperationsTest.php b/tests/Feature/PhotosOperationsTest.php
@@ -83,6 +83,7 @@ public function testManyFunctionsAtOnce(): void
 		$this->photos_tests->set_description($id, 'A night photography');
 		$this->photos_tests->set_star([$id], true);
 		$this->photos_tests->set_tag([$id], ['night']);
+		$this->photos_tests->set_tag([$id], ['trees'], false);
 		$this->photos_tests->set_public($id, true);
 		$this->photos_tests->set_license($id, 'WTFPL', 422, 'license must be one out of');
 		$this->photos_tests->set_license($id, 'CC0');
@@ -141,7 +142,7 @@ public function testManyFunctionsAtOnce(): void
 			'license' => 'reserved',
 			'is_public' => 1,
 			'is_starred' => true,
-			'tags' => ['night'],
+			'tags' => ['night', 'trees'],
 		]);
 
 		/**
+0 −231		deps/basiccontext/scripts/basicContext.js
+0 −9		deps/basiccontext/styles/_container.scss
+0 −51		deps/basiccontext/styles/_context.scss
+0 −2		deps/basiccontext/styles/_vars.scss
+0 −14		deps/basiccontext/styles/addons/fadein.scss
+0 −14		deps/basiccontext/styles/addons/popin.scss
+0 −6		deps/basiccontext/styles/main.scss
+0 −51		deps/basiccontext/styles/themes/bright.scss
+0 −49		deps/basiccontext/styles/themes/dark.scss
+0 −51		deps/basiccontext/styles/themes/default.scss
+8 −9		gulpfile.js
+0 −1		html/frontend.html
+0 −21		modules/Leaflet.Photo-gh-pages/LICENSE
+0 −27		modules/Leaflet.Photo-gh-pages/Leaflet.Photo.css
+0 −109		modules/Leaflet.Photo-gh-pages/Leaflet.Photo.js
+0 −5		modules/Leaflet.Photo-gh-pages/README.md
+33 −180		package-lock.json
+3 −4		package.json
+0 −1		scripts/3rd-party/backend.js
+2 −0		scripts/main/lychee_locale.js
+14 −5		scripts/main/photo.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -384,6 +384,5 @@ @@
     	</div>
     	<script async defer type="text/javascript" src="dist/frontend.js"></script>
-    	<script async defer type="text/javascript" src="dist/Larapass.js"></script>
     </body>
     </html>