Compare commits

...
171 Commits
Author SHA1 Message Date
ik f476568869 feat: recover from invalid filter states
CI / backend-and-migrations (push) Failing after 5m15s
CI / astro-build (push) Failing after 6m41s
CI / dependency-audit (push) Failing after 5m53s
CI / compose-e2e (push) Failing after 7m43s
2026-09-22 20:49:05 +07:00
ik 53083fab1e feat: add retry action to unavailable states
CI / backend-and-migrations (push) Failing after 5m20s
CI / astro-build (push) Failing after 6m40s
CI / dependency-audit (push) Failing after 5m54s
CI / compose-e2e (push) Failing after 7m41s
2026-09-22 20:47:16 +07:00
ik dce413fd81 docs: record lozinoe detail import 2026-09-22 20:43:41 +07:00
ik 9b8559725d feat: add retry actions to tackle catalog
CI / backend-and-migrations (push) Failing after 6m31s
CI / astro-build (push) Failing after 6m41s
CI / dependency-audit (push) Failing after 5m51s
CI / compose-e2e (push) Failing after 5m37s
2026-09-22 20:38:46 +07:00
ik 14ccfec5e6 fix: narrow production proxy trust network 2026-09-22 20:36:33 +07:00
ik d7d1a2873a fix: clarify combined tackle catalog outage 2026-09-22 20:29:20 +07:00
ik ef9cf136f2 perf: cache public catalog responses 2026-09-22 20:27:29 +07:00
ik 1ab2a461b5 fix: label media catalog count accurately 2026-09-22 20:22:59 +07:00
ik 3421472a12 fix: expose catalog count to assistive technology
CI / backend-and-migrations (push) Failing after 14m1s
CI / astro-build (push) Failing after 10m34s
CI / dependency-audit (push) Failing after 8m11s
CI / compose-e2e (push) Failing after 8m19s
2026-09-22 20:21:51 +07:00
ik 54fae57f9c fix: label tackle catalog count accurately 2026-09-22 20:20:01 +07:00
ik 1da9279ddf perf: bound public activity aggregation 2026-09-22 20:17:55 +07:00
ik a501b5ea9d fix: isolate local ports and proxy trust defaults 2026-09-22 20:16:29 +07:00
ik cd862103b8 perf: cache media manifest revisions
CI / backend-and-migrations (push) Failing after 33s
CI / astro-build (push) Failing after 31s
CI / dependency-audit (push) Failing after 38s
CI / compose-e2e (push) Failing after 42s
2026-09-22 20:11:02 +07:00
ik 4b0973b1ab feat: add tackle pages to sitemap 2026-09-22 20:09:17 +07:00
ik 8cb0a65a5c feat: improve recovery for user actions 2026-09-22 20:06:44 +07:00
ik a8321536cc fix: separate demo seed from catalog facts 2026-09-22 20:05:09 +07:00
ik a357988f93 fix: make media provenance explicit
CI / backend-and-migrations (push) Failing after 38s
CI / astro-build (push) Failing after 39s
CI / dependency-audit (push) Failing after 46s
CI / compose-e2e (push) Failing after 41s
2026-09-22 20:02:40 +07:00
ik 1920475580 fix: release cooldown on local media failures
CI / backend-and-migrations (push) Failing after 2m26s
CI / astro-build (push) Failing after 37s
CI / dependency-audit (push) Failing after 31s
CI / compose-e2e (push) Failing after 40s
2026-09-22 20:01:20 +07:00
ik 96c29ab9d9 feat: separate activity maps by waterbody 2026-09-22 20:00:08 +07:00
ik 274c8e7000 feat: make fishing plan imports explicit
CI / dependency-audit (push) Failing after 1m21s
CI / compose-e2e (push) Failing after 4m43s
CI / astro-build (push) Failing after 11m55s
CI / backend-and-migrations (push) Failing after 13m27s
2026-09-22 19:58:41 +07:00
ik d4ccc93894 fix: keep screenshot recovery after timeout 2026-09-22 19:57:19 +07:00
ik c46b28d1bc fix: purge tackle provenance on deletion
CI / backend-and-migrations (push) Failing after 37s
CI / dependency-audit (push) Failing after 1s
CI / astro-build (push) Failing after 10m9s
CI / compose-e2e (push) Failing after 14m40s
2026-09-22 19:55:34 +07:00
ik b0c1a05754 feat: harden tackle analytics thresholds 2026-09-22 19:54:41 +07:00
ik 089b9cc11d feat: split tackle catalog pagination 2026-09-22 19:53:31 +07:00
ik a8288b2dd3 revert: remove remote gitea deployment files 2026-09-22 18:48:08 +07:00
ik 4a6c0aa906 docs: add persistent gitea actions runner compose 2026-09-22 18:46:54 +07:00
ik 89dcf5f48e fix: make screenshot retry idempotent
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-22 08:17:47 +07:00
ik b1d6d8d122 fix: harden catch report idempotency
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-22 08:04:11 +07:00
ik 0eb151f5a7 fix: serialize media publishing decisions 2026-09-22 07:58:38 +07:00
ik f3fb5868df fix: persist media decisions across production restores 2026-09-22 07:48:43 +07:00
ik 104d5803fb docs: audit project and reopen incomplete roadmap gates
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
CI / backend-and-migrations (push) Canceled after 1m1s
2026-09-22 07:33:51 +07:00
ik 25b6f3945e docs: close content hierarchy feature 2026-09-21 20:56:57 +07:00
ik ddc766db56 docs: close tackle analytics feature 2026-09-21 20:56:37 +07:00
ik 068522a850 docs: close saved fishing plan feature 2026-09-21 20:55:30 +07:00
ik 3f6577b936 docs: close list map disclosure feature 2026-09-21 20:55:21 +07:00
ik 2f2096c3ad docs: close evidence trust feature 2026-09-21 20:55:14 +07:00
ik 5f1b16d089 docs: close primary query journey 2026-09-21 20:55:04 +07:00
ik 0a4af12dc0 feat: label low resolution media fallback 2026-09-21 20:54:41 +07:00
ik bf2715b8f6 docs: close admin browser acceptance 2026-09-21 20:53:52 +07:00
ik d792d3350f docs: close visual accessibility acceptance 2026-09-21 20:53:42 +07:00
ik c1969fb0fa docs: close theme feature 2026-09-21 20:53:31 +07:00
ik dd94ec7f3a docs: close tackle catalog feature 2026-09-21 20:53:05 +07:00
ik 5e0dee6f65 docs: clarify cooldown reservation failures 2026-09-21 20:47:34 +07:00
ik a28621fde3 fix: release cooldown on pre-request failures 2026-09-21 20:47:23 +07:00
ik 59bf85ac23 docs: record admin media search
CI / backend-and-migrations (push) Failing after 36s
CI / astro-build (push) Failing after 36s
CI / dependency-audit (push) Failing after 46s
CI / compose-e2e (push) Canceled after 1m45s
2026-09-21 20:44:02 +07:00
ik b713284bab chore: publish admin media search contract 2026-09-21 20:43:42 +07:00
ik 8089570d56 feat: add media review search field 2026-09-21 20:43:31 +07:00
ik 504a8ce552 feat: add admin media label search 2026-09-21 20:43:31 +07:00
ik a46d0e0eac fix: constrain admin media role choices 2026-09-21 20:41:35 +07:00
ik 6a3c6c54de fix: reject incompatible admin media roles 2026-09-21 20:41:35 +07:00
ik c54cb71720 chore: publish admin media role contract 2026-09-21 20:40:27 +07:00
ik b68826836e docs: record admin media role filtering 2026-09-21 20:40:06 +07:00
ik 00f91dbef8 feat: add admin media role filter 2026-09-21 20:39:52 +07:00
ik ad69f90e43 feat: filter admin media by role 2026-09-21 20:39:49 +07:00
ik 8f03eec76a fix: clear moderation selection on logout 2026-09-21 20:38:42 +07:00
ik 78eaf57189 docs: record bulk action safeguards 2026-09-21 20:38:10 +07:00
ik 191f94b834 fix: harden external bulk actions 2026-09-21 20:37:55 +07:00
ik fe3ca11d8f docs: record queue parity improvements
CI / backend-and-migrations (push) Failing after 34s
CI / astro-build (push) Failing after 44s
CI / dependency-audit (push) Failing after 34s
CI / compose-e2e (push) Failing after 40s
2026-09-21 20:36:14 +07:00
ik 86c399f2da feat: add select-all to moderation queue 2026-09-21 20:35:48 +07:00
ik 2a845e8b8d chore: publish bulk publish API contract 2026-09-21 20:34:22 +07:00
ik 97742d4716 docs: record bulk publish workflow 2026-09-21 20:34:04 +07:00
ik e47db12e4d feat: add bulk publish controls 2026-09-21 20:33:53 +07:00
ik bed156ae94 feat: add bulk external observation publishing 2026-09-21 20:33:50 +07:00
ik 8e84f41924 chore: publish bulk mapping API contract 2026-09-21 20:31:09 +07:00
ik 167f23a99f docs: record bulk mapping workflow 2026-09-21 20:31:00 +07:00
ik ec46655e13 feat: add bulk mapping controls 2026-09-21 20:30:43 +07:00
ik 28a361314a feat: add bulk external observation mapping 2026-09-21 20:30:41 +07:00
ik bc02d28169 docs: record bulk queue workflow 2026-09-21 20:28:32 +07:00
ik 5ffe05206c feat: add select-all for external queue 2026-09-21 20:28:09 +07:00
ik 1dbda03209 fix: make bulk observation rejection atomic 2026-09-21 20:27:45 +07:00
ik 1ac27986cb feat: add bulk external rejection controls 2026-09-21 20:27:17 +07:00
ik 21c0ffbe75 feat: add bulk external observation rejection 2026-09-21 20:25:51 +07:00
ik e74929e7f7 feat: add bulk moderation decisions 2026-09-21 20:25:17 +07:00
ik 2fc4b88a80 feat: expand admin import history 2026-09-21 20:23:32 +07:00
ik 55e5810e65 feat: search official records
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 20:21:12 +07:00
ik f711b9ac0b feat: restore admin import cooldown
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 20:20:22 +07:00
ik 4f1381cec8 feat: paginate and label media library 2026-09-21 20:19:22 +07:00
ik c38097767f feat: link tackle items to related rigs 2026-09-21 20:18:23 +07:00
ik 26ad9b5194 feat: guard admin import cooldown
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 20:16:43 +07:00
ik 2f3f6acd78 feat: add activity evidence summaries 2026-09-21 20:15:17 +07:00
ik 0fed0f1bad docs: record media search progress
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 20:13:08 +07:00
ik 4100691268 feat: search media library 2026-09-21 20:12:51 +07:00
ik 558e284745 docs: record pagination recovery
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
CI / backend-and-migrations (push) Canceled after 12s
2026-09-21 20:11:28 +07:00
ik 3246350319 fix: clamp stale pair pagination 2026-09-21 20:11:10 +07:00
ik 9dfad82dd0 fix: clamp stale waterbody pagination 2026-09-21 20:10:49 +07:00
ik 060aacff92 fix: clamp stale fish detail pagination 2026-09-21 20:10:26 +07:00
ik 9c49a0850d docs: record catalog search progress 2026-09-21 20:09:29 +07:00
ik 4c4849ad2c feat: search waterbody catalog 2026-09-21 20:09:11 +07:00
ik 1c4065a26c feat: search fish catalog 2026-09-21 20:08:45 +07:00
ik 7350880736 docs: record detail pagination progress 2026-09-21 20:08:04 +07:00
ik ebc4b0e65c feat: paginate fish waterbody detail 2026-09-21 20:07:49 +07:00
ik 9fc9c820c4 feat: paginate waterbody activity detail 2026-09-21 20:07:06 +07:00
ik f3a9f34ff3 feat: paginate fish activity detail 2026-09-21 20:06:36 +07:00
ik c5c356f948 feat: expose confirmed fishing approach 2026-09-21 20:04:40 +07:00
ik f3cf706ede feat: add activity period filters to detail pages 2026-09-21 20:03:08 +07:00
ik 34a5224e78 feat: filter tackle catalog by unlock level
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
CI / backend-and-migrations (push) Canceled after 5s
2026-09-21 20:00:57 +07:00
ik be59d76791 feat: harden fishing plan sharing 2026-09-21 19:59:13 +07:00
ik bf0f16642a feat: show reviewed media on tackle details 2026-09-21 19:57:11 +07:00
ik 524dad42ec feat: separate waterbody media roles 2026-09-21 19:55:50 +07:00
ik 206343895e chore: call rigs assemblies in UI
CI / backend-and-migrations (push) Failing after 4m19s
CI / astro-build (push) Failing after 2m17s
CI / dependency-audit (push) Failing after 33s
CI / compose-e2e (push) Failing after 1m20s
2026-09-21 19:54:06 +07:00
ik f0b396b598 feat: search rig catalog by name 2026-09-21 19:51:42 +07:00
ik 4d6ec85173 feat: search tackle catalog by name 2026-09-21 19:50:44 +07:00
ik 6fa669b4ef feat: filter tackle analytics by role 2026-09-21 19:48:49 +07:00
ik b7d69619fa feat: filter public media by role 2026-09-21 19:45:16 +07:00
ik b4585cee7e feat: add discoverable rig catalog 2026-09-21 19:43:17 +07:00
ik 5c1a7ffa01 feat: add honest activity map mode 2026-09-21 19:40:35 +07:00
ik b9aecb75f5 feat: link tackle analytics to canonical gear 2026-09-21 19:37:01 +07:00
ik 3fa97047f2 feat: add public rig detail pages 2026-09-21 19:17:36 +07:00
ik cf8e211176 feat: disclose tackle components in catches 2026-09-21 19:14:07 +07:00
ik 7688df8a5a feat: disclose coordinate provenance 2026-09-21 19:08:49 +07:00
ik b91380b5c5 test: align visual capture matrix 2026-09-21 19:03:35 +07:00
ik ed9ec4bf2b docs: refresh local performance baseline 2026-09-21 18:57:53 +07:00
ik 5d9ffa2e59 feat: label reviewed media roles in admin 2026-09-21 18:53:19 +07:00
ik cd0f6fa5a2 test: cover visual error-state matrix
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 18:49:24 +07:00
ik 4972b11fb0 fix: persist normalized fishing plans 2026-09-21 18:47:08 +07:00
ik 0b830a9978 fix: reject credentialed admin URLs 2026-09-21 18:39:39 +07:00
ik a701397e41 fix: standardize unavailable page responses 2026-09-21 18:34:23 +07:00
ik 11e54a7842 fix: sanitize public provenance links 2026-09-21 18:26:38 +07:00
ik f3eb54083f fix: validate saved plan confidence 2026-09-21 18:23:19 +07:00
ik b0421c11f5 test: cover tackle analytics filters 2026-09-21 18:20:04 +07:00
ik 99ca887f77 fix: clarify empty fishing plan shares 2026-09-21 18:17:36 +07:00
ik d32a1973b2 fix: deduplicate shared fishing plans 2026-09-21 18:15:36 +07:00
ik 2d56a67461 fix: harden saved plan normalization 2026-09-21 18:13:51 +07:00
ik 675cd8ba4e fix: unify coordinate precision labels 2026-09-21 18:12:10 +07:00
ik 31b720f7b3 fix: filter public media roles by entity 2026-09-21 18:09:11 +07:00
ik 4f847db38a test: centralize media role labels 2026-09-21 18:06:09 +07:00
ik d32796277c test: bound tackle freshness score
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 18:04:13 +07:00
ik e4e10bb4e9 feat: add freshness decay to tackle analytics 2026-09-21 18:02:23 +07:00
ik 91019cbf3a docs: clarify browser acceptance evidence 2026-09-21 17:56:14 +07:00
ik de2470010c test: centralize evidence passport states 2026-09-21 17:54:40 +07:00
ik 2729e7a035 test: cover theme persistence and reduced motion
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 17:48:17 +07:00
ik 4052350632 test: isolate unavailable-state regression 2026-09-21 08:20:17 +07:00
ik 852e68d9a5 feat: show ordered tackle components 2026-09-21 08:13:37 +07:00
ik c5f9aa85a0 test: cover unavailable public states 2026-09-21 08:12:04 +07:00
ik c84ec1eced fix: extend accessibility coverage 2026-09-21 08:10:40 +07:00
ik 87321d8384 feat: add tackle combination analytics
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 08:08:23 +07:00
ik 8d7538d423 feat: add public tackle detail route 2026-09-21 08:02:31 +07:00
ik 86515a9da1 feat: expose reviewed media roles 2026-09-21 08:00:15 +07:00
ik 81af8a02b6 test: cover coordinate precision states 2026-09-21 07:56:20 +07:00
ik a8c01f01e9 test: enforce first-answer evidence contract 2026-09-21 07:55:09 +07:00
ik f0b63df803 test: extend visual matrix to core journeys
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 07:53:23 +07:00
ik 94f9e408fb docs: record visual reference review
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-21 07:49:14 +07:00
ik 9c521514fc sync 2026-09-21 07:45:00 +07:00
ik b1a2eb5318 test: cover key mobile route contracts 2026-09-21 07:44:28 +07:00
ik eeef4bb536 feat: show catch method on spot detail 2026-09-21 07:42:43 +07:00
ik 10d43013f7 test: cover first useful answer journey 2026-09-21 07:39:28 +07:00
ik 2ed28266df fix: clarify blocked source status 2026-09-21 07:37:32 +07:00
ik 3b4557b549 feat: add method and risk to fishing plans 2026-09-21 07:34:32 +07:00
ik 36d704d854 feat: expose explicit source conflicts 2026-09-21 07:31:17 +07:00
ik bbed832eb8 feat: distinguish insufficient evidence state 2026-09-20 20:52:09 +07:00
ik 6ce9784d0a test: harden saved plan mobile UX 2026-09-20 20:44:58 +07:00
ik 92bb878ced feat: focus home on top spot results 2026-09-20 20:38:17 +07:00
ik 3260f91495 feat: clarify spot card call to action
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-20 20:34:42 +07:00
ik 346ecd2dbe refactor: prioritize activity card decisions 2026-09-20 20:31:56 +07:00
ik 196185dc97 feat: show evidence analysis periods 2026-09-20 20:29:41 +07:00
ik 7a8e49dde3 fix: qualify low-sample tackle signals
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-20 20:26:57 +07:00
ik 5a8174b11e feat: label stale evidence data 2026-09-20 20:21:39 +07:00
ik 1dfe1e8ba4 docs: define ux contract and scorecard 2026-09-20 20:18:29 +07:00
ik 9569f4768a feat: share local fishing plans
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-20 20:17:08 +07:00
ik 5335255c5c feat: add local fishing plan page 2026-09-20 20:12:20 +07:00
ik 3f0a02a9b9 feat: save local fishing plans
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-20 20:05:50 +07:00
ik e31fbe996d feat: standardize catalog evidence 2026-09-20 20:03:34 +07:00
ik 3a8d3565a1 feat: extend evidence passport to spots 2026-09-20 19:58:39 +07:00
ik 7efdb1a16a feat: clarify home query context 2026-09-20 19:55:33 +07:00
ik d1a5ad1b22 feat: add activity evidence card
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-20 19:50:19 +07:00
ik 0ac9830c84 docs: add competitive ux roadmap 2026-09-20 19:46:44 +07:00
ik 4bcf301289 test: add media acceptance coverage 2026-09-20 19:42:46 +07:00
ik 72ae157ec3 fix: improve domain accessibility contrast
CI / backend-and-migrations (push) Canceled after 0s
CI / astro-build (push) Canceled after 0s
CI / dependency-audit (push) Canceled after 0s
CI / compose-e2e (push) Canceled after 0s
2026-09-20 19:25:18 +07:00
ik 25514d9377 test: cover waterbody error states 2026-09-20 19:18:51 +07:00
ik f02cb247a3 feat: add offline waterbody source crosswalk 2026-09-20 19:16:46 +07:00
ik d541443a1a test: cover tackle browser acceptance 2026-09-20 18:42:33 +07:00
127 changed files with 5161 additions and 348 deletions

No files matched your search

+2
View File
@@ -1,4 +1,6 @@
DATABASE_URL=postgresql+psycopg://rf4:rf4_local@localhost:5432/rf4_spotter DATABASE_URL=postgresql+psycopg://rf4:rf4_local@localhost:5432/rf4_spotter
# Local Compose ports bind to loopback; set 0.0.0.0 only for an intentional LAN demo.
RF4_BIND_ADDRESS=127.0.0.1
APP_VERSION=0.1.0 APP_VERSION=0.1.0
APP_REVISION=dev APP_REVISION=dev
PUBLIC_API_URL=http://localhost:8000 PUBLIC_API_URL=http://localhost:8000
+3
View File
@@ -14,6 +14,9 @@ PUBLIC_CACHE_SECONDS=20
ADMIN_TOKEN=replace-with-at-least-32-random-characters ADMIN_TOKEN=replace-with-at-least-32-random-characters
RATE_LIMIT_SECRET=replace-with-at-least-32-random-characters RATE_LIMIT_SECRET=replace-with-at-least-32-random-characters
# Keep these two values aligned if the Docker edge network is customized.
EDGE_NETWORK_SUBNET=172.30.0.0/24
TRUSTED_PROXY_CIDRS=172.30.0.0/24,127.0.0.1/32,::1/128
ADMIN_BASIC_USER=rf4admin ADMIN_BASIC_USER=rf4admin
# Generate with: docker run --rm caddy:2.10.2-alpine caddy hash-password --plaintext 'YOUR PASSWORD' # Generate with: docker run --rm caddy:2.10.2-alpine caddy hash-password --plaintext 'YOUR PASSWORD'
ADMIN_BASIC_PASSWORD_HASH='replace-with-caddy-password-hash' ADMIN_BASIC_PASSWORD_HASH='replace-with-caddy-password-hash'
+2 -2
View File
@@ -6,7 +6,7 @@ RF4 Spotter — неофициальный сервис свежих точек
## Статус разработки ## Статус разработки
**Проверка 20 сентября 2026: локальный кодовый контур проходит сборочные и тестовые gates, внешний запуск ждёт сервер и его настройки.** Пакет восстановления A01–A13 закрыт. Python: **191 passed, 1 skipped**; Astro check/build и web unit проходят. Граф миграций имеет единственную голову `0020`; OpenAPI artifact синхронизирован с FastAPI (`36 paths`). Изолированный production bootstrap с чистыми томами повторно пройден; живая БД, реальные секреты и импорт внешних источников по-прежнему требуют отдельной инфраструктурной/разрешённой приёмки. **Аудит 22 сентября 2026:** сборка проходит; Python — **228 passed, 1 failed, 1 skipped**, web unit — **14 passed, 1 failed**. Два теста отстали от изменённых контрактов. OpenAPI актуален (**45 paths**), локальная БД на **0022 (head)**, media audit чистый. Обнаружены проблемы сохранности media-решений, конкурентных операций и UX; часть преждевременно закрытых пунктов возвращена в работу. Полный отчёт: [PROJECT_AUDIT_2026-09-22.md](docs/PROJECT_AUDIT_2026-09-22.md). Production и свежая browser-приёмка этим аудитом не подтверждены.
Актуальные следующие задачи находятся только в [ROADMAP](docs/ROADMAP.md). Старые планы и аудиты сохранены как история и больше не задают порядок работ. До внешнего запуска нужны сервер, DNS/TLS, production-секреты, публичные контакты, внешний backup и канал уведомлений. Актуальные следующие задачи находятся только в [ROADMAP](docs/ROADMAP.md). Старые планы и аудиты сохранены как история и больше не задают порядок работ. До внешнего запуска нужны сервер, DNS/TLS, production-секреты, публичные контакты, внешний backup и канал уведомлений.
@@ -184,7 +184,7 @@ docker compose up --build
## Что реализовано ## Что реализовано
- FastAPI и SQLAlchemy 2; - FastAPI и SQLAlchemy 2;
- PostgreSQL 17 и линейные миграции Alembic до `0020`; - PostgreSQL 17 и линейные миграции Alembic до `0022`;
- идемпотентный seed с двумя точками и свежими демо-уловами; - идемпотентный seed с двумя точками и свежими демо-уловами;
- `GET /api/v1/activity` с фильтрами периода, водоёма, рыбы, способа и сортировки; - `GET /api/v1/activity` с фильтрами периода, водоёма, рыбы, способа и сортировки;
- `GET /api/v1/spots/{id}` и `/catches`; - `GET /api/v1/spots/{id}` и `/catches`;
+15
View File
@@ -10,6 +10,8 @@ from sqlalchemy.orm import Session, joinedload
from .models import CatchReport, ModerationStatus from .models import CatchReport, ModerationStatus
from .schemas import ActivityOut from .schemas import ActivityOut
MAX_ACTIVITY_FACTS = 10_000
def activity_rows( def activity_rows(
session: Session, session: Session,
@@ -33,6 +35,8 @@ def activity_rows(
CatchReport.spot_id.is_not(None), CatchReport.spot_id.is_not(None),
CatchReport.reported_at >= now - timedelta(hours=hours), CatchReport.reported_at >= now - timedelta(hours=hours),
) )
.order_by(CatchReport.reported_at.desc(), CatchReport.id.desc())
.limit(MAX_ACTIVITY_FACTS)
) )
if waterbody: if waterbody:
query = query.where(CatchReport.waterbody.has(slug=waterbody)) query = query.where(CatchReport.waterbody.has(slug=waterbody))
@@ -80,6 +84,7 @@ def activity_rows(
sources=coordinate_sources, sources=coordinate_sources,
coordinate_precision=coordinate_precision, coordinate_precision=coordinate_precision,
coordinate_sources=coordinate_sources, coordinate_sources=coordinate_sources,
source_conflicts=_source_conflicts(items),
)) ))
return sorted(result, key=lambda row: (row.activity_score, row.last_confirmed_at), reverse=True) return sorted(result, key=lambda row: (row.activity_score, row.last_confirmed_at), reverse=True)
@@ -95,6 +100,16 @@ def _source_system(report: CatchReport) -> str:
return "manual-import" return "manual-import"
def _source_conflicts(reports: list[CatchReport]) -> list[str]:
conflicts: set[str] = set()
for report in reports:
provenance = (report.raw_payload or {}).get("provenance", {})
values = provenance.get("conflicts", []) if isinstance(provenance, dict) else []
if isinstance(values, list):
conflicts.update(str(value).strip() for value in values if str(value).strip())
return sorted(conflicts)
def _coordinate_precision(report: CatchReport) -> str: def _coordinate_precision(report: CatchReport) -> str:
provenance = (report.raw_payload or {}).get("provenance", {}) provenance = (report.raw_payload or {}).get("provenance", {})
value = provenance.get("coordinate_precision") if isinstance(provenance, dict) else None value = provenance.get("coordinate_precision") if isinstance(provenance, dict) else None
+4 -2
View File
@@ -3,18 +3,20 @@ from __future__ import annotations
from sqlalchemy import func, or_, select from sqlalchemy import func, or_, select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from .models import CatchReport, ExternalObservation, Fish, SourceType, Spot, Waterbody from .models import CatchReport, ExternalObservation, Fish, ModerationStatus, SourceType, Spot, Waterbody
def audit_catalog(db: Session) -> dict[str, int]: def audit_catalog(db: Session) -> dict[str, int]:
count = lambda model: db.scalar(select(func.count()).select_from(model)) or 0 count = lambda model: db.scalar(select(func.count()).select_from(model)) or 0
demo_reports = db.scalar(select(func.count()).select_from(CatchReport).where(CatchReport.source_external_id.like("seed:%"))) or 0
approved_reports = db.scalar(select(func.count()).select_from(CatchReport).where(CatchReport.moderation_status == ModerationStatus.approved, or_(CatchReport.source_external_id.is_(None), CatchReport.source_external_id.not_like("seed:%")))) or 0
failures = { failures = {
"invalid_weights": db.scalar(select(func.count()).select_from(CatchReport).where(or_(CatchReport.weight_g <= 0, CatchReport.weight_g > 3_000_000))) or 0, "invalid_weights": db.scalar(select(func.count()).select_from(CatchReport).where(or_(CatchReport.weight_g <= 0, CatchReport.weight_g > 3_000_000))) or 0,
"invalid_coordinates": db.scalar(select(func.count()).select_from(Spot).where(or_(Spot.x < -10_000, Spot.x > 10_000, Spot.y < -10_000, Spot.y > 10_000))) or 0, "invalid_coordinates": db.scalar(select(func.count()).select_from(Spot).where(or_(Spot.x < -10_000, Spot.x > 10_000, Spot.y < -10_000, Spot.y > 10_000))) or 0,
"incomplete_official_records": db.scalar(select(func.count()).select_from(CatchReport).where(CatchReport.source_type == SourceType.official_record, or_(CatchReport.caught_at.is_(None), CatchReport.source_url.is_(None)))) or 0, "incomplete_official_records": db.scalar(select(func.count()).select_from(CatchReport).where(CatchReport.source_type == SourceType.official_record, or_(CatchReport.caught_at.is_(None), CatchReport.source_url.is_(None)))) or 0,
"incomplete_published_staging": db.scalar(select(func.count()).select_from(ExternalObservation).where(ExternalObservation.status == "published", or_(ExternalObservation.fish_id.is_(None), ExternalObservation.waterbody_id.is_(None), ExternalObservation.x.is_(None), ExternalObservation.y.is_(None), ExternalObservation.weight_g.is_(None), ExternalObservation.catch_report_id.is_(None)))) or 0, "incomplete_published_staging": db.scalar(select(func.count()).select_from(ExternalObservation).where(ExternalObservation.status == "published", or_(ExternalObservation.fish_id.is_(None), ExternalObservation.waterbody_id.is_(None), ExternalObservation.x.is_(None), ExternalObservation.y.is_(None), ExternalObservation.weight_g.is_(None), ExternalObservation.catch_report_id.is_(None)))) or 0,
} }
return {"fishes": count(Fish), "waterbodies": count(Waterbody), "reports": count(CatchReport), "staging": count(ExternalObservation), **failures, "failures": sum(failures.values())} return {"fishes": count(Fish), "waterbodies": count(Waterbody), "reports": count(CatchReport), "demo_reports": demo_reports, "approved_confirmed_reports": approved_reports, "staging": count(ExternalObservation), **failures, "failures": sum(failures.values())}
def audit_waterbody_catalog(db: Session, expected_ids: set[str]) -> dict: def audit_waterbody_catalog(db: Session, expected_ids: set[str]) -> dict:
+10 -3
View File
@@ -21,7 +21,7 @@ class ExternalReviewError(ValueError):
def map_observation( def map_observation(
session: Session, observation: ExternalObservation, fish: Fish, waterbody: Waterbody, session: Session, observation: ExternalObservation, fish: Fish, waterbody: Waterbody,
*, note: str | None = None, *, note: str | None = None, commit: bool = True,
) -> ExternalObservation: ) -> ExternalObservation:
if observation.status == "published": if observation.status == "published":
raise ExternalReviewError("published observation cannot be remapped") raise ExternalReviewError("published observation cannot be remapped")
@@ -43,6 +43,7 @@ def map_observation(
observation.status = "ready" if _complete(observation) else "mapped" observation.status = "ready" if _complete(observation) else "mapped"
_save_alias(session, observation, "fish", observation.fish_external_id or observation.fish_name, fish=fish) _save_alias(session, observation, "fish", observation.fish_external_id or observation.fish_name, fish=fish)
_save_alias(session, observation, "waterbody", observation.waterbody_external_id or observation.waterbody_name, waterbody=waterbody) _save_alias(session, observation, "waterbody", observation.waterbody_external_id or observation.waterbody_name, waterbody=waterbody)
if commit:
session.commit() session.commit()
return observation return observation
@@ -61,17 +62,22 @@ def suggest_aliases(session: Session, observation: ExternalObservation) -> tuple
return (fish_alias.fish if fish_alias else None, waterbody_alias.waterbody if waterbody_alias else None) return (fish_alias.fish if fish_alias else None, waterbody_alias.waterbody if waterbody_alias else None)
def reject_observation(session: Session, observation: ExternalObservation, *, reason: str) -> ExternalObservation: def reject_observation(
session: Session, observation: ExternalObservation, *, reason: str, commit: bool = True,
) -> ExternalObservation:
if observation.status == "published": if observation.status == "published":
raise ExternalReviewError("published observation cannot be rejected") raise ExternalReviewError("published observation cannot be rejected")
observation.status = "rejected" observation.status = "rejected"
observation.review_note = reason observation.review_note = reason
observation.reviewed_at = datetime.now(timezone.utc) observation.reviewed_at = datetime.now(timezone.utc)
if commit:
session.commit() session.commit()
return observation return observation
def publish_observation(session: Session, observation: ExternalObservation) -> CatchReport: def publish_observation(
session: Session, observation: ExternalObservation, *, commit: bool = True,
) -> CatchReport:
if observation.catch_report is not None and observation.status == "published": if observation.catch_report is not None and observation.status == "published":
return observation.catch_report return observation.catch_report
if observation.status == "rejected": if observation.status == "rejected":
@@ -134,6 +140,7 @@ def publish_observation(session: Session, observation: ExternalObservation) -> C
observation.catch_report = report observation.catch_report = report
observation.status = "published" observation.status = "published"
observation.reviewed_at = now observation.reviewed_at = now
if commit:
session.commit() session.commit()
return report return report
+11
View File
@@ -35,6 +35,15 @@ app.add_middleware(
allow_headers=["Authorization", "Content-Type"], allow_headers=["Authorization", "Content-Type"],
) )
PUBLIC_CATALOG_CACHE_CONTROL = "public, max-age=60, stale-while-revalidate=60"
def _is_public_catalog_path(path: str) -> bool:
return path in {
"/api/v1/fishes", "/api/v1/waterbodies", "/api/v1/baits",
"/api/v1/tackle/items", "/api/v1/tackle/rigs",
} or path.startswith(("/api/v1/tackle/items/", "/api/v1/tackle/rigs/"))
@app.middleware("http") @app.middleware("http")
async def structured_request_log(request: Request, call_next): async def structured_request_log(request: Request, call_next):
@@ -52,6 +61,8 @@ async def structured_request_log(request: Request, call_next):
response.headers["Cross-Origin-Opener-Policy"] = "same-origin" response.headers["Cross-Origin-Opener-Policy"] = "same-origin"
if request.url.path.startswith("/api/v1/admin/") or request.url.path == "/api/v1/catch-reports": if request.url.path.startswith("/api/v1/admin/") or request.url.path == "/api/v1/catch-reports":
response.headers["Cache-Control"] = "no-store" response.headers["Cache-Control"] = "no-store"
elif request.method == "GET" and response.status_code == 200 and _is_public_catalog_path(request.url.path):
response.headers["Cache-Control"] = PUBLIC_CATALOG_CACHE_CONTROL
if settings.deployment_environment == "production": if settings.deployment_environment == "production":
response.headers["Strict-Transport-Security"] = "max-age=31536000; includeSubDomains" response.headers["Strict-Transport-Security"] = "max-age=31536000; includeSubDomains"
return response return response
+89 -20
View File
@@ -3,25 +3,85 @@ from __future__ import annotations
import json import json
import os import os
from pathlib import Path from pathlib import Path
from urllib.parse import urlsplit
MEDIA_ROOT = Path(os.environ.get("MEDIA_ROOT", "data/media")).resolve() MEDIA_ROOT = Path(os.environ.get("MEDIA_ROOT", "data/media")).resolve()
WATERBODY_MEDIA_ROLES = {"waterbody_cover", "waterbody_map", "waterbody_depth_map", "waterbody_screenshot"}
TACKLE_MEDIA_ROLES = {"tackle_card", "tackle_detail", "rig_diagram", "tackle_screenshot"}
KNOWN_MEDIA_ROLES = WATERBODY_MEDIA_ROLES | TACKLE_MEDIA_ROLES
MEDIA_ROLES_BY_ENTITY = {"waterbody": WATERBODY_MEDIA_ROLES, "tackle": TACKLE_MEDIA_ROLES}
_manifest_cache: tuple[Path, int, int, dict] | None = None
_asset_index_cache: tuple[int, dict[str, tuple[str, str | None]]] | None = None
def published_assets(entity_type: str | None = None) -> list[dict]: def _read_manifest() -> dict:
manifest = json.loads((MEDIA_ROOT / "manifest.json").read_text(encoding="utf-8")) """Read the manifest once per file revision in this API process."""
global _manifest_cache
path = (MEDIA_ROOT / "manifest.json").resolve()
stat = path.stat()
marker = (path, stat.st_mtime_ns, stat.st_size)
if _manifest_cache and _manifest_cache[:3] == marker:
return _manifest_cache[3]
manifest = json.loads(path.read_text(encoding="utf-8"))
if not isinstance(manifest, dict):
raise ValueError("media manifest must be an object")
_manifest_cache = (*marker, manifest)
return manifest
def _source_system(source_page: object) -> str:
"""Map only allowlisted hostnames; never promote an unknown URL to official."""
try:
parsed = urlsplit(str(source_page or ""))
except ValueError:
return "unknown"
hostname = (parsed.hostname or "").lower().rstrip(".")
if hostname == "rf4db.com" or hostname.endswith(".rf4db.com"):
return "rf4db"
if hostname == "rf4map.ru" or hostname.endswith(".rf4map.ru"):
return "rf4map"
if hostname == "rf4-stat.ru" or hostname.endswith(".rf4-stat.ru"):
return "rf4stat"
return "unknown"
def media_manifest_version() -> int:
manifest = _read_manifest()
return max(1, int(manifest.get("version", 1)))
def _public_role_allowed(entity_type: str | None, role: object) -> bool:
if role is None:
return True
if not isinstance(role, str) or role not in KNOWN_MEDIA_ROLES:
return False
if entity_type == "waterbody":
return role in WATERBODY_MEDIA_ROLES
if entity_type == "tackle":
return role in TACKLE_MEDIA_ROLES
return False
def published_assets(entity_type: str | None = None, media_role: str | None = None) -> list[dict]:
manifest = _read_manifest()
result = [] result = []
for item in manifest.get("assets", []): for item in manifest.get("assets", []):
if item.get("status") != "approved" or not item.get("sha256") or not item.get("local_path"): if item.get("status") != "approved" or not item.get("sha256") or not item.get("local_path"):
continue continue
if entity_type and item.get("entity_type") != entity_type: if entity_type and item.get("entity_type") != entity_type:
continue continue
if media_role and item.get("media_role") != media_role:
continue
if not _public_role_allowed(item.get("entity_type"), item.get("media_role")):
continue
source_page = str(item.get("source_page") or "") source_page = str(item.get("source_page") or "")
source = "rf4db" if "rf4db.com" in source_page else "rf4map" if "rf4map.ru" in source_page else "rf4-official" source = _source_system(source_page)
result.append({ result.append({
"id": item["sha256"], "id": item["sha256"],
"entity_type": item.get("entity_type"), "entity_type": item.get("entity_type"),
"entity_key": item.get("entity_key"), "entity_key": item.get("entity_key"),
"media_role": item.get("media_role"),
"label": item.get("label"), "label": item.get("label"),
"width": item.get("width"), "width": item.get("width"),
"height": item.get("height"), "height": item.get("height"),
@@ -47,22 +107,24 @@ def published_assets(entity_type: str | None = None) -> list[dict]:
def published_file(digest: str) -> tuple[Path, str] | None: def published_file(digest: str) -> tuple[Path, str] | None:
if len(digest) != 64 or any(char not in "0123456789abcdef" for char in digest): if len(digest) != 64 or any(char not in "0123456789abcdef" for char in digest):
return None return None
manifest = json.loads((MEDIA_ROOT / "manifest.json").read_text(encoding="utf-8")) manifest = _read_manifest()
item = next((row for row in manifest.get("assets", []) if row.get("status") == "approved" and row.get("sha256") == digest), None) global _asset_index_cache
media_type = None cache_key = id(manifest)
local_path = None if _asset_index_cache is None or _asset_index_cache[0] != cache_key:
if item: index: dict[str, tuple[str, str | None]] = {}
media_type = item.get("content_type")
local_path = item.get("local_path")
else:
for row in manifest.get("assets", []): for row in manifest.get("assets", []):
if row.get("status") != "approved": if row.get("status") != "approved":
continue continue
variant = next((candidate for candidate in row.get("derivatives", []) if candidate.get("sha256") == digest), None) if row.get("sha256") and row.get("local_path"):
if variant: index[str(row["sha256"])] = (str(row["local_path"]), row.get("content_type"))
media_type = variant.get("content_type") for variant in row.get("derivatives", []):
local_path = variant.get("local_path") if variant.get("sha256") and variant.get("local_path"):
break index.setdefault(str(variant["sha256"]), (str(variant["local_path"]), variant.get("content_type")))
_asset_index_cache = (cache_key, index)
asset = _asset_index_cache[1].get(digest)
if asset is None:
return None
local_path, media_type = asset
if not local_path: if not local_path:
return None return None
target = (MEDIA_ROOT / local_path).resolve() target = (MEDIA_ROOT / local_path).resolve()
@@ -71,8 +133,11 @@ def published_file(digest: str) -> tuple[Path, str] | None:
return target, str(media_type or "application/octet-stream") return target, str(media_type or "application/octet-stream")
def review_assets(entity_type: str | None = None, status: str | None = None) -> list[dict]: def review_assets(
manifest = json.loads((MEDIA_ROOT / "manifest.json").read_text(encoding="utf-8")) entity_type: str | None = None, status: str | None = None, media_role: str | None = None,
query: str | None = None,
) -> list[dict]:
manifest = _read_manifest()
result = [] result = []
for item in manifest.get("assets", []): for item in manifest.get("assets", []):
item_status = str(item.get("status") or "") item_status = str(item.get("status") or "")
@@ -80,11 +145,15 @@ def review_assets(entity_type: str | None = None, status: str | None = None) ->
continue continue
if entity_type and item.get("entity_type") != entity_type: if entity_type and item.get("entity_type") != entity_type:
continue continue
if media_role and item.get("media_role") != media_role:
continue
if query and query.casefold() not in str(item.get("label") or "").casefold():
continue
digest = str(item.get("sha256") or "") digest = str(item.get("sha256") or "")
if len(digest) != 64 or not item.get("local_path"): if len(digest) != 64 or not item.get("local_path"):
continue continue
source_page = str(item.get("source_page") or "") source_page = str(item.get("source_page") or "")
source = "rf4db" if "rf4db.com" in source_page else "rf4map" if "rf4map.ru" in source_page else "rf4-official" source = _source_system(source_page)
result.append({ result.append({
"id": digest, "id": digest,
"status": item_status, "status": item_status,
@@ -111,7 +180,7 @@ def review_assets(entity_type: str | None = None, status: str | None = None) ->
def review_file(digest: str) -> tuple[Path, str] | None: def review_file(digest: str) -> tuple[Path, str] | None:
if len(digest) != 64 or any(char not in "0123456789abcdef" for char in digest): if len(digest) != 64 or any(char not in "0123456789abcdef" for char in digest):
return None return None
manifest = json.loads((MEDIA_ROOT / "manifest.json").read_text(encoding="utf-8")) manifest = _read_manifest()
item = next((row for row in manifest.get("assets", []) if row.get("sha256") == digest and row.get("status") in {"approved", "upgrade_queued", "upgrade_stored"}), None) item = next((row for row in manifest.get("assets", []) if row.get("sha256") == digest and row.get("status") in {"approved", "upgrade_queued", "upgrade_stored"}), None)
if not item or not item.get("local_path"): if not item or not item.get("local_path"):
return None return None
+11 -8
View File
@@ -4,8 +4,8 @@ from dataclasses import dataclass
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from typing import Callable from typing import Callable
from sqlalchemy import delete, or_, select from sqlalchemy import delete, select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session, selectinload
from .models import CatchReport, ExternalObservation, ModerationEvent, ModerationStatus, SourceType, SubmissionAttempt from .models import CatchReport, ExternalObservation, ModerationEvent, ModerationStatus, SourceType, SubmissionAttempt
@@ -42,15 +42,15 @@ def apply_retention(
counts["submission_attempts"] = len(attempts) counts["submission_attempts"] = len(attempts)
candidate_cutoff = current - timedelta(days=min(policy.unreviewed_days, policy.approved_personal_days)) candidate_cutoff = current - timedelta(days=min(policy.unreviewed_days, policy.approved_personal_days))
candidates = list(session.scalars(select(CatchReport).where( candidate_rows = list(session.scalars(select(CatchReport).options(selectinload(CatchReport.tackle_components)).where(
CatchReport.source_type == SourceType.user, CatchReport.source_type == SourceType.user,
CatchReport.reported_at < candidate_cutoff, CatchReport.reported_at < candidate_cutoff,
or_(
CatchReport.player_name.is_not(None), CatchReport.source_url.is_not(None),
CatchReport.raw_payload.is_not(None), CatchReport.screenshot_key.is_not(None),
CatchReport.screenshot_upload_token_hash.is_not(None),
),
))) )))
candidates = [item for item in candidate_rows if (
item.player_name is not None or item.source_url is not None or item.raw_payload is not None
or item.screenshot_key is not None or item.screenshot_upload_token_hash is not None
or any(component.source_url is not None or component.raw_payload is not None for component in item.tackle_components)
)]
reports = [item for item in candidates if item.reported_at.replace(tzinfo=item.reported_at.tzinfo or timezone.utc) < current - timedelta( reports = [item for item in candidates if item.reported_at.replace(tzinfo=item.reported_at.tzinfo or timezone.utc) < current - timedelta(
days=policy.approved_personal_days if item.moderation_status == ModerationStatus.approved else policy.unreviewed_days, days=policy.approved_personal_days if item.moderation_status == ModerationStatus.approved else policy.unreviewed_days,
)] )]
@@ -96,6 +96,9 @@ def apply_retention(
report.raw_payload = None report.raw_payload = None
report.screenshot_key = None report.screenshot_key = None
report.screenshot_upload_token_hash = None report.screenshot_upload_token_hash = None
for component in report.tackle_components:
component.source_url = None
component.raw_payload = None
for observation in stale: for observation in stale:
session.delete(observation) session.delete(observation)
for observation in published: for observation in published:
+3 -3
View File
@@ -7,7 +7,7 @@ from fastapi import APIRouter, HTTPException, Query, Response
from sqlalchemy import func, select from sqlalchemy import func, select
from sqlalchemy.orm import Session, joinedload, selectinload from sqlalchemy.orm import Session, joinedload, selectinload
from ..activity import activity_rows from ..activity import _source_conflicts, activity_rows
from ..config import settings from ..config import settings
from ..dependencies import Db from ..dependencies import Db
from ..models import CatchReport, ModerationStatus, SourceType, Spot, Waterbody from ..models import CatchReport, ModerationStatus, SourceType, Spot, Waterbody
@@ -76,7 +76,7 @@ def spot_detail(spot_id: UUID, db: Db) -> SpotOut:
precisions = [item.get("coordinate_precision") for item in provenance] precisions = [item.get("coordinate_precision") for item in provenance]
precision = max((value for value in precisions if value in {"exact", "approximate", "area", "missing"}), key={"exact": 0, "approximate": 1, "area": 2, "missing": 3}.get, default="exact") precision = max((value for value in precisions if value in {"exact", "approximate", "area", "missing"}), key={"exact": 0, "approximate": 1, "area": 2, "missing": 3}.get, default="exact")
sources = sorted({str(item.get("source_system")) for item in provenance if item.get("source_system")}) or ["players"] sources = sorted({str(item.get("source_system")) for item in provenance if item.get("source_system")}) or ["players"]
return SpotOut(id=spot.id, waterbody_slug=spot.waterbody.slug, waterbody=spot.waterbody.name_ru, x=spot.x, y=spot.y, description=spot.description, catches_24h=count_since(timedelta(hours=24)), catches_3d=count_since(timedelta(days=3)), catches_7d=count_since(timedelta(days=7)), top_baits=[name for name, _ in bait_counts.most_common(5)], coordinate_precision=precision, coordinate_sources=sources) return SpotOut(id=spot.id, waterbody_slug=spot.waterbody.slug, waterbody=spot.waterbody.name_ru, x=spot.x, y=spot.y, description=spot.description, catches_24h=count_since(timedelta(hours=24)), catches_3d=count_since(timedelta(days=3)), catches_7d=count_since(timedelta(days=7)), top_baits=[name for name, _ in bait_counts.most_common(5)], coordinate_precision=precision, coordinate_sources=sources, source_conflicts=_source_conflicts(reports))
def _report_source(report: CatchReport) -> str: def _report_source(report: CatchReport) -> str:
@@ -92,7 +92,7 @@ def _report_source(report: CatchReport) -> str:
def spot_catches(spot_id: UUID, db: Db, limit: int = Query(50, ge=1, le=100), offset: int = Query(0, ge=0)) -> list[CatchOut]: def spot_catches(spot_id: UUID, db: Db, limit: int = Query(50, ge=1, le=100), offset: int = Query(0, ge=0)) -> list[CatchOut]:
_spot_or_404(db, spot_id) _spot_or_404(db, spot_id)
reports = list(db.scalars(select(CatchReport).options(joinedload(CatchReport.fish), joinedload(CatchReport.bait), selectinload(CatchReport.tackle_components)).where(CatchReport.spot_id == spot_id, CatchReport.moderation_status == ModerationStatus.approved, CatchReport.deleted_at.is_(None)).order_by(CatchReport.reported_at.desc(), CatchReport.id.desc()).offset(offset).limit(limit))) reports = list(db.scalars(select(CatchReport).options(joinedload(CatchReport.fish), joinedload(CatchReport.bait), selectinload(CatchReport.tackle_components)).where(CatchReport.spot_id == spot_id, CatchReport.moderation_status == ModerationStatus.approved, CatchReport.deleted_at.is_(None)).order_by(CatchReport.reported_at.desc(), CatchReport.id.desc()).offset(offset).limit(limit)))
return [CatchOut(id=report.id, fish=report.fish.name_ru, weight_g=report.weight_g, bait=report.bait.name if report.bait else None, player_name=report.player_name, caught_at=report.caught_at, reported_at=report.reported_at, retrieve_method=report.retrieve_method, retrieve_speed=report.retrieve_speed, source_system=_report_source(report), source_url=report.source_url, tackle_components=[{ return [CatchOut(id=report.id, fish=report.fish.name_ru, weight_g=report.weight_g, bait=report.bait.name if report.bait else None, player_name=report.player_name, caught_at=report.caught_at, reported_at=report.reported_at, fishing_method=report.fishing_method, retrieve_method=report.retrieve_method, retrieve_speed=report.retrieve_speed, source_system=_report_source(report), source_url=report.source_url, tackle_components=[{
"id": component.id, "role": component.role, "position": component.position, "id": component.id, "role": component.role, "position": component.position,
"raw_value": component.raw_value, "tackle_item_id": component.tackle_item_id, "raw_value": component.raw_value, "tackle_item_id": component.tackle_item_id,
"rig_id": component.rig_id, "source_system": component.source_system, "rig_id": component.rig_id, "source_system": component.source_system,
+127 -9
View File
@@ -8,19 +8,19 @@ import httpx
from fastapi import APIRouter, Depends, Header, HTTPException, Query, Request, Response from fastapi import APIRouter, Depends, Header, HTTPException, Query, Request, Response
from fastapi.responses import FileResponse, JSONResponse from fastapi.responses import FileResponse, JSONResponse
from sqlalchemy import case, func, or_, select from sqlalchemy import case, func, or_, select
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload, selectinload
from ..admin_security import verify_admin from ..admin_security import verify_admin
from ..community_review import ExternalReviewError, map_observation, publish_observation, reject_observation, suggest_aliases from ..community_review import ExternalReviewError, map_observation, publish_observation, reject_observation, suggest_aliases
from ..config import settings from ..config import settings
from ..dependencies import Db from ..dependencies import Db
from ..importer import ImportAlreadyRunning, ImportSourceError, import_records from ..importer import ImportAlreadyRunning, ImportSourceError, import_records
from rf4_research.media_assets import publish_quality_upgrades, rollback_quality_upgrade from rf4_research.media_assets import preview_quality_upgrades, publish_quality_upgrades, rollback_quality_upgrade
from ..media_catalog import MEDIA_ROOT, review_assets, review_file from ..media_catalog import KNOWN_MEDIA_ROLES, MEDIA_ROLES_BY_ENTITY, MEDIA_ROOT, media_manifest_version, review_assets, review_file
from ..models import CatchReport, CommunityImportRun, DataSource, ExternalObservation, Fish, ModerationEvent, ModerationStatus, OfficialRecordImport, SourceType, Waterbody from ..models import CatchReport, CommunityImportRun, DataSource, ExternalObservation, Fish, ModerationEvent, ModerationStatus, OfficialRecordImport, SourceType, Waterbody
from ..public_cache import public_cache from ..public_cache import public_cache
from ..schemas import AdminCatchReportOut, AdminMediaDecision, AdminMediaReviewOut, AdminMediaRollback, AdminModerationHistoryOut, AdminSourceStatusOut, CatchReportCreated, ExternalAliasSuggestionOut, ExternalObservationAction, ExternalObservationDecision, ExternalObservationMapping, ExternalObservationOut, ExternalObservationPublished, ImportRunOut, ModerationUpdate from ..schemas import AdminCatchReportOut, AdminMediaDecision, AdminMediaPreview, AdminMediaReviewOut, AdminMediaRollback, AdminModerationHistoryOut, AdminSourceStatusOut, CatchReportCreated, ExternalAliasSuggestionOut, ExternalObservationAction, ExternalObservationBulkAction, ExternalObservationBulkDecision, ExternalObservationBulkMapping, ExternalObservationBulkResult, ExternalObservationDecision, ExternalObservationMapping, ExternalObservationOut, ExternalObservationPublished, ImportRunOut, ModerationBulkResult, ModerationBulkUpdate, ModerationUpdate
from ..storage import delete_screenshot, signed_screenshot_url from ..storage import delete_screenshot, signed_screenshot_url
from ..time_utils import aware from ..time_utils import aware
@@ -35,12 +35,20 @@ def _admin(request: Request, db: Db, authorization: Annotated[str | None, Header
@router.get("/api/v1/admin/media/catalog", response_model=list[AdminMediaReviewOut]) @router.get("/api/v1/admin/media/catalog", response_model=list[AdminMediaReviewOut])
def admin_media_catalog( def admin_media_catalog(
_: Annotated[str, Depends(_admin)], _: Annotated[str, Depends(_admin)],
response: Response,
entity_type: str | None = Query(None, pattern="^(fish|waterbody|tackle|reference)$"), entity_type: str | None = Query(None, pattern="^(fish|waterbody|tackle|reference)$"),
status: str | None = Query(None, pattern="^(approved|upgrade_queued|upgrade_stored)$"), status: str | None = Query(None, pattern="^(approved|upgrade_queued|upgrade_stored)$"),
media_role: str | None = Query(None, pattern="^(waterbody_cover|waterbody_map|waterbody_depth_map|waterbody_screenshot|tackle_card|tackle_detail|rig_diagram|tackle_screenshot)$"),
q: str | None = Query(None, max_length=100),
limit: int = Query(50, ge=1, le=100), limit: int = Query(50, ge=1, le=100),
offset: int = Query(0, ge=0), offset: int = Query(0, ge=0),
) -> list[AdminMediaReviewOut]: ) -> list[AdminMediaReviewOut]:
return review_assets(entity_type, status)[offset:offset + limit] if media_role and media_role not in KNOWN_MEDIA_ROLES:
raise HTTPException(status_code=422, detail="unknown media role")
if media_role and (not entity_type or media_role not in MEDIA_ROLES_BY_ENTITY.get(entity_type, set())):
raise HTTPException(status_code=422, detail="media role is incompatible with entity type")
response.headers["X-Media-Manifest-Version"] = str(media_manifest_version())
return review_assets(entity_type, status, media_role, q.strip() if q else None)[offset:offset + limit]
@router.get("/api/v1/admin/media/assets/{digest}", response_class=FileResponse) @router.get("/api/v1/admin/media/assets/{digest}", response_class=FileResponse)
@@ -52,6 +60,20 @@ def admin_media_asset(digest: str, _: Annotated[str, Depends(_admin)]) -> FileRe
return FileResponse(path, media_type=media_type, headers={"Cache-Control": "private, no-store"}) return FileResponse(path, media_type=media_type, headers={"Cache-Control": "private, no-store"})
@router.post("/api/v1/admin/media/upgrades/preview")
def admin_preview_media_upgrades(
payload: AdminMediaPreview,
_: Annotated[str, Depends(_admin)],
) -> dict:
try:
return preview_quality_upgrades(
MEDIA_ROOT / "manifest.json", asset_ids=payload.asset_ids,
expected_version=payload.expected_version,
)
except ValueError as exc:
raise HTTPException(status_code=409, detail=str(exc)) from exc
@router.post("/api/v1/admin/media/upgrades/publish") @router.post("/api/v1/admin/media/upgrades/publish")
def admin_publish_media_upgrades( def admin_publish_media_upgrades(
payload: AdminMediaDecision, payload: AdminMediaDecision,
@@ -59,7 +81,10 @@ def admin_publish_media_upgrades(
) -> dict[str, int]: ) -> dict[str, int]:
"""Atomically publish all stored quality upgrades after an explicit decision.""" """Atomically publish all stored quality upgrades after an explicit decision."""
try: try:
return publish_quality_upgrades(MEDIA_ROOT / "manifest.json", note=payload.note) return publish_quality_upgrades(
MEDIA_ROOT / "manifest.json", note=payload.note,
asset_ids=payload.asset_ids, expected_version=payload.expected_version,
)
except ValueError as exc: except ValueError as exc:
raise HTTPException(status_code=409, detail=str(exc)) from exc raise HTTPException(status_code=409, detail=str(exc)) from exc
@@ -68,11 +93,12 @@ def admin_publish_media_upgrades(
def admin_rollback_media_upgrade( def admin_rollback_media_upgrade(
payload: AdminMediaRollback, payload: AdminMediaRollback,
_: Annotated[str, Depends(_admin)], _: Annotated[str, Depends(_admin)],
) -> dict[str, str]: ) -> dict:
"""Restore one superseded fallback while retaining the reviewed candidate.""" """Restore one superseded fallback while retaining the reviewed candidate."""
try: try:
return rollback_quality_upgrade( return rollback_quality_upgrade(
MEDIA_ROOT / "manifest.json", asset_url=payload.asset_url, note=payload.note, MEDIA_ROOT / "manifest.json", asset_id=payload.asset_id,
note=payload.note, expected_version=payload.expected_version,
) )
except ValueError as exc: except ValueError as exc:
raise HTTPException(status_code=409, detail=str(exc)) from exc raise HTTPException(status_code=409, detail=str(exc)) from exc
@@ -343,6 +369,34 @@ def admin_map_external_observation(
raise HTTPException(status_code=409, detail=str(exc)) from exc raise HTTPException(status_code=409, detail=str(exc)) from exc
@router.patch("/api/v1/admin/external-observations/bulk-mapping", response_model=ExternalObservationBulkResult)
def admin_map_external_observations_bulk(
payload: ExternalObservationBulkMapping, db: Db, _: Annotated[str, Depends(_admin)],
) -> ExternalObservationBulkResult:
ids = [item.id for item in payload.items]
observations = list(db.scalars(select(ExternalObservation).where(ExternalObservation.id.in_(ids)).with_for_update()))
by_id = {item.id: item for item in observations}
expected = {item.id: item.expected_version for item in payload.items}
if len(by_id) != len(ids) or any(
item.status in {"published", "withdrawn"} or item.moderation_version != expected[item.id]
for item in observations
):
raise HTTPException(status_code=409, detail="one or more observations changed; reload the queue")
fish = db.scalar(select(Fish).where(Fish.slug == payload.fish_slug))
waterbody = db.scalar(select(Waterbody).where(Waterbody.slug == payload.waterbody_slug))
if fish is None or waterbody is None:
raise HTTPException(status_code=422, detail="unknown fish or waterbody")
try:
for item in observations:
item.moderation_version += 1
map_observation(db, item, fish, waterbody, note=payload.note, commit=False)
db.commit()
except ExternalReviewError as exc:
db.rollback()
raise HTTPException(status_code=409, detail=str(exc)) from exc
return ExternalObservationBulkResult(updated=len(observations))
@router.post("/api/v1/admin/external-observations/{observation_id}/publish", response_model=ExternalObservationPublished) @router.post("/api/v1/admin/external-observations/{observation_id}/publish", response_model=ExternalObservationPublished)
def admin_publish_external_observation( def admin_publish_external_observation(
observation_id: UUID, payload: ExternalObservationAction, db: Db, _: Annotated[str, Depends(_admin)], observation_id: UUID, payload: ExternalObservationAction, db: Db, _: Annotated[str, Depends(_admin)],
@@ -361,6 +415,30 @@ def admin_publish_external_observation(
return ExternalObservationPublished(observation_id=observation.id, catch_report_id=report.id, status=observation.status) return ExternalObservationPublished(observation_id=observation.id, catch_report_id=report.id, status=observation.status)
@router.post("/api/v1/admin/external-observations/bulk-publish", response_model=ExternalObservationBulkResult)
def admin_publish_external_observations_bulk(
payload: ExternalObservationBulkAction, db: Db, _: Annotated[str, Depends(_admin)],
) -> ExternalObservationBulkResult:
ids = [item.id for item in payload.items]
observations = list(db.scalars(select(ExternalObservation).where(ExternalObservation.id.in_(ids)).with_for_update()))
expected = {item.id: item.expected_version for item in payload.items}
if len({item.id for item in observations}) != len(ids) or any(
item.status in {"rejected", "withdrawn"} or item.moderation_version != expected[item.id]
for item in observations
):
raise HTTPException(status_code=409, detail="one or more observations changed; reload the queue")
try:
for item in observations:
item.moderation_version += 1
publish_observation(db, item, commit=False)
db.commit()
except ExternalReviewError as exc:
db.rollback()
raise HTTPException(status_code=409, detail=str(exc)) from exc
public_cache.invalidate()
return ExternalObservationBulkResult(updated=len(observations))
@router.patch("/api/v1/admin/external-observations/{observation_id}/reject", response_model=ExternalObservationOut) @router.patch("/api/v1/admin/external-observations/{observation_id}/reject", response_model=ExternalObservationOut)
def admin_reject_external_observation( def admin_reject_external_observation(
observation_id: UUID, payload: ExternalObservationDecision, db: Db, observation_id: UUID, payload: ExternalObservationDecision, db: Db,
@@ -378,6 +456,21 @@ def admin_reject_external_observation(
raise HTTPException(status_code=409, detail=str(exc)) from exc raise HTTPException(status_code=409, detail=str(exc)) from exc
@router.patch("/api/v1/admin/external-observations/bulk-reject", response_model=ExternalObservationBulkResult)
def admin_reject_external_observations_bulk(payload: ExternalObservationBulkDecision, db: Db, _: Annotated[str, Depends(_admin)]) -> ExternalObservationBulkResult:
ids = [item.id for item in payload.items]
observations = list(db.scalars(select(ExternalObservation).where(ExternalObservation.id.in_(ids)).with_for_update()))
by_id = {item.id: item for item in observations}
expected = {item.id: item.expected_version for item in payload.items}
if len(by_id) != len(ids) or any(item.status in {"published", "rejected", "withdrawn"} or item.moderation_version != expected[item.id] for item in observations):
raise HTTPException(status_code=409, detail="one or more observations changed; reload the queue")
for item in observations:
item.moderation_version += 1
reject_observation(db, item, reason=payload.reason, commit=False)
db.commit()
return ExternalObservationBulkResult(updated=len(observations))
@router.get("/api/v1/admin/catch-reports", response_model=list[AdminCatchReportOut]) @router.get("/api/v1/admin/catch-reports", response_model=list[AdminCatchReportOut])
def admin_reports(db: Db, _: Annotated[str, Depends(_admin)], status: ModerationStatus = ModerationStatus.pending, limit: int = Query(50, ge=1, le=100), offset: int = Query(0, ge=0)) -> list[AdminCatchReportOut]: def admin_reports(db: Db, _: Annotated[str, Depends(_admin)], status: ModerationStatus = ModerationStatus.pending, limit: int = Query(50, ge=1, le=100), offset: int = Query(0, ge=0)) -> list[AdminCatchReportOut]:
reports = list(db.scalars(select(CatchReport).options(joinedload(CatchReport.fish), joinedload(CatchReport.waterbody), joinedload(CatchReport.spot), joinedload(CatchReport.bait)).where(CatchReport.source_type == SourceType.user, CatchReport.moderation_status == status, CatchReport.deleted_at.is_(None)).order_by(CatchReport.reported_at, CatchReport.id).offset(offset).limit(limit))) reports = list(db.scalars(select(CatchReport).options(joinedload(CatchReport.fish), joinedload(CatchReport.waterbody), joinedload(CatchReport.spot), joinedload(CatchReport.bait)).where(CatchReport.source_type == SourceType.user, CatchReport.moderation_status == status, CatchReport.deleted_at.is_(None)).order_by(CatchReport.reported_at, CatchReport.id).offset(offset).limit(limit)))
@@ -386,7 +479,7 @@ def admin_reports(db: Db, _: Annotated[str, Depends(_admin)], status: Moderation
@router.patch("/api/v1/admin/catch-reports/{report_id}", response_model=CatchReportCreated) @router.patch("/api/v1/admin/catch-reports/{report_id}", response_model=CatchReportCreated)
def moderate_report(report_id: UUID, payload: ModerationUpdate, db: Db, moderator: Annotated[str, Depends(_admin)]) -> CatchReportCreated: def moderate_report(report_id: UUID, payload: ModerationUpdate, db: Db, moderator: Annotated[str, Depends(_admin)]) -> CatchReportCreated:
report = db.scalar(select(CatchReport).where(CatchReport.id == report_id).with_for_update()) report = db.scalar(select(CatchReport).options(selectinload(CatchReport.tackle_components)).where(CatchReport.id == report_id).with_for_update())
if report is None or report.source_type != SourceType.user or report.deleted_at is not None: if report is None or report.source_type != SourceType.user or report.deleted_at is not None:
raise HTTPException(status_code=404, detail="catch report not found") raise HTTPException(status_code=404, detail="catch report not found")
if report.moderation_version != payload.expected_version: if report.moderation_version != payload.expected_version:
@@ -400,6 +493,27 @@ def moderate_report(report_id: UUID, payload: ModerationUpdate, db: Db, moderato
return CatchReportCreated(id=report.id, moderation_status=report.moderation_status.value) return CatchReportCreated(id=report.id, moderation_status=report.moderation_status.value)
@router.post("/api/v1/admin/catch-reports/bulk", response_model=ModerationBulkResult)
def moderate_reports_bulk(payload: ModerationBulkUpdate, db: Db, moderator: Annotated[str, Depends(_admin)]) -> ModerationBulkResult:
if payload.status == "rejected" and not (payload.reason or "").strip():
raise HTTPException(status_code=422, detail="rejection reason required")
ids = [item.id for item in payload.items]
reports = list(db.scalars(select(CatchReport).where(CatchReport.id.in_(ids)).with_for_update()))
by_id = {report.id: report for report in reports}
if len(by_id) != len(ids) or any(report.source_type != SourceType.user or report.deleted_at is not None or report.moderation_status != ModerationStatus.pending for report in reports):
raise HTTPException(status_code=409, detail="one or more reports are no longer pending")
expected = {item.id: item.expected_version for item in payload.items}
if any(report.moderation_version != expected[report.id] for report in reports):
raise HTTPException(status_code=409, detail="one or more reports changed; reload the queue")
for report in reports:
previous = report.moderation_status
report.moderation_status = ModerationStatus(payload.status)
report.moderation_version += 1
db.add(ModerationEvent(catch_report=report, created_at=datetime.now(timezone.utc), previous_status=previous, new_status=report.moderation_status, moderator=moderator, reason=payload.reason))
db.commit(); public_cache.invalidate()
return ModerationBulkResult(updated=len(reports))
@router.delete("/api/v1/admin/catch-reports/{report_id}", status_code=204, response_class=Response) @router.delete("/api/v1/admin/catch-reports/{report_id}", status_code=204, response_class=Response)
def delete_report(report_id: UUID, db: Db, moderator: Annotated[str, Depends(_admin)], expected_version: int = Query(ge=0)) -> Response: def delete_report(report_id: UUID, db: Db, moderator: Annotated[str, Depends(_admin)], expected_version: int = Query(ge=0)) -> Response:
report = db.scalar(select(CatchReport).where(CatchReport.id == report_id).with_for_update()) report = db.scalar(select(CatchReport).where(CatchReport.id == report_id).with_for_update())
@@ -420,6 +534,10 @@ def delete_report(report_id: UUID, db: Db, moderator: Annotated[str, Depends(_ad
report.source_url = None report.source_url = None
report.screenshot_key = None report.screenshot_key = None
report.raw_payload = None report.raw_payload = None
report.screenshot_upload_token_hash = None
for component in report.tackle_components:
component.source_url = None
component.raw_payload = None
db.add(ModerationEvent(catch_report=report, created_at=report.deleted_at, previous_status=previous, new_status=ModerationStatus.rejected, moderator=moderator, reason="user report deleted and anonymized")) db.add(ModerationEvent(catch_report=report, created_at=report.deleted_at, previous_status=previous, new_status=ModerationStatus.rejected, moderator=moderator, reason="user report deleted and anonymized"))
db.commit() db.commit()
public_cache.invalidate() public_cache.invalidate()
+48 -10
View File
@@ -2,9 +2,10 @@ from __future__ import annotations
from collections import defaultdict from collections import defaultdict
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from math import exp, log
from fastapi import APIRouter, Query from fastapi import APIRouter, HTTPException, Query
from sqlalchemy import select from sqlalchemy import and_, or_, select
from sqlalchemy.orm import Session, joinedload, selectinload from sqlalchemy.orm import Session, joinedload, selectinload
from ..dependencies import Db from ..dependencies import Db
@@ -12,6 +13,13 @@ from ..models import CatchReport, Fish, ModerationStatus, Spot, Waterbody
from ..schemas import TackleCombinationOut from ..schemas import TackleCombinationOut
router = APIRouter() router = APIRouter()
FRESHNESS_HALF_LIFE_HOURS = 12.5
MAX_ANALYTICS_FACTS = 10_000
def _age_hours(value: datetime, now: datetime) -> float:
observed_at = value if value.tzinfo is not None else value.replace(tzinfo=timezone.utc)
return max(0.0, (now - observed_at).total_seconds() / 3600)
@router.get("/api/v1/analytics/tackle", response_model=list[TackleCombinationOut]) @router.get("/api/v1/analytics/tackle", response_model=list[TackleCombinationOut])
@@ -20,10 +28,14 @@ def tackle_combinations(
waterbody: str | None = None, waterbody: str | None = None,
fish: str | None = None, fish: str | None = None,
method: str | None = None, method: str | None = None,
role: str | None = None,
hours: int = Query(72, ge=24, le=168), hours: int = Query(72, ge=24, le=168),
min_samples: int = Query(3, ge=1, le=100), min_samples: int = Query(3, ge=3, le=100),
min_players: int = Query(2, ge=1, le=100), min_players: int = Query(2, ge=2, le=100),
limit: int = Query(100, ge=1, le=500),
) -> list[TackleCombinationOut]: ) -> list[TackleCombinationOut]:
if role is not None and role not in {"lure", "bait", "rig", "rod", "reel", "line", "hook", "float", "sinker"}:
raise HTTPException(status_code=422, detail="invalid tackle role")
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
query = select(CatchReport).options( query = select(CatchReport).options(
joinedload(CatchReport.fish), joinedload(CatchReport.waterbody), joinedload(CatchReport.fish), joinedload(CatchReport.waterbody),
@@ -31,7 +43,10 @@ def tackle_combinations(
).where( ).where(
CatchReport.moderation_status == ModerationStatus.approved, CatchReport.moderation_status == ModerationStatus.approved,
CatchReport.deleted_at.is_(None), CatchReport.deleted_at.is_(None),
CatchReport.reported_at >= now - timedelta(hours=hours), or_(
and_(CatchReport.caught_at.is_not(None), CatchReport.caught_at >= now - timedelta(hours=hours)),
and_(CatchReport.caught_at.is_(None), CatchReport.reported_at >= now - timedelta(hours=hours)),
),
) )
if waterbody: if waterbody:
query = query.join(Waterbody, CatchReport.waterbody_id == Waterbody.id).where(Waterbody.slug == waterbody) query = query.join(Waterbody, CatchReport.waterbody_id == Waterbody.id).where(Waterbody.slug == waterbody)
@@ -39,28 +54,51 @@ def tackle_combinations(
query = query.join(Fish, CatchReport.fish_id == Fish.id).where(Fish.slug == fish) query = query.join(Fish, CatchReport.fish_id == Fish.id).where(Fish.slug == fish)
if method: if method:
query = query.where(CatchReport.fishing_method == method) query = query.where(CatchReport.fishing_method == method)
query = query.order_by(CatchReport.caught_at.desc(), CatchReport.reported_at.desc(), CatchReport.id.desc()).limit(MAX_ANALYTICS_FACTS)
groups: dict[tuple[str, str], list[CatchReport]] = defaultdict(list) groups: dict[tuple[str, str], list[CatchReport]] = defaultdict(list)
for report in db.scalars(query): for report in db.scalars(query):
for component in report.tackle_components: for component in report.tackle_components:
if role and component.role != role:
continue
if component.raw_value.strip(): if component.raw_value.strip():
groups[(component.role, component.raw_value.strip())].append(report) groups[(component.role, component.raw_value.strip())].append(report)
result = [] result = []
for (role, value), reports in groups.items(): for (component_role, value), reports in groups.items():
unique_reports = {report.id: report for report in reports} unique_reports = {report.id: report for report in reports}
matching_components = [
component
for report in unique_reports.values()
for component in report.tackle_components
if component.role == component_role and component.raw_value.strip() == value
]
item_ids = {component.tackle_item_id for component in matching_components if component.tackle_item_id is not None}
rig_ids = {component.rig_id for component in matching_components if component.rig_id is not None}
has_unresolved = any(component.tackle_item_id is None and component.rig_id is None for component in matching_components)
canonical_item_id = next(iter(item_ids)) if len(item_ids) == 1 and not rig_ids and not has_unresolved else None
canonical_rig_id = next(iter(rig_ids)) if len(rig_ids) == 1 and not item_ids and not has_unresolved else None
players = {report.player_name.strip().casefold() for report in unique_reports.values() if report.player_name and report.player_name.strip()} players = {report.player_name.strip().casefold() for report in unique_reports.values() if report.player_name and report.player_name.strip()}
catches = len(unique_reports) catches = len(unique_reports)
unique_players = len(players) unique_players = len(players)
last_seen = max(report.reported_at for report in unique_reports.values()) observed_times = [report.caught_at or report.reported_at for report in unique_reports.values()]
last_seen = max(observed_times)
freshness_score = round(sum(
exp(-_age_hours(report.caught_at or report.reported_at, now) * log(2) / FRESHNESS_HALF_LIFE_HOURS)
for report in unique_reports.values()
) / catches * 100)
enough = catches >= min_samples and unique_players >= min_players enough = catches >= min_samples and unique_players >= min_players
result.append(TackleCombinationOut( result.append(TackleCombinationOut(
role=role, value=value, catches=catches, unique_players=unique_players, role=component_role, value=value, tackle_item_id=canonical_item_id, rig_id=canonical_rig_id,
last_seen_at=last_seen, status="recommendation" if enough else "insufficient_data", catches=catches, unique_players=unique_players,
last_seen_at=last_seen, freshness_score=freshness_score,
status="recommendation" if enough else "insufficient_data",
explanation=( explanation=(
"Достаточно независимых наблюдений для рекомендации." "Достаточно независимых наблюдений для рекомендации."
if enough else if enough else
f"Данных мало: нужно минимум {min_samples} наблюдения и {min_players} независимых игрока." f"Данных мало: нужно минимум {min_samples} наблюдения и {min_players} независимых игрока."
), ),
)) ))
return sorted(result, key=lambda item: (item.status != "recommendation", -item.catches, -item.unique_players, item.role, item.value)) ranked = sorted(result, key=lambda item: (item.status != "recommendation", -item.freshness_score, -item.catches, -item.unique_players, item.role, item.value))
effective_limit = limit if isinstance(limit, int) else 100
return ranked[:effective_limit]
+45 -6
View File
@@ -5,8 +5,8 @@ from sqlalchemy import func, select
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
from ..dependencies import Db from ..dependencies import Db
from ..models import Bait, CatchReport, Fish, ModerationStatus, Rig, Spot, TackleItem, Waterbody from ..models import Bait, CatchReport, Fish, ModerationStatus, Rig, RigComponent, Spot, TackleItem, Waterbody
from ..schemas import BaitOut, FishOut, PaginatedTackleItemOut, RigOut, TackleItemOut, WaterbodyOut from ..schemas import BaitOut, FishOut, PaginatedRigOut, PaginatedTackleItemOut, RigOut, RigSummaryOut, TackleItemOut, TackleItemRigOut, WaterbodyOut
router = APIRouter() router = APIRouter()
@@ -34,17 +34,28 @@ def _item_missing_fields(item: TackleItem) -> list[str]:
) if value is None] ) if value is None]
def _rig_missing_fields(rig: Rig) -> list[str]:
return [field for field, value in (
("source_url", rig.source_url), ("source_checked_at", rig.source_checked_at),
) if value is None]
@router.get("/api/v1/tackle/items", response_model=PaginatedTackleItemOut) @router.get("/api/v1/tackle/items", response_model=PaginatedTackleItemOut)
def tackle_items( def tackle_items(
db: Db, db: Db,
category: str | None = Query(None, pattern="^(bait|lure|rod|reel|line|hook|rig|float|sinker|other)$"), category: str | None = Query(None, pattern="^(bait|lure|rod|reel|line|hook|rig|float|sinker|other)$"),
q: str | None = None,
brand: str | None = None, brand: str | None = None,
family: str | None = None, family: str | None = None,
unlock_level: int | None = Query(None, ge=0), unlock_level: int | None = Query(None, ge=0),
limit: int = Query(50, ge=1, le=100), limit: int = Query(50, ge=1, le=100),
offset: int = Query(0, ge=0), offset: int = Query(0, ge=0),
) -> PaginatedTackleItemOut: ) -> PaginatedTackleItemOut:
if q is not None and len(q) > 100:
raise HTTPException(status_code=422, detail="search query is too long")
query = select(TackleItem) query = select(TackleItem)
if q and q.strip():
query = query.where(TackleItem.name.ilike(f"%{q.strip()}%"))
if category: if category:
query = query.where(TackleItem.category == category) query = query.where(TackleItem.category == category)
if brand: if brand:
@@ -66,7 +77,37 @@ def tackle_item(item_id: UUID, db: Db) -> TackleItemOut:
item = db.get(TackleItem, item_id) item = db.get(TackleItem, item_id)
if item is None: if item is None:
raise HTTPException(status_code=404, detail="tackle item not found") raise HTTPException(status_code=404, detail="tackle item not found")
return TackleItemOut.model_validate(item).model_copy(update={"missing_fields": _item_missing_fields(item)}) rigs = list(db.scalars(select(Rig).join(RigComponent, RigComponent.rig_id == Rig.id).where(RigComponent.tackle_item_id == item_id).options(selectinload(Rig.components)).distinct().order_by(Rig.name, Rig.id)))
related = [TackleItemRigOut(id=rig.id, name=rig.name, source_system=rig.source_system, source_checked_at=rig.source_checked_at, component_count=len(rig.components)) for rig in rigs]
return TackleItemOut.model_validate(item).model_copy(update={"missing_fields": _item_missing_fields(item), "related_rigs": related})
@router.get("/api/v1/tackle/rigs", response_model=PaginatedRigOut)
def tackle_rigs(
db: Db,
q: str | None = None,
limit: int = Query(48, ge=1, le=100),
offset: int = Query(0, ge=0),
) -> PaginatedRigOut:
if q is not None and len(q) > 100:
raise HTTPException(status_code=422, detail="search query is too long")
query = select(Rig).options(selectinload(Rig.components))
if q and q.strip():
query = query.where(Rig.name.ilike(f"%{q.strip()}%"))
total_query = select(func.count(Rig.id))
if q and q.strip():
total_query = total_query.where(Rig.name.ilike(f"%{q.strip()}%"))
total = db.scalar(total_query) or 0
rigs = list(db.scalars(query.order_by(Rig.name, Rig.id).offset(offset).limit(limit)))
return PaginatedRigOut(
items=[RigSummaryOut(
id=rig.id, name=rig.name, source_system=rig.source_system,
source_external_id=rig.source_external_id, source_url=rig.source_url,
source_checked_at=rig.source_checked_at, missing_fields=_rig_missing_fields(rig),
component_count=len(rig.components),
) for rig in rigs],
total=total, limit=limit, offset=offset,
)
@router.get("/api/v1/tackle/rigs/{rig_id}", response_model=RigOut) @router.get("/api/v1/tackle/rigs/{rig_id}", response_model=RigOut)
@@ -74,9 +115,7 @@ def rig_detail(rig_id: UUID, db: Db) -> RigOut:
rig = db.scalar(select(Rig).options(selectinload(Rig.components)).where(Rig.id == rig_id)) rig = db.scalar(select(Rig).options(selectinload(Rig.components)).where(Rig.id == rig_id))
if rig is None: if rig is None:
raise HTTPException(status_code=404, detail="rig not found") raise HTTPException(status_code=404, detail="rig not found")
missing = [field for field, value in ( missing = _rig_missing_fields(rig)
("source_url", rig.source_url), ("source_checked_at", rig.source_checked_at),
) if value is None]
return RigOut( return RigOut(
id=rig.id, name=rig.name, source_system=rig.source_system, id=rig.id, name=rig.name, source_system=rig.source_system,
source_external_id=rig.source_external_id, source_url=rig.source_url, source_external_id=rig.source_external_id, source_url=rig.source_url,
+14 -4
View File
@@ -1,15 +1,25 @@
from fastapi import APIRouter, HTTPException, Query from fastapi import APIRouter, HTTPException, Query, Response
from fastapi.responses import FileResponse from fastapi.responses import FileResponse
from ..media_catalog import published_assets, published_file from ..media_catalog import KNOWN_MEDIA_ROLES, media_manifest_version, published_assets, published_file
router = APIRouter() router = APIRouter()
@router.get("/api/v1/media/catalog") @router.get("/api/v1/media/catalog")
def media_catalog(entity_type: str | None = Query(None, pattern="^(fish|waterbody|tackle|reference)$")) -> list[dict]: def media_catalog(
return published_assets(entity_type) response: Response,
entity_type: str | None = Query(None, pattern="^(fish|waterbody|tackle|reference)$"),
media_role: str | None = Query(None, pattern="^(waterbody_cover|waterbody_map|waterbody_depth_map|waterbody_screenshot|tackle_card|tackle_detail|rig_diagram|tackle_screenshot)$"),
) -> list[dict]:
if media_role and entity_type not in {"waterbody", "tackle"}:
raise HTTPException(status_code=422, detail="media_role requires waterbody or tackle entity_type")
if media_role and media_role not in KNOWN_MEDIA_ROLES:
raise HTTPException(status_code=422, detail="unknown media role")
response.headers["Cache-Control"] = "public, max-age=60, stale-while-revalidate=60"
response.headers["X-Media-Manifest-Version"] = str(media_manifest_version())
return published_assets(entity_type, media_role)
@router.get("/api/v1/media/assets/{digest}", response_class=FileResponse) @router.get("/api/v1/media/assets/{digest}", response_class=FileResponse)
+9 -2
View File
@@ -1,13 +1,14 @@
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from fastapi import APIRouter, Query from fastapi import APIRouter, HTTPException, Query
from sqlalchemy import func, select from sqlalchemy import func, or_, select
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload
from ..config import settings from ..config import settings
from ..dependencies import Db from ..dependencies import Db
from ..models import ( from ..models import (
CatchReport, CatchReport,
Bait,
CommunityImportRun, CommunityImportRun,
DataSource, DataSource,
ExternalObservation, ExternalObservation,
@@ -117,9 +118,12 @@ def records(
fish: str | None = None, fish: str | None = None,
waterbody: str | None = None, waterbody: str | None = None,
category: str | None = None, category: str | None = None,
q: str | None = None,
limit: int = Query(50, ge=1, le=100), limit: int = Query(50, ge=1, le=100),
offset: int = Query(0, ge=0), offset: int = Query(0, ge=0),
) -> PaginatedOfficialRecordOut: ) -> PaginatedOfficialRecordOut:
if q is not None and len(q) > 100:
raise HTTPException(status_code=422, detail="record search query is too long")
query = select(CatchReport).options( query = select(CatchReport).options(
joinedload(CatchReport.fish), joinedload(CatchReport.fish),
joinedload(CatchReport.waterbody), joinedload(CatchReport.waterbody),
@@ -131,6 +135,9 @@ def records(
query = query.join(CatchReport.waterbody).where(Waterbody.slug == waterbody) query = query.join(CatchReport.waterbody).where(Waterbody.slug == waterbody)
if category: if category:
query = query.where(CatchReport.raw_payload["category"].as_string() == category) query = query.where(CatchReport.raw_payload["category"].as_string() == category)
if q and q.strip():
needle = f"%{q.strip()}%"
query = query.outerjoin(Bait, CatchReport.bait_id == Bait.id).where(or_(CatchReport.player_name.ilike(needle), Bait.name.ilike(needle)))
total = db.scalar( total = db.scalar(
query.with_only_columns(func.count(CatchReport.id), maintain_column_froms=True).order_by(None) query.with_only_columns(func.count(CatchReport.id), maintain_column_froms=True).order_by(None)
) or 0 ) or 0
+63 -22
View File
@@ -19,7 +19,7 @@ from ..dependencies import Db
from ..importer import normalize from ..importer import normalize
from ..models import Bait, BaitKind, CatchReport, Fish, ModerationStatus, SourceType, Spot, SubmissionAttempt, Waterbody from ..models import Bait, BaitKind, CatchReport, Fish, ModerationStatus, SourceType, Spot, SubmissionAttempt, Waterbody
from ..schemas import CatchReportAccepted, CatchReportCreate from ..schemas import CatchReportAccepted, CatchReportCreate
from ..storage import ScreenshotError, upload_screenshot from ..storage import ScreenshotError, delete_screenshot, upload_screenshot
from ..submission_security import check_rate_limit from ..submission_security import check_rate_limit
from ..tackle_components import replace_tackle_components from ..tackle_components import replace_tackle_components
from rf4_research.gear_components import from_catch_fields from rf4_research.gear_components import from_catch_fields
@@ -39,25 +39,14 @@ def create_catch_report(payload: CatchReportCreate, request: Request, db: Db, id
db.expire_all() db.expire_all()
existing = db.scalar(select(SubmissionAttempt).where(SubmissionAttempt.idempotency_key == key_hash, SubmissionAttempt.created_at >= cutoff)) existing = db.scalar(select(SubmissionAttempt).where(SubmissionAttempt.idempotency_key == key_hash, SubmissionAttempt.created_at >= cutoff))
if existing is not None: if existing is not None:
logger.info("idempotent hit", extra={"idempotency_key": idempotency_key[:8]}) return _replay_existing(existing, payload_hash, key_hash, cutoff)
if existing.payload_hash and not hmac.compare_digest(existing.payload_hash, payload_hash):
raise HTTPException(status_code=409, detail="Idempotency-Key was already used with different payload")
if existing.catch_report is None:
raise HTTPException(status_code=409, detail="idempotency record is incomplete; retry with a new key")
replay_token = _replay_token(key_hash)
if not hmac.compare_digest(hashlib.sha256(replay_token.encode()).hexdigest(), existing.catch_report.screenshot_upload_token_hash or ""):
raise HTTPException(status_code=409, detail="idempotency record token mismatch; retry with a new key")
return JSONResponse(status_code=200, content=_accepted(existing.catch_report, replay_token, True))
logger.info("idempotency check miss", extra={"idempotency_key": idempotency_key[:8]}) logger.info("idempotency check miss", extra={"idempotency_key": idempotency_key[:8]})
check_rate_limit(request, db, settings) check_rate_limit(request, db, settings)
fish = db.scalar(select(Fish).where(Fish.slug == payload.fish_slug)) fish = db.scalar(select(Fish).where(Fish.slug == payload.fish_slug))
waterbody = db.scalar(select(Waterbody).where(Waterbody.slug == payload.waterbody_slug)) waterbody = db.scalar(select(Waterbody).where(Waterbody.slug == payload.waterbody_slug))
if fish is None or waterbody is None: if fish is None or waterbody is None:
raise HTTPException(status_code=422, detail="unknown fish or waterbody") raise HTTPException(status_code=422, detail="unknown fish or waterbody")
spot = db.scalar(select(Spot).where(Spot.waterbody_id == waterbody.id, Spot.x == payload.x, Spot.y == payload.y)) spot = _spot(db, waterbody, payload.x, payload.y)
if spot is None:
spot = Spot(waterbody=waterbody, x=payload.x, y=payload.y)
db.add(spot)
bait = _bait(db, payload.bait_name) bait = _bait(db, payload.bait_name)
upload_token = _replay_token(key_hash) if key_hash else secrets.token_urlsafe(32) upload_token = _replay_token(key_hash) if key_hash else secrets.token_urlsafe(32)
report = CatchReport(fish=fish, spot=spot, waterbody=waterbody, bait=bait, weight_g=payload.weight_g, fishing_method=payload.fishing_method, rig_type=payload.rig_type, retrieve_method=payload.retrieve_method, retrieve_speed=payload.retrieve_speed, caught_at=payload.caught_at, reported_at=datetime.now(timezone.utc), player_name=payload.player_name, source_type=SourceType.user, source_url=payload.source_url, source_confidence=60, moderation_status=ModerationStatus.pending, raw_payload={"comment": payload.comment} if payload.comment else None, screenshot_upload_token_hash=hashlib.sha256(upload_token.encode()).hexdigest()) report = CatchReport(fish=fish, spot=spot, waterbody=waterbody, bait=bait, weight_g=payload.weight_g, fishing_method=payload.fishing_method, rig_type=payload.rig_type, retrieve_method=payload.retrieve_method, retrieve_speed=payload.retrieve_speed, caught_at=payload.caught_at, reported_at=datetime.now(timezone.utc), player_name=payload.player_name, source_type=SourceType.user, source_url=payload.source_url, source_confidence=60, moderation_status=ModerationStatus.pending, raw_payload={"comment": payload.comment} if payload.comment else None, screenshot_upload_token_hash=hashlib.sha256(upload_token.encode()).hexdigest())
@@ -77,8 +66,8 @@ def create_catch_report(payload: CatchReportCreate, request: Request, db: Db, id
except IntegrityError: except IntegrityError:
db.rollback() db.rollback()
winner = db.scalar(select(SubmissionAttempt).where(SubmissionAttempt.idempotency_key == key_hash)) winner = db.scalar(select(SubmissionAttempt).where(SubmissionAttempt.idempotency_key == key_hash))
if winner and winner.catch_report: if winner is not None:
return JSONResponse(status_code=200, content=_accepted(winner.catch_report, _replay_token(key_hash), True)) return _replay_existing(winner, payload_hash, key_hash, cutoff)
raise raise
logger.info("idempotency key stored", extra={"idempotency_key": idempotency_key[:8]}) logger.info("idempotency key stored", extra={"idempotency_key": idempotency_key[:8]})
else: else:
@@ -88,21 +77,31 @@ def create_catch_report(payload: CatchReportCreate, request: Request, db: Db, id
@router.post("/api/v1/catch-reports/{report_id}/screenshot", status_code=204, response_class=Response) @router.post("/api/v1/catch-reports/{report_id}/screenshot", status_code=204, response_class=Response)
def add_screenshot(report_id: UUID, db: Db, screenshot: UploadFile = File(), upload_token: Annotated[str | None, Header(alias="X-Upload-Token")] = None) -> Response: def add_screenshot(report_id: UUID, db: Db, screenshot: UploadFile = File(), upload_token: Annotated[str | None, Header(alias="X-Upload-Token")] = None) -> Response:
report = db.get(CatchReport, report_id) report_query = select(CatchReport).where(CatchReport.id == report_id)
if db.bind is not None and db.bind.dialect.name == "postgresql":
report_query = report_query.with_for_update()
report = db.scalar(report_query)
if report is None or report.source_type != SourceType.user or report.moderation_status != ModerationStatus.pending: if report is None or report.source_type != SourceType.user or report.moderation_status != ModerationStatus.pending:
raise HTTPException(status_code=404, detail="pending catch report not found") raise HTTPException(status_code=404, detail="pending catch report not found")
supplied_hash = hashlib.sha256((upload_token or "").encode()).hexdigest() supplied_hash = hashlib.sha256((upload_token or "").encode()).hexdigest()
if not report.screenshot_upload_token_hash or not hmac.compare_digest(report.screenshot_upload_token_hash, supplied_hash): if not report.screenshot_upload_token_hash or not hmac.compare_digest(report.screenshot_upload_token_hash, supplied_hash):
raise HTTPException(status_code=401, detail="invalid screenshot upload token") raise HTTPException(status_code=401, detail="invalid screenshot upload token")
if report.screenshot_key: if report.screenshot_key:
raise HTTPException(status_code=409, detail="screenshot already uploaded") return Response(status_code=204)
raw = screenshot.file.read(settings.screenshot_max_bytes + 1) raw = screenshot.file.read(settings.screenshot_max_bytes + 1)
try: try:
report.screenshot_key = upload_screenshot(raw, filename=screenshot.filename, content_type=screenshot.content_type) report.screenshot_key = upload_screenshot(raw, filename=screenshot.filename, content_type=screenshot.content_type)
except ScreenshotError as exc: except ScreenshotError as exc:
raise HTTPException(status_code=422, detail=str(exc)) from exc raise HTTPException(status_code=422, detail=str(exc)) from exc
report.screenshot_upload_token_hash = None try:
db.commit() db.commit()
except Exception as exc:
db.rollback()
try:
delete_screenshot(report.screenshot_key)
except Exception:
logger.exception("failed to remove orphaned screenshot", extra={"screenshot_key": report.screenshot_key})
raise HTTPException(status_code=503, detail="screenshot could not be saved; please retry") from exc
return Response(status_code=204) return Response(status_code=204)
@@ -114,12 +113,54 @@ def _accepted(report: CatchReport, token: str, idempotent: bool) -> dict[str, ob
return {"id": str(report.id), "moderation_status": report.moderation_status.value, "screenshot_upload_token": token, "idempotent": idempotent} return {"id": str(report.id), "moderation_status": report.moderation_status.value, "screenshot_upload_token": token, "idempotent": idempotent}
def _replay_existing(existing: SubmissionAttempt, payload_hash: str, key_hash: str, cutoff: datetime) -> JSONResponse:
logger.info("idempotent hit", extra={"idempotency_key": key_hash[:8]})
created_at = existing.created_at if existing.created_at.tzinfo else existing.created_at.replace(tzinfo=timezone.utc)
if created_at < cutoff:
raise HTTPException(status_code=409, detail="Idempotency-Key has expired; retry with a new key")
if existing.payload_hash and not hmac.compare_digest(existing.payload_hash, payload_hash):
raise HTTPException(status_code=409, detail="Idempotency-Key was already used with different payload")
if existing.catch_report is None:
raise HTTPException(status_code=409, detail="idempotency record is incomplete; retry with a new key")
replay_token = _replay_token(key_hash)
if existing.catch_report.screenshot_key is None:
if not hmac.compare_digest(hashlib.sha256(replay_token.encode()).hexdigest(), existing.catch_report.screenshot_upload_token_hash or ""):
raise HTTPException(status_code=409, detail="idempotency record token mismatch; retry with a new key")
return JSONResponse(status_code=200, content=_accepted(existing.catch_report, replay_token, True))
def _spot(db: Db, waterbody: Waterbody, x: int, y: int) -> Spot:
spot = db.scalar(select(Spot).where(Spot.waterbody_id == waterbody.id, Spot.x == x, Spot.y == y))
if spot is not None:
return spot
candidate = Spot(waterbody=waterbody, x=x, y=y)
try:
with db.begin_nested():
db.add(candidate)
db.flush()
return candidate
except IntegrityError:
winner = db.scalar(select(Spot).where(Spot.waterbody_id == waterbody.id, Spot.x == x, Spot.y == y))
if winner is None:
raise
return winner
def _bait(db: Db, value: str | None) -> Bait | None: def _bait(db: Db, value: str | None) -> Bait | None:
if not value or not value.strip(): if not value or not value.strip():
return None return None
key = normalize(value) key = normalize(value)
bait = db.scalar(select(Bait).where(Bait.normalized_name == key)) bait = db.scalar(select(Bait).where(Bait.normalized_name == key))
if bait is None: if bait is not None:
bait = Bait(name=value.strip(), normalized_name=key, kind=BaitKind.unknown)
db.add(bait)
return bait return bait
candidate = Bait(name=value.strip(), normalized_name=key, kind=BaitKind.unknown)
try:
with db.begin_nested():
db.add(candidate)
db.flush()
return candidate
except IntegrityError:
winner = db.scalar(select(Bait).where(Bait.normalized_name == key))
if winner is None:
raise
return winner
+112 -2
View File
@@ -40,6 +40,14 @@ class BaitOut(BaseModel):
kind: str kind: str
class TackleItemRigOut(BaseModel):
id: UUID
name: str
source_system: str | None
source_checked_at: datetime | None
component_count: int
class TackleItemOut(BaseModel): class TackleItemOut(BaseModel):
model_config = ConfigDict(from_attributes=True) model_config = ConfigDict(from_attributes=True)
id: UUID id: UUID
@@ -54,6 +62,7 @@ class TackleItemOut(BaseModel):
source_url: str | None source_url: str | None
source_checked_at: datetime | None source_checked_at: datetime | None
missing_fields: list[str] = Field(default_factory=list) missing_fields: list[str] = Field(default_factory=list)
related_rigs: list[TackleItemRigOut] = Field(default_factory=list)
class PaginatedTackleItemOut(BaseModel): class PaginatedTackleItemOut(BaseModel):
@@ -63,6 +72,24 @@ class PaginatedTackleItemOut(BaseModel):
offset: int offset: int
class RigSummaryOut(BaseModel):
id: UUID
name: str
source_system: str | None
source_external_id: str | None
source_url: str | None
source_checked_at: datetime | None
missing_fields: list[str] = Field(default_factory=list)
component_count: int
class PaginatedRigOut(BaseModel):
items: list[RigSummaryOut]
total: int
limit: int
offset: int
class RigComponentOut(BaseModel): class RigComponentOut(BaseModel):
id: UUID id: UUID
role: str role: str
@@ -102,6 +129,7 @@ class ActivityOut(BaseModel):
sources: list[str] sources: list[str]
coordinate_precision: str coordinate_precision: str
coordinate_sources: list[str] coordinate_sources: list[str]
source_conflicts: list[str] = Field(default_factory=list)
class PaginatedActivityOut(BaseModel): class PaginatedActivityOut(BaseModel):
@@ -114,9 +142,12 @@ class PaginatedActivityOut(BaseModel):
class TackleCombinationOut(BaseModel): class TackleCombinationOut(BaseModel):
role: str role: str
value: str value: str
tackle_item_id: UUID | None = None
rig_id: UUID | None = None
catches: int catches: int
unique_players: int unique_players: int
last_seen_at: datetime last_seen_at: datetime
freshness_score: int = Field(ge=0, le=100)
status: str status: str
explanation: str explanation: str
@@ -129,6 +160,7 @@ class CatchOut(BaseModel):
player_name: str | None player_name: str | None
caught_at: datetime | None caught_at: datetime | None
reported_at: datetime reported_at: datetime
fishing_method: str | None
retrieve_method: str | None retrieve_method: str | None
retrieve_speed: int | None retrieve_speed: int | None
source_system: str source_system: str
@@ -160,6 +192,7 @@ class SpotOut(BaseModel):
top_baits: list[str] top_baits: list[str]
coordinate_precision: str coordinate_precision: str
coordinate_sources: list[str] coordinate_sources: list[str]
source_conflicts: list[str] = Field(default_factory=list)
class OfficialRecordOut(BaseModel): class OfficialRecordOut(BaseModel):
@@ -293,6 +326,28 @@ class ModerationUpdate(BaseModel):
return value return value
class ModerationBulkItem(BaseModel):
id: UUID
expected_version: int = Field(ge=0)
class ModerationBulkUpdate(BaseModel):
status: str
reason: str | None = Field(default=None, max_length=1000)
items: list[ModerationBulkItem] = Field(min_length=1, max_length=50)
@field_validator("status")
@classmethod
def known_bulk_status(cls, value: str) -> str:
if value not in {"approved", "rejected", "pending"}:
raise ValueError("unknown moderation status")
return value
class ModerationBulkResult(BaseModel):
updated: int
class ExternalObservationOut(BaseModel): class ExternalObservationOut(BaseModel):
id: UUID id: UUID
source_system: str source_system: str
@@ -348,6 +403,31 @@ class ExternalObservationDecision(BaseModel):
expected_version: int = Field(ge=0) expected_version: int = Field(ge=0)
class ExternalObservationBulkItem(BaseModel):
id: UUID
expected_version: int = Field(ge=0)
class ExternalObservationBulkDecision(BaseModel):
reason: str = Field(min_length=1, max_length=1000)
items: list[ExternalObservationBulkItem] = Field(min_length=1, max_length=50)
class ExternalObservationBulkAction(BaseModel):
items: list[ExternalObservationBulkItem] = Field(min_length=1, max_length=50)
class ExternalObservationBulkMapping(BaseModel):
fish_slug: str
waterbody_slug: str
note: str | None = Field(default=None, max_length=1000)
items: list[ExternalObservationBulkItem] = Field(min_length=1, max_length=50)
class ExternalObservationBulkResult(BaseModel):
updated: int
class ExternalObservationAction(BaseModel): class ExternalObservationAction(BaseModel):
expected_version: int = Field(ge=0) expected_version: int = Field(ge=0)
@@ -406,7 +486,37 @@ class AdminMediaReviewOut(BaseModel):
class AdminMediaDecision(BaseModel): class AdminMediaDecision(BaseModel):
note: str = Field(min_length=1, max_length=1000) note: str = Field(min_length=1, max_length=1000)
asset_ids: list[str] = Field(min_length=1, max_length=500)
expected_version: int = Field(ge=1)
@field_validator("asset_ids")
@classmethod
def validate_asset_ids(cls, value: list[str]) -> list[str]:
if len(set(value)) != len(value) or any(len(item) != 64 or any(char not in "0123456789abcdef" for char in item) for item in value):
raise ValueError("asset_ids must contain unique SHA-256 ids")
return value
class AdminMediaRollback(AdminMediaDecision): class AdminMediaPreview(BaseModel):
asset_url: str = Field(min_length=1, max_length=2000) asset_ids: list[str] = Field(min_length=1, max_length=500)
expected_version: int | None = Field(default=None, ge=1)
@field_validator("asset_ids")
@classmethod
def validate_asset_ids(cls, value: list[str]) -> list[str]:
if len(set(value)) != len(value) or any(len(item) != 64 or any(char not in "0123456789abcdef" for char in item) for item in value):
raise ValueError("asset_ids must contain unique SHA-256 ids")
return value
class AdminMediaRollback(BaseModel):
note: str = Field(min_length=1, max_length=1000)
asset_id: str = Field(min_length=64, max_length=64)
expected_version: int = Field(ge=1)
@field_validator("asset_id")
@classmethod
def validate_asset_id(cls, value: str) -> str:
if any(char not in "0123456789abcdef" for char in value):
raise ValueError("asset_id must be a SHA-256 id")
return value
+3 -2
View File
@@ -47,8 +47,9 @@ def seed() -> None:
db.flush() db.flush()
return item return item
spot1 = spot(vyunok, "spot1", 110, 103, "Кромка травы у северного берега") spot_description = settings.seed_demo_data
spot2 = spot(kuori, "spot2", 85, 92, "Свальчик в глубину") spot1 = spot(vyunok, "spot1", 110, 103, "Кромка травы у северного берега" if spot_description else None)
spot2 = spot(kuori, "spot2", 85, 92, "Свальчик в глубину" if spot_description else None)
if not settings.seed_demo_data: if not settings.seed_demo_data:
return return
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
+1657 -10
View File
File diff suppressed because it is too large. Load diff
+11
View File
@@ -131,6 +131,17 @@ def test_reports_without_coordinates_do_not_create_activity_group(db: Session) -
assert activity_rows(db, hours=72, now=NOW) == [] assert activity_rows(db, hours=72, now=NOW) == []
@pytest.mark.parametrize("precision", ["exact", "approximate", "area", "missing"])
def test_coordinate_precision_is_preserved_in_activity_evidence(db: Session, precision: str) -> None:
report = add_report(db, age_hours=1)
report.raw_payload = {"provenance": {"coordinate_precision": precision}}
db.commit()
row = activity_rows(db, hours=24, now=NOW)[0]
assert row.coordinate_precision == precision
def test_confidence_capped_at_50_with_single_player() -> None: def test_confidence_capped_at_50_with_single_player() -> None:
"""D06: One player cannot artificially inflate confidence above 50%.""" """D06: One player cannot artificially inflate confidence above 50%."""
engine = create_engine("sqlite://", connect_args={"check_same_thread": False}, poolclass=StaticPool) engine = create_engine("sqlite://", connect_args={"check_same_thread": False}, poolclass=StaticPool)
+46
View File
@@ -6,6 +6,7 @@ from sqlalchemy.orm import Session
from app.database import Base from app.database import Base
from app.models import CatchReport, CatchTackleComponent, Fish, ModerationStatus, SourceType, Spot, Waterbody from app.models import CatchReport, CatchTackleComponent, Fish, ModerationStatus, SourceType, Spot, Waterbody
from app.routers.analytics import tackle_combinations from app.routers.analytics import tackle_combinations
from app.schemas import TackleCombinationOut
def test_tackle_recommendation_requires_samples_and_independent_players() -> None: def test_tackle_recommendation_requires_samples_and_independent_players() -> None:
@@ -69,3 +70,48 @@ def test_tackle_analytics_handles_empty_and_multicomponent_observations() -> Non
assert tackle_combinations(db, waterbody="missing", fish=None, method=None, hours=72) == [] assert tackle_combinations(db, waterbody="missing", fish=None, method=None, hours=72) == []
engine.dispose() engine.dispose()
def test_tackle_analytics_exposes_decay_and_prefers_fresher_equal_samples() -> None:
now = datetime.now(timezone.utc)
engine = create_engine("sqlite://")
Base.metadata.create_all(engine)
with Session(engine) as db:
waterbody = Waterbody(slug="decay-check", name_ru="Свежесть", unlock_level=1)
fish = Fish(slug="pike", name_ru="Щука", trophy_weight_g=10_000)
spot = Spot(waterbody=waterbody, x=3, y=4)
db.add_all([waterbody, fish, spot])
db.flush()
for value, age in (("Fresh spinner", 1), ("Old spinner", 48)):
for index, player in enumerate(("One", "One", "Two")):
report = CatchReport(
fish=fish, waterbody=waterbody, spot=spot, weight_g=1000,
caught_at=now - timedelta(hours=age), reported_at=now - timedelta(hours=age),
player_name=player, source_type=SourceType.user, source_confidence=80,
moderation_status=ModerationStatus.approved,
)
report.tackle_components.append(CatchTackleComponent(role="lure", position=index, raw_value=value))
db.add(report)
db.commit()
rows = tackle_combinations(db, waterbody="decay-check", fish="pike", method=None, hours=72, min_samples=3, min_players=2)
assert [row.value for row in rows] == ["Fresh spinner", "Old spinner"]
assert rows[0].freshness_score > rows[1].freshness_score
assert rows[0].freshness_score <= 100
engine.dispose()
def test_tackle_freshness_score_contract_rejects_out_of_range_values() -> None:
base = {
"role": "lure", "value": "Spinner", "catches": 3, "unique_players": 2,
"last_seen_at": datetime.now(timezone.utc), "status": "recommendation", "explanation": "ok",
}
assert TackleCombinationOut(**base, freshness_score=0).freshness_score == 0
assert TackleCombinationOut(**base, freshness_score=100).freshness_score == 100
for value in (-1, 101):
try:
TackleCombinationOut(**base, freshness_score=value)
except ValueError:
continue
raise AssertionError(f"freshness score {value} was accepted")
+96 -11
View File
@@ -55,11 +55,26 @@ def test_activity_filters_and_explains_score() -> None:
assert payload["items"][0]["unique_players"] == 3 assert payload["items"][0]["unique_players"] == 3
assert "3 свежих улова" in payload["items"][0]["explanation"] assert "3 свежих улова" in payload["items"][0]["explanation"]
assert payload["items"][0]["sources"] == ["manual-import"] assert payload["items"][0]["sources"] == ["manual-import"]
assert payload["items"][0]["source_conflicts"] == []
def test_explicit_source_conflict_is_exposed_on_activity_and_spot() -> None:
with Session(engine) as db:
report = db.scalar(select(CatchReport).where(CatchReport.waterbody.has(slug="test-lake")))
assert report is not None
report.raw_payload = {"provenance": {"conflicts": ["координаты: 10:20 · 11:21"]}}
spot_id = report.spot_id
db.commit()
activity = client.get("/api/v1/activity?waterbody=test-lake&fish=pike&hours=6").json()
assert activity["items"][0]["source_conflicts"] == ["координаты: 10:20 · 11:21"]
spot = client.get(f"/api/v1/spots/{spot_id}").json()
assert spot["source_conflicts"] == ["координаты: 10:20 · 11:21"]
def test_waterbody_catalog_exposes_nullable_source_provenance() -> None: def test_waterbody_catalog_exposes_nullable_source_provenance() -> None:
response = client.get("/api/v1/waterbodies") response = client.get("/api/v1/waterbodies")
assert response.status_code == 200 assert response.status_code == 200
assert response.headers["cache-control"] == "public, max-age=60, stale-while-revalidate=60"
item = next(row for row in response.json() if row["slug"] == "test-lake") item = next(row for row in response.json() if row["slug"] == "test-lake")
assert item["source_system"] is None assert item["source_system"] is None
assert item["source_external_id"] is None assert item["source_external_id"] is None
@@ -88,6 +103,12 @@ def test_published_media_catalog_and_content_addressed_file() -> None:
assert client.get("/api/v1/media/assets/not-a-hash").status_code == 404 assert client.get("/api/v1/media/assets/not-a-hash").status_code == 404
def test_published_media_catalog_exposes_reviewed_media_role() -> None:
catalog = client.get("/api/v1/media/catalog?entity_type=fish")
assert catalog.status_code == 200
assert all("media_role" in item for item in catalog.json())
def test_review_queue_filters_before_pagination() -> None: def test_review_queue_filters_before_pagination() -> None:
with Session(engine) as db: with Session(engine) as db:
stage_observations(db, [{ stage_observations(db, [{
@@ -187,29 +208,39 @@ def test_admin_media_review_requires_auth() -> None:
def test_admin_media_decisions_require_auth_and_note(monkeypatch) -> None: def test_admin_media_decisions_require_auth_and_note(monkeypatch) -> None:
assert client.post("/api/v1/admin/media/upgrades/publish", json={"note": "publish"}).status_code == 401 decision = {"asset_ids": ["a" * 64], "expected_version": 1, "note": "publish"}
assert client.post("/api/v1/admin/media/upgrades/rollback", json={"asset_url": "https://example.test/a", "note": "rollback"}).status_code == 401 assert client.post("/api/v1/admin/media/upgrades/publish", json=decision).status_code == 401
assert client.post("/api/v1/admin/media/upgrades/rollback", json={"asset_id": "a" * 64, "expected_version": 1, "note": "rollback"}).status_code == 401
monkeypatch.setattr(admin_router, "publish_quality_upgrades", lambda path, note: {"published": 2, "retained_fallbacks": 2}) monkeypatch.setattr(admin_router, "preview_quality_upgrades", lambda path, asset_ids, expected_version: {"manifest_version": expected_version or 1, "assets": [{"id": asset_ids[0]}]})
preview = client.post(
"/api/v1/admin/media/upgrades/preview",
json={"asset_ids": ["a" * 64], "expected_version": 2},
headers={"Authorization": "Bearer change-me-in-production"},
)
assert preview.status_code == 200
assert preview.json()["manifest_version"] == 2
monkeypatch.setattr(admin_router, "publish_quality_upgrades", lambda path, note, asset_ids, expected_version: {"published": 2, "retained_fallbacks": 2, "manifest_version": expected_version + 1})
publish = client.post( publish = client.post(
"/api/v1/admin/media/upgrades/publish", "/api/v1/admin/media/upgrades/publish",
json={"note": "visual review complete"}, json={"asset_ids": ["a" * 64], "expected_version": 3, "note": "visual review complete"},
headers={"Authorization": "Bearer change-me-in-production"}, headers={"Authorization": "Bearer change-me-in-production"},
) )
assert publish.status_code == 200 assert publish.status_code == 200
assert publish.json() == {"published": 2, "retained_fallbacks": 2} assert publish.json() == {"published": 2, "retained_fallbacks": 2, "manifest_version": 4}
monkeypatch.setattr(admin_router, "rollback_quality_upgrade", lambda path, asset_url, note: {"rolled_back": asset_url, "restored": "https://example.test/fallback"}) monkeypatch.setattr(admin_router, "rollback_quality_upgrade", lambda path, asset_id, note, expected_version: {"rolled_back": asset_id, "restored": "https://example.test/fallback", "manifest_version": expected_version + 1})
rollback = client.post( rollback = client.post(
"/api/v1/admin/media/upgrades/rollback", "/api/v1/admin/media/upgrades/rollback",
json={"asset_url": "https://example.test/a", "note": "fallback is preferred"}, json={"asset_id": "a" * 64, "expected_version": 4, "note": "fallback is preferred"},
headers={"Authorization": "Bearer change-me-in-production"}, headers={"Authorization": "Bearer change-me-in-production"},
) )
assert rollback.status_code == 200 assert rollback.status_code == 200
assert rollback.json()["rolled_back"] == "https://example.test/a" assert rollback.json()["rolled_back"] == "a" * 64
assert client.post( assert client.post(
"/api/v1/admin/media/upgrades/publish", "/api/v1/admin/media/upgrades/publish",
json={"note": ""}, json={"asset_ids": ["a" * 64], "expected_version": 1, "note": ""},
headers={"Authorization": "Bearer change-me-in-production"}, headers={"Authorization": "Bearer change-me-in-production"},
).status_code == 422 ).status_code == 422
@@ -255,6 +286,12 @@ def test_spot_detail_and_catches() -> None:
assert catches.status_code == 200 assert catches.status_code == 200
assert len(catches.json()) == 3 assert len(catches.json()) == 3
assert catches.json()[0]["source_system"] == "manual-import" assert catches.json()[0]["source_system"] == "manual-import"
assert catches.json()[0]["fishing_method"] == "spinning"
assert catches.json()[0]["tackle_components"] == []
fixture = client.get("/api/v1/spots/resolve?waterbody=test-lake&x=10&y=20")
assert fixture.status_code == 200
fixture_catches = client.get(f"/api/v1/spots/{fixture.json()['id']}/catches")
assert fixture_catches.json()[0]["fishing_method"] == "spinning"
resolved = client.get("/api/v1/spots/resolve?waterbody=test-lake&x=10&y=20") resolved = client.get("/api/v1/spots/resolve?waterbody=test-lake&x=10&y=20")
assert resolved.status_code == 200 assert resolved.status_code == 200
assert resolved.json()["id"] == spot_id assert resolved.json()["id"] == spot_id
@@ -492,14 +529,62 @@ def test_admin_can_start_and_list_official_import(monkeypatch) -> None:
def test_pending_report_accepts_one_validated_screenshot(monkeypatch) -> None: def test_pending_report_accepts_one_validated_screenshot(monkeypatch) -> None:
created = client.post("/api/v1/catch-reports", json={"fish_slug": "pike", "waterbody_slug": "test-lake", "x": 91, "y": 92, "weight_g": 4200}).json() created = client.post("/api/v1/catch-reports", json={"fish_slug": "pike", "waterbody_slug": "test-lake", "x": 91, "y": 92, "weight_g": 4200}).json()
monkeypatch.setattr("app.routers.submissions.upload_screenshot", lambda raw, **metadata: "reports/test.jpg" if raw == b"image-bytes" and metadata == {"filename": "catch.jpg", "content_type": "image/jpeg"} else "unexpected") uploaded: list[bytes] = []
def fake_upload(raw, **metadata):
if raw == b"image-bytes" and metadata == {"filename": "catch.jpg", "content_type": "image/jpeg"}:
uploaded.append(raw)
return "reports/test.jpg"
return "unexpected"
monkeypatch.setattr("app.routers.submissions.upload_screenshot", fake_upload)
upload_url = f"/api/v1/catch-reports/{created['id']}/screenshot" upload_url = f"/api/v1/catch-reports/{created['id']}/screenshot"
assert client.post(upload_url, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")}).status_code == 401 assert client.post(upload_url, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")}).status_code == 401
assert client.post(upload_url, headers={"X-Upload-Token": "wrong"}, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")}).status_code == 401 assert client.post(upload_url, headers={"X-Upload-Token": "wrong"}, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")}).status_code == 401
response = client.post(upload_url, headers={"X-Upload-Token": created["screenshot_upload_token"]}, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")}) response = client.post(upload_url, headers={"X-Upload-Token": created["screenshot_upload_token"]}, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")})
assert response.status_code == 204 assert response.status_code == 204
reused = client.post(upload_url, headers={"X-Upload-Token": created["screenshot_upload_token"]}, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")}) reused = client.post(upload_url, headers={"X-Upload-Token": created["screenshot_upload_token"]}, files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")})
assert reused.status_code == 401 assert reused.status_code == 204
assert uploaded == [b"image-bytes"]
def test_idempotency_replay_survives_completed_screenshot(monkeypatch) -> None:
import uuid
monkeypatch.setattr("app.routers.submissions.check_rate_limit", lambda *args, **kwargs: None)
key = f"idem-upload-{uuid.uuid4().hex}"
payload = {"fish_slug": "pike", "waterbody_slug": "test-lake", "x": 94, "y": 95, "weight_g": 4300}
created = client.post("/api/v1/catch-reports", json=payload, headers={"Idempotency-Key": key}).json()
monkeypatch.setattr("app.routers.submissions.upload_screenshot", lambda raw, **metadata: "reports/idempotent.jpg")
upload = client.post(
f"/api/v1/catch-reports/{created['id']}/screenshot",
headers={"X-Upload-Token": created["screenshot_upload_token"]},
files={"screenshot": ("catch.jpg", b"image-bytes", "image/jpeg")},
)
assert upload.status_code == 204
replay = client.post("/api/v1/catch-reports", json=payload, headers={"Idempotency-Key": key})
assert replay.status_code == 200
assert replay.json()["id"] == created["id"]
assert replay.json()["screenshot_upload_token"] == created["screenshot_upload_token"]
assert client.post("/api/v1/catch-reports", json=dict(payload, weight_g=4301), headers={"Idempotency-Key": key}).status_code == 409
def test_expired_idempotency_key_integrity_winner_is_not_replayed(monkeypatch) -> None:
import uuid
monkeypatch.setattr("app.routers.submissions.check_rate_limit", lambda *args, **kwargs: None)
key = f"idem-expired-{uuid.uuid4().hex}"
payload = {"fish_slug": "pike", "waterbody_slug": "test-lake", "x": 96, "y": 97, "weight_g": 4400}
created = client.post("/api/v1/catch-reports", json=payload, headers={"Idempotency-Key": key})
assert created.status_code == 201
with Session(engine) as db:
attempt = db.scalar(select(SubmissionAttempt).where(SubmissionAttempt.catch_report_id == UUID(created.json()["id"])))
assert attempt is not None
attempt.created_at = datetime.now(timezone.utc) - timedelta(minutes=6)
db.commit()
expired = client.post("/api/v1/catch-reports", json=payload, headers={"Idempotency-Key": key})
assert expired.status_code == 409
assert "expired" in expired.json()["detail"]
def test_admin_delete_anonymizes_report_removes_screenshot_and_keeps_audit(monkeypatch) -> None: def test_admin_delete_anonymizes_report_removes_screenshot_and_keeps_audit(monkeypatch) -> None:
+2
View File
@@ -18,6 +18,8 @@ def test_catalog_audit_checks_the_whole_catalog() -> None:
db.add(CatchReport(fish=fish, waterbody=water, spot=spot, weight_g=1000, reported_at=datetime.now(timezone.utc), source_type=SourceType.user, source_confidence=60, moderation_status=ModerationStatus.approved)) db.add(CatchReport(fish=fish, waterbody=water, spot=spot, weight_g=1000, reported_at=datetime.now(timezone.utc), source_type=SourceType.user, source_confidence=60, moderation_status=ModerationStatus.approved))
db.commit() db.commit()
assert audit_catalog(db)["failures"] == 0 assert audit_catalog(db)["failures"] == 0
assert audit_catalog(db)["approved_confirmed_reports"] == 1
assert audit_catalog(db)["demo_reports"] == 0
spot.x = 10_001 spot.x = 10_001
db.commit() db.commit()
result = audit_catalog(db) result = audit_catalog(db)
+50
View File
@@ -0,0 +1,50 @@
import json
from app import media_catalog
def test_public_media_catalog_rejects_unknown_and_cross_entity_roles(tmp_path, monkeypatch) -> None:
manifest = {
"assets": [
{"status": "approved", "sha256": "a" * 64, "local_path": "water.webp", "entity_type": "waterbody", "entity_key": "kuori", "media_role": "waterbody_map"},
{"status": "approved", "sha256": "b" * 64, "local_path": "wrong.webp", "entity_type": "waterbody", "entity_key": "kuori", "media_role": "tackle_card"},
{"status": "approved", "sha256": "c" * 64, "local_path": "unknown.webp", "entity_type": "tackle", "entity_key": "spiker", "media_role": "future_role"},
{"status": "approved", "sha256": "d" * 64, "local_path": "tackle.webp", "entity_type": "tackle", "entity_key": "spiker", "media_role": "tackle_card"},
],
}
(tmp_path / "manifest.json").write_text(json.dumps(manifest), encoding="utf-8")
monkeypatch.setattr(media_catalog, "MEDIA_ROOT", tmp_path)
rows = media_catalog.published_assets()
assert [row["id"] for row in rows] == ["d" * 64, "a" * 64]
def test_media_catalog_does_not_infer_official_source_from_url_substrings(tmp_path, monkeypatch) -> None:
manifest = {"assets": [
{"status": "approved", "sha256": "e" * 64, "local_path": "asset.webp", "entity_type": "fish", "entity_key": "pike", "source_page": "https://rf4db.com.attacker.test/pike"},
{"status": "approved", "sha256": "f" * 64, "local_path": "asset2.webp", "entity_type": "fish", "entity_key": "pike", "source_page": "https://rf4db.com/ru/fish/pike"},
]}
(tmp_path / "manifest.json").write_text(json.dumps(manifest), encoding="utf-8")
monkeypatch.setattr(media_catalog, "MEDIA_ROOT", tmp_path)
rows = {row["id"]: row for row in media_catalog.published_assets()}
assert rows["e" * 64]["source_system"] == "unknown"
assert rows["f" * 64]["source_system"] == "rf4db"
def test_media_manifest_cache_invalidates_after_revision(tmp_path, monkeypatch) -> None:
manifest_path = tmp_path / "manifest.json"
manifest_path.write_text(json.dumps({"version": 1, "assets": [
{"status": "approved", "sha256": "a" * 64, "local_path": "one.webp", "entity_type": "fish", "entity_key": "pike"},
]}), encoding="utf-8")
monkeypatch.setattr(media_catalog, "MEDIA_ROOT", tmp_path)
assert [row["id"] for row in media_catalog.published_assets()] == ["a" * 64]
manifest_path.write_text(json.dumps({"version": 2, "assets": [
{"status": "approved", "sha256": "b" * 64, "local_path": "two.webp", "entity_type": "fish", "entity_key": "pike"},
]}), encoding="utf-8")
assert media_catalog.media_manifest_version() == 2
assert [row["id"] for row in media_catalog.published_assets()] == ["b" * 64]
+1
View File
@@ -25,3 +25,4 @@ def test_seed_repairs_partial_database_and_is_idempotent(monkeypatch) -> None:
assert db.scalar(select(func.count()).select_from(Waterbody)) == 2 assert db.scalar(select(func.count()).select_from(Waterbody)) == 2
assert db.scalar(select(func.count()).select_from(Spot)) == 2 assert db.scalar(select(func.count()).select_from(Spot)) == 2
assert db.scalar(select(func.count()).select_from(CatchReport)) == 0 assert db.scalar(select(func.count()).select_from(CatchReport)) == 0
assert all(spot.description is None for spot in db.scalars(select(Spot)))
+7 -6
View File
@@ -1,14 +1,14 @@
--- ---
import type { Activity } from "../lib/api"; import type { Activity } from "../lib/api";
import { activityLevel, ago, kg, plural, spotPath } from "../lib/api"; import { activityLevel, ago, coordinatePrecisionLabel, kg, spotPath } from "../lib/api";
import FishingIcon from "./FishingIcon.astro"; import FishingIcon from "./FishingIcon.astro";
import DataPassport from "./DataPassport.astro"; import DataPassport from "./DataPassport.astro";
import FishSilhouette from "./FishSilhouette.astro"; import FishSilhouette from "./FishSilhouette.astro";
import TackleGlyph from "./TackleGlyph.astro"; import TackleGlyph from "./TackleGlyph.astro";
const { item } = Astro.props as { item: Activity }; const { item, periodLabel = null } = Astro.props as { item: Activity; periodLabel?: string | null };
const level = activityLevel(item.activity_score); const level = activityLevel(item.activity_score);
const limited = item.catches < 3; const limited = item.catches < 3;
const precision = { exact: "точные", approximate: "приблизительные", area: "район", missing: "не указаны" }[item.coordinate_precision]; const precision = coordinatePrecisionLabel(item.coordinate_precision);
--- ---
<a class="spot-card" data-testid={`spot-${item.x}-${item.y}`} href={spotPath(item)}> <a class="spot-card" data-testid={`spot-${item.x}-${item.y}`} href={spotPath(item)}>
<span class="spot-rank">{String(item.activity_score).padStart(2,"0")}</span> <span class="spot-rank">{String(item.activity_score).padStart(2,"0")}</span>
@@ -18,8 +18,9 @@ const precision = { exact: "точные", approximate: "приблизител
<FishSilhouette name={item.fish}/> <FishSilhouette name={item.fish}/>
<div class="spot-meta"><span><FishingIcon name="pin" size={14}/> {item.x}:{item.y} · {precision}</span><span><FishingIcon name="clock" size={14}/> {ago(item.last_confirmed_at)}</span></div> <div class="spot-meta"><span><FishingIcon name="pin" size={14}/> {item.x}:{item.y} · {precision}</span><span><FishingIcon name="clock" size={14}/> {ago(item.last_confirmed_at)}</span></div>
<p class="data-note">{item.explanation}</p> <p class="data-note">{item.explanation}</p>
<DataPassport sources={item.sources} observedAt={item.last_confirmed_at} confidence={item.confidence_score}/> <DataPassport sources={item.sources} observedAt={item.last_confirmed_at} periodLabel={periodLabel} confidence={item.confidence_score} sampleSize={item.catches} independentPlayers={item.unique_players} coordinatePrecision={item.coordinate_precision} coordinateSources={item.coordinate_sources} sourceConflicts={item.source_conflicts} status={limited ? "insufficient" : "verified"}/>
<div class="bait-line"><TackleGlyph name={item.best_bait}/><div><span>Работает сейчас</span><strong>{item.best_bait ?? "не указана"}</strong></div></div> <div class="bait-line"><TackleGlyph name={item.best_bait}/><div><span>{limited ? "Нужно ещё подтверждений" : item.best_bait ? "Работает сейчас" : "Наживка не указана"}</span><strong>{item.best_bait ?? "не указана"}</strong></div></div>
<span class="card-cta">Открыть точку <span aria-hidden="true">→</span></span>
</div> </div>
<div class="spot-stats"><div><strong>{item.catches}</strong><span>{plural(item.catches, ["улов", "улова", "уловов"])}</span></div><div><strong>{item.unique_players}</strong><span>{plural(item.unique_players, ["игрок", "игрока", "игроков"])}</span></div><div><strong>{kg(item.average_weight_g)}</strong><span>средний вес</span></div><div><strong>{item.confidence_score}%</strong><span>уверенность</span></div></div><span class="card-arrow"><FishingIcon name="arrow" size={22}/></span> <div class="spot-stats"><div><strong>{kg(item.average_weight_g)}</strong><span>средний вес</span></div><div><strong>{kg(item.max_weight_g)}</strong><span>макс. вес</span></div></div><span class="card-arrow"><FishingIcon name="arrow" size={22}/></span>
</a> </a>
@@ -0,0 +1,26 @@
---
import DataPassport from "./DataPassport.astro";
import type { Activity } from "../lib/api";
const { items, totalPoints, periodLabel } = Astro.props as { items: Activity[]; totalPoints: number; periodLabel: string };
const sources = [...new Set(items.flatMap(item => item.sources))];
const conflicts = [...new Set(items.flatMap(item => item.source_conflicts))];
const observations = items.reduce((sum, item) => sum + item.catches, 0);
const confidence = items.length ? Math.round(items.reduce((sum, item) => sum + item.confidence_score, 0) / items.length) : null;
const observedAt = items.map(item => item.last_confirmed_at).filter(Boolean).sort().at(-1) ?? null;
const status = observations < 3 ? "insufficient" : "verified";
---
<section class="activity-evidence content-grid" aria-labelledby="activity-evidence-title">
<div>
<span class="overline">Доверие к выборке</span>
<h2 id="activity-evidence-title">Паспорт активности</h2>
<p>{totalPoints} {totalPoints === 1 ? "точка" : totalPoints < 5 ? "точки" : "точек"} за {periodLabel}. Сводка построена по подтверждённым карточкам этого списка.</p>
</div>
<DataPassport sources={sources} observedAt={observedAt} periodLabel={periodLabel} confidence={confidence} sampleSize={observations} sourceConflicts={conflicts} status={status} />
</section>
<style>
.activity-evidence { display: grid; grid-template-columns: minmax(0, 1fr) minmax(320px, 1.1fr); gap: 24px; align-items: start; margin-block: 26px; }
.activity-evidence h2 { margin: 6px 0 8px; }
.activity-evidence p { max-width: 470px; margin: 0; color: var(--text-muted); line-height: 1.6; }
@media (max-width: 720px) { .activity-evidence { grid-template-columns: 1fr; } }
</style>
+69
View File
@@ -0,0 +1,69 @@
---
import { spotPath, type Activity } from "../lib/api";
const { items } = Astro.props as { items: Activity[] };
const groups = [...items.reduce((result, item) => {
const group = result.get(item.waterbody_slug) ?? [];
group.push(item);
result.set(item.waterbody_slug, group);
return result;
}, new Map<string, Activity[]>()).values()];
const plotPoints = (group: Activity[]) => {
const minX = Math.min(...group.map(item => item.x), 0);
const maxX = Math.max(...group.map(item => item.x), 1);
const minY = Math.min(...group.map(item => item.y), 0);
const maxY = Math.max(...group.map(item => item.y), 1);
const xRange = Math.max(1, maxX - minX);
const yRange = Math.max(1, maxY - minY);
const occupied = new Set<string>();
return group.map(item => {
const targetColumn = Math.min(19, Math.max(2, Math.round(((item.x - minX) / xRange) * 16) + 2));
const targetRow = Math.min(19, Math.max(2, Math.round((1 - (item.y - minY) / yRange) * 16) + 2));
let column = targetColumn;
let row = targetRow;
for (let distance = 0; occupied.has(`${column}:${row}`) && distance < 20; distance += 1) {
column = ((targetColumn - 2 + distance + 1) % 18) + 2;
row = ((targetRow - 2 + Math.floor((distance + 1) / 18)) % 18) + 2;
}
occupied.add(`${column}:${row}`);
return { item, column, row };
});
};
---
<section class="activity-map" aria-label="Схема координат горячих точек">
<header class="activity-map__header">
<div><span class="overline">Режим схемы</span><h3>Горячие точки по водоёмам</h3></div>
<p>Для каждого водоёма своя координатная сетка `x:y`. Совпадающие точки разнесены, чтобы каждая оставалась доступной.</p>
</header>
{groups.map(group => <section class="activity-map__group" aria-labelledby={`activity-map-${group[0].waterbody_slug}`}>
<h4 id={`activity-map-${group[0].waterbody_slug}`}>{group[0].waterbody} <small>{group.length} {group.length === 1 ? "точка" : "точки"}</small></h4>
<div class="activity-map__plot" role="group" aria-label={`Координатная схема водоёма ${group[0].waterbody}, точек: ${group.length}`}>
<span class="activity-map__axis activity-map__axis--x" aria-hidden="true">x →</span>
<span class="activity-map__axis activity-map__axis--y" aria-hidden="true">y ↑</span>
{plotPoints(group).map(({ item, column, row }) => <a class:list={["activity-map__point", `activity-map__point--col-${column}`, `activity-map__point--row-${row}`]} href={spotPath(item)} aria-label={`${item.waterbody}, ${item.x}:${item.y}, ${item.fish}`} title={`${item.waterbody} · ${item.x}:${item.y} · ${item.fish}`}><span>{item.x}:{item.y}</span><strong>{item.fish}</strong></a>)}
</div>
</section>)}
</section>
<style>
.activity-map { display: grid; gap: 18px; }
.activity-map__header { display: flex; justify-content: space-between; gap: 22px; align-items: end; }
.activity-map__header h3 { margin: 6px 0 0; font: 400 27px Georgia, serif; letter-spacing: -.03em; }
.activity-map__header p { max-width: 330px; margin: 0; color: var(--text-muted); font-size: 12px; line-height: 1.5; }
.activity-map__group { display: grid; gap: 10px; }
.activity-map__group h4 { margin: 0; font: 400 21px Georgia, serif; }
.activity-map__group h4 small { margin-left: 8px; color: var(--text-muted); font: 700 10px Inter, sans-serif; text-transform: uppercase; letter-spacing: .08em; }
.activity-map__plot { position: relative; display: grid; grid-template-columns: repeat(20, minmax(0, 1fr)); grid-template-rows: repeat(20, minmax(0, 1fr)); min-height: 470px; overflow: hidden; border: 1px solid var(--border); border-radius: 20px; background: linear-gradient(90deg, color-mix(in srgb, var(--accent-muted) 8%, transparent) 1px, transparent 1px), linear-gradient(color-mix(in srgb, var(--accent-muted) 8%, transparent) 1px, transparent 1px), var(--surface-soft); background-size: 10% 10%; }
.activity-map__plot::after { content: ""; position: absolute; inset: 8%; border: 1px dashed color-mix(in srgb, var(--accent-muted) 40%, transparent); border-radius: 12px; pointer-events: none; }
.activity-map__axis { position: absolute; z-index: 1; color: var(--text-subtle); font-size: 10px; font-weight: 750; letter-spacing: .08em; text-transform: uppercase; }
.activity-map__axis--x { right: 5%; bottom: 3%; }
.activity-map__axis--y { left: 2%; top: 4%; writing-mode: vertical-rl; transform: rotate(180deg); }
.activity-map__point { position: relative; z-index: 2; display: grid; align-self: center; justify-self: center; gap: 3px; min-width: 74px; margin: 5px; padding: 8px 10px; border: 1px solid color-mix(in srgb, var(--accent-muted) 45%, var(--border)); border-radius: 12px; background: var(--surface); color: var(--text); text-decoration: none; box-shadow: 0 8px 18px color-mix(in srgb, var(--deep) 11%, transparent); }
.activity-map__point::before { content: ""; position: absolute; left: 50%; bottom: -6px; width: 10px; height: 10px; border-right: 1px solid color-mix(in srgb, var(--accent-muted) 45%, var(--border)); border-bottom: 1px solid color-mix(in srgb, var(--accent-muted) 45%, var(--border)); background: var(--surface); transform: translateX(-50%) rotate(45deg); }
.activity-map__point:hover, .activity-map__point:focus-visible { border-color: var(--focus); transform: scale(1.03); }
.activity-map__point span { color: var(--text-muted); font-size: 10px; font-weight: 750; }
.activity-map__point strong { max-width: 180px; overflow-wrap: anywhere; font-size: 12px; line-height: 1.2; }
:global(.activity-map__point--col-1) { grid-column: 1; } :global(.activity-map__point--col-2) { grid-column: 2; } :global(.activity-map__point--col-3) { grid-column: 3; } :global(.activity-map__point--col-4) { grid-column: 4; } :global(.activity-map__point--col-5) { grid-column: 5; } :global(.activity-map__point--col-6) { grid-column: 6; } :global(.activity-map__point--col-7) { grid-column: 7; } :global(.activity-map__point--col-8) { grid-column: 8; } :global(.activity-map__point--col-9) { grid-column: 9; } :global(.activity-map__point--col-10) { grid-column: 10; } :global(.activity-map__point--col-11) { grid-column: 11; } :global(.activity-map__point--col-12) { grid-column: 12; } :global(.activity-map__point--col-13) { grid-column: 13; } :global(.activity-map__point--col-14) { grid-column: 14; } :global(.activity-map__point--col-15) { grid-column: 15; } :global(.activity-map__point--col-16) { grid-column: 16; } :global(.activity-map__point--col-17) { grid-column: 17; } :global(.activity-map__point--col-18) { grid-column: 18; } :global(.activity-map__point--col-19) { grid-column: 19; } :global(.activity-map__point--col-20) { grid-column: 20; }
:global(.activity-map__point--row-1) { grid-row: 1; } :global(.activity-map__point--row-2) { grid-row: 2; } :global(.activity-map__point--row-3) { grid-row: 3; } :global(.activity-map__point--row-4) { grid-row: 4; } :global(.activity-map__point--row-5) { grid-row: 5; } :global(.activity-map__point--row-6) { grid-row: 6; } :global(.activity-map__point--row-7) { grid-row: 7; } :global(.activity-map__point--row-8) { grid-row: 8; } :global(.activity-map__point--row-9) { grid-row: 9; } :global(.activity-map__point--row-10) { grid-row: 10; } :global(.activity-map__point--row-11) { grid-row: 11; } :global(.activity-map__point--row-12) { grid-row: 12; } :global(.activity-map__point--row-13) { grid-row: 13; } :global(.activity-map__point--row-14) { grid-row: 14; } :global(.activity-map__point--row-15) { grid-row: 15; } :global(.activity-map__point--row-16) { grid-row: 16; } :global(.activity-map__point--row-17) { grid-row: 17; } :global(.activity-map__point--row-18) { grid-row: 18; } :global(.activity-map__point--row-19) { grid-row: 19; } :global(.activity-map__point--row-20) { grid-row: 20; }
@media (max-width: 720px) { .activity-map__header { display: grid; gap: 8px; align-items: start; } .activity-map__plot { min-height: 390px; } .activity-map__point { min-width: 62px; padding: 7px 8px; } .activity-map__point strong { max-width: 90px; } }
</style>
@@ -0,0 +1,8 @@
---
const { hours = "72" } = Astro.props as { hours?: string };
const options = [["24", "24 часа"], ["72", "72 часа"], ["168", "7 дней"]] as const;
---
<form class="record-filters activity-period-filter" method="get" aria-label="Период активности">
<label>Период активности<select name="hours">{options.map(([value, label]) => <option value={value} selected={hours === value}>{label}</option>)}</select></label>
<button data-action="secondary">Обновить</button>
</form>
+4 -2
View File
@@ -3,16 +3,18 @@ import SourceBadge from "./SourceBadge.astro";
import { ago, kg, type Catch } from "../lib/api"; import { ago, kg, type Catch } from "../lib/api";
import TackleGlyph from "./TackleGlyph.astro"; import TackleGlyph from "./TackleGlyph.astro";
const { catches } = Astro.props as { catches: Catch[] }; const { catches } = Astro.props as { catches: Catch[] };
const methodLabels: Record<string, string> = { spinning: "Спиннинг", bottom: "Донная", float: "Поплавочная" };
const roleLabels: Record<string, string> = { lure: "Приманка", bait: "Наживка", rig: "Сборка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", float: "Поплавок", sinker: "Груз" };
--- ---
<div class="catch-list"> <div class="catch-list">
{catches.map(item => { {catches.map(item => {
const timestamp = item.caught_at ?? item.reported_at; const timestamp = item.caught_at ?? item.reported_at;
return <article> return <article>
<div><strong>{item.fish}</strong><span class="tackle-label"><TackleGlyph name={item.bait} size={24}/><span>{item.bait ?? "Приманка не указана"}</span></span><SourceBadge source={item.source_system} href={item.source_url}/></div> <div><strong>{item.fish}</strong><span class="tackle-label"><TackleGlyph name={item.bait} size={24}/><span>{item.bait ?? "Приманка не указана"}</span></span>{item.fishing_method && <span>Метод: {methodLabels[item.fishing_method] ?? item.fishing_method}</span>}{item.retrieve_method && <span>Проводка: {item.retrieve_method}{item.retrieve_speed != null ? ` · скорость ${item.retrieve_speed}` : ""}</span>}{item.tackle_components?.length > 0 && <details class="catch-components"><summary>Комплект снастей ({item.tackle_components.length})</summary><ul>{item.tackle_components.map(component => <li><span>{roleLabels[component.role] ?? component.role}</span>{component.rig_id ? <a href={`/tackle/rigs/${component.rig_id}`}>{component.raw_value}</a> : component.tackle_item_id ? <a href={`/tackle/items/${component.tackle_item_id}`}>{component.raw_value}</a> : <span>{component.raw_value}</span>}</li>)}</ul></details>}<SourceBadge source={item.source_system} href={item.source_url}/></div>
<div><strong>{kg(item.weight_g)}</strong><span>{item.player_name ?? "Анонимно"}</span><span>{item.caught_at ? "Время улова" : "Получено · время улова неизвестно"}</span><time datetime={timestamp}>{ago(timestamp)} · {new Date(timestamp).toLocaleString("ru-RU", { timeZone: "UTC" })} UTC</time></div> <div><strong>{kg(item.weight_g)}</strong><span>{item.player_name ?? "Анонимно"}</span><span>{item.caught_at ? "Время улова" : "Получено · время улова неизвестно"}</span><time datetime={timestamp}>{ago(timestamp)} · {new Date(timestamp).toLocaleString("ru-RU", { timeZone: "UTC" })} UTC</time></div>
</article>; </article>;
})} })}
</div> </div>
<style> <style>
time{margin-top:7px;color:var(--text-secondary);font-size:10px;font-weight:750} time{margin-top:7px;color:var(--text-secondary);font-size:10px;font-weight:750}.catch-components{margin-top:8px}.catch-components summary{cursor:pointer;color:var(--text-secondary);font-size:11px;font-weight:750}.catch-components ul{display:grid;gap:4px;margin:8px 0 0;padding:0;list-style:none;color:var(--text-secondary);font-size:11px}.catch-components li{display:flex;gap:6px;flex-wrap:wrap}.catch-components li span:first-child{color:var(--text-subtle)}.catch-components a{color:inherit;text-underline-offset:3px}
</style> </style>
+11 -6
View File
@@ -1,13 +1,18 @@
--- ---
import SourceBadge from "./SourceBadge.astro"; import SourceBadge from "./SourceBadge.astro";
import { ago } from "../lib/api"; import { ago, coordinatePrecisionLabel, freshnessStatus, passportDisplayStatus } from "../lib/api";
type Props = { sources: string[]; sourceUrl?: string | null; observedAt: string; completeness?: number | null; confidence?: number | null; status?: "verified" | "unverified" | "incomplete" }; type Props = { sources: string[]; sourceUrl?: string | null; observedAt?: string | null; periodLabel?: string | null; completeness?: number | null; confidence?: number | null; sampleSize?: number | null; independentPlayers?: number | null; coordinatePrecision?: "exact" | "approximate" | "area" | "missing" | null; coordinateSources?: string[]; sourceConflicts?: string[]; status?: "verified" | "unverified" | "incomplete" | "insufficient" | "blocked" };
const { sources, sourceUrl, observedAt, completeness = null, confidence = null, status = "verified" } = Astro.props; const { sources, sourceUrl, observedAt, periodLabel = null, completeness = null, confidence = null, sampleSize = null, independentPlayers = null, coordinatePrecision = null, coordinateSources = [], sourceConflicts = [], status = "verified" } = Astro.props as Props;
const statusLabels = { verified: "Учтено", unverified: "Ждёт проверки", incomplete: "Неполные данные" }; const freshness = freshnessStatus(observedAt);
const displayStatus = passportDisplayStatus(status, freshness, sourceConflicts.length > 0);
const statusLabels = { verified: "Учтено", unverified: "Ждёт проверки", incomplete: "Неполные данные", insufficient: "Недостаточно данных", blocked: "Источник ограничен", conflict: "Источники расходятся", stale: "Данные устарели" };
const completenessLabel = completeness == null ? "Не рассчитана" : `${Math.min(100, Math.max(0, completeness))}% полей`; const completenessLabel = completeness == null ? "Не рассчитана" : `${Math.min(100, Math.max(0, completeness))}% полей`;
--- ---
<section class="data-passport" aria-label="Паспорт данных"> <section class="data-passport" aria-label="Паспорт данных">
<header><span>Паспорт данных</span><strong data-passport-status={status}>{statusLabels[status]}</strong></header> <header><span>Паспорт данных</span><strong data-passport-status={displayStatus}>{statusLabels[displayStatus]}</strong></header>
<div class="data-passport__sources">{sources.map(source => <SourceBadge source={source} href={sources.length === 1 ? sourceUrl : null}/>)}</div> <div class="data-passport__sources">{sources.map(source => <SourceBadge source={source} href={sources.length === 1 ? sourceUrl : null}/>)}</div>
<dl><div><dt>Свежесть</dt><dd>{ago(observedAt)}</dd></div><div><dt>Полнота</dt><dd>{completenessLabel}</dd></div><div><dt>Доверие</dt><dd>{confidence == null ? "После проверки" : `${confidence}%`}</dd></div></dl> {sourceConflicts.length > 0 && <p class="data-passport__conflict"><strong>Источники расходятся:</strong> {sourceConflicts.join(" · ")}</p>}
{coordinateSources.length > 0 && <details class="data-passport__coordinate-sources"><summary>Источники координат</summary><div>{coordinateSources.map(source => <SourceBadge source={source}/>)}</div></details>}
<dl><div><dt>Свежесть</dt><dd data-freshness={freshness}>{freshness === "stale" ? "Устарело" : freshness === "fresh" ? "Свежо" : "Не указана"}{observedAt && ` · ${ago(observedAt)}`}</dd></div>{periodLabel && <div><dt>Период</dt><dd>{periodLabel}</dd></div>}<div><dt>Полнота</dt><dd>{completenessLabel}</dd></div><div><dt>Доверие</dt><dd>{confidence == null ? "После проверки" : `${confidence}%`}</dd></div>{sampleSize != null && <div><dt>Наблюдения</dt><dd>{sampleSize}</dd></div>}{independentPlayers != null && <div><dt>Игроки</dt><dd>{independentPlayers}</dd></div>}{coordinatePrecision && <div><dt>Координаты</dt><dd>{coordinatePrecisionLabel(coordinatePrecision)}</dd></div>}</dl>
{sampleSize != null && sampleSize < 3 && <p class="data-passport__minimum">Минимум для рекомендации: 3 наблюдения.</p>}
</section> </section>
+4 -1
View File
@@ -1,7 +1,10 @@
--- ---
import SourceBadge from "./SourceBadge.astro"; import SourceBadge from "./SourceBadge.astro";
import type { MediaAsset } from "../lib/api"; import type { MediaAsset } from "../lib/api";
import { mediaRoleLabel } from "../lib/media";
const { asset, compact = false, sourceLink = false } = Astro.props as { asset: MediaAsset; compact?: boolean; sourceLink?: boolean }; const { asset, compact = false, sourceLink = false } = Astro.props as { asset: MediaAsset; compact?: boolean; sourceLink?: boolean };
const isLowResolution = Math.min(asset.width, asset.height) < 256;
const hasCardVariant = (asset.variants ?? []).some(item => item.role === "card" && Math.min(item.width, item.height) >= 256);
--- ---
<figure class:list={["entity-media", { "entity-media--compact": compact }]}> <figure class:list={["entity-media", { "entity-media--compact": compact }]}>
<span class="entity-media__frame"><picture> <span class="entity-media__frame"><picture>
@@ -11,5 +14,5 @@ const { asset, compact = false, sourceLink = false } = Astro.props as { asset: M
})} })}
<img src={asset.image_url} alt={asset.label ?? "Иллюстрация RF4"} width={asset.width} height={asset.height} loading="lazy" decoding="async" /> <img src={asset.image_url} alt={asset.label ?? "Иллюстрация RF4"} width={asset.width} height={asset.height} loading="lazy" decoding="async" />
</picture></span> </picture></span>
<figcaption><SourceBadge source={asset.source_system} href={sourceLink ? asset.source_url : undefined} /><span>{asset.label ?? "Справочный материал"}</span></figcaption> <figcaption><SourceBadge source={asset.source_system} href={sourceLink ? asset.source_url : undefined} /><span>{asset.label ?? "Справочный материал"}</span>{asset.media_role && <small data-media-role={asset.media_role}>{mediaRoleLabel(asset.media_role)}</small>}{isLowResolution && <small class="entity-media__quality" title={hasCardVariant ? "Доступна более крупная проверенная версия" : "В опубликованном наборе нет более крупной проверенной версии"}>{hasCardVariant ? "Миниатюра · доступна версия крупнее" : "Низкое разрешение · проверенная альтернатива не найдена"} · {asset.width}×{asset.height}</small>}</figcaption>
</figure> </figure>
+2 -2
View File
@@ -2,9 +2,9 @@
import FishSilhouette from "./FishSilhouette.astro"; import FishSilhouette from "./FishSilhouette.astro";
import WaterbodyMark from "./WaterbodyMark.astro"; import WaterbodyMark from "./WaterbodyMark.astro";
import AtlasPairMark from "./AtlasPairMark.astro"; import AtlasPairMark from "./AtlasPairMark.astro";
const { eyebrow, title, description, variant, count, identity = title, secondaryIdentity = "waterbody" } = Astro.props as { eyebrow: string; title: string; description?: string; variant?: "water" | "fish" | "pair"; count?: number; identity?: string; secondaryIdentity?: string }; const { eyebrow, title, description, variant, count, countLabel, identity = title, secondaryIdentity = "waterbody" } = Astro.props as { eyebrow: string; title: string; description?: string; variant?: "water" | "fish" | "pair"; count?: number; countLabel?: string; identity?: string; secondaryIdentity?: string };
--- ---
<section class:list={["catalog-hero content-grid", { "catalog-hero--illustrated": variant }]}> <section class:list={["catalog-hero content-grid", { "catalog-hero--illustrated": variant }]}>
<div class="catalog-hero__copy"><span class="overline">{eyebrow}</span><h1>{title}</h1>{description && <p>{description}</p>}</div> <div class="catalog-hero__copy"><span class="overline">{eyebrow}</span><h1>{title}</h1>{description && <p>{description}</p>}</div>
{variant && <div class:list={["catalog-hero__seal", { "catalog-hero__seal--pair": variant === "pair" }]} aria-hidden="true"><span>{variant === "water" ? <WaterbodyMark identity={identity} size={94} /> : variant === "pair" ? <AtlasPairMark waterbody={secondaryIdentity} fish={identity} /> : <FishSilhouette name={identity} size={92} />}</span>{typeof count === "number" && <><strong>{String(count).padStart(2,"0")}</strong><small>{variant === "water" ? "водоёмов" : "видов рыб"}</small></>}</div>} {variant && <div class:list={["catalog-hero__seal", { "catalog-hero__seal--pair": variant === "pair" }]}><span aria-hidden="true">{variant === "water" ? <WaterbodyMark identity={identity} size={94} /> : variant === "pair" ? <AtlasPairMark waterbody={secondaryIdentity} fish={identity} /> : <FishSilhouette name={identity} size={92} />}</span>{typeof count === "number" && <><strong>{String(count).padStart(2,"0")}</strong><small>{countLabel ?? (variant === "water" ? "водоёмов" : "видов рыб")}</small></>}</div>}
</section> </section>
+4 -3
View File
@@ -7,21 +7,22 @@ interface Props {
total: number; total: number;
limit: number; limit: number;
offset: number; offset: number;
offsetParam?: string;
anchor?: string; anchor?: string;
itemLabel?: string; itemLabel?: string;
} }
const { path, params, total, limit, offset, anchor = "", itemLabel = "записей" } = Astro.props; const { path, params, total, limit, offset, offsetParam = "offset", anchor = "", itemLabel = "записей" } = Astro.props;
const state = pageWindow(total, limit, offset); const state = pageWindow(total, limit, offset);
--- ---
{total > limit && <nav class="pagination" aria-label="Пагинация"> {total > limit && <nav class="pagination" aria-label="Пагинация">
<span>{state.start}–{state.end} из {total} {itemLabel} · страница {state.page} из {state.pages}</span> <span>{state.start}–{state.end} из {total} {itemLabel} · страница {state.page} из {state.pages}</span>
<div> <div>
{state.previousOffset !== null {state.previousOffset !== null
? <a data-action="secondary" rel="prev" href={pageHref(path, params, state.previousOffset, anchor)}>← Предыдущая</a> ? <a data-action="secondary" rel="prev" href={pageHref(path, params, state.previousOffset, anchor, offsetParam)}>← Предыдущая</a>
: <span class="pagination__disabled" aria-disabled="true">← Предыдущая</span>} : <span class="pagination__disabled" aria-disabled="true">← Предыдущая</span>}
{state.nextOffset !== null {state.nextOffset !== null
? <a data-action="secondary" rel="next" href={pageHref(path, params, state.nextOffset, anchor)}>Следующая →</a> ? <a data-action="secondary" rel="next" href={pageHref(path, params, state.nextOffset, anchor, offsetParam)}>Следующая →</a>
: <span class="pagination__disabled" aria-disabled="true">Следующая →</span>} : <span class="pagination__disabled" aria-disabled="true">Следующая →</span>}
</div> </div>
</nav>} </nav>}
+3 -1
View File
@@ -1,4 +1,5 @@
--- ---
import { safeHttpUrl } from "../lib/urls";
const { source, href, tone = "source" } = Astro.props as { source: string; href?: string | null; tone?: "source" | "incomplete" | "verified" }; const { source, href, tone = "source" } = Astro.props as { source: string; href?: string | null; tone?: "source" | "incomplete" | "verified" };
const labels: Record<string, string> = { const labels: Record<string, string> = {
"rf4-official": "RF4 · официальный", "rf4-official": "RF4 · официальный",
@@ -12,5 +13,6 @@ const labels: Record<string, string> = {
}; };
const label = labels[source] ?? source; const label = labels[source] ?? source;
const mark = source === "players" ? "♟" : source === "rf4-official" ? "★" : "↗"; const mark = source === "players" ? "♟" : source === "rf4-official" ? "★" : "↗";
const safeHref = safeHttpUrl(href);
--- ---
{href ? <a class="source-chip" data-source={source} data-tone={tone} href={href} target="_blank" rel="noreferrer" title={`Открыть источник: ${label}`}><i>{mark}</i><span>{label}</span></a> : <span class="source-chip" data-source={source} data-tone={tone}><i>{mark}</i><span>{label}</span></span>} {safeHref ? <a class="source-chip" data-source={source} data-tone={tone} href={safeHref} target="_blank" rel="noreferrer" title={`Открыть источник: ${label}`}><i>{mark}</i><span>{label}</span></a> : <span class="source-chip" data-source={source} data-tone={tone}><i>{mark}</i><span>{label}</span></span>}
+3 -1
View File
@@ -1,8 +1,10 @@
--- ---
const { title, description, actionHref, actionLabel, tone = "empty", compact = false, contained = true } = Astro.props as { title: string; description?: string; actionHref?: string; actionLabel?: string; tone?: "empty" | "error" | "unavailable"; compact?: boolean; contained?: boolean }; const { title, description, actionHref, actionLabel, tone = "empty", compact = false, contained = true } = Astro.props as { title: string; description?: string; actionHref?: string; actionLabel?: string; tone?: "empty" | "error" | "unavailable"; compact?: boolean; contained?: boolean };
const retryHref = actionHref ?? (tone === "unavailable" ? `${Astro.url.pathname}${Astro.url.search}` : tone === "error" ? Astro.url.pathname : undefined);
const retryLabel = actionLabel ?? (tone === "unavailable" ? "Повторить загрузку" : tone === "error" ? "Вернуться к разделу" : undefined);
--- ---
<div class:list={["state", { "content-grid": contained, "compact-state": compact, "error-state": tone === "error", "unavailable-state": tone === "unavailable" }]} role={tone === "empty" ? "status" : "alert"}> <div class:list={["state", { "content-grid": contained, "compact-state": compact, "error-state": tone === "error", "unavailable-state": tone === "unavailable" }]} role={tone === "empty" ? "status" : "alert"}>
<h2>{title}</h2> <h2>{title}</h2>
{description && <p>{description}</p>} {description && <p>{description}</p>}
{actionHref && actionLabel && <a data-action="secondary" href={actionHref}>{actionLabel}</a>} {retryHref && retryLabel && <a data-action="secondary" href={retryHref}>{retryLabel}</a>}
</div> </div>
+3 -1
View File
@@ -14,6 +14,8 @@ import "../styles/signal-pagination.css";
import "../styles/pagination.css"; import "../styles/pagination.css";
import "../styles/dashboard-polish.css"; import "../styles/dashboard-polish.css";
import "../styles/loading-states.css"; import "../styles/loading-states.css";
import "../styles/query-context.css";
import "../styles/plan.css";
import "../styles/theme.css"; import "../styles/theme.css";
import "../styles/media-catalog.css"; import "../styles/media-catalog.css";
import FishingIcon from "../components/FishingIcon.astro"; import FishingIcon from "../components/FishingIcon.astro";
@@ -121,7 +123,7 @@ Astro.response.headers.set("Content-Security-Policy", [
<a class="skip-link" href="#main-content">Перейти к содержимому</a> <a class="skip-link" href="#main-content">Перейти к содержимому</a>
<header class="topbar"> <header class="topbar">
<a href="/" class="brand"><span class="brand-mark" aria-hidden="true"><FishingIcon name="hook" size={24}/></span><span class="brand-name"><strong>RF4 Spotter</strong><span>Ни хвоста, ни чешуи</span></span></a> <a href="/" class="brand"><span class="brand-mark" aria-hidden="true"><FishingIcon name="hook" size={24}/></span><span class="brand-name"><strong>RF4 Spotter</strong><span>Ни хвоста, ни чешуи</span></span></a>
<nav aria-label="Разделы сайта"><a class:list={{active:path === "/"}} aria-current={path === "/" ? "page" : undefined} href="/"><FishingIcon name="float"/> <span>Сейчас клюёт</span></a><a class:list={{active:path.startsWith("/waterbodies") || path.startsWith("/fish")}} aria-current={path.startsWith("/waterbodies") || path.startsWith("/fish") ? "page" : undefined} href="/waterbodies"><FishingIcon name="ripple"/> <span>Каталог</span></a><a class:list={{active:path.startsWith("/media") || path.startsWith("/admin/media")}} aria-current={path.startsWith("/media") || path.startsWith("/admin/media") ? "page" : undefined} href="/media"><FishingIcon name="lure"/> <span>Медиатека</span></a><a class:list={{active:path.startsWith("/records")}} aria-current={path.startsWith("/records") ? "page" : undefined} href="/records"><FishingIcon name="trophy"/> <span>Рекорды</span></a><a class:list={{active:path.startsWith("/report")}} aria-current={path.startsWith("/report") ? "page" : undefined} href="/report"><FishingIcon name="plus"/> <span>Добавить улов</span></a></nav> <nav aria-label="Разделы сайта"><a class:list={{active:path === "/"}} aria-current={path === "/" ? "page" : undefined} href="/"><FishingIcon name="float"/> <span>Сейчас клюёт</span></a><a class:list={{active:path.startsWith("/waterbodies") || path.startsWith("/fish")}} aria-current={path.startsWith("/waterbodies") || path.startsWith("/fish") ? "page" : undefined} href="/waterbodies"><FishingIcon name="ripple"/> <span>Каталог</span></a><a class:list={{active:path === "/plan"}} aria-current={path === "/plan" ? "page" : undefined} href="/plan"><FishingIcon name="pin"/> <span>Мой план</span></a><a class:list={{active:path.startsWith("/media") || path.startsWith("/admin/media")}} aria-current={path.startsWith("/media") || path.startsWith("/admin/media") ? "page" : undefined} href="/media"><FishingIcon name="lure"/> <span>Медиатека</span></a><a class:list={{active:path.startsWith("/records")}} aria-current={path.startsWith("/records") ? "page" : undefined} href="/records"><FishingIcon name="trophy"/> <span>Рекорды</span></a><a class:list={{active:path.startsWith("/report")}} aria-current={path.startsWith("/report") ? "page" : undefined} href="/report"><FishingIcon name="plus"/> <span>Добавить улов</span></a></nav>
<div class="header-tools"> <div class="header-tools">
<p class="live-badge"><span></span> Свежие данные и честная оценка</p> <p class="live-badge"><span></span> Свежие данные и честная оценка</p>
<div class="theme-switcher" role="group" aria-label="Цветовая тема"> <div class="theme-switcher" role="group" aria-label="Цветовая тема">
+13 -6
View File
@@ -4,7 +4,7 @@ export type Activity = {
unique_players: number; average_weight_g: number; max_weight_g: number; unique_players: number; average_weight_g: number; max_weight_g: number;
last_confirmed_at: string; activity_score: number; confidence_score: number; last_confirmed_at: string; activity_score: number; confidence_score: number;
explanation: string; sources: string[]; explanation: string; sources: string[];
coordinate_precision: "exact" | "approximate" | "area" | "missing"; coordinate_sources: string[]; coordinate_precision: "exact" | "approximate" | "area" | "missing"; coordinate_sources: string[]; source_conflicts: string[];
}; };
export type PaginatedActivity = { export type PaginatedActivity = {
@@ -14,11 +14,17 @@ export type PaginatedActivity = {
offset: number; offset: number;
}; };
export type Spot = { id: string; waterbody_slug: string; waterbody: string; x: number; y: number; description: string | null; catches_24h: number; catches_3d: number; catches_7d: number; top_baits: string[]; coordinate_precision: "exact" | "approximate" | "area" | "missing"; coordinate_sources: string[] }; export type Spot = { id: string; waterbody_slug: string; waterbody: string; x: number; y: number; description: string | null; catches_24h: number; catches_3d: number; catches_7d: number; top_baits: string[]; coordinate_precision: "exact" | "approximate" | "area" | "missing"; coordinate_sources: string[]; source_conflicts: string[] };
export type Catch = { id: string; fish: string; weight_g: number; bait: string | null; player_name: string | null; caught_at: string | null; reported_at: string; retrieve_method: string | null; retrieve_speed: number | null; source_system: string; source_url: string | null }; export type CatchTackleComponent = { id: string; role: string; position: number; raw_value: string; tackle_item_id: string | null; rig_id: string | null; source_system: string | null; source_url: string | null };
export type RigComponent = { id: string; role: string; position: number; raw_value: string | null; tackle_item_id: string | null };
export type Rig = { id: string; name: string; source_system: string | null; source_external_id: string | null; source_url: string | null; source_checked_at: string | null; missing_fields: string[]; components: RigComponent[] };
export type Catch = { id: string; fish: string; weight_g: number; bait: string | null; player_name: string | null; caught_at: string | null; reported_at: string; fishing_method: string | null; retrieve_method: string | null; retrieve_speed: number | null; source_system: string; source_url: string | null; tackle_components: CatchTackleComponent[] };
export type DictionaryItem = { id: string; slug: string; name_ru: string; unlock_level?: number | null; fish_species_count?: number | null; source_system?: string | null; source_external_id?: string | null; source_url?: string | null; description?: string | null; source_aliases?: string[] | null; source_fish_species?: string[] | null; source_image_urls?: string[] | null; source_point_urls?: string[] | null; source_checked_at?: string | null }; export type DictionaryItem = { id: string; slug: string; name_ru: string; unlock_level?: number | null; fish_species_count?: number | null; source_system?: string | null; source_external_id?: string | null; source_url?: string | null; description?: string | null; source_aliases?: string[] | null; source_fish_species?: string[] | null; source_image_urls?: string[] | null; source_point_urls?: string[] | null; source_checked_at?: string | null };
export type TackleItem = { id: string; name: string; category: string; subcategory: string | null; brand: string | null; family: string | null; unlock_level: number | null; source_system: string | null; source_external_id: string | null; source_url: string | null; source_checked_at: string | null; missing_fields: string[] }; export type TackleItem = { id: string; name: string; category: string; subcategory: string | null; brand: string | null; family: string | null; unlock_level: number | null; source_system: string | null; source_external_id: string | null; source_url: string | null; source_checked_at: string | null; missing_fields: string[]; related_rigs: { id: string; name: string; source_system: string | null; source_checked_at: string | null; component_count: number }[] };
export type PaginatedTackleItems = { items: TackleItem[]; total: number; limit: number; offset: number }; export type PaginatedTackleItems = { items: TackleItem[]; total: number; limit: number; offset: number };
export type RigSummary = { id: string; name: string; source_system: string | null; source_external_id: string | null; source_url: string | null; source_checked_at: string | null; missing_fields: string[]; component_count: number };
export type PaginatedRigs = { items: RigSummary[]; total: number; limit: number; offset: number };
export type TackleCombination = { role: string; value: string; tackle_item_id: string | null; rig_id: string | null; catches: number; unique_players: number; last_seen_at: string; freshness_score: number; status: "recommendation" | "insufficient_data"; explanation: string };
export type OfficialRecord = { id: string; fish: string; weight_g: number; waterbody: string; bait: string | null; player_name: string | null; record_date: string | null; category: string | null; region: string | null; source_url: string | null; source_system: string }; export type OfficialRecord = { id: string; fish: string; weight_g: number; waterbody: string; bait: string | null; player_name: string | null; record_date: string | null; category: string | null; region: string | null; source_url: string | null; source_system: string };
export type PaginatedOfficialRecord = { export type PaginatedOfficialRecord = {
items: OfficialRecord[]; items: OfficialRecord[];
@@ -30,11 +36,12 @@ export type PublicObservation = { id: string; source_system: string; source_name
export type ImportRun = { id: string; started_at: string; finished_at: string | null; status: string; source_url: string; rows_seen: number; rows_created: number; rows_updated: number; error_summary: string | null }; export type ImportRun = { id: string; started_at: string; finished_at: string | null; status: string; source_url: string; rows_seen: number; rows_created: number; rows_updated: number; error_summary: string | null };
export type SourceStatus = { source_system: string; name: string; status: "healthy" | "stale" | "temporarily_limited" | "source_changed" | "waiting" | "disabled"; last_started_at: string | null; last_success_at: string | null; observations: number }; export type SourceStatus = { source_system: string; name: string; status: "healthy" | "stale" | "temporarily_limited" | "source_changed" | "waiting" | "disabled"; last_started_at: string | null; last_success_at: string | null; observations: number };
export type MediaVariant = { role: "card" | "detail"; format: "webp" | "avif"; width: number; height: number; url: string }; export type MediaVariant = { role: "card" | "detail"; format: "webp" | "avif"; width: number; height: number; url: string };
export type MediaAsset = { id: string; entity_type: "fish" | "waterbody" | "tackle" | "reference"; entity_key: string; label: string | null; width: number; height: number; content_type: string; image_url: string; source_system: string; source_url: string; variants?: MediaVariant[] }; export type MediaRole = "waterbody_cover" | "waterbody_map" | "waterbody_depth_map" | "waterbody_screenshot" | "tackle_card" | "tackle_detail" | "rig_diagram" | "tackle_screenshot";
export type MediaAsset = { id: string; entity_type: "fish" | "waterbody" | "tackle" | "reference"; entity_key: string; media_role?: MediaRole | null; label: string | null; width: number; height: number; content_type: string; image_url: string; source_system: string; source_url: string; variants?: MediaVariant[] };
export const spotPath = (item: Pick<Activity, "waterbody_slug" | "x" | "y">) => `/spots/${item.waterbody_slug}-${item.x}x${item.y}`; export const spotPath = (item: Pick<Activity, "waterbody_slug" | "x" | "y">) => `/spots/${item.waterbody_slug}-${item.x}x${item.y}`;
export { activityLevel, ago, kg, plural } from "./presentation"; export { activityLevel, ago, coordinatePrecisionLabel, freshnessStatus, kg, passportDisplayStatus, plural, sourceStatusLabel } from "./presentation";
const base = process.env.API_INTERNAL_URL || import.meta.env.API_INTERNAL_URL || "http://localhost:8000"; const base = process.env.API_INTERNAL_URL || import.meta.env.API_INTERNAL_URL || "http://localhost:8000";
+18 -4
View File
@@ -1,4 +1,17 @@
import type { MediaAsset } from "./api"; import type { MediaAsset, MediaRole } from "./api";
const mediaRoleLabels: Record<MediaRole, string> = {
waterbody_cover: "Заставка водоёма",
waterbody_map: "Карта водоёма",
waterbody_depth_map: "Карта глубин",
waterbody_screenshot: "Скриншот водоёма",
tackle_card: "Карточка снасти",
tackle_detail: "Деталь снасти",
rig_diagram: "Схема сборки",
tackle_screenshot: "Скриншот снасти",
};
export const mediaRoleLabel = (role: string): string => mediaRoleLabels[role as MediaRole] ?? role;
const tokens = (value: string) => value const tokens = (value: string) => value
.toLocaleLowerCase("ru") .toLocaleLowerCase("ru")
@@ -9,13 +22,14 @@ const tokens = (value: string) => value
.split(/\s+/) .split(/\s+/)
.filter(Boolean); .filter(Boolean);
export const findMediaByLabel = (assets: MediaAsset[], label: string): MediaAsset | undefined => { export const findMediaByLabel = (assets: MediaAsset[], label: string, allowedRoles?: readonly MediaRole[]): MediaAsset | undefined => {
const filtered = allowedRoles ? assets.filter((asset) => asset.media_role && allowedRoles.includes(asset.media_role)) : assets;
const wanted = tokens(label); const wanted = tokens(label);
const exact = assets.filter((asset) => tokens(asset.label ?? "").join(" ") === wanted.join(" ")); const exact = filtered.filter((asset) => tokens(asset.label ?? "").join(" ") === wanted.join(" "));
if (exact.length === 1) return exact[0]; if (exact.length === 1) return exact[0];
const wantedSet = new Set(wanted); const wantedSet = new Set(wanted);
const candidates = assets.filter((asset) => { const candidates = filtered.filter((asset) => {
const available = new Set(tokens(asset.label ?? "")); const available = new Set(tokens(asset.label ?? ""));
return wanted.every((token) => available.has(token)) || [...available].every((token) => wantedSet.has(token)); return wanted.every((token) => available.has(token)) || [...available].every((token) => wantedSet.has(token));
}); });
+3 -3
View File
@@ -22,10 +22,10 @@ export const pageWindow = (total: number, limit: number, offset: number): PageWi
}; };
}; };
export const pageHref = (path: string, search: URLSearchParams, offset: number, anchor = "") => { export const pageHref = (path: string, search: URLSearchParams, offset: number, anchor = "", offsetParam = "offset") => {
const params = new URLSearchParams(search); const params = new URLSearchParams(search);
if (offset > 0) params.set("offset", String(offset)); if (offset > 0) params.set(offsetParam, String(offset));
else params.delete("offset"); else params.delete(offsetParam);
const query = params.toString(); const query = params.toString();
return `${path}${query ? `?${query}` : ""}${anchor}`; return `${path}${query ? `?${query}` : ""}${anchor}`;
}; };
+30
View File
@@ -20,3 +20,33 @@ export function ago(value: string) {
const minutes = Math.max(0, Math.round((Date.now() - new Date(value).getTime()) / 60000)); const minutes = Math.max(0, Math.round((Date.now() - new Date(value).getTime()) / 60000));
return minutes < 60 ? `${minutes} мин назад` : `${Math.floor(minutes / 60)} ч назад`; return minutes < 60 ? `${minutes} мин назад` : `${Math.floor(minutes / 60)} ч назад`;
} }
export function freshnessStatus(value: string | null | undefined, now = Date.now()): "fresh" | "stale" | "unknown" {
if (!value) return "unknown";
const timestamp = new Date(value).getTime();
if (!Number.isFinite(timestamp)) return "unknown";
return now - timestamp > 48 * 60 * 60 * 1000 ? "stale" : "fresh";
}
export type CoordinatePrecision = "exact" | "approximate" | "area" | "missing";
export function coordinatePrecisionLabel(value: CoordinatePrecision | string | null | undefined): string {
return ({ exact: "точные", approximate: "приблизительные", area: "район", missing: "не указаны" } as Record<string, string>)[value ?? ""] ?? "не указаны";
}
export type PassportStatus = "verified" | "unverified" | "incomplete" | "insufficient" | "blocked";
export type PassportDisplayStatus = PassportStatus | "conflict" | "stale";
export function passportDisplayStatus(status: PassportStatus, freshness: "fresh" | "stale" | "unknown", hasConflicts: boolean): PassportDisplayStatus {
if (hasConflicts) return "conflict";
if (status === "verified" && freshness === "stale") return "stale";
return status;
}
export function sourceStatusLabel(status: string) {
const labels: Record<string, string> = {
healthy: "Актуален", stale: "Данные устарели", temporarily_limited: "Источник временно ограничен",
source_changed: "Источник изменился", waiting: "Ожидает запуска", disabled: "Выключен",
};
return labels[status] ?? "Состояние не определено";
}
+10
View File
@@ -0,0 +1,10 @@
export function safeHttpUrl(value: string | null | undefined): string | null {
if (!value) return null;
try {
const url = new URL(value);
if ((url.protocol !== "http:" && url.protocol !== "https:") || url.username || url.password || !url.hostname) return null;
return url.href;
} catch {
return null;
}
}
@@ -17,7 +17,7 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
<label>Порядок<select name="order"><option value="risk">Сначала требуют внимания</option><option value="newest">Сначала новые</option><option value="oldest">Сначала старые</option></select></label> <label>Порядок<select name="order"><option value="risk">Сначала требуют внимания</option><option value="newest">Сначала новые</option><option value="oldest">Сначала старые</option></select></label>
<button data-action="primary" type="submit">Применить</button> <button data-action="primary" type="submit">Применить</button>
</form> </form>
<div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><div class="moderation-list" data-external-list aria-live="polite"></div> <div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><label><input type="checkbox" data-external-select-all> Выбрать все записи на странице</label><div data-external-bulk hidden><strong data-external-bulk-count>0 выбрано</strong><label>Рыба<select data-external-bulk-fish><option value="">Выберите…</option></select></label><label>Водоём<select data-external-bulk-waterbody><option value="">Выберите…</option></select></label><textarea data-external-bulk-reason rows="1" maxlength="1000" placeholder="Примечание или причина отклонения"></textarea><button data-action="secondary" type="button" data-external-bulk-map>Сопоставить выбранные</button><button data-action="primary" type="button" data-external-bulk-publish>Опубликовать выбранные</button><button data-action="danger" type="button" data-external-bulk-reject>Отклонить выбранные</button></div><div class="moderation-list" data-external-list aria-live="polite"></div>
<nav data-pages aria-label="Страницы очереди" hidden> <nav data-pages aria-label="Страницы очереди" hidden>
<button data-action="secondary" type="button" data-previous>Предыдущая</button> <button data-action="secondary" type="button" data-previous>Предыдущая</button>
<span data-page-number aria-live="polite"></span> <span data-page-number aria-live="polite"></span>
@@ -40,17 +40,28 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
const sessionBar = document.querySelector<HTMLElement>(".admin-session-bar"); const sessionBar = document.querySelector<HTMLElement>(".admin-session-bar");
const logout = document.querySelector<HTMLButtonElement>("[data-admin-logout]"); const logout = document.querySelector<HTMLButtonElement>("[data-admin-logout]");
const filters = document.querySelector<HTMLFormElement>(".admin-queue-filters"); const filters = document.querySelector<HTMLFormElement>(".admin-queue-filters");
const bulk = document.querySelector<HTMLElement>("[data-external-bulk]");
const selectAll = document.querySelector<HTMLInputElement>("[data-external-select-all]");
let offset = 0; let offset = 0;
let token = ""; let fishes: Record<string, string>[] = []; let waters: Record<string, string>[] = []; let token = ""; let fishes: Record<string, string>[] = []; let waters: Record<string, string>[] = [];
let sessionTimer: ReturnType<typeof setTimeout> | undefined; let sessionTimer: ReturnType<typeof setTimeout> | undefined;
const loadingCards = () => `<div class="loading-grid" aria-hidden="true">${Array.from({length:2}, () => '<div class="loading-card"><span class="loading-line loading-line--label"></span><span class="loading-line loading-line--title"></span><span class="loading-line"></span><span class="loading-line loading-line--short"></span></div>').join("")}</div><span class="sr-only">Загружаем внешние наблюдения</span>`; const loadingCards = () => `<div class="loading-grid" aria-hidden="true">${Array.from({length:2}, () => '<div class="loading-card"><span class="loading-line loading-line--label"></span><span class="loading-line loading-line--title"></span><span class="loading-line"></span><span class="loading-line loading-line--short"></span></div>').join("")}</div><span class="sr-only">Загружаем внешние наблюдения</span>`;
const setLoading = (loading: boolean) => list?.setAttribute("aria-busy", String(loading)); const setLoading = (loading: boolean) => list?.setAttribute("aria-busy", String(loading));
const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char)); const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char));
const safeHttpUrl = (value: unknown) => { try { const url = new URL(String(value)); return url.protocol === "http:" || url.protocol === "https:" ? esc(url.href) : ""; } catch { return ""; } }; const safeHttpUrl = (value: unknown) => { try { const url = new URL(String(value)); return (url.protocol === "http:" || url.protocol === "https:") && !url.username && !url.password && url.hostname ? esc(url.href) : ""; } catch { return ""; } };
const fail = (message: string) => { if (status) status.hidden = true; if (error) { error.textContent = message; error.hidden = false; } }; const fail = (message: string) => { if (status) status.hidden = true; if (error) { error.textContent = message; error.hidden = false; } };
const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } }; const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } };
const endSession = (message?: string) => { token = ""; if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = undefined; if (login) { login.hidden = false; login.reset(); } if (sessionBar) sessionBar.hidden = true; if (filters) filters.hidden = true; if (list) list.innerHTML = ""; pages?.setAttribute("hidden", ""); if (message) fail(message); }; const endSession = (message?: string) => { token = ""; if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = undefined; if (login) { login.hidden = false; login.reset(); } if (sessionBar) sessionBar.hidden = true; if (filters) filters.hidden = true; if (list) list.innerHTML = ""; if (selectAll) { selectAll.checked = false; selectAll.indeterminate = false; } syncBulk(); pages?.setAttribute("hidden", ""); if (message) fail(message); };
const keepSession = () => { if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = setTimeout(() => endSession("Сессия завершена после 15 минут бездействия. Введите токен снова."), 15 * 60 * 1000); }; const keepSession = () => { if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = setTimeout(() => endSession("Сессия завершена после 15 минут бездействия. Введите токен снова."), 15 * 60 * 1000); };
const syncBulk = () => { const inputs = [...(list?.querySelectorAll<HTMLInputElement>("[data-external-select]") ?? [])]; const selected = inputs.filter(input => input.checked).length; if (bulk) bulk.hidden = selected === 0; if (selectAll) { selectAll.checked = inputs.length > 0 && selected === inputs.length; selectAll.indeterminate = selected > 0 && selected < inputs.length; } const count = bulk?.querySelector<HTMLElement>("[data-external-bulk-count]"); if (count) count.textContent = `${selected} выбрано`; };
const hydrateBulk = () => { list?.querySelectorAll<HTMLElement>("[data-observation-id]").forEach(card => { if (card.querySelector("[data-external-select]")) return; const label = document.createElement("label"); label.innerHTML = `<input type="checkbox" data-external-select aria-label="Выбрать наблюдение">`; card.prepend(label); }); const fishSelect = bulk?.querySelector<HTMLSelectElement>("[data-external-bulk-fish]"); const waterSelect = bulk?.querySelector<HTMLSelectElement>("[data-external-bulk-waterbody]"); if (fishSelect && fishSelect.options.length === 1 && fishes.length) fishSelect.innerHTML = '<option value="">Выберите…</option>' + options(fishes); if (waterSelect && waterSelect.options.length === 1 && waters.length) waterSelect.innerHTML = '<option value="">Выберите…</option>' + options(waters); syncBulk(); };
const selectedCards = () => [...(list?.querySelectorAll<HTMLInputElement>("[data-external-select]:checked") ?? [])].map(input => input.closest<HTMLElement>("[data-observation-id]")).filter((card): card is HTMLElement => Boolean(card));
const setBulkBusy = (busy: boolean) => bulk?.querySelectorAll<HTMLButtonElement>("button").forEach(button => { button.disabled = busy; });
bulk?.querySelector<HTMLButtonElement>("[data-external-bulk-map]")?.addEventListener("click", async () => { const cards = selectedCards(); const fish_slug = bulk.querySelector<HTMLSelectElement>("[data-external-bulk-fish]")?.value; const waterbody_slug = bulk.querySelector<HTMLSelectElement>("[data-external-bulk-waterbody]")?.value; if (!cards.length) return; if (!fish_slug || !waterbody_slug) { fail("Выберите каноническую рыбу и водоём."); return; } setBulkBusy(true); try { await json(`${root?.dataset.apiUrl}/api/v1/admin/external-observations/bulk-mapping`, {method:"PATCH",headers:{Authorization:`Bearer ${token}`,"Content-Type":"application/json"},body:JSON.stringify({fish_slug,waterbody_slug,note:bulk.querySelector<HTMLTextAreaElement>("[data-external-bulk-reason]")?.value.trim() || null,items:cards.map(card => ({id:card.dataset.observationId,expected_version:Number(card.dataset.version)}))})}); await loadQueue(); succeed(`Сопоставлено наблюдений: ${cards.length}.`); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка пакетного сопоставления."); } finally { setBulkBusy(false); } });
bulk?.querySelector<HTMLButtonElement>("[data-external-bulk-publish]")?.addEventListener("click", async () => { const cards = selectedCards(); if (!cards.length) return; setBulkBusy(true); try { await json(`${root?.dataset.apiUrl}/api/v1/admin/external-observations/bulk-publish`, {method:"POST",headers:{Authorization:`Bearer ${token}`,"Content-Type":"application/json"},body:JSON.stringify({items:cards.map(card => ({id:card.dataset.observationId,expected_version:Number(card.dataset.version)}))})}); await loadQueue(); succeed(`Опубликовано наблюдений: ${cards.length}.`); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка пакетной публикации."); } finally { setBulkBusy(false); } });
bulk?.querySelector<HTMLButtonElement>("[data-external-bulk-reject]")?.addEventListener("click", async () => { const cards = selectedCards(); const reason = bulk.querySelector<HTMLTextAreaElement>("[data-external-bulk-reason]")?.value.trim(); if (!cards.length) return; if (!reason) { fail("Укажите причину отклонения."); return; } setBulkBusy(true); try { await json(`${root?.dataset.apiUrl}/api/v1/admin/external-observations/bulk-reject`, {method:"PATCH",headers:{Authorization:`Bearer ${token}`,"Content-Type":"application/json"},body:JSON.stringify({reason,items:cards.map(card => ({id:card.dataset.observationId,expected_version:Number(card.dataset.version)}))})}); await loadQueue(); succeed(`Отклонено наблюдений: ${cards.length}.`); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка пакетного отклонения."); } finally { setBulkBusy(false); } });
list?.addEventListener("change", event => { if ((event.target as HTMLElement).matches("[data-external-select]")) syncBulk(); });
selectAll?.addEventListener("change", () => { list?.querySelectorAll<HTMLInputElement>("[data-external-select]").forEach(input => input.checked = selectAll.checked); syncBulk(); });
const options = (items: Record<string, string>[], selected?: unknown) => items.map(item => `<option value="${esc(item.slug)}" ${item.slug === selected ? "selected" : ""}>${esc(item.name_ru)}</option>`).join(""); const options = (items: Record<string, string>[], selected?: unknown) => items.map(item => `<option value="${esc(item.slug)}" ${item.slug === selected ? "selected" : ""}>${esc(item.name_ru)}</option>`).join("");
async function json(url: string, init: RequestInit = {}) { const response = await fetch(url, init); if (response.status === 409) { await loadQueue(); throw new Error("Запись уже изменена в другой вкладке. Очередь обновлена."); } if (!response.ok) { if (adminEndsSession(response.status)) endSession(); throw new Error(adminErrorMessage(response.status, `Запрос завершился ошибкой ${response.status}.`)); } if ((init.headers as Record<string, string> | undefined)?.Authorization) keepSession(); return response.json(); } async function json(url: string, init: RequestInit = {}) { const response = await fetch(url, init); if (response.status === 409) { await loadQueue(); throw new Error("Запись уже изменена в другой вкладке. Очередь обновлена."); } if (!response.ok) { if (adminEndsSession(response.status)) endSession(); throw new Error(adminErrorMessage(response.status, `Запрос завершился ошибкой ${response.status}.`)); } if ((init.headers as Record<string, string> | undefined)?.Authorization) keepSession(); return response.json(); }
async function loadQueue() { async function loadQueue() {
@@ -68,6 +79,7 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
if (pageNumber) pageNumber.textContent = `Страница ${offset / 50 + 1}`; if (pageNumber) pageNumber.textContent = `Страница ${offset / 50 + 1}`;
if (!pending.length) { list.innerHTML = '<div class="state"><h2>Очередь пуста</h2><p>Все внешние записи обработаны.</p></div>'; return; } if (!pending.length) { list.innerHTML = '<div class="state"><h2>Очередь пуста</h2><p>Все внешние записи обработаны.</p></div>'; return; }
list.innerHTML = pending.map((row: Record<string, unknown>) => { const complete = row.x != null && row.y != null && row.weight_g != null; const sourceUrl = safeHttpUrl(row.source_url); return `<article class="moderation-card" data-observation-id="${esc(row.id)}" data-version="${esc(row.moderation_version)}"><div class="moderation-summary"><span class="activity-pill"><i></i>${esc(row.source_system)} · ${esc(row.status)}</span><h2>${esc(row.fish_name)}</h2><p>${esc(row.waterbody_name)}</p><dl><div><dt>Координаты</dt><dd>${row.x == null || row.y == null ? "нет" : `${esc(row.x)}:${esc(row.y)}`}</dd></div><div><dt>Вес</dt><dd>${row.weight_g == null ? "нет" : `${esc(row.weight_g)} г`}</dd></div><div><dt>ID источника</dt><dd>${esc(row.source_external_id)}</dd></div><div><dt>Состояние</dt><dd>${complete ? "полная запись" : "неполная"}</dd></div></dl>${sourceUrl ? `<a href="${sourceUrl}" target="_blank" rel="noreferrer">Открыть первоисточник</a>` : '<span class="privacy">Ссылка источника имеет небезопасный формат</span>'}</div><div class="moderation-actions"><label>Каноническая рыба<select name="fish" required><option value="">Выберите…</option>${options(fishes, row.fish_slug)}</select></label><label>Канонический водоём<select name="waterbody" required><option value="">Выберите…</option>${options(waters, row.waterbody_slug)}</select></label><label>Примечание<textarea name="note" rows="2" maxlength="1000">${esc(row.review_note ?? "")}</textarea></label><p data-alias-message role="status"></p><div><button data-action="secondary" type="button" data-suggest>Подсказать соответствия</button><button data-action="secondary" type="button" data-map>Сопоставить</button><button data-action="primary" type="button" data-publish ${complete && row.status === "ready" ? "" : "disabled"}>Опубликовать</button><button data-action="danger" type="button" data-reject>Отклонить</button></div></div></article>`; }).join(""); list.innerHTML = pending.map((row: Record<string, unknown>) => { const complete = row.x != null && row.y != null && row.weight_g != null; const sourceUrl = safeHttpUrl(row.source_url); return `<article class="moderation-card" data-observation-id="${esc(row.id)}" data-version="${esc(row.moderation_version)}"><div class="moderation-summary"><span class="activity-pill"><i></i>${esc(row.source_system)} · ${esc(row.status)}</span><h2>${esc(row.fish_name)}</h2><p>${esc(row.waterbody_name)}</p><dl><div><dt>Координаты</dt><dd>${row.x == null || row.y == null ? "нет" : `${esc(row.x)}:${esc(row.y)}`}</dd></div><div><dt>Вес</dt><dd>${row.weight_g == null ? "нет" : `${esc(row.weight_g)} г`}</dd></div><div><dt>ID источника</dt><dd>${esc(row.source_external_id)}</dd></div><div><dt>Состояние</dt><dd>${complete ? "полная запись" : "неполная"}</dd></div></dl>${sourceUrl ? `<a href="${sourceUrl}" target="_blank" rel="noreferrer">Открыть первоисточник</a>` : '<span class="privacy">Ссылка источника имеет небезопасный формат</span>'}</div><div class="moderation-actions"><label>Каноническая рыба<select name="fish" required><option value="">Выберите…</option>${options(fishes, row.fish_slug)}</select></label><label>Канонический водоём<select name="waterbody" required><option value="">Выберите…</option>${options(waters, row.waterbody_slug)}</select></label><label>Примечание<textarea name="note" rows="2" maxlength="1000">${esc(row.review_note ?? "")}</textarea></label><p data-alias-message role="status"></p><div><button data-action="secondary" type="button" data-suggest>Подсказать соответствия</button><button data-action="secondary" type="button" data-map>Сопоставить</button><button data-action="primary" type="button" data-publish ${complete && row.status === "ready" ? "" : "disabled"}>Опубликовать</button><button data-action="danger" type="button" data-reject>Отклонить</button></div></div></article>`; }).join("");
hydrateBulk();
const payloadLabels: Record<string, string> = {bait:"Приманка",fishing_method:"Метод ловли",rig_type:"Оснастка",retrieve_method:"Проводка",retrieve_speed:"Скорость проводки",player_name:"Игрок",published_at:"Опубликовано источником",region:"Регион",category:"Категория"}; const payloadLabels: Record<string, string> = {bait:"Приманка",fishing_method:"Метод ловли",rig_type:"Оснастка",retrieve_method:"Проводка",retrieve_speed:"Скорость проводки",player_name:"Игрок",published_at:"Опубликовано источником",region:"Регион",category:"Категория"};
const missingLabels: Record<string, string> = {coordinates:"координаты",weight_g:"вес"}; const missingLabels: Record<string, string> = {coordinates:"координаты",weight_g:"вес"};
pending.forEach((row: Record<string, unknown>, index: number) => { pending.forEach((row: Record<string, unknown>, index: number) => {
+44 -1
View File
@@ -25,20 +25,32 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
const logout = document.querySelector<HTMLButtonElement>("[data-admin-logout]"); const logout = document.querySelector<HTMLButtonElement>("[data-admin-logout]");
let token = ""; let token = "";
let sessionTimer: ReturnType<typeof setTimeout> | undefined; let sessionTimer: ReturnType<typeof setTimeout> | undefined;
let importCooldownUntil = 0;
let importCooldownTimer: ReturnType<typeof setInterval> | undefined;
let importHistoryOffset = 5;
const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char)); const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char));
const fail = (message: string) => { if (error) { error.textContent = message; error.hidden = false; } }; const fail = (message: string) => { if (error) { error.textContent = message; error.hidden = false; } };
const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } }; const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } };
const endSession = (message?: string) => { token = ""; if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = undefined; if (login) { login.hidden = false; login.reset(); } if (sessionBar) sessionBar.hidden = true; if (content) content.innerHTML = ""; if (message) fail(message); }; const endSession = (message?: string) => { token = ""; if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = undefined; if (login) { login.hidden = false; login.reset(); } if (sessionBar) sessionBar.hidden = true; if (content) content.innerHTML = ""; if (message) fail(message); };
const keepSession = () => { if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = setTimeout(() => endSession("Сессия завершена после 15 минут бездействия. Введите токен снова."), 15 * 60 * 1000); }; const keepSession = () => { if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = setTimeout(() => endSession("Сессия завершена после 15 минут бездействия. Введите токен снова."), 15 * 60 * 1000); };
const syncImportButton = () => { const button = content?.querySelector<HTMLButtonElement>("[data-official-import]"); if (!button) return; const seconds = Math.max(0, Math.ceil((importCooldownUntil - Date.now()) / 1000)); button.disabled = seconds > 0; button.textContent = seconds > 0 ? `Повторить через ${seconds < 60 ? `${seconds} с` : `${Math.ceil(seconds / 60)} мин`}` : "Запустить импорт"; button.setAttribute("aria-disabled", String(seconds > 0)); };
const startImportCooldown = (seconds: number) => { if (!Number.isFinite(seconds) || seconds <= 0) return; importCooldownUntil = Math.max(importCooldownUntil, Date.now() + Math.ceil(seconds) * 1000); if (importCooldownTimer) clearInterval(importCooldownTimer); syncImportButton(); importCooldownTimer = setInterval(() => { syncImportButton(); if (Date.now() >= importCooldownUntil && importCooldownTimer) { clearInterval(importCooldownTimer); importCooldownTimer = undefined; } }, 1000); };
const importStatusLabels: Record<string, string> = {running:"Выполняется",success:"Успешно",partial:"Частично",failed:"Ошибка"};
const importRow = (run: Record<string, unknown>) => { const state = String(run.status); const rows = Number(run.rows_seen ?? 0); const created = Number(run.rows_created ?? 0); const updated = Number(run.rows_updated ?? 0); const result = rows ? ` · ${rows} строк · +${created}/↻${updated}` : ""; const finished = run.finished_at ? ` · завершён ${new Date(String(run.finished_at)).toLocaleString("ru-RU")}` : ""; return `<li><span>${esc(importStatusLabels[state] ?? state)}<small>${esc(result)}</small></span><time>${esc(new Date(String(run.started_at)).toLocaleString("ru-RU"))}<small>${esc(finished)}</small></time></li>`; };
const ensureImportMoreButton = () => { const section = content?.querySelector<HTMLElement>(".admin-dashboard-grid section:nth-child(2)"); const list = section?.querySelector<HTMLUListElement>("ul"); if (!section || !list || list.children.length < 5 || section.querySelector("[data-import-more]")) return; const button = document.createElement("button"); button.type = "button"; button.dataset.action = "quiet"; button.dataset.importMore = "true"; button.textContent = "Показать ещё импорты"; list.after(button); };
window.setInterval(ensureImportMoreButton, 1000);
async function authorizedJson(path: string) { const response = await fetch(`${root?.dataset.apiUrl}${path}`, {headers:{Authorization:`Bearer ${token}`}}); if (!response.ok) { if (adminEndsSession(response.status)) endSession(); throw new Error(adminErrorMessage(response.status, "Не удалось загрузить административные данные.")); } keepSession(); return response.json(); } async function authorizedJson(path: string) { const response = await fetch(`${root?.dataset.apiUrl}${path}`, {headers:{Authorization:`Bearer ${token}`}}); if (!response.ok) { if (adminEndsSession(response.status)) endSession(); throw new Error(adminErrorMessage(response.status, "Не удалось загрузить административные данные.")); } keepSession(); return response.json(); }
async function loadDashboard() { async function loadDashboard() {
if (!content) return; if (!content) return;
importHistoryOffset = 5;
error?.setAttribute("hidden", ""); status?.setAttribute("hidden", ""); content.setAttribute("aria-busy", "true"); content.innerHTML = '<div class="loading-grid" aria-hidden="true"><div class="loading-card"></div><div class="loading-card"></div></div>'; error?.setAttribute("hidden", ""); status?.setAttribute("hidden", ""); content.setAttribute("aria-busy", "true"); content.innerHTML = '<div class="loading-grid" aria-hidden="true"><div class="loading-card"></div><div class="loading-card"></div></div>';
const diagnostics = await authorizedJson("/api/v1/admin/diagnostics"); const diagnostics = await authorizedJson("/api/v1/admin/diagnostics");
const [imports, sources, history] = await Promise.all([authorizedJson("/api/v1/admin/imports?limit=5"), authorizedJson("/api/v1/admin/source-status"), authorizedJson("/api/v1/admin/moderation-history?limit=8")]); const [imports, sources, history] = await Promise.all([authorizedJson("/api/v1/admin/imports?limit=5"), authorizedJson("/api/v1/admin/source-status"), authorizedJson("/api/v1/admin/moderation-history?limit=8")]);
const reports = diagnostics.counts?.catch_reports ?? {}; const observations = diagnostics.counts?.external_observations ?? {}; const reports = diagnostics.counts?.catch_reports ?? {}; const observations = diagnostics.counts?.external_observations ?? {};
const sourceLabels: Record<string, string> = {healthy:"Работает",waiting:"Ожидает",stale:"Устарел",disabled:"Отключён",source_changed:"Изменился",temporarily_limited:"Временно недоступен"}; const sourceLabels: Record<string, string> = {healthy:"Работает",waiting:"Ожидает",stale:"Устарел",disabled:"Отключён",source_changed:"Изменился",temporarily_limited:"Временно недоступен"};
const sourceRows = (sources as Record<string, unknown>[]).map(source => { const state = String(source.status); const safeState = Object.hasOwn(sourceLabels, state) ? state : "waiting"; const cooldown = Number(source.cooldown_seconds ?? 0); const detail = cooldown > 0 ? ` · cooldown ${Math.ceil(cooldown / 60)} мин` : source.backoff_recommended ? " · backoff рекомендован" : ""; const success = source.last_success_at ? ` · успех ${new Date(String(source.last_success_at)).toLocaleString("ru-RU")}` : " · успешных запусков нет"; return `<li><span><i class="status-dot ${safeState}"></i>${esc(source.name)}<small>${esc(detail + success)}</small></span><strong>${sourceLabels[safeState]}</strong></li>`; }).join(""); const sourceRows = (sources as Record<string, unknown>[]).map(source => { const state = String(source.status); const safeState = Object.hasOwn(sourceLabels, state) ? state : "waiting"; const cooldown = Number(source.cooldown_seconds ?? 0); const detail = cooldown > 0 ? ` · cooldown ${Math.ceil(cooldown / 60)} мин` : source.backoff_recommended ? " · backoff рекомендован" : ""; const success = source.last_success_at ? ` · успех ${new Date(String(source.last_success_at)).toLocaleString("ru-RU")}` : " · успешных запусков нет"; return `<li><span><i class="status-dot ${safeState}"></i>${esc(source.name)}<small>${esc(detail + success)}</small></span><strong>${sourceLabels[safeState]}</strong></li>`; }).join("");
const savedCooldown = Math.max(0, ...(sources as Record<string, unknown>[]).map(source => Number(source.cooldown_seconds ?? 0)).filter(Number.isFinite));
if (savedCooldown > 0) startImportCooldown(savedCooldown);
const importLabels: Record<string, string> = {running:"Выполняется",success:"Успешно",partial:"Частично",failed:"Ошибка"}; const importLabels: Record<string, string> = {running:"Выполняется",success:"Успешно",partial:"Частично",failed:"Ошибка"};
const importRows = (imports as Record<string, unknown>[]).map(run => { const status = String(run.status); const rows = Number(run.rows_seen ?? 0); const created = Number(run.rows_created ?? 0); const updated = Number(run.rows_updated ?? 0); const result = rows ? ` · ${rows} строк · +${created}/↻${updated}` : ""; const finished = run.finished_at ? ` · завершён ${new Date(String(run.finished_at)).toLocaleString("ru-RU")}` : ""; return `<li><span>${esc(importLabels[status] ?? status)}<small>${esc(result)}</small></span><time>${esc(new Date(String(run.started_at)).toLocaleString("ru-RU"))}<small>${esc(finished)}</small></time></li>`; }).join(""); const importRows = (imports as Record<string, unknown>[]).map(run => { const status = String(run.status); const rows = Number(run.rows_seen ?? 0); const created = Number(run.rows_created ?? 0); const updated = Number(run.rows_updated ?? 0); const result = rows ? ` · ${rows} строк · +${created}/↻${updated}` : ""; const finished = run.finished_at ? ` · завершён ${new Date(String(run.finished_at)).toLocaleString("ru-RU")}` : ""; return `<li><span>${esc(importLabels[status] ?? status)}<small>${esc(result)}</small></span><time>${esc(new Date(String(run.started_at)).toLocaleString("ru-RU"))}<small>${esc(finished)}</small></time></li>`; }).join("");
const actionLabels: Record<string, string> = {approved:"Одобрено",rejected:"Отклонено",pending:"Возвращено на проверку",published:"Опубликовано",mapped:"Сопоставлено",ready:"Готово"}; const actionLabels: Record<string, string> = {approved:"Одобрено",rejected:"Отклонено",pending:"Возвращено на проверку",published:"Опубликовано",mapped:"Сопоставлено",ready:"Готово"};
@@ -46,8 +58,39 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
const historyRows = (history as Record<string, unknown>[]).map(event => { const action = String(event.action); const type = String(event.entity_type); return `<li><span><b>${esc(typeLabels[type] ?? "Запись")}</b> · ${esc(actionLabels[action] ?? action)}${event.reason ? `<small>${esc(event.reason)}</small>` : ""}</span><time>${esc(new Date(String(event.decided_at)).toLocaleString("ru-RU"))}</time></li>`; }).join(""); const historyRows = (history as Record<string, unknown>[]).map(event => { const action = String(event.action); const type = String(event.entity_type); return `<li><span><b>${esc(typeLabels[type] ?? "Запись")}</b> · ${esc(actionLabels[action] ?? action)}${event.reason ? `<small>${esc(event.reason)}</small>` : ""}</span><time>${esc(new Date(String(event.decided_at)).toLocaleString("ru-RU"))}</time></li>`; }).join("");
content.removeAttribute("aria-busy"); content.innerHTML = `<div class="admin-kpis"><a href="/admin/moderation"><span>Уловы на проверке</span><strong>${esc(reports.pending ?? 0)}</strong><small>Открыть очередь →</small></a><a href="/admin/external-sources"><span>Наблюдения в staging</span><strong>${esc((observations.staged ?? 0) + (observations.mapped ?? 0) + (observations.ready ?? 0))}</strong><small>Проверить источники →</small></a><article><span>Одобрено уловов</span><strong>${esc(reports.approved ?? 0)}</strong><small>Участвуют в статистике</small></article><article><span>Источников включено</span><strong>${esc(diagnostics.counts?.enabled_data_sources ?? 0)}</strong><small>из ${esc(diagnostics.counts?.data_sources ?? 0)}</small></article></div><div class="admin-dashboard-grid"><section><div class="admin-section-head"><h2>Состояние источников</h2><button type="button" data-action="secondary" data-refresh>Обновить</button></div><ul>${sourceRows || "<li>Нет данных</li>"}</ul><a href="/status">Публичная страница состояния →</a><br /><a href="/admin/media">Проверить медиа →</a></section><section><div class="admin-section-head"><h2>Последние импорты</h2><button type="button" data-action="secondary" data-official-import>Запустить импорт</button></div><ul>${importRows || "<li>Запусков пока нет</li>"}</ul><p class="privacy">Импорт обращается к официальному источнику и соблюдает cooldown.</p></section><section class="admin-history"><div class="admin-section-head"><h2>Последние решения</h2><button type="button" data-action="secondary" data-history-export>Экспорт JSON</button></div><ul>${historyRows || "<li>Решений пока нет</li>"}</ul><p class="privacy">Экспорт обезличен: без UUID, модератора, причин и исходных данных.</p></section></div>`; content.removeAttribute("aria-busy"); content.innerHTML = `<div class="admin-kpis"><a href="/admin/moderation"><span>Уловы на проверке</span><strong>${esc(reports.pending ?? 0)}</strong><small>Открыть очередь →</small></a><a href="/admin/external-sources"><span>Наблюдения в staging</span><strong>${esc((observations.staged ?? 0) + (observations.mapped ?? 0) + (observations.ready ?? 0))}</strong><small>Проверить источники →</small></a><article><span>Одобрено уловов</span><strong>${esc(reports.approved ?? 0)}</strong><small>Участвуют в статистике</small></article><article><span>Источников включено</span><strong>${esc(diagnostics.counts?.enabled_data_sources ?? 0)}</strong><small>из ${esc(diagnostics.counts?.data_sources ?? 0)}</small></article></div><div class="admin-dashboard-grid"><section><div class="admin-section-head"><h2>Состояние источников</h2><button type="button" data-action="secondary" data-refresh>Обновить</button></div><ul>${sourceRows || "<li>Нет данных</li>"}</ul><a href="/status">Публичная страница состояния →</a><br /><a href="/admin/media">Проверить медиа →</a></section><section><div class="admin-section-head"><h2>Последние импорты</h2><button type="button" data-action="secondary" data-official-import>Запустить импорт</button></div><ul>${importRows || "<li>Запусков пока нет</li>"}</ul><p class="privacy">Импорт обращается к официальному источнику и соблюдает cooldown.</p></section><section class="admin-history"><div class="admin-section-head"><h2>Последние решения</h2><button type="button" data-action="secondary" data-history-export>Экспорт JSON</button></div><ul>${historyRows || "<li>Решений пока нет</li>"}</ul><p class="privacy">Экспорт обезличен: без UUID, модератора, причин и исходных данных.</p></section></div>`;
} }
login?.addEventListener("submit", async event => { event.preventDefault(); token = String(new FormData(login).get("token") || ""); try { await loadDashboard(); login.hidden = true; if (sessionBar) sessionBar.hidden = false; } catch (cause) { if (content) { content.removeAttribute("aria-busy"); content.innerHTML = ""; } fail(cause instanceof Error ? cause.message : "Ошибка загрузки."); } }); login?.addEventListener("submit", async event => { event.preventDefault(); token = String(new FormData(login).get("token") || ""); try { await loadDashboard(); ensureImportMoreButton(); login.hidden = true; if (sessionBar) sessionBar.hidden = false; } catch (cause) { if (content) { content.removeAttribute("aria-busy"); content.innerHTML = ""; } fail(cause instanceof Error ? cause.message : "Ошибка загрузки."); } });
logout?.addEventListener("click", () => endSession("Вы вышли из административной панели.")); logout?.addEventListener("click", () => endSession("Вы вышли из административной панели."));
content?.addEventListener("click", async event => {
const button = (event.target as HTMLElement).closest<HTMLButtonElement>("[data-official-import]");
if (!button) return;
event.preventDefault(); event.stopImmediatePropagation();
if (Date.now() < importCooldownUntil) { syncImportButton(); return; }
button.disabled = true;
try {
const response = await fetch(`${root?.dataset.apiUrl}/api/v1/admin/imports/official-records`, {method:"POST",headers:{Authorization:`Bearer ${token}`} });
if (!response.ok) {
const retryAfter = Number(response.headers.get("Retry-After") ?? 0);
if (response.status === 429 && retryAfter > 0) startImportCooldown(retryAfter);
if (adminEndsSession(response.status)) endSession();
throw new Error(response.status === 429 ? "Источник на cooldown. Повторный запуск временно заблокирован." : response.status === 502 ? "Официальный источник временно недоступен. Старые данные сохранены." : adminErrorMessage(response.status, "Не удалось запустить импорт."));
}
keepSession(); await loadDashboard(); succeed("Импорт запущен. Список запусков обновлён.");
} catch (cause) { fail(cause instanceof Error ? cause.message : "Операция не выполнена."); }
finally { syncImportButton(); }
}, true);
content?.addEventListener("click", async event => {
const button = (event.target as HTMLElement).closest<HTMLButtonElement>("[data-import-more]");
if (!button) return;
event.preventDefault(); event.stopImmediatePropagation(); button.disabled = true;
try {
const rows = await authorizedJson(`/api/v1/admin/imports?limit=5&offset=${importHistoryOffset}`) as Record<string, unknown>[];
const list = content?.querySelector<HTMLUListElement>(".admin-dashboard-grid section:nth-child(2) ul");
if (list) list.insertAdjacentHTML("beforeend", rows.map(importRow).join(""));
importHistoryOffset += rows.length;
if (rows.length < 5) button.remove(); else button.disabled = false;
keepSession();
} catch (cause) { button.disabled = false; fail(cause instanceof Error ? cause.message : "Не удалось загрузить историю импортов."); }
}, true);
content?.addEventListener("click", async event => { content?.addEventListener("click", async event => {
const button = (event.target as HTMLElement).closest<HTMLButtonElement>("[data-history-export],[data-official-import],[data-refresh]"); if (!button) return; const button = (event.target as HTMLElement).closest<HTMLButtonElement>("[data-history-export],[data-official-import],[data-refresh]"); if (!button) return;
button.disabled = true; button.disabled = true;
+15 -8
View File
@@ -10,12 +10,13 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
<form class="admin-login" autocomplete="off"><label>Административный токен<input name="token" type="password" required autocomplete="off" /></label><button data-action="primary" type="submit">Открыть медиатеку</button></form> <form class="admin-login" autocomplete="off"><label>Административный токен<input name="token" type="password" required autocomplete="off" /></label><button data-action="primary" type="submit">Открыть медиатеку</button></form>
<p class="privacy">Публикация требует явной причины и атомарно сохраняет fallback для rollback. Токен хранится только в памяти страницы.</p> <p class="privacy">Публикация требует явной причины и атомарно сохраняет fallback для rollback. Токен хранится только в памяти страницы.</p>
<div class="admin-session-bar" hidden><span>Административная сессия активна</span><button data-action="secondary" type="button" data-admin-logout>Выйти</button></div> <div class="admin-session-bar" hidden><span>Административная сессия активна</span><button data-action="secondary" type="button" data-admin-logout>Выйти</button></div>
<form class="admin-queue-filters" hidden><label>Тип<select name="entity_type"><option value="">Все типы</option><option value="fish">Рыбы</option><option value="waterbody">Водоёмы</option><option value="tackle">Снасти</option><option value="reference">Справка</option></select></label><label>Состояние<select name="status"><option value="">Все состояния</option><option value="approved">Approved</option><option value="upgrade_queued">Upgrade queued</option><option value="upgrade_stored">Upgrade stored</option></select></label><button data-action="primary" type="submit">Применить</button></form> <form class="admin-queue-filters" hidden><label>Поиск по подписи<input name="q" maxlength="100" placeholder="Например, щука или Вьюнок" /></label><label>Тип<select name="entity_type"><option value="">Все типы</option><option value="fish">Рыбы</option><option value="waterbody">Водоёмы</option><option value="tackle">Снасти</option><option value="reference">Справка</option></select></label><label>Роль<select name="media_role"><option value="">Все роли</option><option value="waterbody_cover">Заставка водоёма</option><option value="waterbody_map">Карта водоёма</option><option value="waterbody_depth_map">Карта глубин</option><option value="waterbody_screenshot">Скриншот водоёма</option><option value="tackle_card">Карточка снасти</option><option value="tackle_detail">Деталь снасти</option><option value="rig_diagram">Схема сборки</option><option value="tackle_screenshot">Скриншот снасти</option></select></label><label>Состояние<select name="status"><option value="">Все состояния</option><option value="approved">Approved</option><option value="upgrade_queued">Upgrade queued</option><option value="upgrade_stored">Upgrade stored</option></select></label><button data-action="primary" type="submit">Применить</button></form>
<div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><section class="media-library__grid" data-media-list aria-live="polite"></section> <div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><section class="media-library__grid" data-media-list aria-live="polite"></section>
<nav data-pages aria-label="Страницы медиатеки" hidden><button data-action="secondary" type="button" data-previous>Предыдущая</button><span data-page-number aria-live="polite"></span><button data-action="secondary" type="button" data-next>Следующая</button><button data-action="secondary" type="button" data-refresh>Обновить</button></nav> <nav data-pages aria-label="Страницы медиатеки" hidden><button data-action="secondary" type="button" data-previous>Предыдущая</button><span data-page-number aria-live="polite"></span><button data-action="secondary" type="button" data-next>Следующая</button><button data-action="secondary" type="button" data-refresh>Обновить</button></nav>
</section> </section>
<script> <script>
import { adminEndsSession, adminErrorMessage } from "../../lib/admin-errors"; import { adminEndsSession, adminErrorMessage } from "../../lib/admin-errors";
import { mediaRoleLabel } from "../../lib/media";
const root = document.querySelector<HTMLElement>("[data-api-url]"); const root = document.querySelector<HTMLElement>("[data-api-url]");
const login = document.querySelector<HTMLFormElement>(".admin-login"); const login = document.querySelector<HTMLFormElement>(".admin-login");
const filters = document.querySelector<HTMLFormElement>(".admin-queue-filters"); const filters = document.querySelector<HTMLFormElement>(".admin-queue-filters");
@@ -29,9 +30,13 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
const next = document.querySelector<HTMLButtonElement>("[data-next]"); const next = document.querySelector<HTMLButtonElement>("[data-next]");
const refresh = document.querySelector<HTMLButtonElement>("[data-refresh]"); const refresh = document.querySelector<HTMLButtonElement>("[data-refresh]");
const pageNumber = document.querySelector<HTMLElement>("[data-page-number]"); const pageNumber = document.querySelector<HTMLElement>("[data-page-number]");
let token = ""; let offset = 0; let timer: ReturnType<typeof setTimeout> | undefined; const entityFilter = filters?.querySelector<HTMLSelectElement>('[name="entity_type"]');
const roleFilter = filters?.querySelector<HTMLSelectElement>('[name="media_role"]');
const rolesByEntity: Record<string, Set<string>> = { waterbody: new Set(["waterbody_cover", "waterbody_map", "waterbody_depth_map", "waterbody_screenshot"]), tackle: new Set(["tackle_card", "tackle_detail", "rig_diagram", "tackle_screenshot"]) };
const syncRoleFilter = () => { const allowed = rolesByEntity[entityFilter?.value ?? ""] ?? new Set<string>(); if (roleFilter) { [...roleFilter.options].forEach(option => { if (!option.value) return; option.hidden = !allowed.has(option.value); option.disabled = !allowed.has(option.value); }); if (roleFilter.value && !allowed.has(roleFilter.value)) roleFilter.value = ""; roleFilter.disabled = allowed.size === 0; } };
let token = ""; let offset = 0; let manifestVersion = 1; let timer: ReturnType<typeof setTimeout> | undefined;
const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char)); const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char));
const url = (value: unknown) => { try { const parsed = new URL(String(value), root?.dataset.apiUrl); return parsed.protocol === "http:" || parsed.protocol === "https:" ? esc(parsed.href) : ""; } catch { return ""; } }; const url = (value: unknown) => { try { const parsed = new URL(String(value), root?.dataset.apiUrl); return (parsed.protocol === "http:" || parsed.protocol === "https:") && !parsed.username && !parsed.password && parsed.hostname ? esc(parsed.href) : ""; } catch { return ""; } };
const fail = (message: string) => { if (status) status.hidden = true; if (error) { error.textContent = message; error.hidden = false; } }; const fail = (message: string) => { if (status) status.hidden = true; if (error) { error.textContent = message; error.hidden = false; } };
const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } }; const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } };
const endSession = (message?: string) => { token = ""; if (timer) clearTimeout(timer); timer = undefined; if (login) { login.hidden = false; login.reset(); } if (filters) filters.hidden = true; if (sessionBar) sessionBar.hidden = true; if (list) list.innerHTML = ""; pages?.setAttribute("hidden", ""); if (message) fail(message); }; const endSession = (message?: string) => { token = ""; if (timer) clearTimeout(timer); timer = undefined; if (login) { login.hidden = false; login.reset(); } if (filters) filters.hidden = true; if (sessionBar) sessionBar.hidden = true; if (list) list.innerHTML = ""; pages?.setAttribute("hidden", ""); if (message) fail(message); };
@@ -40,21 +45,23 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
async function load() { async function load() {
if (!root || !list || !filters) return; if (!root || !list || !filters) return;
error?.setAttribute("hidden", ""); list.innerHTML = loading(); list.setAttribute("aria-busy", "true"); error?.setAttribute("hidden", ""); list.innerHTML = loading(); list.setAttribute("aria-busy", "true");
const values = new FormData(filters); const params = new URLSearchParams({limit:"51", offset:String(offset)}); for (const key of ["entity_type", "status"]) { const value = String(values.get(key) || ""); if (value) params.set(key, value); } const values = new FormData(filters); const params = new URLSearchParams({limit:"51", offset:String(offset)}); for (const key of ["q", "entity_type", "media_role", "status"]) { const value = String(values.get(key) || "").trim(); if (value) params.set(key, value); }
const response = await fetch(`${root.dataset.apiUrl}/api/v1/admin/media/catalog?${params}`, {headers:{Authorization:`Bearer ${token}`} }); const response = await fetch(`${root.dataset.apiUrl}/api/v1/admin/media/catalog?${params}`, {headers:{Authorization:`Bearer ${token}`} });
if (!response.ok) { if (adminEndsSession(response.status)) endSession(); throw new Error(adminErrorMessage(response.status, "Не удалось загрузить медиатеку.")); } if (!response.ok) { if (adminEndsSession(response.status)) endSession(); throw new Error(adminErrorMessage(response.status, "Не удалось загрузить медиатеку.")); }
const rows: Record<string, unknown>[] = await response.json(); keepSession(); list.removeAttribute("aria-busy"); manifestVersion = Number(response.headers.get("X-Media-Manifest-Version") || 1); const rows: Record<string, unknown>[] = await response.json(); keepSession(); list.removeAttribute("aria-busy");
if (!rows.length && offset > 0) { offset = 0; return load(); } if (!rows.length && offset > 0) { offset = 0; return load(); }
const assets = rows.slice(0, 50); if (pages) pages.hidden = !assets.length; if (previous) previous.disabled = offset === 0; if (next) next.disabled = rows.length <= 50; if (pageNumber) pageNumber.textContent = `Страница ${offset / 50 + 1}`; const assets = rows.slice(0, 50); if (pages) pages.hidden = !assets.length; if (previous) previous.disabled = offset === 0; if (next) next.disabled = rows.length <= 50; if (pageNumber) pageNumber.textContent = `Страница ${offset / 50 + 1}`;
if (!assets.length) { list.innerHTML = '<div class="state"><h2>Кандидатов нет</h2><p>Для выбранных фильтров нет approved или upgrade_queued файлов.</p></div>'; return; } if (!assets.length) { list.innerHTML = '<div class="state"><h2>Кандидатов нет</h2><p>Для выбранных фильтров нет approved или upgrade_queued файлов.</p></div>'; return; }
list.innerHTML = assets.map(asset => { const image = url(asset.image_url); const source = url(asset.source_url); const variants = (asset.derivatives as Record<string, unknown>[] ?? []).map(item => `${esc(item.format)} ${esc(item.width)}×${esc(item.height)}`).join(", "); const rollback = asset.status === "approved" && asset.supersedes ? `<button data-media-rollback="${esc(asset.asset_url)}" type="button" data-action="secondary">Откатить замену</button>` : ""; return `<article class="media-library__card"><a href="${image}" target="_blank" rel="noreferrer">${image ? `<img src="${image}" alt="${esc(asset.label)}" loading="lazy" />` : ""}</a><h2>${esc(asset.label)}</h2><span>${esc(asset.status)} · ${esc(asset.entity_type)} · ${esc(asset.width)}×${esc(asset.height)}</span><p>${esc(asset.source_system)}${asset.duplicate_of ? ` · duplicate_of ${esc(asset.duplicate_of)}` : ""}</p>${variants ? `<small>Производные: ${variants}</small>` : "<small>Производных нет</small>"}${source ? `<a href="${source}" target="_blank" rel="noreferrer">Первоисточник →</a>` : ""}${rollback}</article>`; }).join(""); list.innerHTML = assets.map(asset => { const image = url(asset.image_url); const source = url(asset.source_url); const role = String(asset.media_role || ""); const variants = (asset.derivatives as Record<string, unknown>[] ?? []).map(item => `${esc(item.format)} ${esc(item.width)}×${esc(item.height)}`).join(", "); const rollback = asset.status === "approved" && asset.supersedes ? `<button data-media-rollback="${esc(asset.id)}" type="button" data-action="secondary">Откатить замену</button>` : ""; return `<article class="media-library__card"${role ? ` data-media-role="${esc(role)}"` : ""}><a href="${image}" target="_blank" rel="noreferrer">${image ? `<img src="${image}" alt="${esc(asset.label)}" loading="lazy" />` : ""}</a><h2>${esc(asset.label)}</h2><span>${esc(asset.status)} · ${esc(asset.entity_type)} · ${esc(asset.width)}×${esc(asset.height)}</span>${role ? `<small>${esc(mediaRoleLabel(role))}</small>` : ""}<p>${esc(asset.source_system)}${asset.duplicate_of ? ` · duplicate_of ${esc(asset.duplicate_of)}` : ""}</p>${variants ? `<small>Производные: ${variants}</small>` : "<small>Производных нет</small>"}${source ? `<a href="${source}" target="_blank" rel="noreferrer">Первоисточник →</a>` : ""}${rollback}</article>`; }).join("");
list.querySelectorAll<HTMLButtonElement>("[data-media-rollback]").forEach(button => button.addEventListener("click", async () => { const note = window.prompt("Причина отката:"); if (!note?.trim()) return; button.disabled = true; try { const response = await fetch(`${root?.dataset.apiUrl}/api/v1/admin/media/upgrades/rollback`, {method:"POST", headers:{Authorization:`Bearer ${token}`, "Content-Type":"application/json"}, body:JSON.stringify({asset_url:button.dataset.mediaRollback, note:note.trim()})}); if (!response.ok) throw new Error(adminErrorMessage(response.status, "Не удалось выполнить откат.")); succeed("Fallback восстановлен."); await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Не удалось выполнить откат."); } finally { button.disabled = false; } })); list.querySelectorAll<HTMLButtonElement>("[data-media-rollback]").forEach(button => button.addEventListener("click", async () => { const note = window.prompt("Причина отката:"); if (!note?.trim()) return; button.disabled = true; try { const response = await fetch(`${root?.dataset.apiUrl}/api/v1/admin/media/upgrades/rollback`, {method:"POST", headers:{Authorization:`Bearer ${token}`, "Content-Type":"application/json"}, body:JSON.stringify({asset_id:button.dataset.mediaRollback, expected_version:manifestVersion, note:note.trim()})}); if (!response.ok) throw new Error(adminErrorMessage(response.status, "Не удалось выполнить откат.")); succeed("Fallback восстановлен."); await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Не удалось выполнить откат."); } finally { button.disabled = false; } }));
if (assets.some(asset => asset.status === "upgrade_stored")) { const publish = document.createElement("button"); publish.type = "button"; publish.dataset.action = "primary"; publish.textContent = "Опубликовать сохранённые замены"; publish.addEventListener("click", async () => { const note = window.prompt("Причина публикации замен:"); if (!note?.trim()) return; publish.disabled = true; try { const response = await fetch(`${root?.dataset.apiUrl}/api/v1/admin/media/upgrades/publish`, {method:"POST", headers:{Authorization:`Bearer ${token}`, "Content-Type":"application/json"}, body:JSON.stringify({note:note.trim()})}); if (!response.ok) throw new Error(adminErrorMessage(response.status, "Не удалось опубликовать замены.")); succeed("Замены опубликованы атомарно, fallback сохранены."); await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Не удалось опубликовать замены."); } finally { publish.disabled = false; } }); list.prepend(publish); } if (assets.some(asset => asset.status === "upgrade_stored")) { const publish = document.createElement("button"); publish.type = "button"; publish.dataset.action = "primary"; publish.textContent = "Опубликовать выбранные замены"; publish.addEventListener("click", async () => { const note = window.prompt("Причина публикации замен:"); if (!note?.trim()) return; publish.disabled = true; try { const asset_ids = assets.filter(asset => asset.status === "upgrade_stored").map(asset => String(asset.id)); const response = await fetch(`${root?.dataset.apiUrl}/api/v1/admin/media/upgrades/publish`, {method:"POST", headers:{Authorization:`Bearer ${token}`, "Content-Type":"application/json"}, body:JSON.stringify({asset_ids, expected_version:manifestVersion, note:note.trim()})}); if (!response.ok) throw new Error(adminErrorMessage(response.status, "Не удалось опубликовать замены.")); succeed("Выбранные замены опубликованы атомарно, fallback сохранены."); await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Не удалось опубликовать замены."); } finally { publish.disabled = false; } }); list.prepend(publish); }
} }
login?.addEventListener("submit", async event => { event.preventDefault(); token = String(new FormData(login).get("token") || ""); offset = 0; try { await load(); login.hidden = true; if (sessionBar) sessionBar.hidden = false; if (filters) filters.hidden = false; } catch (cause) { list && (list.innerHTML = ""); fail(cause instanceof Error ? cause.message : "Ошибка загрузки."); } }); login?.addEventListener("submit", async event => { event.preventDefault(); token = String(new FormData(login).get("token") || ""); offset = 0; try { await load(); login.hidden = true; if (sessionBar) sessionBar.hidden = false; if (filters) filters.hidden = false; } catch (cause) { list && (list.innerHTML = ""); fail(cause instanceof Error ? cause.message : "Ошибка загрузки."); } });
filters?.addEventListener("submit", async event => { event.preventDefault(); offset = 0; try { await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка фильтрации."); } }); filters?.addEventListener("submit", async event => { event.preventDefault(); offset = 0; try { await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка фильтрации."); } });
const move = async (delta: number) => { offset = Math.max(0, offset + delta); try { await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка загрузки страницы."); } }; const move = async (delta: number) => { offset = Math.max(0, offset + delta); try { await load(); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка загрузки страницы."); } };
previous?.addEventListener("click", () => move(-50)); next?.addEventListener("click", () => move(50)); refresh?.addEventListener("click", async () => { refresh.disabled = true; try { await load(); succeed("Медиатека обновлена."); } catch (cause) { fail(cause instanceof Error ? cause.message : "Не удалось обновить медиатеку."); } finally { refresh.disabled = false; } }); previous?.addEventListener("click", () => move(-50)); next?.addEventListener("click", () => move(50)); refresh?.addEventListener("click", async () => { refresh.disabled = true; try { await load(); succeed("Медиатека обновлена."); } catch (cause) { fail(cause instanceof Error ? cause.message : "Не удалось обновить медиатеку."); } finally { refresh.disabled = false; } });
logout?.addEventListener("click", () => endSession("Вы вышли из административной панели.")); logout?.addEventListener("click", () => endSession("Вы вышли из административной панели."));
entityFilter?.addEventListener("change", syncRoleFilter);
syncRoleFilter();
</script> </script>
</Layout> </Layout>
+13 -3
View File
@@ -10,7 +10,7 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
<form class="admin-login" autocomplete="off"><label>Административный токен<input name="token" type="password" required autocomplete="off" /></label><button data-action="primary" type="submit">Открыть очередь</button></form> <form class="admin-login" autocomplete="off"><label>Административный токен<input name="token" type="password" required autocomplete="off" /></label><button data-action="primary" type="submit">Открыть очередь</button></form>
<p class="privacy">Токен хранится только в памяти страницы и не записывается в URL или localStorage.</p> <p class="privacy">Токен хранится только в памяти страницы и не записывается в URL или localStorage.</p>
<div class="admin-session-bar" hidden><span>Административная сессия активна</span><button data-action="secondary" type="button" data-admin-logout>Выйти</button></div> <div class="admin-session-bar" hidden><span>Административная сессия активна</span><button data-action="secondary" type="button" data-admin-logout>Выйти</button></div>
<div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><div class="moderation-list" data-moderation-list aria-live="polite"></div> <div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><label class="queue-select-all"><input type="checkbox" data-bulk-select-all> Выбрать все записи на странице</label><div class="moderation-bulk" data-bulk hidden><strong data-bulk-count>0 выбрано</strong><label>Причина отклонения<textarea data-bulk-reason rows="1" maxlength="1000"></textarea></label><button data-action="primary" type="button" data-bulk-approve>Одобрить выбранные</button><button data-action="danger" type="button" data-bulk-reject>Отклонить выбранные</button></div><div class="moderation-list" data-moderation-list aria-live="polite"></div>
<nav data-pages aria-label="Страницы очереди" hidden><button data-action="secondary" type="button" data-previous>Предыдущая</button><span data-page-number aria-live="polite"></span><button data-action="secondary" type="button" data-next>Следующая</button><button data-action="secondary" type="button" data-refresh>Обновить</button></nav> <nav data-pages aria-label="Страницы очереди" hidden><button data-action="secondary" type="button" data-previous>Предыдущая</button><span data-page-number aria-live="polite"></span><button data-action="secondary" type="button" data-next>Следующая</button><button data-action="secondary" type="button" data-refresh>Обновить</button></nav>
<p class="admin-shortcuts"><kbd>A</kbd> одобрить карточку с фокусом · отклонение и удаление — только кнопками</p> <p class="admin-shortcuts"><kbd>A</kbd> одобрить карточку с фокусом · отклонение и удаление — только кнопками</p>
</section> </section>
@@ -28,17 +28,27 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
const pageNumber = document.querySelector<HTMLElement>("[data-page-number]"); const pageNumber = document.querySelector<HTMLElement>("[data-page-number]");
const sessionBar = document.querySelector<HTMLElement>(".admin-session-bar"); const sessionBar = document.querySelector<HTMLElement>(".admin-session-bar");
const logout = document.querySelector<HTMLButtonElement>("[data-admin-logout]"); const logout = document.querySelector<HTMLButtonElement>("[data-admin-logout]");
const bulk = document.querySelector<HTMLElement>("[data-bulk]");
const selectAll = document.querySelector<HTMLInputElement>("[data-bulk-select-all]");
let token = ""; let token = "";
let offset = 0; let offset = 0;
let sessionTimer: ReturnType<typeof setTimeout> | undefined; let sessionTimer: ReturnType<typeof setTimeout> | undefined;
const loadingCards = () => `<div class="loading-grid" aria-hidden="true">${Array.from({length:2}, () => '<div class="loading-card"><span class="loading-line loading-line--label"></span><span class="loading-line loading-line--title"></span><span class="loading-line"></span><span class="loading-line loading-line--short"></span></div>').join("")}</div><span class="sr-only">Загружаем очередь модерации</span>`; const loadingCards = () => `<div class="loading-grid" aria-hidden="true">${Array.from({length:2}, () => '<div class="loading-card"><span class="loading-line loading-line--label"></span><span class="loading-line loading-line--title"></span><span class="loading-line"></span><span class="loading-line loading-line--short"></span></div>').join("")}</div><span class="sr-only">Загружаем очередь модерации</span>`;
const setLoading = (loading: boolean) => list?.setAttribute("aria-busy", String(loading)); const setLoading = (loading: boolean) => list?.setAttribute("aria-busy", String(loading));
const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char)); const esc = (value: unknown) => String(value ?? "—").replace(/[&<>'"]/g, char => ({"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"}[char] ?? char));
const safeHttpUrl = (value: unknown) => { try { const url = new URL(String(value)); return url.protocol === "http:" || url.protocol === "https:" ? esc(url.href) : ""; } catch { return ""; } }; const safeHttpUrl = (value: unknown) => { try { const url = new URL(String(value)); return (url.protocol === "http:" || url.protocol === "https:") && !url.username && !url.password && url.hostname ? esc(url.href) : ""; } catch { return ""; } };
const fail = (message: string) => { if (status) status.hidden = true; if (error) { error.textContent = message; error.hidden = false; } }; const fail = (message: string) => { if (status) status.hidden = true; if (error) { error.textContent = message; error.hidden = false; } };
const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } }; const succeed = (message: string) => { if (error) error.hidden = true; if (status) { status.textContent = message; status.hidden = false; } };
const endSession = (message?: string) => { token = ""; if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = undefined; if (login) { login.hidden = false; login.reset(); } if (sessionBar) sessionBar.hidden = true; if (list) list.innerHTML = ""; if (message) fail(message); }; const endSession = (message?: string) => { token = ""; if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = undefined; if (login) { login.hidden = false; login.reset(); } if (sessionBar) sessionBar.hidden = true; if (list) list.innerHTML = ""; if (selectAll) { selectAll.checked = false; selectAll.indeterminate = false; } syncBulk(); if (message) fail(message); };
const keepSession = () => { if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = setTimeout(() => endSession("Сессия завершена после 15 минут бездействия. Введите токен снова."), 15 * 60 * 1000); }; const keepSession = () => { if (sessionTimer) clearTimeout(sessionTimer); sessionTimer = setTimeout(() => endSession("Сессия завершена после 15 минут бездействия. Введите токен снова."), 15 * 60 * 1000); };
const syncBulk = () => { const inputs = [...(list?.querySelectorAll<HTMLInputElement>("[data-bulk-select]") ?? [])]; const cards = inputs.filter(input => input.checked); if (bulk) bulk.hidden = cards.length === 0; if (selectAll) { selectAll.checked = inputs.length > 0 && cards.length === inputs.length; selectAll.indeterminate = cards.length > 0 && cards.length < inputs.length; } const count = bulk?.querySelector<HTMLElement>("[data-bulk-count]"); if (count) count.textContent = `${cards.length} выбрано`; };
const hydrateBulk = () => { list?.querySelectorAll<HTMLElement>("[data-report-id]").forEach(card => { if (card.querySelector("[data-bulk-select]")) return; const label = document.createElement("label"); label.className = "moderation-select"; label.innerHTML = `<input type="checkbox" data-bulk-select aria-label="Выбрать улов ${card.querySelector("h2")?.textContent ?? ""}">`; card.prepend(label); }); syncBulk(); };
window.setInterval(hydrateBulk, 1000);
async function runBulk(statusValue: "approved" | "rejected") { const selected = [...(list?.querySelectorAll<HTMLInputElement>("[data-bulk-select]:checked") ?? [])].map(input => input.closest<HTMLElement>("[data-report-id]")); const reason = bulk?.querySelector<HTMLTextAreaElement>("[data-bulk-reason]")?.value.trim() || null; if (!selected.length) return; if (statusValue === "rejected" && !reason) { fail("Укажите причину отклонения."); return; } const buttons = bulk?.querySelectorAll<HTMLButtonElement>("button") ?? []; buttons.forEach(button => button.disabled = true); try { const response = await fetch(`${root?.dataset.apiUrl}/api/v1/admin/catch-reports/bulk`, {method:"POST",headers:{Authorization:`Bearer ${token}`,"Content-Type":"application/json"},body:JSON.stringify({status:statusValue,reason,items:selected.map(card => ({id:card?.dataset.reportId,expected_version:Number(card?.dataset.version)}))})}); if (response.status === 409) { await loadQueue(); throw new Error("Часть выбранных записей уже изменена. Очередь обновлена."); } if (!response.ok) throw new Error(adminErrorMessage(response.status, "Не удалось применить пакетное решение.")); keepSession(); await loadQueue(); succeed(`Обработано записей: ${selected.length}.`); } catch (cause) { fail(cause instanceof Error ? cause.message : "Ошибка пакетного решения."); } finally { buttons.forEach(button => button.disabled = false); syncBulk(); } }
bulk?.querySelector<HTMLButtonElement>("[data-bulk-approve]")?.addEventListener("click", () => runBulk("approved"));
bulk?.querySelector<HTMLButtonElement>("[data-bulk-reject]")?.addEventListener("click", () => runBulk("rejected"));
list?.addEventListener("change", event => { if ((event.target as HTMLElement).matches("[data-bulk-select]")) syncBulk(); });
selectAll?.addEventListener("change", () => { list?.querySelectorAll<HTMLInputElement>("[data-bulk-select]").forEach(input => input.checked = selectAll.checked); syncBulk(); });
async function loadQueue() { async function loadQueue() {
if (!root || !list) return; if (!root || !list) return;
error?.setAttribute("hidden", ""); setLoading(true); list.innerHTML = loadingCards(); error?.setAttribute("hidden", ""); setLoading(true); list.innerHTML = loadingCards();
+8 -6
View File
@@ -12,12 +12,14 @@ export const POST: APIRoute = async ({ request, redirect, cookies }) => {
try { try {
const upload = new FormData(); upload.set("screenshot", screenshot); const upload = new FormData(); upload.set("screenshot", screenshot);
const response = await fetch(`${base}/api/v1/catch-reports/${reportId}/screenshot`, { method: "POST", headers:{"X-Upload-Token":uploadToken}, body: upload, signal: AbortSignal.timeout(60_000) }); const response = await fetch(`${base}/api/v1/catch-reports/${reportId}/screenshot`, { method: "POST", headers:{"X-Upload-Token":uploadToken}, body: upload, signal: AbortSignal.timeout(60_000) });
if (response.ok) cookies.delete(cookieName, {path:"/"}); if (response.ok) {
cookies.delete(cookieName, {path:"/"});
cookies.delete("rf4-idempotency-key", {path:"/"});
}
return redirect(response.ok ? "/report?state=screenshot_sent" : `/report?state=screenshot_error&report_id=${encodeURIComponent(reportId)}`, 303); return redirect(response.ok ? "/report?state=screenshot_sent" : `/report?state=screenshot_error&report_id=${encodeURIComponent(reportId)}`, 303);
} catch (err) { } catch {
const isTimeout = err instanceof DOMException && err.name === "TimeoutError" || // The report already exists and the upload can have reached the API before
err instanceof TypeError && err.message.toLowerCase().includes("fetch") || // the timeout. Keep the recovery form visible; the API makes a retry safe.
err instanceof Error && err.message.toLowerCase().includes("abort"); return redirect(`/report?state=screenshot_error&report_id=${encodeURIComponent(reportId)}`, 303);
return redirect(isTimeout ? `/report?state=timeout&report_id=${encodeURIComponent(reportId)}` : `/report?state=screenshot_error&report_id=${encodeURIComponent(reportId)}`, 303);
} }
}; };
+1
View File
@@ -22,6 +22,7 @@ export const POST: APIRoute = async ({ request, redirect, cookies }) => {
const response = await fetch(`${base}/api/v1/catch-reports`, { method: "POST", headers: { "content-type": "application/json", "Idempotency-Key": idempotencyKey, "X-Forwarded-For": request.headers.get("x-forwarded-for") || request.headers.get("x-real-ip") || "unknown" }, body: JSON.stringify(payload), signal: AbortSignal.timeout(30_000) }); const response = await fetch(`${base}/api/v1/catch-reports`, { method: "POST", headers: { "content-type": "application/json", "Idempotency-Key": idempotencyKey, "X-Forwarded-For": request.headers.get("x-forwarded-for") || request.headers.get("x-real-ip") || "unknown" }, body: JSON.stringify(payload), signal: AbortSignal.timeout(30_000) });
if (!response.ok) { if (!response.ok) {
if (response.status === 429) return redirect("/report?state=rate_limited", 303); if (response.status === 429) return redirect("/report?state=rate_limited", 303);
if (response.status === 409) { cookies.delete("rf4-idempotency-key", { path: "/" }); return redirect("/report?state=conflict", 303); }
if (response.status >= 500) return redirect("/report?state=server_error", 303); if (response.status >= 500) return redirect("/report?state=server_error", 303);
return redirect("/report?state=create_error", 303); return redirect("/report?state=create_error", 303);
} }
+23 -4
View File
@@ -1,20 +1,36 @@
--- ---
import ActivityCard from "../../components/ActivityCard.astro"; import ActivityCard from "../../components/ActivityCard.astro";
import ActivityEvidenceSummary from "../../components/ActivityEvidenceSummary.astro";
import ActivityPeriodFilter from "../../components/ActivityPeriodFilter.astro";
import EntityMedia from "../../components/EntityMedia.astro"; import EntityMedia from "../../components/EntityMedia.astro";
import AtlasBreadcrumbs from "../../components/AtlasBreadcrumbs.astro"; import AtlasBreadcrumbs from "../../components/AtlasBreadcrumbs.astro";
import AtlasEntityLink from "../../components/AtlasEntityLink.astro"; import AtlasEntityLink from "../../components/AtlasEntityLink.astro";
import PageHero from "../../components/PageHero.astro"; import PageHero from "../../components/PageHero.astro";
import StatePanel from "../../components/StatePanel.astro"; import StatePanel from "../../components/StatePanel.astro";
import Layout from "../../layouts/Layout.astro"; import Layout from "../../layouts/Layout.astro";
import Pagination from "../../components/Pagination.astro";
import { api, plural, type Activity, type DictionaryItem, type MediaAsset, type PaginatedActivity } from "../../lib/api"; import { api, plural, type Activity, type DictionaryItem, type MediaAsset, type PaginatedActivity } from "../../lib/api";
import { findMediaByLabel } from "../../lib/media"; import { findMediaByLabel } from "../../lib/media";
const { slug } = Astro.params; const { slug } = Astro.params;
let fish: DictionaryItem | undefined, items: Activity[] = [], media: MediaAsset[] = [], unavailable = false; const requestedHours = Astro.url.searchParams.get("hours") ?? "72";
const hours = ["24", "72", "168"].includes(requestedHours) ? requestedHours : "72";
const periodLabel = { "24": "24 часа", "72": "72 часа", "168": "7 дней" }[hours];
const requestedOffset = Number(Astro.url.searchParams.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
const activityLimit = 24;
let fish: DictionaryItem | undefined, items: Activity[] = [], media: MediaAsset[] = [], totalItems = 0, unavailable = false;
try { try {
const [fishes, fishMedia] = await Promise.all([api<DictionaryItem[]>("/api/v1/fishes?limit=500"), api<MediaAsset[]>("/api/v1/media/catalog?entity_type=fish")]); const [fishes, fishMedia] = await Promise.all([api<DictionaryItem[]>("/api/v1/fishes?limit=500"), api<MediaAsset[]>("/api/v1/media/catalog?entity_type=fish")]);
media = fishMedia; media = fishMedia;
fish = fishes.find(item => item.slug === slug); fish = fishes.find(item => item.slug === slug);
if (fish) { const paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=72&fish=${encodeURIComponent(fish.slug)}&limit=100`); items = paginated.items; } if (fish) {
let paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`);
if (paginated.total > 0 && offset >= paginated.total) {
offset = Math.floor((paginated.total - 1) / activityLimit) * activityLimit;
paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`);
}
items = paginated.items; totalItems = paginated.total;
}
} catch { unavailable = true; } } catch { unavailable = true; }
if (unavailable) { if (unavailable) {
Astro.response.status = 503; Astro.response.status = 503;
@@ -28,7 +44,10 @@ const schema = fish ? { "@context":"https://schema.org", "@type":"CollectionPage
--- ---
<Layout title={fish ? `Где ловить ${fish.name_ru} в RF4 — свежие точки` : "Рыба не найдена — RF4 Spotter"} description={fish ? `Свежие точки ловли ${fish.name_ru} в Russian Fishing 4: водоёмы, координаты, приманки, активность и источники наблюдений.` : "Такого вида рыбы нет в каталоге RF4 Spotter."} noindex={!fish || unavailable} structuredData={schema} errorPage={!fish || unavailable}> <Layout title={fish ? `Где ловить ${fish.name_ru} в RF4 — свежие точки` : "Рыба не найдена — RF4 Spotter"} description={fish ? `Свежие точки ловли ${fish.name_ru} в Russian Fishing 4: водоёмы, координаты, приманки, активность и источники наблюдений.` : "Такого вида рыбы нет в каталоге RF4 Spotter."} noindex={!fish || unavailable} structuredData={schema} errorPage={!fish || unavailable}>
<AtlasBreadcrumbs items={[{ label: "Рыбы", href: "/fish" }, { label: fish?.name_ru ?? "Не найдено" }]} /> <AtlasBreadcrumbs items={[{ label: "Рыбы", href: "/fish" }, { label: fish?.name_ru ?? "Не найдено" }]} />
<PageHero eyebrow="Свежие данные за 72 часа" title={fish?.name_ru ?? "Рыба не найдена"} description={fish ? `${items.length} ${plural(items.length,["активная точка","активные точки","активных точек"])} на ${waters.length} ${plural(waters.length,["водоёме","водоёмах","водоёмах"])}.` : undefined} variant={fish ? "fish" : undefined} identity={fish?.name_ru} /> <PageHero eyebrow={`Свежие данные за ${periodLabel}`} title={fish?.name_ru ?? "Рыба не найдена"} description={fish ? `${totalItems} ${plural(totalItems,["активная точка","активные точки","активных точек"])} на ${waters.length} ${plural(waters.length,["водоёме","водоёмах","водоёмах"])}.` : undefined} variant={fish ? "fish" : undefined} identity={fish?.name_ru} />
{fish && <ActivityPeriodFilter hours={hours} />}
{image && <section class="entity-feature content-grid" aria-label={`Изображение: ${fish!.name_ru}`}><EntityMedia asset={image} sourceLink /><div><span class="overline">Визуальный справочник</span><h2>{fish!.name_ru}</h2><p>Изображение опубликовано с прямой ссылкой на источник. Оно помогает отличить вид, а актуальные точки ниже остаются отдельными наблюдениями игроков.</p></div></section>} {image && <section class="entity-feature content-grid" aria-label={`Изображение: ${fish!.name_ru}`}><EntityMedia asset={image} sourceLink /><div><span class="overline">Визуальный справочник</span><h2>{fish!.name_ru}</h2><p>Изображение опубликовано с прямой ссылкой на источник. Оно помогает отличить вид, а актуальные точки ниже остаются отдельными наблюдениями игроков.</p></div></section>}
{unavailable ? <StatePanel tone="unavailable" title="Данные временно недоступны" description="Каталог сохранён, но свежие наблюдения сейчас не получены." /> : !fish ? <StatePanel tone="error" title="Такой рыбы нет в справочнике" actionHref="/fish" actionLabel="Открыть каталог" /> : <section class="catalog-results content-grid"><aside><span class="overline">Водоёмы</span>{waters.length ? <nav>{waters.map(([waterSlug,name]) => <AtlasEntityLink href={`/waterbodies/${waterSlug}/${fish!.slug}`} label={name} kind="water" identity={waterSlug} />)}</nav> : <p>Свежих подтверждённых водоёмов пока нет.</p>}</aside><div>{items.length ? items.map(item => <ActivityCard item={item}/>) : <StatePanel contained={false} title="Свежих точек пока нет" description="Проверьте позже или посмотрите полевые сигналы на главной." />}</div></section>} {fish && <ActivityEvidenceSummary items={items} totalPoints={totalItems} periodLabel={periodLabel} />}
{unavailable ? <StatePanel tone="unavailable" title="Данные временно недоступны" description="Каталог сохранён, но свежие наблюдения сейчас не получены." /> : !fish ? <StatePanel tone="error" title="Такой рыбы нет в справочнике" actionHref="/fish" actionLabel="Открыть каталог" /> : <section class="catalog-results content-grid"><aside><span class="overline">Водоёмы</span>{waters.length ? <nav>{waters.map(([waterSlug,name]) => <AtlasEntityLink href={`/waterbodies/${waterSlug}/${fish!.slug}?hours=${hours}`} label={name} kind="water" identity={waterSlug} />)}</nav> : <p>Свежих подтверждённых водоёмов пока нет.</p>}</aside><div>{items.length ? items.map(item => <ActivityCard item={item} periodLabel={periodLabel}/>) : <StatePanel contained={false} title="Свежих точек пока нет" description="Проверьте позже или посмотрите полевые сигналы на главной." />}</div></section>}
{fish && <Pagination path={`/fish/${fish.slug}`} params={new URLSearchParams({ hours })} total={totalItems} limit={activityLimit} offset={offset} itemLabel="точек" />}
</Layout> </Layout>
+8 -4
View File
@@ -8,14 +8,17 @@ import Pagination from "../../components/Pagination.astro";
import { api, type DictionaryItem, type MediaAsset } from "../../lib/api"; import { api, type DictionaryItem, type MediaAsset } from "../../lib/api";
import { findMediaByLabel } from "../../lib/media"; import { findMediaByLabel } from "../../lib/media";
const params = Astro.url.searchParams; const params = Astro.url.searchParams;
const search = params.get("q")?.trim() ?? "";
const pageLimit = 48; const pageLimit = 48;
const requestedOffset = Number(params.get("offset") ?? 0); const requestedOffset = Number(params.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0; let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
let fishes: DictionaryItem[] = [], allFishes: DictionaryItem[] = [], media: MediaAsset[] = [], unavailable = false; let fishes: DictionaryItem[] = [], allFishes: DictionaryItem[] = [], media: MediaAsset[] = [], unavailable = false;
try { try {
[allFishes, media] = await Promise.all([api<DictionaryItem[]>("/api/v1/fishes?limit=500"), api<MediaAsset[]>("/api/v1/media/catalog?entity_type=fish")]); [allFishes, media] = await Promise.all([api<DictionaryItem[]>("/api/v1/fishes?limit=500"), api<MediaAsset[]>("/api/v1/media/catalog?entity_type=fish")]);
if (allFishes.length > 0 && offset >= allFishes.length) offset = Math.floor((allFishes.length - 1) / pageLimit) * pageLimit; const matchingFishes = search ? allFishes.filter(item => item.name_ru.toLocaleLowerCase("ru-RU").includes(search.toLocaleLowerCase("ru-RU"))) : allFishes;
fishes = allFishes.slice(offset, offset + pageLimit); if (matchingFishes.length > 0 && offset >= matchingFishes.length) offset = Math.floor((matchingFishes.length - 1) / pageLimit) * pageLimit;
fishes = matchingFishes.slice(offset, offset + pageLimit);
allFishes = matchingFishes;
} catch { unavailable = true; } } catch { unavailable = true; }
if (unavailable) { if (unavailable) {
Astro.response.status = 503; Astro.response.status = 503;
@@ -23,8 +26,9 @@ if (unavailable) {
Astro.response.headers.set("Cache-Control", "no-store"); Astro.response.headers.set("Cache-Control", "no-store");
} }
--- ---
<Layout title="Все виды рыб Russian Fishing 4 — RF4 Spotter" description="Каталог рыб RF4 со свежими точками, уловами, приманками и прозрачными источниками данных."> <Layout title="Все виды рыб Russian Fishing 4 — RF4 Spotter" description="Каталог рыб RF4 со свежими точками, уловами, приманками и прозрачными источниками данных." noindex={unavailable} errorPage={unavailable}>
<PageHero eyebrow="Справочник RF4" title="Рыбы" description="Выберите вид, чтобы увидеть свежие подтверждённые точки и полевые сигналы." variant="fish" count={allFishes.length} /> <PageHero eyebrow="Справочник RF4" title="Рыбы" description="Выберите вид, чтобы увидеть свежие подтверждённые точки и полевые сигналы." variant="fish" count={allFishes.length} />
{unavailable ? <StatePanel tone="unavailable" title="Каталог временно недоступен" description="Не показываем непроверенный список. Попробуйте обновить страницу позже." /> : <nav class="catalog-grid content-grid" aria-label="Виды рыб">{fishes.map((fish,index) => { const asset = findMediaByLabel(media, fish.name_ru); return <a href={`/fish/${fish.slug}`}><span>Вид рыбы · {String(offset + index + 1).padStart(2,"0")}</span><strong>{fish.name_ru}</strong><i>Открыть <b>→</b></i>{asset ? <EntityMedia asset={asset} compact /> : <FishSilhouette name={fish.name_ru} size={92}/>}</a>; })}</nav>} <form class="record-filters content-grid" method="get" aria-label="Поиск рыбы"><label>Поиск по названию<input name="q" value={search} maxlength="100" placeholder="Например, щука" /></label><button data-action="primary">Найти</button>{search && <a data-action="quiet" href="/fish">Сбросить</a>}</form>
{unavailable ? <StatePanel tone="unavailable" title="Каталог временно недоступен" description="Не показываем непроверенный список. Попробуйте обновить страницу позже." /> : fishes.length ? <nav class="catalog-grid content-grid" aria-label="Виды рыб">{fishes.map((fish,index) => { const asset = findMediaByLabel(media, fish.name_ru); return <a href={`/fish/${fish.slug}`}><span>Вид рыбы · {String(offset + index + 1).padStart(2,"0")}</span><strong>{fish.name_ru}</strong><i>Открыть <b>→</b></i>{asset ? <EntityMedia asset={asset} compact /> : <FishSilhouette name={fish.name_ru} size={92}/>}</a>; })}</nav> : <StatePanel title="Ничего не найдено" description="Попробуйте изменить запрос или открыть полный справочник рыбы." />}
{!unavailable && <Pagination path="/fish" params={params} total={allFishes.length} limit={pageLimit} offset={offset} itemLabel="видов" />} {!unavailable && <Pagination path="/fish" params={params} total={allFishes.length} limit={pageLimit} offset={offset} itemLabel="видов" />}
</Layout> </Layout>
+7 -3
View File
@@ -1,6 +1,7 @@
--- ---
import Layout from "../layouts/Layout.astro"; import Layout from "../layouts/Layout.astro";
import ActivityCard from "../components/ActivityCard.astro"; import ActivityCard from "../components/ActivityCard.astro";
import ActivityMap from "../components/ActivityMap.astro";
import FishingIcon from "../components/FishingIcon.astro"; import FishingIcon from "../components/FishingIcon.astro";
import SourceBadge from "../components/SourceBadge.astro"; import SourceBadge from "../components/SourceBadge.astro";
import TackleGlyph from "../components/TackleGlyph.astro"; import TackleGlyph from "../components/TackleGlyph.astro";
@@ -14,7 +15,8 @@ const hours = params.get("hours") ?? "24";
const waterbody = params.get("waterbody") ?? ""; const waterbody = params.get("waterbody") ?? "";
const fish = params.get("fish") ?? ""; const fish = params.get("fish") ?? "";
const sort = params.get("sort") ?? "activity"; const sort = params.get("sort") ?? "activity";
const activityLimit = 20; const view = params.get("view") === "map" ? "map" : "list";
const activityLimit = 5;
const requestedOffset = Number(params.get("offset") ?? 0); const requestedOffset = Number(params.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0; let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
const requestedSignalLimit = Number(params.get("signals") ?? 12); const requestedSignalLimit = Number(params.get("signals") ?? 12);
@@ -69,9 +71,11 @@ const selectedFish = fishes.find(item => item.slug === fish)?.name_ru ?? "Люб
const periodLabel = { "6": "6 часов", "12": "12 часов", "24": "24 часа", "72": "72 часа" }[hours] ?? hours; const periodLabel = { "6": "6 часов", "12": "12 часов", "24": "24 часа", "72": "72 часа" }[hours] ?? hours;
const sortLabel = { activity: "Сначала активные", confidence: "Сначала надёжные", freshness: "Сначала свежие" }[sort] ?? sort; const sortLabel = { activity: "Сначала активные", confidence: "Сначала надёжные", freshness: "Сначала свежие" }[sort] ?? sort;
const filtersChanged = Boolean(waterbody || fish || hours !== "24" || sort !== "activity"); const filtersChanged = Boolean(waterbody || fish || hours !== "24" || sort !== "activity");
const queryTitle = `${selectedFish} · ${selectedWaterbody}`;
const moreSignalParams = new URLSearchParams(params); const moreSignalParams = new URLSearchParams(params);
moreSignalParams.set("signals", String(Math.min(48, signalLimit + 12))); moreSignalParams.set("signals", String(Math.min(48, signalLimit + 12)));
const moreSignalsHref = `/?${moreSignalParams.toString()}#signals-title`; const moreSignalsHref = `/?${moreSignalParams.toString()}#signals-title`;
const viewHref = (next: "list" | "map") => { const query = new URLSearchParams(params); query.set("view", next); query.delete("offset"); return `/?${query.toString()}#results`; };
const datasetJsonLd = { const datasetJsonLd = {
"@context": "https://schema.org", "@type": "Dataset", "@context": "https://schema.org", "@type": "Dataset",
name: "RF4 Spotter — наблюдения об активности рыбы", name: "RF4 Spotter — наблюдения об активности рыбы",
@@ -92,8 +96,8 @@ const datasetJsonLd = {
</div></details> </div></details>
<button data-action="primary">⌕ Найти клёв</button> <button data-action="primary">⌕ Найти клёв</button>
</form></section> </form></section>
<div class="active-filters content-grid" aria-label="Применённые фильтры"><span>{selectedWaterbody}</span><span>{selectedFish}</span><span>{periodLabel}</span><span>{sortLabel}</span>{filtersChanged && <a href="/#results">Сбросить</a>}</div> <section class="query-summary content-grid" aria-label="Контекст запроса" aria-live="polite"><div><span class="overline">Ваш запрос</span><h2 id="query-summary-title">{queryTitle}</h2><p>{periodLabel} · {sortLabel}</p></div><div class="query-summary__filters" aria-label="Применённые фильтры"><span>{selectedWaterbody}</span><span>{selectedFish}</span><span>{periodLabel}</span><span>{sortLabel}</span>{filtersChanged && <a href="/#results">Сбросить запрос</a>}</div></section>
<section class="dashboard content-grid" id="results"><div class="results-column"><div class="section-heading"><div><span class="overline">За выбранный период</span><h2>Горячие точки</h2></div><span class="result-count">{items.length} на странице · всего {totalItems}</span></div>{filterError ? <div class="state error-state"><h2>Некорректные фильтры</h2><p>Выберите период и сортировку из предложенных значений.</p><a data-action="secondary" href="/">Сбросить фильтры</a></div> : activityUnavailable ? <StatePanel contained={false} tone="unavailable" title="Горячие точки временно недоступны" description="Полевые сигналы и справочники продолжают работать независимо." /> : items.length ? <div class="spot-list">{items.map(item => <ActivityCard item={item} />)}</div> : <div class="state"><h2>Пока нет свежих данных</h2><p>Для выбранных фильтров нет одобренных наблюдений. Расширьте период или выберите другой водоём.</p></div>}</div> <section class="dashboard content-grid" id="results"><div class="results-column"><div class="section-heading"><div><span class="overline">За выбранный период</span><h2>Горячие точки</h2></div><div class="result-tools"><span class="result-count">{items.length} на странице · всего {totalItems}</span><nav class="view-toggle" aria-label="Режим отображения"><a class:list={{ "view-toggle__active": view === "list" }} href={viewHref("list")} aria-current={view === "list" ? "page" : undefined}>Список</a><a class:list={{ "view-toggle__active": view === "map" }} href={viewHref("map")} aria-current={view === "map" ? "page" : undefined}>Схема</a></nav></div></div>{filterError ? <div class="state error-state"><h2>Некорректные фильтры</h2><p>Выберите период и сортировку из предложенных значений.</p><a data-action="secondary" href="/">Сбросить фильтры</a></div> : activityUnavailable ? <StatePanel contained={false} tone="unavailable" title="Горячие точки временно недоступны" description="Полевые сигналы и справочники продолжают работать независимо." /> : items.length ? (view === "map" ? <ActivityMap items={items} /> : <div class="spot-list">{items.map(item => <ActivityCard item={item} periodLabel={periodLabel} />)}</div>) : <div class="state"><h2>Пока нет свежих данных</h2><p>Для выбранных фильтров нет одобренных наблюдений. Расширьте период или выберите другой водоём.</p>{filtersChanged && <a data-action="secondary" href="/#results">Показать все данные</a>}</div>}</div>
{items[0] && leaderLevel && <aside class="detail-card"><div class="detail-head"><div><span class="overline">Лидер активности</span><h2>{items[0].waterbody} <em>{items[0].x}:{items[0].y}</em></h2></div><a href={`/spots/${items[0].spot_id}`} aria-label="Открыть точку"><FishingIcon name="arrow"/></a></div><div class="source-strip">{items[0].sources.map(source => <SourceBadge source={source}/>)}</div><div class="detail-score"><div class:list={["float-gauge", `meter-level-${leaderMeter}`]} aria-label={`Индекс активности: ${items[0].activity_score} из 100`}><span class="float-gauge__line"></span><span class="float-gauge__water"></span><span class="float-gauge__bob"><i></i></span><strong>{items[0].activity_score}</strong><small>из 100</small></div><div><span>Индекс активности</span><strong data-activity-level={leaderLevel.short}>{leaderLevel.description}</strong><p>{items[0].explanation}</p></div></div><div class="metric-grid"><div><span><FishingIcon name="ripple"/></span><small>Уверенность</small><strong>{items[0].confidence_score}%</strong></div><div><span><FishingIcon name="angler"/></span><small>{plural(items[0].unique_players, ["Игрок", "Игрока", "Игроков"])}</small><strong>{items[0].unique_players}</strong></div><div><span><FishingIcon name="clock"/></span><small>Последний</small><strong>{ago(items[0].last_confirmed_at)}</strong></div><div><span><FishingIcon name="scale"/></span><small>Средний вес</small><strong>{kg(items[0].average_weight_g)}</strong></div></div><div class="best-lure"><span class="overline">Лучшая связка</span><div><TackleGlyph name={items[0].best_bait}/><strong>{items[0].best_bait ?? "Не указана"}</strong><span>{items[0].catches} {plural(items[0].catches, ["улов", "улова", "уловов"])}</span></div></div><p class="confidence-note"><span>✓</span><span><strong>Оценка объяснима.</strong> Один игрок не может искусственно поднять уверенность.</span></p></aside>} {items[0] && leaderLevel && <aside class="detail-card"><div class="detail-head"><div><span class="overline">Лидер активности</span><h2>{items[0].waterbody} <em>{items[0].x}:{items[0].y}</em></h2></div><a href={`/spots/${items[0].spot_id}`} aria-label="Открыть точку"><FishingIcon name="arrow"/></a></div><div class="source-strip">{items[0].sources.map(source => <SourceBadge source={source}/>)}</div><div class="detail-score"><div class:list={["float-gauge", `meter-level-${leaderMeter}`]} aria-label={`Индекс активности: ${items[0].activity_score} из 100`}><span class="float-gauge__line"></span><span class="float-gauge__water"></span><span class="float-gauge__bob"><i></i></span><strong>{items[0].activity_score}</strong><small>из 100</small></div><div><span>Индекс активности</span><strong data-activity-level={leaderLevel.short}>{leaderLevel.description}</strong><p>{items[0].explanation}</p></div></div><div class="metric-grid"><div><span><FishingIcon name="ripple"/></span><small>Уверенность</small><strong>{items[0].confidence_score}%</strong></div><div><span><FishingIcon name="angler"/></span><small>{plural(items[0].unique_players, ["Игрок", "Игрока", "Игроков"])}</small><strong>{items[0].unique_players}</strong></div><div><span><FishingIcon name="clock"/></span><small>Последний</small><strong>{ago(items[0].last_confirmed_at)}</strong></div><div><span><FishingIcon name="scale"/></span><small>Средний вес</small><strong>{kg(items[0].average_weight_g)}</strong></div></div><div class="best-lure"><span class="overline">Лучшая связка</span><div><TackleGlyph name={items[0].best_bait}/><strong>{items[0].best_bait ?? "Не указана"}</strong><span>{items[0].catches} {plural(items[0].catches, ["улов", "улова", "уловов"])}</span></div></div><p class="confidence-note"><span>✓</span><span><strong>Оценка объяснима.</strong> Один игрок не может искусственно поднять уверенность.</span></p></aside>}
</section> </section>
{!filterError && !activityUnavailable && <Pagination path="/" params={params} total={totalItems} limit={activityLimit} offset={offset} anchor="#results" itemLabel="точек" />} {!filterError && !activityUnavailable && <Pagination path="/" params={params} total={totalItems} limit={activityLimit} offset={offset} anchor="#results" itemLabel="точек" />}
+22 -6
View File
@@ -1,20 +1,36 @@
--- ---
import EntityMedia from "../components/EntityMedia.astro"; import EntityMedia from "../components/EntityMedia.astro";
import Pagination from "../components/Pagination.astro";
import PageHero from "../components/PageHero.astro"; import PageHero from "../components/PageHero.astro";
import StatePanel from "../components/StatePanel.astro"; import StatePanel from "../components/StatePanel.astro";
import Layout from "../layouts/Layout.astro"; import Layout from "../layouts/Layout.astro";
import { api, type MediaAsset } from "../lib/api"; import { api, type MediaAsset } from "../lib/api";
import { mediaRoleLabel } from "../lib/media";
const allowed = new Set(["fish", "waterbody", "tackle", "reference"]); const allowed = new Set(["fish", "waterbody", "tackle", "reference"]);
const requested = Astro.url.searchParams.get("type") ?? "fish"; const requested = Astro.url.searchParams.get("type") ?? "fish";
const type = allowed.has(requested) ? requested : "fish"; const type = allowed.has(requested) ? requested : "fish";
let assets: MediaAsset[] = [], unavailable = false; const requestedRole = Astro.url.searchParams.get("role") ?? "";
try { assets = await api<MediaAsset[]>(`/api/v1/media/catalog?entity_type=${type}`); } catch { unavailable = true; } const search = Astro.url.searchParams.get("q")?.trim() ?? "";
const requestedOffset = Number(Astro.url.searchParams.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
const pageLimit = 48;
const roleOptions: Record<string, Array<[string, string]>> = { waterbody: [["waterbody_cover", "Заставки"], ["waterbody_map", "Карты"], ["waterbody_depth_map", "Карты глубин"], ["waterbody_screenshot", "Скриншоты"]], tackle: [["tackle_card", "Карточки снастей"], ["tackle_detail", "Детали снастей"], ["rig_diagram", "Схемы сборок"], ["tackle_screenshot", "Скриншоты снастей"]] };
const selectedRole = (roleOptions[type] ?? []).some(([value]) => value === requestedRole) ? requestedRole : "";
let assets: MediaAsset[] = [], allAssets: MediaAsset[] = [], unavailable = false;
try { const query = new URLSearchParams({ entity_type: type }); if (selectedRole) query.set("media_role", selectedRole); allAssets = await api<MediaAsset[]>(`/api/v1/media/catalog?${query}`); if (search) { const needle = search.toLocaleLowerCase("ru-RU"); allAssets = allAssets.filter(asset => (asset.label ?? "").toLocaleLowerCase("ru-RU").includes(needle)); } if (allAssets.length > 0 && offset >= allAssets.length) offset = Math.floor((allAssets.length - 1) / pageLimit) * pageLimit; assets = allAssets.slice(offset, offset + pageLimit); } catch { unavailable = true; }
if (unavailable) {
Astro.response.status = 503;
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
const labels: Record<string,string> = {fish:"Рыбы",waterbody:"Водоёмы",tackle:"Снасти и приманки",reference:"Справочные материалы"}; const labels: Record<string,string> = {fish:"Рыбы",waterbody:"Водоёмы",tackle:"Снасти и приманки",reference:"Справочные материалы"};
--- ---
<Layout title={`${labels[type]} RF4 — медиатека RF4 Spotter`} description="Изображения рыб, водоёмов и снастей Russian Fishing 4 с обязательной атрибуцией каждого источника."> <Layout title={`${labels[type]} RF4 — медиатека RF4 Spotter`} description="Изображения рыб, водоёмов и снастей Russian Fishing 4 с обязательной атрибуцией каждого источника." noindex={unavailable} errorPage={unavailable}>
<PageHero eyebrow="Визуальный справочник" title="Медиатека" description="Собранные материалы RF4 с источником у каждого изображения. Каталог пополняется по мере импорта и проверки." variant="fish" count={assets.length} /> <PageHero eyebrow="Визуальный справочник" title="Медиатека" description="Собранные материалы RF4 с источником у каждого изображения. Каталог пополняется по мере импорта и проверки." variant="fish" count={allAssets.length} countLabel="материалов" />
<section class="media-library content-grid"> <section class="media-library content-grid">
<nav class="media-library__intro" aria-label="Разделы медиатеки"><strong>{labels[type]} · {assets.length}</strong><span><a href="/media?type=fish">Рыбы</a> · <a href="/media?type=waterbody">Водоёмы</a> · <a href="/media?type=tackle">Снасти</a> · <a href="/media?type=reference">Справка</a></span></nav> <nav class="media-library__intro" aria-label="Разделы медиатеки"><strong>{labels[type]} · {allAssets.length}</strong><span><a href="/media?type=fish">Рыбы</a> · <a href="/media?type=waterbody">Водоёмы</a> · <a href="/media?type=tackle">Снасти</a> · <a href="/media?type=reference">Справка</a></span></nav>
{unavailable ? <StatePanel tone="unavailable" title="Медиатека временно недоступна" /> : assets.length ? <div class="media-library__grid">{assets.map(asset => <article class="media-library__card"><EntityMedia asset={asset} sourceLink /><h2>{asset.label ?? "Без подписи"}</h2><span>{labels[asset.entity_type]}</span></article>)}</div> : <StatePanel title="В этом разделе пока нет изображений" description="Материалы появятся после следующего импорта." />} <form class="media-role-filter" method="get"><input type="hidden" name="type" value={type} /><label>Поиск по подписи<input name="q" value={search} maxlength="100" placeholder="Например, щука" /></label>{roleOptions[type]?.length > 0 && <label>Тип материала<select name="role"><option value="">Все роли</option>{roleOptions[type].map(([value, label]) => <option value={value} selected={selectedRole === value}>{label}</option>)}</select></label>}<button data-action="secondary">Показать</button>{(selectedRole || search) && <a data-action="quiet" href={`/media?type=${type}`}>Сбросить</a>}</form>
{unavailable ? <StatePanel tone="unavailable" title="Медиатека временно недоступна" /> : assets.length ? <div class="media-library__grid">{assets.map(asset => <article class="media-library__card"><EntityMedia asset={asset} sourceLink /><h2>{asset.label ?? "Без подписи"}</h2><span>{labels[asset.entity_type]} · {mediaRoleLabel(asset.media_role ?? "")}</span><small>Источник: {asset.source_system}</small></article>)}</div> : <StatePanel title={search ? "Ничего не найдено" : "В этом разделе пока нет изображений"} description="Материалы появятся после следующего импорта." />}
{!unavailable && <Pagination path="/media" params={new URLSearchParams({ type, ...(selectedRole ? { role: selectedRole } : {}), ...(search ? { q: search } : {}) })} total={allAssets.length} limit={pageLimit} offset={offset} itemLabel="материалов" />}
</section> </section>
</Layout> </Layout>
+150
View File
@@ -0,0 +1,150 @@
---
import Layout from "../layouts/Layout.astro";
---
<Layout title="Мой план рыбалки — RF4 Spotter" description="Сохранённые точки рыбалки RF4 без аккаунта: координаты, наживки, свежесть и доверие." noindex>
<section class="plan-hero content-grid"><div><span class="eyebrow">Локально на этом устройстве</span><h1>Мой план<br/><em>рыбалки.</em></h1><p>Соберите до пяти точек, сравните их перед выездом и распечатайте список. План хранится на устройстве; ссылка содержит только snapshot для передачи.</p></div><div class="plan-hero__mark" aria-hidden="true">♢</div></section>
<section class="plan-toolbar content-grid" aria-label="Действия с планом"><span data-plan-count>0 из 5 точек</span><div><button data-action="secondary" type="button" data-plan-share>Поделиться планом</button><button data-action="secondary" type="button" data-plan-copy>Скопировать ссылку</button><button data-action="secondary" type="button" data-plan-print>Печать / PDF</button><button data-action="quiet" type="button" data-plan-clear>Очистить план</button><small data-plan-share-status aria-live="polite"></small></div></section>
<section class="plan-content content-grid" data-plan-page aria-live="polite"><div class="plan-grid" data-plan-list></div><div class="state" data-plan-empty><h2>План пока пуст</h2><p>Сохраните точку на её detail-странице — она появится здесь.</p><a data-action="secondary" href="/">Посмотреть горячие точки</a></div></section>
<dialog data-plan-import aria-labelledby="plan-import-title"><form method="dialog"><h2 id="plan-import-title">Импортировать план?</h2><p data-plan-import-summary></p><div class="plan-import-actions"><button data-action="secondary" value="cancel">Отмена</button><button data-action="secondary" value="merge">Добавить к текущему</button><button data-action="primary" value="replace">Заменить текущий</button></div></form></dialog>
</Layout>
<script>
const planStorageKey = "rf4spotter:fishing-plan";
const list = document.querySelector<HTMLElement>("[data-plan-list]");
const empty = document.querySelector<HTMLElement>("[data-plan-empty]");
const count = document.querySelector<HTMLElement>("[data-plan-count]");
const shareStatus = document.querySelector<HTMLElement>("[data-plan-share-status]");
const shareButton = document.querySelector<HTMLButtonElement>("[data-plan-share]");
const copyButton = document.querySelector<HTMLButtonElement>("[data-plan-copy]");
const printButton = document.querySelector<HTMLButtonElement>("[data-plan-print]");
const clearButton = document.querySelector<HTMLButtonElement>("[data-plan-clear]");
const importDialog = document.querySelector<HTMLDialogElement>("[data-plan-import]");
const importSummary = document.querySelector<HTMLElement>("[data-plan-import-summary]");
const planFieldLimits: Record<string, number> = { key: 512, waterbody: 160, coordinates: 80, baits: 1000, method: 120, retrieve: 160, risk: 160, freshness: 40, confidence: 8 };
const planText = (key: string, value: unknown) => typeof value === "string" ? value.slice(0, planFieldLimits[key] ?? 240) : "";
const normalisePlan = (value: unknown): Array<Record<string, string>> => {
if (!Array.isArray(value)) return [];
const seen = new Set<string>();
return value.filter(item => item && typeof item === "object" && typeof item.key === "string" && item.key.startsWith("/spots/")).map(item => {
const source = item as Record<string, unknown>;
const entry = Object.fromEntries(["key", "waterbody", "coordinates", "baits", "method", "retrieve", "risk", "freshness", "confidence"].map(key => [key, planText(key, source[key])]));
if (!/^\d{1,3}$/.test(entry.confidence) || Number(entry.confidence) > 100) entry.confidence = "";
return entry;
}).filter(item => {
if (seen.has(item.key)) return false;
seen.add(item.key);
return true;
}).slice(0, 5);
};
const readPlan = (): Array<Record<string, string>> => {
try {
const raw = localStorage.getItem(planStorageKey) || "[]";
const normalised = normalisePlan(JSON.parse(raw));
const serialised = JSON.stringify(normalised);
if (serialised !== raw) { try { localStorage.setItem(planStorageKey, serialised); } catch { if (shareStatus) shareStatus.textContent = "Хранилище браузера недоступно"; } }
return normalised;
}
catch { return []; }
};
const writePlan = (value: Array<Record<string, string>>) => {
try { localStorage.setItem(planStorageKey, JSON.stringify(normalisePlan(value))); return true; }
catch { if (shareStatus) shareStatus.textContent = "Не удалось сохранить план в браузере"; return false; }
};
const freshnessLabel = (value: string) => {
if (!value) return "Свежесть не указана";
const timestamp = Date.parse(value);
if (!Number.isFinite(timestamp)) return "Свежесть не распознана";
return Date.now() - timestamp > 24 * 60 * 60 * 1000 ? "Устарело" : "Свежо";
};
let undoEntry: Record<string, string> | null = null;
let undoTimer: number | undefined;
const offerUndo = (entry: Record<string, string>) => {
undoEntry = entry;
if (undoTimer) window.clearTimeout(undoTimer);
document.querySelector("[data-plan-undo]")?.remove();
if (!shareStatus) return;
shareStatus.textContent = "Точка удалена";
const undo = document.createElement("button");
undo.type = "button"; undo.dataset.action = "quiet"; undo.dataset.planUndo = "true"; undo.textContent = "Вернуть";
undo.addEventListener("click", () => {
if (undoEntry && writePlan([...readPlan(), undoEntry])) { undoEntry = null; undo.remove(); shareStatus.textContent = "Точка возвращена"; render(); }
});
shareStatus.append(" · ", undo);
undoTimer = window.setTimeout(() => { undoEntry = null; undo.remove(); }, 8000);
};
const shared = new URLSearchParams(location.search).get("plan");
let pendingImport: Array<Record<string, string>> | null = null;
if (shared) {
history.replaceState(null, "", `${location.pathname}${location.hash}`);
try {
const imported = normalisePlan(JSON.parse(shared));
if (imported.length) {
pendingImport = imported;
if (importSummary) importSummary.textContent = `В ссылке ${imported.length} ${imported.length === 1 ? "точка" : "точки"}. Текущий план не изменён.`;
if (importDialog?.showModal) importDialog.showModal();
}
else if (shareStatus) shareStatus.textContent = "В ссылке нет сохранённых точек";
} catch { if (shareStatus) shareStatus.textContent = "Ссылка плана не распознана"; }
}
const render = () => {
if (!list || !empty) return;
const plan = readPlan();
list.replaceChildren();
empty.hidden = plan.length > 0;
if (count) count.textContent = `${plan.length} из 5 точек`;
[shareButton, copyButton, printButton, clearButton].forEach(button => { if (button) button.disabled = plan.length === 0; });
plan.forEach(item => {
const card = document.createElement("article"); card.className = "plan-card";
const heading = document.createElement("h2"); heading.textContent = item.waterbody || "Водоём не указан";
const coordinate = document.createElement("strong"); coordinate.textContent = item.coordinates || "Координаты не указаны";
const meta = document.createElement("p"); meta.textContent = item.baits ? `Наживка: ${item.baits.split("|").join(", ")}` : "Наживка не указана";
const approach = document.createElement("p"); approach.textContent = [item.method, item.retrieve].filter(Boolean).join(" · ") || "Метод не указан";
const facts = document.createElement("small"); facts.textContent = [item.risk ? `Риск: ${item.risk}` : "Риск не рассчитан", freshnessLabel(item.freshness), item.confidence !== "" ? `Доверие: ${item.confidence}%` : "Доверие не рассчитано"].join(" · ");
const link = document.createElement("a"); link.href = item.key || "/"; link.textContent = "Открыть точку";
const remove = document.createElement("button"); remove.type = "button"; remove.dataset.action = "quiet"; remove.textContent = "Убрать"; remove.addEventListener("click", () => { if (writePlan(readPlan().filter(entry => entry.key !== item.key))) { offerUndo(item); render(); } });
const actions = document.createElement("div"); actions.className = "plan-card__actions"; actions.append(link, remove);
card.append(heading, coordinate, meta, approach, facts, actions); list.append(card);
});
};
const planUrl = () => {
const plan = readPlan();
const url = new URL(location.href); url.search = ""; url.searchParams.set("plan", JSON.stringify(plan));
return { plan, value: url.toString() };
};
const copyText = async (value: string) => {
if (navigator.clipboard?.writeText) { await navigator.clipboard.writeText(value); return; }
const field = document.createElement("textarea");
field.value = value; field.setAttribute("readonly", ""); field.style.position = "fixed"; field.style.opacity = "0";
document.body.append(field); field.select();
const copied = document.execCommand("copy");
field.remove();
if (!copied) throw new Error("Clipboard is unavailable");
};
const copyPlanLink = async () => {
const { plan, value } = planUrl();
if (!plan.length) { if (shareStatus) shareStatus.textContent = "Сначала добавьте точку в план"; return; }
await copyText(value);
if (shareStatus) shareStatus.textContent = "Ссылка скопирована";
};
shareButton?.addEventListener("click", async () => {
const { plan, value } = planUrl();
if (!plan.length) { if (shareStatus) shareStatus.textContent = "Сначала добавьте точку в план"; return; }
try {
if (navigator.share) { await navigator.share({ title: "Мой план рыбалки RF4", url: value }); if (shareStatus) shareStatus.textContent = "План отправлен"; }
else await copyPlanLink();
} catch (error) {
if (error instanceof DOMException && error.name === "AbortError") { if (shareStatus) shareStatus.textContent = "Поделиться отменено"; return; }
if (shareStatus) shareStatus.textContent = "Не удалось скопировать ссылку";
}
});
copyButton?.addEventListener("click", async () => { try { await copyPlanLink(); } catch { if (shareStatus) shareStatus.textContent = "Не удалось скопировать ссылку"; } });
printButton?.addEventListener("click", () => window.print());
clearButton?.addEventListener("click", () => { try { localStorage.removeItem(planStorageKey); if (shareStatus) shareStatus.textContent = "План очищен"; render(); } catch { if (shareStatus) shareStatus.textContent = "Не удалось очистить план в браузере"; } });
importDialog?.addEventListener("close", () => {
const choice = importDialog.returnValue;
if (!pendingImport || choice === "cancel") { pendingImport = null; return; }
const current = readPlan();
const merged = choice === "replace" ? pendingImport : normalisePlan([...current, ...pendingImport]);
if (writePlan(merged)) { pendingImport = null; if (shareStatus) shareStatus.textContent = choice === "replace" ? "План заменён" : "Точки добавлены в план"; render(); }
});
render();
</script>
+10 -3
View File
@@ -9,13 +9,14 @@ import { api, kg, type DictionaryItem, type ImportRun, type OfficialRecord, type
const params = Astro.url.searchParams; const params = Astro.url.searchParams;
const fish = params.get("fish") ?? ""; const fish = params.get("fish") ?? "";
const waterbody = params.get("waterbody") ?? ""; const waterbody = params.get("waterbody") ?? "";
const search = params.get("q") ?? "";
const recordsLimit = 50; const recordsLimit = 50;
const requestedOffset = Number(params.get("offset") ?? 0); const requestedOffset = Number(params.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0; let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
let items: OfficialRecord[] = [], runs: ImportRun[] = [], fishes: DictionaryItem[] = [], waterbodies: DictionaryItem[] = []; let items: OfficialRecord[] = [], runs: ImportRun[] = [], fishes: DictionaryItem[] = [], waterbodies: DictionaryItem[] = [];
let unavailable = false, showNoIndex = false, totalRecords = 0; let unavailable = false, showNoIndex = false, totalRecords = 0;
try { try {
const query = new URLSearchParams({ fish, waterbody, limit: String(recordsLimit), offset: String(offset) }); const query = new URLSearchParams({ fish, waterbody, q: search, limit: String(recordsLimit), offset: String(offset) });
const paginated = await api<PaginatedOfficialRecord>(`/api/v1/records?${query}`); const paginated = await api<PaginatedOfficialRecord>(`/api/v1/records?${query}`);
items = paginated.items; items = paginated.items;
totalRecords = paginated.total; totalRecords = paginated.total;
@@ -25,12 +26,18 @@ try {
items = (await api<PaginatedOfficialRecord>(`/api/v1/records?${query}`)).items; items = (await api<PaginatedOfficialRecord>(`/api/v1/records?${query}`)).items;
} }
[runs, fishes, waterbodies] = await Promise.all([api<ImportRun[]>("/api/v1/imports?limit=1"), api<DictionaryItem[]>("/api/v1/fishes"), api<DictionaryItem[]>("/api/v1/waterbodies")]); [runs, fishes, waterbodies] = await Promise.all([api<ImportRun[]>("/api/v1/imports?limit=1"), api<DictionaryItem[]>("/api/v1/fishes"), api<DictionaryItem[]>("/api/v1/waterbodies")]);
} catch { unavailable = true; showNoIndex = true; Astro.response.status = 503; Astro.response.headers.set("Retry-After", "60"); } } catch {
unavailable = true;
showNoIndex = true;
Astro.response.status = 503;
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
const last = runs[0]; const last = runs[0];
--- ---
<Layout title="Официальные рекорды Russian Fishing 4 — RF4 Spotter" description="Последние официальные рекорды RF4 по рыбам и водоёмам: вес, приманка, игрок, дата и прямая ссылка на источник." noindex={showNoIndex} errorPage={unavailable}> <Layout title="Официальные рекорды Russian Fishing 4 — RF4 Spotter" description="Последние официальные рекорды RF4 по рыбам и водоёмам: вес, приманка, игрок, дата и прямая ссылка на источник." noindex={showNoIndex} errorPage={unavailable}>
<section class="records-hero"><div><span class="eyebrow">Публичные данные RF4</span><h1>Официальные<br/><em>рекорды</em></h1></div><div class="source-status"><span class:list={["status-dot", last?.status]}></span><strong>{last ? `Импорт: ${last.status}` : "Импорт ещё не запускался"}</strong>{last?.finished_at && <small>{new Date(last.finished_at).toLocaleString("ru-RU")} · {last.rows_seen} строк</small>}</div></section> <section class="records-hero"><div><span class="eyebrow">Публичные данные RF4</span><h1>Официальные<br/><em>рекорды</em></h1></div><div class="source-status"><span class:list={["status-dot", last?.status]}></span><strong>{last ? `Импорт: ${last.status}` : "Импорт ещё не запускался"}</strong>{last?.finished_at && <small>{new Date(last.finished_at).toLocaleString("ru-RU")} · {last.rows_seen} строк</small>}</div></section>
<form class="record-filters" method="get"><label>Рыба<select name="fish"><option value="">Любая рыба</option>{fishes.map(item => <option value={item.slug} selected={fish === item.slug}>{item.name_ru}</option>)}</select></label><label>Водоём<select name="waterbody"><option value="">Все водоёмы</option>{waterbodies.map(item => <option value={item.slug} selected={waterbody === item.slug}>{item.name_ru}</option>)}</select></label><button data-action="primary">Фильтровать</button>{(fish || waterbody) && <a data-action="quiet" href="/records">Сбросить</a>}</form> <form class="record-filters" method="get"><label>Рыба<select name="fish"><option value="">Любая рыба</option>{fishes.map(item => <option value={item.slug} selected={fish === item.slug}>{item.name_ru}</option>)}</select></label><label>Водоём<select name="waterbody"><option value="">Все водоёмы</option>{waterbodies.map(item => <option value={item.slug} selected={waterbody === item.slug}>{item.name_ru}</option>)}</select></label><label>Игрок или приманка<input name="q" value={search} maxlength="100" placeholder="Например, игрок или блесна" /></label><button data-action="primary">Фильтровать</button>{(fish || waterbody || search) && <a data-action="quiet" href="/records">Сбросить</a>}</form>
<div class="content-grid"><SectionHeading eyebrow="Официальный источник" title="Последние записи" count={`${items.length} на странице · всего ${totalRecords}`} /></div> <div class="content-grid"><SectionHeading eyebrow="Официальный источник" title="Последние записи" count={`${items.length} на странице · всего ${totalRecords}`} /></div>
{unavailable && <StatePanel tone="unavailable" title="Источник временно недоступен" description="Сохраняем ранее импортированные данные, но не показываем их как свежее обновление." />} {unavailable && <StatePanel tone="unavailable" title="Источник временно недоступен" description="Сохраняем ранее импортированные данные, но не показываем их как свежее обновление." />}
{!unavailable && items.length && <div class="record-table"><div class="record-row record-head"><span>Рыба</span><span>Вес</span><span>Водоём</span><span>Приманка</span><span>Игрок</span><span>Дата и источник</span></div>{items.map(record => <article class="record-row"><strong data-label="Рыба">{record.fish}</strong><strong data-label="Вес">{kg(record.weight_g)}</strong><span data-label="Водоём">{record.waterbody}</span><span class="tackle-label" data-label="Приманка"><TackleGlyph name={record.bait} size={24}/><span>{record.bait ?? "—"}</span></span><span data-label="Игрок">{record.player_name ?? "—"}</span><span data-label="Дата и источник" class="record-provenance"><time>{record.record_date ? new Date(record.record_date).toLocaleDateString("ru-RU") : "—"}</time><SourceBadge source={record.source_system} href={record.source_url}/></span></article>)}</div>} {!unavailable && items.length && <div class="record-table"><div class="record-row record-head"><span>Рыба</span><span>Вес</span><span>Водоём</span><span>Приманка</span><span>Игрок</span><span>Дата и источник</span></div>{items.map(record => <article class="record-row"><strong data-label="Рыба">{record.fish}</strong><strong data-label="Вес">{kg(record.weight_g)}</strong><span data-label="Водоём">{record.waterbody}</span><span class="tackle-label" data-label="Приманка"><TackleGlyph name={record.bait} size={24}/><span>{record.bait ?? "—"}</span></span><span data-label="Игрок">{record.player_name ?? "—"}</span><span data-label="Дата и источник" class="record-provenance"><time>{record.record_date ? new Date(record.record_date).toLocaleDateString("ru-RU") : "—"}</time><SourceBadge source={record.source_system} href={record.source_url}/></span></article>)}</div>}
+13 -5
View File
@@ -2,22 +2,30 @@
import Layout from "../layouts/Layout.astro"; import Layout from "../layouts/Layout.astro";
import { api, type DictionaryItem } from "../lib/api"; import { api, type DictionaryItem } from "../lib/api";
let fishes: DictionaryItem[] = [], waterbodies: DictionaryItem[] = [], unavailable = false; let fishes: DictionaryItem[] = [], waterbodies: DictionaryItem[] = [], unavailable = false;
try { [fishes, waterbodies] = await Promise.all([api<DictionaryItem[]>("/api/v1/fishes"), api<DictionaryItem[]>("/api/v1/waterbodies")]); } catch { unavailable = true; } try { [fishes, waterbodies] = await Promise.all([api<DictionaryItem[]>("/api/v1/fishes"), api<DictionaryItem[]>("/api/v1/waterbodies")]); }
catch {
unavailable = true;
Astro.response.status = 503;
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
const state = Astro.url.searchParams.get("state"); const state = Astro.url.searchParams.get("state");
const reportId = Astro.url.searchParams.get("report_id"); const reportId = Astro.url.searchParams.get("report_id");
--- ---
<Layout title="Добавить улов Russian Fishing 4 — RF4 Spotter" description="Отправьте собственное наблюдение об улове RF4 на проверку и помогите игрокам находить актуальные точки."> <Layout title="Добавить улов Russian Fishing 4 — RF4 Spotter" description="Отправьте собственное наблюдение об улове RF4 на проверку и помогите игрокам находить актуальные точки." noindex={unavailable} errorPage={unavailable}>
<span id="report-state" data-state={state ?? ""} hidden></span> <span id="report-state" data-state={state ?? ""} hidden></span>
<section class="form-hero"><div><span class="eyebrow"><b>+1</b> Помочь сообществу</span><h1>Добавить<br/><em>свой улов</em></h1></div><p>Около минуты — и рабочая точка появится в общей статистике после проверки модератором.</p></section> <section class="form-hero"><div><span class="eyebrow"><b>+1</b> Помочь сообществу</span><h1>Добавить<br/><em>свой улов</em></h1></div><p>Около минуты — и рабочая точка появится в общей статистике после проверки модератором.</p></section>
{state === "sent" && <div class="notice success">Улов отправлен на модерацию. Спасибо!</div>} {state === "sent" && <div class="notice success">Улов отправлен на модерацию. Спасибо!</div>}
{state === "screenshot_sent" && <div class="notice success">Скриншот добавлен к ранее созданной заявке.</div>} {state === "screenshot_sent" && <div class="notice success">Скриншот добавлен к ранее созданной заявке.</div>}
{state === "create_error" && <div class="notice error" id="form-error" tabindex="-1"><strong>Заявка не создана.</strong> Проверьте поля; введённые значения сохранены.</div>} {state === "create_error" && <div class="notice error" id="form-error" tabindex="-1"><strong>Заявка не создана.</strong> Проверьте поля; введённые значения сохранены.</div>}
{state === "conflict" && <div class="notice warning" id="form-error" tabindex="-1"><strong>Повторная отправка отличается от уже сохранённой.</strong> Черновик оставлен на странице; проверьте поля и отправьте его с новым ключом.</div>}
{state === "rate_limited" && <div class="notice error" id="form-error" tabindex="-1"><strong>Слишком много отправок.</strong> Подождите 10 минут перед повторной попыткой.</div>} {state === "rate_limited" && <div class="notice error" id="form-error" tabindex="-1"><strong>Слишком много отправок.</strong> Подождите 10 минут перед повторной попыткой.</div>}
{state === "timeout" && <div class="notice error" id="form-error" tabindex="-1"><strong>Превышено время ожидания.</strong> Проверьте соединение и попробуйте снова.</div>} {state === "timeout" && <div class="notice error" id="form-error" tabindex="-1"><strong>Превышено время ожидания.</strong> Проверьте соединение и попробуйте снова.</div>}
{state === "server_error" && <div class="notice error" id="form-error" tabindex="-1"><strong>Сервер временно недоступен.</strong> Попробуйте позже.</div>} {state === "server_error" && <div class="notice error" id="form-error" tabindex="-1"><strong>Сервер временно недоступен.</strong> Попробуйте позже.</div>}
{state === "screenshot_error" && <div class="notice warning"><strong>Заявка сохранена без скриншота.</strong> Изображение не загрузилось; можно повторить отдельно, не отправляя улов заново.</div>} {state === "screenshot_error" && <div class="notice warning"><strong>Заявка сохранена без скриншота.</strong> Изображение не загрузилось; можно повторить отдельно, не отправляя улов заново.</div>}
{state === "screenshot_error" && reportId && <form class="screenshot-retry" method="post" action="/api/report-screenshot" enctype="multipart/form-data"><input type="hidden" name="report_id" value={reportId} /><label>Повторная загрузка скриншота<input name="screenshot" type="file" accept="image/jpeg,image/png,image/webp" required /></label><button data-action="inverse" type="submit">Загрузить скриншот</button></form>} {state === "timeout" && reportId && <div class="notice warning"><strong>Заявка уже сохранена.</strong> Ответ загрузки не успел прийти; повтор безопасен и не создаст новый улов.</div>}
{unavailable ? <div class="state"><h2>Форма временно недоступна</h2></div> : <form class="report-form" method="post" action="/api/report" enctype="multipart/form-data"> {(state === "screenshot_error" || (state === "timeout" && reportId)) && reportId && <form class="screenshot-retry" method="post" action="/api/report-screenshot" enctype="multipart/form-data"><input type="hidden" name="report_id" value={reportId} /><label>Повторная загрузка скриншота<input name="screenshot" type="file" accept="image/jpeg,image/png,image/webp" required /></label><button data-action="inverse" type="submit">Загрузить скриншот</button></form>}
{unavailable ? <div class="state" role="alert"><h2>Форма временно недоступна</h2></div> : <form class="report-form" method="post" action="/api/report" enctype="multipart/form-data">
<fieldset><legend>Главное <span>обязательно</span></legend><div class="form-grid"><label>Рыба *<select name="fish_slug" required>{fishes.map(x => <option value={x.slug}>{x.name_ru}</option>)}</select></label><label>Водоём *<select name="waterbody_slug" required>{waterbodies.map(x => <option value={x.slug}>{x.name_ru}</option>)}</select></label><label>Координата X *<input name="x" type="number" min="-10000" max="10000" placeholder="Например, 72" required /></label><label>Координата Y *<input name="y" type="number" min="-10000" max="10000" placeholder="Например, 84" required /></label><label>Вес, граммы *<input name="weight_g" type="number" min="1" max="3000000" placeholder="1250" required /></label><label>Приманка<input name="bait_name" maxlength="200" placeholder="Название в игре" /></label></div><p class="field-help">Координаты — два целых числа с карты. Вес: 1,25 кг = 1250 г.</p></fieldset> <fieldset><legend>Главное <span>обязательно</span></legend><div class="form-grid"><label>Рыба *<select name="fish_slug" required>{fishes.map(x => <option value={x.slug}>{x.name_ru}</option>)}</select></label><label>Водоём *<select name="waterbody_slug" required>{waterbodies.map(x => <option value={x.slug}>{x.name_ru}</option>)}</select></label><label>Координата X *<input name="x" type="number" min="-10000" max="10000" placeholder="Например, 72" required /></label><label>Координата Y *<input name="y" type="number" min="-10000" max="10000" placeholder="Например, 84" required /></label><label>Вес, граммы *<input name="weight_g" type="number" min="1" max="3000000" placeholder="1250" required /></label><label>Приманка<input name="bait_name" maxlength="200" placeholder="Название в игре" /></label></div><p class="field-help">Координаты — два целых числа с карты. Вес: 1,25 кг = 1250 г.</p></fieldset>
<details class="optional-fields"><summary>Дополнительные сведения <span>необязательно</span></summary><div class="form-grid"><label>Способ ловли<select name="fishing_method"><option value="">Не указан</option><option value="spinning">Спиннинг</option><option value="bottom">Донная</option><option value="float">Поплавочная</option></select></label><label>Проводка<input name="retrieve_method" maxlength="100" /></label><label>Скорость проводки<input name="retrieve_speed" type="number" min="0" max="100" /></label><label>Ник игрока<input name="player_name" maxlength="100" /></label></div><label class="wide">Комментарий<textarea name="comment" maxlength="1000" rows="4"></textarea></label><label class="wide">Скриншот, JPEG/PNG/WebP до 8 МБ<input name="screenshot" type="file" accept="image/jpeg,image/png,image/webp" /></label></details><label class="honeypot" aria-hidden="true">Сайт<input name="website" tabindex="-1" autocomplete="off" /></label><p class="privacy">Ник и скриншот необязательны. Из изображения удаляются EXIF и прочие метаданные.</p><label class="consent"><input name="consent" type="checkbox" required /> <span>Я отправляю собственное наблюдение и принимаю <a href="/rules" target="_blank">правила</a> и <a href="/privacy" target="_blank">политику конфиденциальности</a>.</span></label><button data-action="primary" type="submit">Отправить на проверку</button> <details class="optional-fields"><summary>Дополнительные сведения <span>необязательно</span></summary><div class="form-grid"><label>Способ ловли<select name="fishing_method"><option value="">Не указан</option><option value="spinning">Спиннинг</option><option value="bottom">Донная</option><option value="float">Поплавочная</option></select></label><label>Проводка<input name="retrieve_method" maxlength="100" /></label><label>Скорость проводки<input name="retrieve_speed" type="number" min="0" max="100" /></label><label>Ник игрока<input name="player_name" maxlength="100" /></label></div><label class="wide">Комментарий<textarea name="comment" maxlength="1000" rows="4"></textarea></label><label class="wide">Скриншот, JPEG/PNG/WebP до 8 МБ<input name="screenshot" type="file" accept="image/jpeg,image/png,image/webp" /></label></details><label class="honeypot" aria-hidden="true">Сайт<input name="website" tabindex="-1" autocomplete="off" /></label><p class="privacy">Ник и скриншот необязательны. Из изображения удаляются EXIF и прочие метаданные.</p><label class="consent"><input name="consent" type="checkbox" required /> <span>Я отправляю собственное наблюдение и принимаю <a href="/rules" target="_blank">правила</a> и <a href="/privacy" target="_blank">политику конфиденциальности</a>.</span></label><button data-action="primary" type="submit">Отправить на проверку</button>
</form>} </form>}
@@ -32,7 +40,7 @@ const reportId = Astro.url.searchParams.get("report_id");
removeItem: (k: string) => { try { sessionStorage.removeItem(k); } catch {} }, removeItem: (k: string) => { try { sessionStorage.removeItem(k); } catch {} },
}; };
// A05: Restore draft on all error states that don't destroy the submission // A05: Restore draft on all error states that don't destroy the submission
const recoverableStates = ["create_error", "rate_limited", "server_error", "timeout"]; const recoverableStates = ["create_error", "conflict", "rate_limited", "server_error", "timeout"];
if (form && recoverableStates.includes(state)) { if (form && recoverableStates.includes(state)) {
try { try {
const draft = JSON.parse(safeStorage.getItem(key) || "{}"); const draft = JSON.parse(safeStorage.getItem(key) || "{}");
+14 -2
View File
@@ -1,5 +1,5 @@
import type { APIRoute } from "astro"; import type { APIRoute } from "astro";
import { api, type DictionaryItem } from "../lib/api"; import { api, type DictionaryItem, type PaginatedRigs, type PaginatedTackleItems } from "../lib/api";
const escapeXml = (value: string) => value.replace(/[<>&'"]/g, c => ({ "<": "&lt;", ">": "&gt;", "&": "&amp;", "'": "&apos;", '"': "&quot;" })[c] ?? c); const escapeXml = (value: string) => value.replace(/[<>&'"]/g, c => ({ "<": "&lt;", ">": "&gt;", "&": "&amp;", "'": "&apos;", '"': "&quot;" })[c] ?? c);
let lastGood: { origin: string; xml: string; at: number } | undefined; let lastGood: { origin: string; xml: string; at: number } | undefined;
@@ -9,7 +9,7 @@ export const GET: APIRoute = async ({ site }) => {
const output = (xml: string) => new Response(xml, { headers: { "Content-Type": "application/xml; charset=utf-8", "Cache-Control": "public, max-age=1800" } }); const output = (xml: string) => new Response(xml, { headers: { "Content-Type": "application/xml; charset=utf-8", "Cache-Control": "public, max-age=1800" } });
if (lastGood?.origin === origin && Date.now() - lastGood.at < 1800000) return output(lastGood.xml); if (lastGood?.origin === origin && Date.now() - lastGood.at < 1800000) return output(lastGood.xml);
try { try {
const paths = new Set(["/", "/records", "/report", "/status", "/rules", "/privacy", "/fish", "/waterbodies", "/media"]); const paths = new Set(["/", "/records", "/report", "/status", "/rules", "/privacy", "/fish", "/waterbodies", "/media", "/tackle"]);
for (const [endpoint, prefix] of [["fishes", "fish"], ["waterbodies", "waterbodies"]]) { for (const [endpoint, prefix] of [["fishes", "fish"], ["waterbodies", "waterbodies"]]) {
for (let offset = 0; ; offset += 500) { for (let offset = 0; ; offset += 500) {
const rows = await api<DictionaryItem[]>(`/api/v1/${endpoint}?limit=500&offset=${offset}`); const rows = await api<DictionaryItem[]>(`/api/v1/${endpoint}?limit=500&offset=${offset}`);
@@ -18,6 +18,18 @@ export const GET: APIRoute = async ({ site }) => {
if (rows.length < 500) break; if (rows.length < 500) break;
} }
} }
for (let offset = 0; ; offset += 100) {
const page = await api<PaginatedTackleItems>(`/api/v1/tackle/items?limit=100&offset=${offset}`);
page.items.forEach(item => paths.add(`/tackle/items/${item.id}`));
if (paths.size > 49000) throw new Error("Sitemap index required");
if (page.items.length < page.limit) break;
}
for (let offset = 0; ; offset += 100) {
const page = await api<PaginatedRigs>(`/api/v1/tackle/rigs?limit=100&offset=${offset}`);
page.items.forEach(rig => paths.add(`/tackle/rigs/${rig.id}`));
if (paths.size > 49000) throw new Error("Sitemap index required");
if (page.items.length < page.limit) break;
}
for (let offset = 0; ; offset += 500) { for (let offset = 0; ; offset += 500) {
const rows = await api<string[]>(`/api/v1/public-spot-pages?limit=500&offset=${offset}`); const rows = await api<string[]>(`/api/v1/public-spot-pages?limit=500&offset=${offset}`);
rows.forEach(path => paths.add(path)); rows.forEach(path => paths.add(path));
+59 -9
View File
@@ -1,12 +1,12 @@
--- ---
import Layout from "../../layouts/Layout.astro"; import Layout from "../../layouts/Layout.astro";
import AtlasBreadcrumbs from "../../components/AtlasBreadcrumbs.astro"; import AtlasBreadcrumbs from "../../components/AtlasBreadcrumbs.astro";
import SourceBadge from "../../components/SourceBadge.astro";
import CoordinateRadar from "../../components/CoordinateRadar.astro"; import CoordinateRadar from "../../components/CoordinateRadar.astro";
import TackleGlyph from "../../components/TackleGlyph.astro"; import TackleGlyph from "../../components/TackleGlyph.astro";
import ActivityTimeline from "../../components/ActivityTimeline.astro"; import ActivityTimeline from "../../components/ActivityTimeline.astro";
import CatchList from "../../components/CatchList.astro"; import CatchList from "../../components/CatchList.astro";
import { activityLevel, api, ApiError, plural, type Activity, type Catch, type PaginatedActivity, type Spot } from "../../lib/api"; import DataPassport from "../../components/DataPassport.astro";
import { activityLevel, api, ApiError, coordinatePrecisionLabel, type Activity, type Catch, type PaginatedActivity, type Spot } from "../../lib/api";
const { id } = Astro.params; const { id } = Astro.params;
let spot: Spot | null = null, catches: Catch[] = [], activity: Activity | null = null, unavailable = false; let spot: Spot | null = null, catches: Catch[] = [], activity: Activity | null = null, unavailable = false;
let timeline: { start: string; end: string; count: number }[] = []; let timeline: { start: string; end: string; count: number }[] = [];
@@ -22,20 +22,28 @@ try {
} catch (error) { } catch (error) {
unavailable = true; unavailable = true;
Astro.response.status = error instanceof ApiError && [404, 422].includes(error.status) ? 404 : 503; Astro.response.status = error instanceof ApiError && [404, 422].includes(error.status) ? 404 : 503;
if (Astro.response.status === 503) Astro.response.headers.set("Retry-After", "60"); if (Astro.response.status === 503) {
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
} }
const level = activity ? activityLevel(activity.activity_score) : null; const level = activity ? activityLevel(activity.activity_score) : null;
const coordinatePrecision = { exact: "точные", approximate: "приблизительные", area: "район", missing: "не указаны" } as const; const methodLabels: Record<string, string> = { spinning: "Спиннинг", bottom: "Донная", float: "Поплавочная" };
const method = catches.map(item => item.fishing_method).find(Boolean) ?? "";
const retrieve = catches.map(item => item.retrieve_method).find(Boolean) ?? "";
const confirmedMethods = [...new Set(catches.map(item => item.fishing_method).filter((value): value is string => Boolean(value)))].map(value => methodLabels[value] ?? value);
const confirmedRetrieves = [...new Set(catches.map(item => item.retrieve_method).filter((value): value is string => Boolean(value)))];
const risk = activity ? activity.catches < 3 ? "Малая выборка" : activity.confidence_score < 50 ? "Низкая уверенность" : "Подтверждено" : "Нет оценки";
const spotDescription = spot ? `Свежие уловы и активность на точке ${spot.x}:${spot.y}, ${spot.waterbody}: рыба, вес, приманки и источники данных.` : "Данные точки ловли Russian Fishing 4."; const spotDescription = spot ? `Свежие уловы и активность на точке ${spot.x}:${spot.y}, ${spot.waterbody}: рыба, вес, приманки и источники данных.` : "Данные точки ловли Russian Fishing 4.";
const breadcrumbs = spot ? { "@context": "https://schema.org", "@type": "BreadcrumbList", itemListElement: [ const breadcrumbs = spot ? { "@context": "https://schema.org", "@type": "BreadcrumbList", itemListElement: [
{ "@type": "ListItem", position: 1, name: "Сейчас клюёт", item: "https://rf4spotter.ru/" }, { "@type": "ListItem", position: 1, name: "Сейчас клюёт", item: "https://rf4spotter.ru/" },
{ "@type": "ListItem", position: 2, name: `${spot.waterbody} ${spot.x}:${spot.y}`, item: `https://rf4spotter.ru/spots/${spot.waterbody_slug}-${spot.x}x${spot.y}` }, { "@type": "ListItem", position: 2, name: `${spot.waterbody} ${spot.x}:${spot.y}`, item: `https://rf4spotter.ru/spots/${spot.waterbody_slug}-${spot.x}x${spot.y}` },
] } : null; ] } : null;
--- ---
<Layout title={spot ? `Точка ${spot.x}:${spot.y}, ${spot.waterbody} — RF4 Spotter` : "Точка не найдена — RF4 Spotter"} description={spotDescription} noindex={!spot} structuredData={breadcrumbs} errorPage={!spot || unavailable}> <Layout title={spot ? `Точка ${spot.x}:${spot.y}, ${spot.waterbody} — RF4 Spotter` : "Точка не найдена — RF4 Spotter"} description={spotDescription} noindex={!spot || unavailable} structuredData={breadcrumbs} errorPage={!spot || unavailable}>
<AtlasBreadcrumbs items={[{ label: "Сейчас клюёт", href: "/" }, ...(spot ? [{ label: spot.waterbody, href: `/waterbodies/${spot.waterbody_slug}` }, { label: `Точка ${spot.x}:${spot.y}` }] : [{ label: "Точка недоступна" }])]} /> <AtlasBreadcrumbs items={[{ label: "Сейчас клюёт", href: "/" }, ...(spot ? [{ label: spot.waterbody, href: `/waterbodies/${spot.waterbody_slug}` }, { label: `Точка ${spot.x}:${spot.y}` }] : [{ label: "Точка недоступна" }])]} />
{unavailable || !spot ? <div class="state"><h1>Точка недоступна</h1><p>API не ответил или такой точки нет.</p></div> : <> {unavailable || !spot ? <div class="state" role="alert"><h1>Точка недоступна</h1><p>API не ответил или такой точки нет.</p></div> : <>
<section class="spot-hero"><div><span class="eyebrow">{spot.waterbody}</span><h1>Точка {spot.x}:{spot.y}</h1><p>{spot.description}</p><p class="coordinate-precision">Точность координат: <strong>{coordinatePrecision[spot.coordinate_precision as keyof typeof coordinatePrecision] ?? "не указаны"}</strong></p><button class="coordinate-copy" data-action="inverse" type="button" data-copy-coordinates={`${spot.x}:${spot.y}`}>Скопировать координаты</button><small class="copy-status" aria-live="polite"></small></div><CoordinateRadar x={spot.x} y={spot.y}/></section> <section class="spot-hero"><div><span class="eyebrow">{spot.waterbody}</span><h1>Точка {spot.x}:{spot.y}</h1><p>{spot.description}</p><p class="coordinate-precision">Точность координат: <strong>{coordinatePrecisionLabel(spot.coordinate_precision)}</strong></p><div class="spot-hero__actions"><button class="coordinate-copy" data-action="inverse" type="button" data-copy-coordinates={`${spot.x}:${spot.y}`}>Скопировать координаты</button><button class="plan-save" data-action="inverse" type="button" data-plan-save data-plan-key={Astro.url.pathname} data-plan-waterbody={spot.waterbody} data-plan-coordinates={`${spot.x}:${spot.y}`} data-plan-baits={spot.top_baits.join("|")} data-plan-method={methodLabels[method] ?? method} data-plan-retrieve={retrieve} data-plan-risk={risk} data-plan-freshness={activity?.last_confirmed_at ?? ""} data-plan-confidence={activity?.confidence_score ?? ""} aria-pressed="false">Сохранить в план</button><small class="copy-status" aria-live="polite"></small><small class="plan-status" aria-live="polite"></small></div></div><CoordinateRadar x={spot.x} y={spot.y}/></section>
<div class="periods"><div><strong>{spot.catches_24h}</strong><span>за 24 часа</span></div><div><strong>{spot.catches_3d}</strong><span>за 3 дня</span></div><div><strong>{spot.catches_7d}</strong><span>за 7 дней</span></div></div> <div class="periods"><div><strong>{spot.catches_24h}</strong><span>за 24 часа</span></div><div><strong>{spot.catches_3d}</strong><span>за 3 дня</span></div><div><strong>{spot.catches_7d}</strong><span>за 7 дней</span></div></div>
<ActivityTimeline buckets={timeline}/> <ActivityTimeline buckets={timeline}/>
<div class="activity-legend" aria-label="Уровни активности"><span>Тихо</span><span>Есть сигналы</span><span>Горячо</span></div> <div class="activity-legend" aria-label="Уровни активности"><span>Тихо</span><span>Есть сигналы</span><span>Горячо</span></div>
@@ -44,17 +52,59 @@ const breadcrumbs = spot ? { "@context": "https://schema.org", "@type": "Breadcr
<div class="section-heading"><h2>Последние уловы</h2></div> <div class="section-heading"><h2>Последние уловы</h2></div>
{catches.length ? <CatchList catches={catches}/> : <div class="state compact-state"><h2>Уловов пока нет</h2><p>Для этой точки нет одобренных наблюдений.</p></div>} {catches.length ? <CatchList catches={catches}/> : <div class="state compact-state"><h2>Уловов пока нет</h2><p>Для этой точки нет одобренных наблюдений.</p></div>}
</div> </div>
<aside><span class="eyebrow">Оценка за 24 часа</span>{activity && level ? <><h2>{activity.activity_score} / 100</h2><strong data-activity-level={level.short}>{level.description}</strong><div class="source-strip">{activity.sources.map(source => <SourceBadge source={source}/>)}</div><p>{activity.explanation}</p><p class="note">Основано на {activity.catches} {plural(activity.catches, ["наблюдении", "наблюдениях", "наблюдениях"])} от {activity.unique_players} {plural(activity.unique_players, ["игрока", "игроков", "игроков"])}. Уверенность: {activity.confidence_score}%.</p></> : <p>За последние 24 часа данных для расчёта нет.</p>}<span class="eyebrow">Лучшие приманки</span>{spot.top_baits.length ? <ol>{spot.top_baits.map(name => <li><span class="tackle-label"><TackleGlyph name={name} size={24}/><span>{name}</span></span></li>)}</ol> : <p>Недостаточно данных.</p>}<p class="note">Учитываются только одобренные наблюдения.</p></aside> <aside><span class="eyebrow">Оценка за 24 часа</span>{activity && level ? <><h2>{activity.activity_score} / 100</h2><strong data-activity-level={level.short}>{level.description}</strong><p>{activity.explanation}</p><DataPassport sources={activity.sources} observedAt={activity.last_confirmed_at} confidence={activity.confidence_score} sampleSize={activity.catches} independentPlayers={activity.unique_players} coordinatePrecision={activity.coordinate_precision} coordinateSources={activity.coordinate_sources} sourceConflicts={activity.source_conflicts} status={activity.catches < 3 ? "insufficient" : "verified"}/></> : <p>За последние 24 часа данных для расчёта нет.</p>}<h3 class="detail-action-heading">Что взять</h3>{spot.top_baits.length ? <ol>{spot.top_baits.map(name => <li><span class="tackle-label"><TackleGlyph name={name} size={24}/><span>{name}</span></span></li>)}</ol> : <p>Недостаточно данных.</p>}<section class="confirmed-approach" aria-label="Подтверждённый метод и проводка"><h3>Подтверждённый подход</h3>{confirmedMethods.length || confirmedRetrieves.length ? <dl>{confirmedMethods.length > 0 && <div><dt>Метод</dt><dd>{confirmedMethods.join(", ")}</dd></div>}{confirmedRetrieves.length > 0 && <div><dt>Проводка</dt><dd>{confirmedRetrieves.join(", ")}</dd></div>}</dl> : <p>Метод и проводка в уловах не указаны.</p>}<small>По одобренным уловам этой точки.</small></section><p class="note">Учитываются только одобренные наблюдения.</p></aside>
</section> </section>
</>} </>}
</Layout> </Layout>
<script> <script>
const copyText = async (value: string) => {
if (navigator.clipboard?.writeText) { await navigator.clipboard.writeText(value); return; }
const field = document.createElement("textarea");
field.value = value; field.setAttribute("readonly", ""); field.style.position = "fixed"; field.style.opacity = "0";
document.body.append(field); field.select();
const copied = document.execCommand("copy");
field.remove();
if (!copied) throw new Error("Clipboard is unavailable");
};
document.querySelectorAll<HTMLButtonElement>("[data-copy-coordinates]").forEach((button) => { document.querySelectorAll<HTMLButtonElement>("[data-copy-coordinates]").forEach((button) => {
button.addEventListener("click", async () => { button.addEventListener("click", async () => {
const value = button.dataset.copyCoordinates || ""; const value = button.dataset.copyCoordinates || "";
const status = button.parentElement?.querySelector<HTMLElement>(".copy-status"); const status = button.parentElement?.querySelector<HTMLElement>(".copy-status");
try { await navigator.clipboard.writeText(value); if (status) status.textContent = "Скопировано"; } try { await copyText(value); if (status) status.textContent = "Скопировано"; }
catch { if (status) status.textContent = value; } catch { if (status) status.textContent = value; }
}); });
}); });
const planStorageKey = "rf4spotter:fishing-plan";
const readPlan = (): Array<Record<string, string>> => {
try { const value = JSON.parse(localStorage.getItem(planStorageKey) || "[]"); return Array.isArray(value) ? value : []; }
catch { return []; }
};
document.querySelectorAll<HTMLButtonElement>("[data-plan-save]").forEach((button) => {
const key = button.dataset.planKey || "";
const status = button.parentElement?.querySelector<HTMLElement>(".plan-status");
const sync = () => {
const saved = readPlan().some(item => item.key === key);
button.textContent = saved ? "В плане" : "Сохранить в план";
button.setAttribute("aria-pressed", String(saved));
button.dataset.saved = String(saved);
};
sync();
button.addEventListener("click", () => {
const plan = readPlan();
const index = plan.findIndex(item => item.key === key);
if (index >= 0) { plan.splice(index, 1); if (status) status.textContent = "Удалено из плана"; }
else { plan.unshift({ key, waterbody: button.dataset.planWaterbody || "", coordinates: button.dataset.planCoordinates || "", baits: button.dataset.planBaits || "", method: button.dataset.planMethod || "", retrieve: button.dataset.planRetrieve || "", risk: button.dataset.planRisk || "", freshness: button.dataset.planFreshness || "", confidence: button.dataset.planConfidence || "" }); if (status) status.textContent = "Добавлено в план"; }
localStorage.setItem(planStorageKey, JSON.stringify(plan.slice(0, 5)));
sync();
});
});
</script> </script>
<style>
.confirmed-approach { margin-top: 22px; padding-top: 18px; border-top: 1px solid var(--border); }
.confirmed-approach h3 { margin: 0 0 12px; }
.confirmed-approach dl { display: grid; gap: 8px; margin: 0 0 8px; }
.confirmed-approach dl div { display: grid; grid-template-columns: 92px 1fr; gap: 8px; }
.confirmed-approach dt { color: var(--text-subtle); font-size: 11px; font-weight: 750; text-transform: uppercase; }
.confirmed-approach dd { margin: 0; color: var(--text-secondary); }
.confirmed-approach p, .confirmed-approach small { color: var(--text-muted); }
</style>
+10 -5
View File
@@ -4,13 +4,18 @@ import SourceBadge from "../components/SourceBadge.astro";
import DataLegend from "../components/DataLegend.astro"; import DataLegend from "../components/DataLegend.astro";
import PageHero from "../components/PageHero.astro"; import PageHero from "../components/PageHero.astro";
import StatePanel from "../components/StatePanel.astro"; import StatePanel from "../components/StatePanel.astro";
import { ago, api, plural, type SourceStatus } from "../lib/api"; import { ago, api, plural, sourceStatusLabel, type SourceStatus } from "../lib/api";
let sources: SourceStatus[] = [], unavailable = false; let sources: SourceStatus[] = [], unavailable = false;
try { sources = await api<SourceStatus[]>("/api/v1/source-status"); } catch { unavailable = true; } try { sources = await api<SourceStatus[]>("/api/v1/source-status"); }
const labels = { healthy:"Актуален", stale:"Данные устарели", temporarily_limited:"Временная пауза", source_changed:"Источник изменился", waiting:"Ожидает запуска", disabled:"Выключен" }; catch {
unavailable = true;
Astro.response.status = 503;
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
--- ---
<Layout title="Состояние источников — RF4 Spotter" description="Текущее безопасное состояние источников данных RF4 Spotter."> <Layout title="Состояние источников — RF4 Spotter" description="Текущее безопасное состояние источников данных RF4 Spotter." noindex={unavailable} errorPage={unavailable}>
<PageHero eyebrow="Прозрачность данных" title="Статус источников" description="Пауза или изменение страницы не удаляют уже опубликованные данные." /> <PageHero eyebrow="Прозрачность данных" title="Статус источников" description="Пауза или изменение страницы не удаляют уже опубликованные данные." />
{unavailable ? <StatePanel tone="unavailable" title="Статус временно недоступен" description="Данные о состоянии источников не получены. Публичные наблюдения при этом не изменяются." /> : <section class="source-health-grid content-grid">{sources.map(source => <article data-status={source.status}><div><SourceBadge source={source.source_system}/><span class="health-state"><i></i>{labels[source.status]}</span></div><h2>{source.name}</h2><strong>{source.observations} {plural(source.observations,["наблюдение","наблюдения","наблюдений"])}</strong><p>{source.last_success_at ? `Последнее успешное обновление ${ago(source.last_success_at)}` : "Успешных запусков пока нет"}</p></article>)}</section>} {unavailable ? <StatePanel tone="unavailable" title="Статус временно недоступен" description="Данные о состоянии источников не получены. Публичные наблюдения при этом не изменяются." /> : <section class="source-health-grid content-grid">{sources.map(source => <article data-status={source.status}><div><SourceBadge source={source.source_system}/><span class="health-state"><i></i>{sourceStatusLabel(source.status)}</span></div><h2>{source.name}</h2><strong>{source.observations} {plural(source.observations,["наблюдение","наблюдения","наблюдений"])}</strong><p>{source.status === "temporarily_limited" ? "Источник ограничен; опубликованные данные сохранены." : source.last_success_at ? `Последнее успешное обновление ${ago(source.last_success_at)}` : "Успешных запусков пока нет"}</p></article>)}</section>}
<DataLegend /> <DataLegend />
</Layout> </Layout>
+43
View File
@@ -0,0 +1,43 @@
---
import Layout from "../../layouts/Layout.astro";
import PageHero from "../../components/PageHero.astro";
import StatePanel from "../../components/StatePanel.astro";
import { ago, api, type DictionaryItem, type TackleCombination } from "../../lib/api";
const params = Astro.url.searchParams;
const waterbody = params.get("waterbody") ?? "";
const fish = params.get("fish") ?? "";
const method = params.get("method") ?? "";
const role = params.get("role") ?? "";
const hours = [24, 72, 168].includes(Number(params.get("hours"))) ? Number(params.get("hours")) : 72;
const query = new URLSearchParams({ hours: String(hours), min_samples: "3", min_players: "2", limit: "100" });
if (waterbody) query.set("waterbody", waterbody);
if (fish) query.set("fish", fish);
if (method) query.set("method", method);
if (role) query.set("role", role);
let combinations: TackleCombination[] = [], waters: DictionaryItem[] = [], fishes: DictionaryItem[] = [], unavailable = false;
try {
[combinations, waters, fishes] = await Promise.all([
api<TackleCombination[]>(`/api/v1/analytics/tackle?${query}`),
api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"),
api<DictionaryItem[]>("/api/v1/fishes?limit=500"),
]);
} catch { unavailable = true; }
if (unavailable) { Astro.response.status = 503; Astro.response.headers.set("Retry-After", "60"); Astro.response.headers.set("Cache-Control", "no-store"); }
const methodLabels: Record<string, string> = { spinning: "Спиннинг", bottom: "Донная", float: "Поплавочная" };
const roleLabels: Record<string, string> = { lure: "Приманка", bait: "Наживка", rig: "Сборка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", float: "Поплавок", sinker: "Груз" };
---
<Layout title="Сочетания снастей RF4 — RF4 Spotter" description="Подтверждённые сочетания снастей RF4 по одобренным наблюдениям, с выборкой и независимыми игроками." noindex={unavailable} errorPage={unavailable}>
<PageHero eyebrow="Только одобренные наблюдения" title="Сочетания снастей" description="Факт использования отделён от рекомендации: малой выборке нельзя приписывать эффективность." variant="fish" />
<form class="record-filters" method="get" aria-label="Фильтры сочетаний снастей">
<label>Водоём<select name="waterbody"><option value="">Все водоёмы</option>{waters.map(item => <option value={item.slug} selected={waterbody === item.slug}>{item.name_ru}</option>)}</select></label>
<label>Рыба<select name="fish"><option value="">Все виды</option>{fishes.map(item => <option value={item.slug} selected={fish === item.slug}>{item.name_ru}</option>)}</select></label>
<label>Метод<select name="method"><option value="">Все методы</option>{Object.entries(methodLabels).map(([value, label]) => <option value={value} selected={method === value}>{label}</option>)}</select></label>
<label>Роль<select name="role"><option value="">Все роли</option>{Object.entries(roleLabels).map(([value, label]) => <option value={value} selected={role === value}>{label}</option>)}</select></label>
<label>Период<select name="hours">{[24, 72, 168].map(value => <option value={value} selected={hours === value}>{value} ч</option>)}</select></label>
<button data-action="primary">Показать</button>
{(waterbody || fish || method || role || hours !== 72) && <a data-action="quiet" href="/tackle/analytics">Сбросить</a>}
</form>
<p class="privacy content-grid">Порог рекомендации: минимум 3 наблюдения от 2 независимых игроков. Это не рейтинг снасти и не гарантия улова.</p>
{unavailable ? <StatePanel tone="unavailable" title="Аналитика временно недоступна" description="Не показываем непроверенные сочетания. Попробуйте позже." /> : combinations.length ? <section class="signal-grid content-grid" aria-label="Сочетания снастей" data-analytics-results>{combinations.map(item => { const canonicalHref = item.rig_id ? `/tackle/rigs/${item.rig_id}` : item.tackle_item_id ? `/tackle/items/${item.tackle_item_id}` : null; return <article class="signal-card" data-analytics-status={item.status}><div class="signal-card__top"><span class="source-chip"><span>{roleLabels[item.role] ?? item.role}</span></span><span class="quality-chip">{item.status === "recommendation" ? "Рекомендация" : "Недостаточно данных"}</span></div><h2>{canonicalHref ? <a href={canonicalHref}>{item.value}</a> : item.value}</h2><dl><div><dt>Наблюдения</dt><dd>{item.catches}</dd></div><div><dt>Игроки</dt><dd>{item.unique_players}</dd></div><div><dt>Свежесть выборки</dt><dd>{item.freshness_score}%</dd></div><div><dt>Последнее</dt><dd>{ago(item.last_seen_at)}</dd></div></dl><p>{item.explanation}</p></article>})}</section> : <div data-analytics-results><StatePanel title="Подтверждённых сочетаний пока нет" description="Сочетания появятся после новых одобренных наблюдений с указанием компонентов." /></div>}
</Layout>
+46 -13
View File
@@ -4,37 +4,70 @@ import PageHero from "../../components/PageHero.astro";
import StatePanel from "../../components/StatePanel.astro"; import StatePanel from "../../components/StatePanel.astro";
import Pagination from "../../components/Pagination.astro"; import Pagination from "../../components/Pagination.astro";
import TackleGlyph from "../../components/TackleGlyph.astro"; import TackleGlyph from "../../components/TackleGlyph.astro";
import { api, type PaginatedTackleItems } from "../../lib/api"; import DataPassport from "../../components/DataPassport.astro";
import { api, ApiError, type PaginatedRigs, type PaginatedTackleItems } from "../../lib/api";
const params = Astro.url.searchParams; const params = Astro.url.searchParams;
const category = params.get("category") ?? ""; const category = params.get("category") ?? "";
const search = params.get("q") ?? "";
const brand = params.get("brand") ?? ""; const brand = params.get("brand") ?? "";
const family = params.get("family") ?? ""; const family = params.get("family") ?? "";
const requestedOffset = Number(params.get("offset") ?? 0); const unlockLevelParam = params.get("unlock_level") ?? "";
const unlockLevel = /^\d+$/.test(unlockLevelParam) ? unlockLevelParam : "";
const requestedItemsOffset = Number(params.get("items_offset") ?? 0);
const requestedRigsOffset = Number(params.get("rigs_offset") ?? 0);
const limit = 48; const limit = 48;
const offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0; const itemsOffset = Number.isInteger(requestedItemsOffset) && requestedItemsOffset >= 0 ? requestedItemsOffset : 0;
const query = new URLSearchParams({ limit: String(limit), offset: String(offset) }); const rigsOffset = Number.isInteger(requestedRigsOffset) && requestedRigsOffset >= 0 ? requestedRigsOffset : 0;
const query = new URLSearchParams({ limit: String(limit), offset: String(itemsOffset) });
if (category) query.set("category", category); if (category) query.set("category", category);
if (search) query.set("q", search);
if (brand) query.set("brand", brand); if (brand) query.set("brand", brand);
if (family) query.set("family", family); if (family) query.set("family", family);
let result: PaginatedTackleItems = { items: [], total: 0, limit, offset }, unavailable = false; if (unlockLevel) query.set("unlock_level", unlockLevel);
try { result = await api<PaginatedTackleItems>(`/api/v1/tackle/items?${query}`); } catch { unavailable = true; } let result: PaginatedTackleItems = { items: [], total: 0, limit, offset: itemsOffset }, rigs: PaginatedRigs = { items: [], total: 0, limit, offset: rigsOffset };
if (unavailable) { Astro.response.status = 503; Astro.response.headers.set("Retry-After", "60"); Astro.response.headers.set("Cache-Control", "no-store"); } const [itemsResult, rigsResult] = await Promise.allSettled([
const categoryLabels: Record<string, string> = { bait: "Наживка", lure: "Приманка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", rig: "Монтаж", float: "Поплавок", sinker: "Груз", other: "Другое" }; api<PaginatedTackleItems>(`/api/v1/tackle/items?${query}`),
api<PaginatedRigs>(`/api/v1/tackle/rigs?limit=${limit}&offset=${rigsOffset}${search ? `&q=${encodeURIComponent(search)}` : ""}`),
]);
const itemsError = itemsResult.status === "rejected" ? itemsResult.reason : null;
const rigsError = rigsResult.status === "rejected" ? rigsResult.reason : null;
const itemsInvalid = itemsError instanceof ApiError && itemsError.status === 422;
const rigsInvalid = rigsError instanceof ApiError && rigsError.status === 422;
const itemsUnavailable = Boolean(itemsError) && !itemsInvalid;
const rigsUnavailable = Boolean(rigsError) && !rigsInvalid;
const invalidFilters = itemsInvalid || rigsInvalid;
const unavailable = itemsUnavailable || rigsUnavailable;
if (itemsResult.status === "fulfilled") result = itemsResult.value;
if (rigsResult.status === "fulfilled") rigs = rigsResult.value;
if (invalidFilters) Astro.response.status = 422;
else if (unavailable) { Astro.response.status = 503; Astro.response.headers.set("Retry-After", "60"); Astro.response.headers.set("Cache-Control", "no-store"); }
const categoryLabels: Record<string, string> = { bait: "Наживка", lure: "Приманка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", rig: "Сборка", float: "Поплавок", sinker: "Груз", other: "Другое" };
const filterParams = new URLSearchParams(); const filterParams = new URLSearchParams();
if (category) filterParams.set("category", category); if (category) filterParams.set("category", category);
if (search) filterParams.set("q", search);
if (brand) filterParams.set("brand", brand); if (brand) filterParams.set("brand", brand);
if (family) filterParams.set("family", family); if (family) filterParams.set("family", family);
if (unlockLevel) filterParams.set("unlock_level", unlockLevel);
const itemsParams = new URLSearchParams(filterParams);
const rigsParams = new URLSearchParams(search ? { q: search } : {});
--- ---
<Layout title="Снасти и приманки RF4 — RF4 Spotter" description="Канонический каталог снастей, приманок и монтажей Russian Fishing 4 с источниками и отметками неполноты."> <Layout title="Снасти и приманки RF4 — RF4 Spotter" description="Канонический каталог снастей, приманок и сборок Russian Fishing 4 с источниками и отметками неполноты." noindex={unavailable || invalidFilters} errorPage={false}>
<PageHero eyebrow="Канонический справочник" title="Снасти и приманки" description="Показываем только подтверждённые карточки. Пустые поля явно отмечены и не заменяются догадками." variant="fish" count={result.total} /> <PageHero eyebrow="Канонический справочник" title="Снасти и приманки" description="Показываем только подтверждённые карточки. Пустые поля явно отмечены и не заменяются догадками." variant="fish" count={result.total} countLabel="карточек" />
<form class="record-filters" method="get" aria-label="Фильтры каталога снастей"> <form class="record-filters" method="get" aria-label="Фильтры каталога снастей">
<label>Категория<select name="category"><option value="">Все категории</option>{Object.entries(categoryLabels).map(([value, label]) => <option value={value} selected={category === value}>{label}</option>)}</select></label> <label>Категория<select name="category"><option value="">Все категории</option>{Object.entries(categoryLabels).map(([value, label]) => <option value={value} selected={category === value}>{label}</option>)}</select></label>
<label>Поиск<input name="q" value={search} maxlength="100" placeholder="Название снасти или приманки" /></label>
<label>Бренд<input name="brand" value={brand} maxlength="100" placeholder="Например, RF4" /></label> <label>Бренд<input name="brand" value={brand} maxlength="100" placeholder="Например, RF4" /></label>
<label>Семейство<input name="family" value={family} maxlength="100" placeholder="Название семейства" /></label> <label>Семейство<input name="family" value={family} maxlength="100" placeholder="Название семейства" /></label>
<label>Уровень открытия<input name="unlock_level" value={unlockLevel} inputmode="numeric" pattern="[0-9]+" min="0" maxlength="4" placeholder="Например, 20" /></label>
<button data-action="primary">Фильтровать</button> <button data-action="primary">Фильтровать</button>
{(category || brand || family) && <a data-action="quiet" href="/tackle">Сбросить</a>} {(category || search || brand || family || unlockLevel) && <a data-action="quiet" href="/tackle">Сбросить</a>}
<a data-action="quiet" href="/tackle/analytics">Сочетания снастей</a>
</form> </form>
{unavailable ? <StatePanel tone="unavailable" title="Каталог временно недоступен" description="Не показываем непроверенные карточки. Попробуйте обновить страницу позже." /> : result.items.length ? <section class="catalog-grid content-grid" aria-label="Карточки снастей">{result.items.map(item => <a href={`/tackle/items/${item.id}`}><TackleGlyph name={item.name} size={32} /><span>{categoryLabels[item.category] ?? item.category}</span><strong>{item.name}</strong><small>{[item.brand, item.family].filter(Boolean).join(" · ") || "Характеристики уточняются"}</small></a>)}</section> : <StatePanel title="Подтверждённых карточек пока нет" description="Каталог заполнится после разрешённой загрузки и ручной проверки источников." />} {invalidFilters ? <StatePanel tone="error" title="Проверьте фильтры каталога" description="Один из параметров поиска имеет недопустимое значение. Измените фильтры и попробуйте снова." /> : <>
{!unavailable && <Pagination path="/tackle" params={filterParams} total={result.total} limit={limit} offset={offset} itemLabel="карточек" />} {itemsUnavailable ? <StatePanel tone="unavailable" title="Каталог снастей временно недоступен" description={rigsUnavailable ? "Каталог снастей и сборок сейчас не отвечает. Попробуйте обновить страницу позже." : "Сборки продолжают отображаться независимо. Попробуйте обновить карточки снастей позже."} actionHref={`${Astro.url.pathname}${Astro.url.search}`} actionLabel="Повторить загрузку" /> : result.items.length ? <section class="catalog-grid content-grid" aria-label="Карточки снастей">{result.items.map(item => <article class="catalog-card"><TackleGlyph name={item.name} size={32} /><span>{categoryLabels[item.category] ?? item.category}</span><a class="catalog-card__title" href={`/tackle/items/${item.id}`}><strong>{item.name}</strong></a><small>{[item.brand, item.family].filter(Boolean).join(" · ") || "Характеристики уточняются"}</small>{item.unlock_level !== null && <small>Открывается с уровня {item.unlock_level}</small>}<div class="tackle-card-passport"><DataPassport sources={item.source_system ? [item.source_system] : []} sourceUrl={item.source_url} observedAt={item.source_checked_at} completeness={item.missing_fields.length ? null : 100} status={item.missing_fields.length ? "incomplete" : item.source_checked_at ? "verified" : "unverified"}/></div></article>)}</section> : <StatePanel title={search ? "По запросу ничего не найдено" : "Подтверждённых карточек пока нет"} description={search ? "Измените запрос или сбросьте фильтры." : "Каталог заполнится после разрешённой загрузки и ручной проверки источников."} />}
{!itemsUnavailable && <Pagination path="/tackle" params={itemsParams} total={result.total} limit={limit} offset={itemsOffset} offsetParam="items_offset" itemLabel="карточек" />}
<section class="rig-catalog content-grid" aria-labelledby="rig-catalog-title"><div class="section-heading"><div><span class="overline">Сборки снастей</span><h2 id="rig-catalog-title">Сборки</h2></div><span class="result-count">{rigs.total} всего</span></div>{rigsUnavailable ? <StatePanel contained={false} tone="unavailable" title="Сборки временно недоступны" description={itemsUnavailable ? "Каталог снастей и сборок сейчас не отвечает. Попробуйте обновить страницу позже." : "Карточки отдельных снастей продолжают работать независимо."} actionHref={`${Astro.url.pathname}${Astro.url.search}`} actionLabel="Повторить загрузку" /> : rigs.items.length ? <div class="catalog-grid">{rigs.items.map(rig => <article class="catalog-card"><TackleGlyph name={rig.name} size={32} /><span>Сборка · {rig.component_count} компонентов</span><a class="catalog-card__title" href={`/tackle/rigs/${rig.id}`}><strong>{rig.name}</strong></a><small>{rig.source_system ?? "Источник не указан"}</small><div class="tackle-card-passport"><DataPassport sources={rig.source_system ? [rig.source_system] : []} sourceUrl={rig.source_url} observedAt={rig.source_checked_at} completeness={rig.missing_fields.length ? null : 100} status={rig.missing_fields.length ? "incomplete" : rig.source_checked_at ? "verified" : "unverified"}/></div></article>)}</div> : <StatePanel contained={false} title={search ? "По запросу сборки не найдены" : "Подтверждённых сборок пока нет"} description={search ? "Измените запрос или сбросьте фильтры." : "Сборки появятся после разрешённой загрузки и проверки источников."} />}</section>
{!rigsUnavailable && <Pagination path="/tackle" params={rigsParams} total={rigs.total} limit={limit} offset={rigsOffset} offsetParam="rigs_offset" itemLabel="сборок" />}
</>}
</Layout> </Layout>
@@ -0,0 +1,59 @@
---
import AtlasBreadcrumbs from "../../../components/AtlasBreadcrumbs.astro";
import DataPassport from "../../../components/DataPassport.astro";
import EntityMedia from "../../../components/EntityMedia.astro";
import Layout from "../../../layouts/Layout.astro";
import PageHero from "../../../components/PageHero.astro";
import StatePanel from "../../../components/StatePanel.astro";
import TackleGlyph from "../../../components/TackleGlyph.astro";
import { ApiError, api, type MediaAsset, type TackleItem } from "../../../lib/api";
import { findMediaByLabel, mediaRoleLabel } from "../../../lib/media";
import { safeHttpUrl } from "../../../lib/urls";
const { id } = Astro.params;
let item: TackleItem | undefined, media: MediaAsset[] = [];
let unavailable = false;
const [itemResult, mediaResult] = await Promise.allSettled([
api<TackleItem>(`/api/v1/tackle/items/${encodeURIComponent(id ?? "")}`),
api<MediaAsset[]>("/api/v1/media/catalog?entity_type=tackle"),
]);
if (itemResult.status === "fulfilled") item = itemResult.value;
else { const error = itemResult.reason; unavailable = !(error instanceof ApiError) || error.status >= 500; }
if (mediaResult.status === "fulfilled") media = mediaResult.value;
if (!item && !unavailable) Astro.response.status = 404;
if (unavailable) {
Astro.response.status = 503;
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
const categoryLabels: Record<string, string> = { bait: "Наживка", lure: "Приманка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", rig: "Сборка", float: "Поплавок", sinker: "Груз", other: "Другое" };
const missingLabels: Record<string, string> = { subcategory: "подкатегория", brand: "бренд", family: "семейство", unlock_level: "уровень открытия", source_url: "ссылка на источник", source_checked_at: "дата проверки" };
const missing = item?.missing_fields.map((field) => missingLabels[field] ?? field) ?? [];
const sourceHref = safeHttpUrl(item?.source_url);
const mediaCandidates = item ? (["tackle_card", "tackle_detail"] as const).map(role => findMediaByLabel(media, item!.name, [role])).filter((asset): asset is MediaAsset => Boolean(asset)) : [];
---
<Layout title={item ? `${item.name} — снасти RF4` : "Снасть не найдена — RF4 Spotter"} description={item ? `Подтверждённая карточка ${item.name} в каталоге снастей RF4 с источником и отметками полноты.` : "Такой карточки нет в каталоге снастей RF4."} noindex={!item || unavailable} errorPage={!item || unavailable}>
<AtlasBreadcrumbs items={[{ label: "Снасти", href: "/tackle" }, { label: item?.name ?? "Не найдено" }]} />
<PageHero eyebrow={item ? categoryLabels[item.category] ?? "Каталог RF4" : "Каталог RF4"} title={item?.name ?? (unavailable ? "Каталог недоступен" : "Снасть не найдена")} description={item ? "Канонические характеристики и происхождение без догадок." : undefined} variant={item ? "fish" : undefined} identity={item?.name} />
{unavailable ? <StatePanel tone="unavailable" title="Карточка временно недоступна" description="Каталог не ответил. Непроверенные характеристики не показываем." /> : !item ? <StatePanel tone="error" title="Такой карточки нет в каталоге" actionHref="/tackle" actionLabel="Открыть каталог" /> : <>
<section class="tackle-detail content-grid" aria-label="Характеристики снасти">
<div class="tackle-detail__identity"><TackleGlyph name={item.name} size={72} /><span class="overline">{categoryLabels[item.category] ?? item.category}</span><h2>{item.name}</h2><p>{[item.brand, item.family].filter(Boolean).join(" · ") || "Бренд и семейство не указаны."}</p></div>
<div><dl><div><dt>Подкатегория</dt><dd>{item.subcategory ?? "Не указана"}</dd></div><div><dt>Уровень открытия</dt><dd>{item.unlock_level ?? "Не указан"}</dd></div><div><dt>Источник</dt><dd>{item.source_system ?? "Не указан"}</dd></div></dl>{missing.length > 0 && <p class="tackle-detail__missing"><strong>Не хватает:</strong> {missing.join(", ")}.</p>}{sourceHref && <a data-action="secondary" href={sourceHref} rel="noreferrer">Открыть первоисточник</a>}</div>
</section>
<DataPassport sources={item.source_system ? [item.source_system] : []} sourceUrl={item.source_url} observedAt={item.source_checked_at} completeness={missing.length ? null : 100} status={missing.length ? "incomplete" : item.source_checked_at ? "verified" : "unverified"} />
<section class="related-rigs content-grid" aria-labelledby="related-rigs-title"><div><span class="overline">Связанные сборки</span><h2 id="related-rigs-title">Где используется снасть</h2><p>Показываем только сборки, где компонент привязан к канонической карточке.</p></div>{item.related_rigs.length ? <nav class="related-rigs__list">{item.related_rigs.map(rig => <a href={`/tackle/rigs/${rig.id}`}><strong>{rig.name}</strong><span>{rig.component_count} компонентов · {rig.source_system ?? "Источник не указан"}</span></a>)}</nav> : <p>Подтверждённых связанных сборок пока нет.</p>}</section>
{mediaCandidates.length > 0 && <section class="catalog-media-grid content-grid" aria-label={`Изображения снасти: ${item.name}`}>{mediaCandidates.map(asset => <article><span class="overline">{mediaRoleLabel(asset.media_role ?? "")}</span><EntityMedia asset={asset} sourceLink /></article>)}</section>}
</>}
</Layout>
<style>
.related-rigs { display: grid; grid-template-columns: minmax(0, 1fr) minmax(280px, 1fr); gap: 24px; margin-block: 26px; }
.related-rigs h2 { margin: 6px 0 8px; }
.related-rigs p { margin: 0; color: var(--text-muted); line-height: 1.5; }
.related-rigs__list { display: grid; gap: 10px; }
.related-rigs__list a { display: grid; gap: 4px; padding: 14px 16px; border: 1px solid var(--border); border-radius: 14px; color: inherit; text-decoration: none; }
.related-rigs__list a:hover, .related-rigs__list a:focus-visible { border-color: var(--focus); }
.related-rigs__list span { color: var(--text-muted); font-size: 12px; }
@media (max-width: 720px) { .related-rigs { grid-template-columns: 1fr; } }
</style>
+54
View File
@@ -0,0 +1,54 @@
---
import AtlasBreadcrumbs from "../../../components/AtlasBreadcrumbs.astro";
import DataPassport from "../../../components/DataPassport.astro";
import EntityMedia from "../../../components/EntityMedia.astro";
import Layout from "../../../layouts/Layout.astro";
import PageHero from "../../../components/PageHero.astro";
import StatePanel from "../../../components/StatePanel.astro";
import TackleGlyph from "../../../components/TackleGlyph.astro";
import { ApiError, api, type MediaAsset, type Rig } from "../../../lib/api";
import { findMediaByLabel, mediaRoleLabel } from "../../../lib/media";
import { safeHttpUrl } from "../../../lib/urls";
const { id } = Astro.params;
let rig: Rig | undefined, media: MediaAsset[] = [];
let unavailable = false;
const [rigResult, mediaResult] = await Promise.allSettled([
api<Rig>(`/api/v1/tackle/rigs/${encodeURIComponent(id ?? "")}`),
api<MediaAsset[]>("/api/v1/media/catalog?entity_type=tackle"),
]);
if (rigResult.status === "fulfilled") rig = rigResult.value;
else { const error = rigResult.reason; unavailable = !(error instanceof ApiError) || error.status >= 500; }
if (mediaResult.status === "fulfilled") media = mediaResult.value;
if (!rig && !unavailable) Astro.response.status = 404;
if (unavailable) {
Astro.response.status = 503;
Astro.response.headers.set("Retry-After", "60");
Astro.response.headers.set("Cache-Control", "no-store");
}
const roleLabels: Record<string, string> = { lure: "Приманка", bait: "Наживка", rig: "Сборка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", float: "Поплавок", sinker: "Груз" };
const missingLabels: Record<string, string> = { source_url: "ссылка на источник", source_checked_at: "дата проверки" };
const missing = rig?.missing_fields.map((field) => missingLabels[field] ?? field) ?? [];
const sourceHref = safeHttpUrl(rig?.source_url);
const mediaCandidates = rig ? [findMediaByLabel(media, rig.name, ["rig_diagram"])].filter((asset): asset is MediaAsset => Boolean(asset)) : [];
---
<Layout title={rig ? `${rig.name} — сборки RF4` : "Сборка не найдена — RF4 Spotter"} description={rig ? `Подтверждённая карточка сборки ${rig.name} в каталоге RF4 с составом и источником.` : "Такой карточки сборки нет в каталоге RF4."} noindex={!rig || unavailable} errorPage={!rig || unavailable}>
<AtlasBreadcrumbs items={[{ label: "Снасти", href: "/tackle" }, { label: "Сборки" }, { label: rig?.name ?? "Не найдено" }]} />
<PageHero eyebrow="Каноническая сборка" title={rig?.name ?? (unavailable ? "Каталог недоступен" : "Сборка не найдена")} description={rig ? "Состав сборки показан в исходном порядке; неподтверждённые значения не дополняются догадками." : undefined} variant={rig ? "fish" : undefined} identity={rig?.name} />
{unavailable ? <StatePanel tone="unavailable" title="Карточка временно недоступна" description="Каталог не ответил. Непроверенный состав не показываем." /> : !rig ? <StatePanel tone="error" title="Такой сборки нет в каталоге" actionHref="/tackle" actionLabel="Открыть каталог снастей" /> : <>
<section class="tackle-detail content-grid" aria-label="Состав сборки">
<div class="tackle-detail__identity"><TackleGlyph name={rig.name} size={72} /><span class="overline">Сборка</span><h2>{rig.name}</h2><p>{rig.source_external_id ? `Идентификатор источника: ${rig.source_external_id}` : "Внешний идентификатор не указан."}</p></div>
<div><span class="overline">Компоненты</span><ol class="rig-components">{rig.components.length ? rig.components.map(component => <li><span>{roleLabels[component.role] ?? component.role}</span>{component.tackle_item_id ? <a href={`/tackle/items/${component.tackle_item_id}`}>{component.raw_value ?? "Карточка снасти"}</a> : <span>{component.raw_value ?? "Значение не указано"}</span>}</li>) : <li>Состав не указан.</li>}</ol>{missing.length > 0 && <p class="tackle-detail__missing"><strong>Не хватает:</strong> {missing.join(", ")}.</p>}{sourceHref && <a data-action="secondary" href={sourceHref} rel="noreferrer">Открыть первоисточник</a>}</div>
</section>
<DataPassport sources={rig.source_system ? [rig.source_system] : []} sourceUrl={rig.source_url} observedAt={rig.source_checked_at} completeness={missing.length ? null : 100} status={missing.length ? "incomplete" : rig.source_checked_at ? "verified" : "unverified"} />
{mediaCandidates.length > 0 && <section class="catalog-media-grid content-grid" aria-label={`Изображения сборки: ${rig.name}`}>{mediaCandidates.map(asset => <article><span class="overline">{mediaRoleLabel(asset.media_role ?? "")}</span><EntityMedia asset={asset} sourceLink /></article>)}</section>}
</>}
</Layout>
<style>
.rig-components { display: grid; gap: 10px; margin: 14px 0 20px; padding-left: 22px; }
.rig-components li { padding-left: 4px; color: var(--text-secondary); }
.rig-components li > span:first-child { display: inline-block; min-width: 110px; margin-right: 8px; color: var(--text-subtle); font-size: 11px; font-weight: 750; text-transform: uppercase; letter-spacing: .06em; }
.rig-components a { color: inherit; text-underline-offset: 3px; }
</style>
+33 -8
View File
@@ -1,20 +1,38 @@
--- ---
import ActivityCard from "../../components/ActivityCard.astro"; import ActivityCard from "../../components/ActivityCard.astro";
import ActivityEvidenceSummary from "../../components/ActivityEvidenceSummary.astro";
import ActivityPeriodFilter from "../../components/ActivityPeriodFilter.astro";
import EntityMedia from "../../components/EntityMedia.astro"; import EntityMedia from "../../components/EntityMedia.astro";
import AtlasBreadcrumbs from "../../components/AtlasBreadcrumbs.astro"; import AtlasBreadcrumbs from "../../components/AtlasBreadcrumbs.astro";
import AtlasEntityLink from "../../components/AtlasEntityLink.astro"; import AtlasEntityLink from "../../components/AtlasEntityLink.astro";
import PageHero from "../../components/PageHero.astro"; import PageHero from "../../components/PageHero.astro";
import StatePanel from "../../components/StatePanel.astro"; import StatePanel from "../../components/StatePanel.astro";
import DataPassport from "../../components/DataPassport.astro";
import Layout from "../../layouts/Layout.astro"; import Layout from "../../layouts/Layout.astro";
import Pagination from "../../components/Pagination.astro";
import { api, plural, type Activity, type DictionaryItem, type MediaAsset, type PaginatedActivity } from "../../lib/api"; import { api, plural, type Activity, type DictionaryItem, type MediaAsset, type PaginatedActivity } from "../../lib/api";
import { findMediaByLabel } from "../../lib/media"; import { findMediaByLabel, mediaRoleLabel } from "../../lib/media";
import { safeHttpUrl } from "../../lib/urls";
const { slug } = Astro.params; const { slug } = Astro.params;
let water: DictionaryItem | undefined, items: Activity[] = [], media: MediaAsset[] = [], unavailable = false; const requestedHours = Astro.url.searchParams.get("hours") ?? "72";
const hours = ["24", "72", "168"].includes(requestedHours) ? requestedHours : "72";
const periodLabel = { "24": "24 часа", "72": "72 часа", "168": "7 дней" }[hours];
const requestedOffset = Number(Astro.url.searchParams.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
const activityLimit = 24;
let water: DictionaryItem | undefined, items: Activity[] = [], media: MediaAsset[] = [], totalItems = 0, unavailable = false;
try { try {
const [waters, waterMedia] = await Promise.all([api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"), api<MediaAsset[]>("/api/v1/media/catalog?entity_type=waterbody")]); const [waters, waterMedia] = await Promise.all([api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"), api<MediaAsset[]>("/api/v1/media/catalog?entity_type=waterbody")]);
media = waterMedia; media = waterMedia;
water = waters.find(item => item.slug === slug); water = waters.find(item => item.slug === slug);
if (water) { const paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=72&waterbody=${encodeURIComponent(water.slug)}&limit=100`); items = paginated.items; } if (water) {
let paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&limit=${activityLimit}&offset=${offset}`);
if (paginated.total > 0 && offset >= paginated.total) {
offset = Math.floor((paginated.total - 1) / activityLimit) * activityLimit;
paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&limit=${activityLimit}&offset=${offset}`);
}
items = paginated.items; totalItems = paginated.total;
}
} catch { unavailable = true; } } catch { unavailable = true; }
if (unavailable) { if (unavailable) {
Astro.response.status = 503; Astro.response.status = 503;
@@ -23,13 +41,20 @@ if (unavailable) {
} }
if (!water && !unavailable) Astro.response.status = 404; if (!water && !unavailable) Astro.response.status = 404;
const fishes = [...new Map(items.map(item => [item.fish_slug, item.fish])).entries()]; const fishes = [...new Map(items.map(item => [item.fish_slug, item.fish])).entries()];
const image = water ? findMediaByLabel(media, water.name_ru) : undefined; const coverImage = water ? findMediaByLabel(media, water.name_ru, ["waterbody_cover"]) : undefined;
const supportingMedia = water ? (["waterbody_map", "waterbody_depth_map"] as const).map(role => findMediaByLabel(media, water!.name_ru, [role])).filter((asset): asset is MediaAsset => Boolean(asset)) : [];
const sourceHref = safeHttpUrl(water?.source_url);
const schema = water ? { "@context":"https://schema.org", "@type":"CollectionPage", name:`Что ловить на ${water.name_ru} в RF4`, url:`https://rf4spotter.ru/waterbodies/${water.slug}` } : null; const schema = water ? { "@context":"https://schema.org", "@type":"CollectionPage", name:`Что ловить на ${water.name_ru} в RF4`, url:`https://rf4spotter.ru/waterbodies/${water.slug}` } : null;
--- ---
<Layout title={water ? `${water.name_ru} в RF4 — рыба и свежие точки` : "Водоём не найден — RF4 Spotter"} description={water ? `${water.name_ru} в Russian Fishing 4: свежие координаты, активные виды рыб, приманки и источники наблюдений.` : "Такого водоёма нет в каталоге RF4 Spotter."} noindex={!water || unavailable} structuredData={schema} errorPage={!water || unavailable}> <Layout title={water ? `${water.name_ru} в RF4 — рыба и свежие точки` : "Водоём не найден — RF4 Spotter"} description={water ? `${water.name_ru} в Russian Fishing 4: свежие координаты, активные виды рыб, приманки и источники наблюдений.` : "Такого водоёма нет в каталоге RF4 Spotter."} noindex={!water || unavailable} structuredData={schema} errorPage={!water || unavailable}>
<AtlasBreadcrumbs items={[{ label: "Водоёмы", href: "/waterbodies" }, { label: water?.name_ru ?? "Не найдено" }]} /> <AtlasBreadcrumbs items={[{ label: "Водоёмы", href: "/waterbodies" }, { label: water?.name_ru ?? "Не найдено" }]} />
<PageHero eyebrow="Свежие данные за 72 часа" title={water?.name_ru ?? "Водоём не найден"} description={water ? `${items.length} ${plural(items.length,["активная точка","активные точки","активных точек"])} для ${fishes.length} ${plural(fishes.length,["вида рыбы","видов рыб","видов рыб"])}.` : undefined} variant={water ? "water" : undefined} identity={water?.slug} /> <PageHero eyebrow={`Свежие данные за ${periodLabel}`} title={water?.name_ru ?? "Водоём не найден"} description={water ? `${totalItems} ${plural(totalItems,["активная точка","активные точки","активных точек"])} для ${fishes.length} ${plural(fishes.length,["вида рыбы","видов рыб","видов рыб"])}.` : undefined} variant={water ? "water" : undefined} identity={water?.slug} />
{image && <section class="entity-feature content-grid" aria-label={`Изображение: ${water!.name_ru}`}><EntityMedia asset={image} sourceLink /><div><span class="overline">Карта и образ водоёма</span><h2>{water!.name_ru}</h2><p>Материал показан с прямой атрибуцией. Координаты активных точек ниже относятся к данным наблюдений, а не к геометрии изображения.</p></div></section>} {water && <ActivityPeriodFilter hours={hours} />}
{water && (water.description || water.unlock_level !== undefined || water.source_url || water.source_fish_species) && <section class="data-passport content-grid" aria-label="Паспорт водоёма"><div><span class="overline">Канонические сведения</span><h2>{water.name_ru}</h2>{water.description && <p>{water.description}</p>}{water.unlock_level !== undefined && water.unlock_level !== null && <p>Открывается с уровня: <strong>{water.unlock_level}</strong></p>}{water.source_fish_species?.length && <p>В карточке источника указано видов рыб: <strong>{water.source_fish_species.length}</strong>.</p>}{water.source_aliases?.length && <p>Алиасы источника: {water.source_aliases.join(", ")}.</p>}</div><div><span class="overline">Источник</span>{water.source_url ? <p><a href={water.source_url} rel="noreferrer">{water.source_system ?? "Внешний источник"} · исходная карточка</a></p> : <p>Источник для описания ещё не подтверждён.</p>}{water.source_point_urls?.length && <p>Сохранено ссылок на точки: <strong>{water.source_point_urls.length}</strong>.</p>}{water.source_image_urls?.length && <p>Изображений-кандидатов: <strong>{water.source_image_urls.length}</strong>; публикация требует отдельной проверки.</p>}{water.source_checked_at && <p>Проверено: {new Date(water.source_checked_at).toLocaleDateString("ru-RU")}</p>}</div></section>} {coverImage && <section class="entity-feature content-grid" aria-label={`Заставка: ${water!.name_ru}`}><EntityMedia asset={coverImage} sourceLink /><div><span class="overline">{mediaRoleLabel("waterbody_cover")}</span><h2>{water!.name_ru}</h2><p>Материал показан с прямой атрибуцией. Координаты активных точек ниже относятся к данным наблюдений, а не к геометрии изображения.</p></div></section>}
{unavailable ? <StatePanel tone="unavailable" title="Данные временно недоступны" description="Каталог сохранён, но свежие наблюдения сейчас не получены." /> : !water ? <StatePanel tone="error" title="Такого водоёма нет в справочнике" actionHref="/waterbodies" actionLabel="Открыть каталог" /> : <section class="catalog-results content-grid"><aside><span class="overline">Рыбы</span>{fishes.length ? <nav>{fishes.map(([fishSlug,name]) => <AtlasEntityLink href={`/waterbodies/${water!.slug}/${fishSlug}`} label={name} kind="fish" identity={name} />)}</nav> : <p>Свежих подтверждённых видов пока нет.</p>}</aside><div>{items.length ? items.map(item => <ActivityCard item={item}/>) : <StatePanel contained={false} title="Свежих точек пока нет" description="Проверьте позже или посмотрите полевые сигналы на главной." />}</div></section>} {supportingMedia.length > 0 && <section class="waterbody-media-grid content-grid" aria-label={`Карты: ${water!.name_ru}`}>{supportingMedia.map(asset => <article><span class="overline">{mediaRoleLabel(asset.media_role ?? "")}</span><EntityMedia asset={asset} sourceLink /></article>)}</section>}
{water && (water.description || water.unlock_level !== undefined || water.source_url || water.source_fish_species) && <section class="data-passport content-grid" aria-label="Паспорт водоёма"><div><span class="overline">Канонические сведения</span><h2>{water.name_ru}</h2>{water.description && <p>{water.description}</p>}{water.unlock_level !== undefined && water.unlock_level !== null && <p>Открывается с уровня: <strong>{water.unlock_level}</strong></p>}{water.source_fish_species?.length && <p>В карточке источника указано видов рыб: <strong>{water.source_fish_species.length}</strong>.</p>}{water.source_aliases?.length && <p>Алиасы источника: {water.source_aliases.join(", ")}.</p>}</div><div><span class="overline">Источник</span>{sourceHref ? <p><a href={sourceHref} rel="noreferrer">{water.source_system ?? "Внешний источник"} · исходная карточка</a></p> : <p>Источник для описания ещё не подтверждён.</p>}{water.source_point_urls?.length && <p>Сохранено ссылок на точки: <strong>{water.source_point_urls.length}</strong>.</p>}{water.source_image_urls?.length && <p>Изображений-кандидатов: <strong>{water.source_image_urls.length}</strong>; публикация требует отдельной проверки.</p>}{water.source_checked_at && <p>Проверено: {new Date(water.source_checked_at).toLocaleDateString("ru-RU")}</p>}</div></section>}
{water && <DataPassport sources={water.source_system ? [water.source_system] : []} sourceUrl={water.source_url} observedAt={water.source_checked_at} status={water.source_checked_at ? "verified" : "unverified"}/>}
{water && <ActivityEvidenceSummary items={items} totalPoints={totalItems} periodLabel={periodLabel} />}
{unavailable ? <StatePanel tone="unavailable" title="Данные временно недоступны" description="Каталог сохранён, но свежие наблюдения сейчас не получены." /> : !water ? <StatePanel tone="error" title="Такого водоёма нет в справочнике" actionHref="/waterbodies" actionLabel="Открыть каталог" /> : <section class="catalog-results content-grid"><aside><span class="overline">Рыбы</span>{fishes.length ? <nav>{fishes.map(([fishSlug,name]) => <AtlasEntityLink href={`/waterbodies/${water!.slug}/${fishSlug}?hours=${hours}`} label={name} kind="fish" identity={name} />)}</nav> : <p>Свежих подтверждённых видов пока нет.</p>}</aside><div>{items.length ? items.map(item => <ActivityCard item={item} periodLabel={periodLabel}/>) : <StatePanel contained={false} title="Свежих точек пока нет" description="Свежих подтверждённых наблюдений пока нет." />}</div></section>}
{water && <Pagination path={`/waterbodies/${water.slug}`} params={new URLSearchParams({ hours })} total={totalItems} limit={activityLimit} offset={offset} itemLabel="точек" />}
</Layout> </Layout>
@@ -1,16 +1,32 @@
--- ---
import ActivityCard from "../../../components/ActivityCard.astro"; import ActivityCard from "../../../components/ActivityCard.astro";
import ActivityEvidenceSummary from "../../../components/ActivityEvidenceSummary.astro";
import ActivityPeriodFilter from "../../../components/ActivityPeriodFilter.astro";
import AtlasBreadcrumbs from "../../../components/AtlasBreadcrumbs.astro"; import AtlasBreadcrumbs from "../../../components/AtlasBreadcrumbs.astro";
import PageHero from "../../../components/PageHero.astro"; import PageHero from "../../../components/PageHero.astro";
import StatePanel from "../../../components/StatePanel.astro"; import StatePanel from "../../../components/StatePanel.astro";
import Layout from "../../../layouts/Layout.astro"; import Layout from "../../../layouts/Layout.astro";
import Pagination from "../../../components/Pagination.astro";
import { api, plural, type Activity, type DictionaryItem, type PaginatedActivity } from "../../../lib/api"; import { api, plural, type Activity, type DictionaryItem, type PaginatedActivity } from "../../../lib/api";
const { slug, fish: fishSlug } = Astro.params; const { slug, fish: fishSlug } = Astro.params;
let water: DictionaryItem | undefined, fish: DictionaryItem | undefined, items: Activity[] = [], unavailable = false; const requestedHours = Astro.url.searchParams.get("hours") ?? "72";
const hours = ["24", "72", "168"].includes(requestedHours) ? requestedHours : "72";
const periodLabel = { "24": "24 часа", "72": "72 часа", "168": "7 дней" }[hours];
const requestedOffset = Number(Astro.url.searchParams.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
const activityLimit = 24;
let water: DictionaryItem | undefined, fish: DictionaryItem | undefined, items: Activity[] = [], totalItems = 0, unavailable = false;
try { try {
const [waters, fishes] = await Promise.all([api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"), api<DictionaryItem[]>("/api/v1/fishes?limit=500")]); const [waters, fishes] = await Promise.all([api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"), api<DictionaryItem[]>("/api/v1/fishes?limit=500")]);
water = waters.find(item => item.slug === slug); fish = fishes.find(item => item.slug === fishSlug); water = waters.find(item => item.slug === slug); fish = fishes.find(item => item.slug === fishSlug);
if (water && fish) { const paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=72&waterbody=${encodeURIComponent(water.slug)}&fish=${encodeURIComponent(fish.slug)}&limit=100`); items = paginated.items; } if (water && fish) {
let paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`);
if (paginated.total > 0 && offset >= paginated.total) {
offset = Math.floor((paginated.total - 1) / activityLimit) * activityLimit;
paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`);
}
items = paginated.items; totalItems = paginated.total;
}
} catch { unavailable = true; } } catch { unavailable = true; }
if (unavailable) { if (unavailable) {
Astro.response.status = 503; Astro.response.status = 503;
@@ -23,6 +39,9 @@ const schema = valid ? { "@type":"CollectionPage", name:`${fish!.name_ru} на $
--- ---
<Layout title={valid ? `${fish!.name_ru} на ${water!.name_ru} в RF4 — точки и приманки` : "Страница не найдена — RF4 Spotter"} description={valid ? `Где ловить ${fish!.name_ru} на ${water!.name_ru} в Russian Fishing 4: свежие координаты, приманки, активность и источники.` : "Такого сочетания рыбы и водоёма нет в каталоге."} noindex={!valid || unavailable} structuredData={schema} errorPage={!valid || unavailable}> <Layout title={valid ? `${fish!.name_ru} на ${water!.name_ru} в RF4 — точки и приманки` : "Страница не найдена — RF4 Spotter"} description={valid ? `Где ловить ${fish!.name_ru} на ${water!.name_ru} в Russian Fishing 4: свежие координаты, приманки, активность и источники.` : "Такого сочетания рыбы и водоёма нет в каталоге."} noindex={!valid || unavailable} structuredData={schema} errorPage={!valid || unavailable}>
<AtlasBreadcrumbs items={[{ label: "Водоёмы", href: "/waterbodies" }, { label: water?.name_ru ?? "Не найдено", href: water ? `/waterbodies/${water.slug}` : undefined }, { label: fish?.name_ru ?? "Не найдено" }]} /> <AtlasBreadcrumbs items={[{ label: "Водоёмы", href: "/waterbodies" }, { label: water?.name_ru ?? "Не найдено", href: water ? `/waterbodies/${water.slug}` : undefined }, { label: fish?.name_ru ?? "Не найдено" }]} />
<PageHero eyebrow={water?.name_ru ?? "Каталог RF4"} title={fish?.name_ru ?? "Данные не найдены"} description={valid ? `${items.length} ${plural(items.length,["свежая точка","свежие точки","свежих точек"])} за последние 72 часа.` : undefined} variant={valid ? "pair" : undefined} identity={fish?.name_ru} secondaryIdentity={water?.slug} /> <PageHero eyebrow={water?.name_ru ?? "Каталог RF4"} title={fish?.name_ru ?? "Данные не найдены"} description={valid ? `${totalItems} ${plural(totalItems,["свежая точка","свежие точки","свежих точек"])} за ${periodLabel}.` : undefined} variant={valid ? "pair" : undefined} identity={fish?.name_ru} secondaryIdentity={water?.slug} />
{unavailable ? <StatePanel tone="unavailable" title="Данные временно недоступны" description="Свежие наблюдения сейчас не получены. Попробуйте позднее." /> : !valid ? <StatePanel tone="error" title="Такого сочетания нет в справочнике" actionHref="/" actionLabel="Вернуться на главную" /> : <section class="catalog-results catalog-results--single content-grid"><div>{items.length ? items.map(item => <ActivityCard item={item}/>) : <StatePanel contained={false} title="Свежих точек пока нет" description="Данные появятся после новых подтверждённых наблюдений." />}</div></section>} {valid && <ActivityPeriodFilter hours={hours} />}
{valid && <ActivityEvidenceSummary items={items} totalPoints={totalItems} periodLabel={periodLabel} />}
{unavailable ? <StatePanel tone="unavailable" title="Данные временно недоступны" description="Свежие наблюдения сейчас не получены. Попробуйте позднее." /> : !valid ? <StatePanel tone="error" title="Такого сочетания нет в справочнике" actionHref="/" actionLabel="Вернуться на главную" /> : <section class="catalog-results catalog-results--single content-grid"><div>{items.length ? items.map(item => <ActivityCard item={item} periodLabel={periodLabel}/>) : <StatePanel contained={false} title="Свежих точек пока нет" description="Данные появятся после новых подтверждённых наблюдений." />}</div></section>}
{valid && <Pagination path={`/waterbodies/${water!.slug}/${fish!.slug}`} params={new URLSearchParams({ hours })} total={totalItems} limit={activityLimit} offset={offset} itemLabel="точек" />}
</Layout> </Layout>
+8 -4
View File
@@ -6,14 +6,17 @@ import WaterbodyMark from "../../components/WaterbodyMark.astro";
import Pagination from "../../components/Pagination.astro"; import Pagination from "../../components/Pagination.astro";
import { api, type DictionaryItem } from "../../lib/api"; import { api, type DictionaryItem } from "../../lib/api";
const params = Astro.url.searchParams; const params = Astro.url.searchParams;
const search = params.get("q")?.trim() ?? "";
const pageLimit = 48; const pageLimit = 48;
const requestedOffset = Number(params.get("offset") ?? 0); const requestedOffset = Number(params.get("offset") ?? 0);
let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0; let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
let waters: DictionaryItem[] = [], allWaters: DictionaryItem[] = [], unavailable = false; let waters: DictionaryItem[] = [], allWaters: DictionaryItem[] = [], unavailable = false;
try { try {
allWaters = await api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"); allWaters = await api<DictionaryItem[]>("/api/v1/waterbodies?limit=500");
if (allWaters.length > 0 && offset >= allWaters.length) offset = Math.floor((allWaters.length - 1) / pageLimit) * pageLimit; const matchingWaters = search ? allWaters.filter(item => item.name_ru.toLocaleLowerCase("ru-RU").includes(search.toLocaleLowerCase("ru-RU"))) : allWaters;
waters = allWaters.slice(offset, offset + pageLimit); if (matchingWaters.length > 0 && offset >= matchingWaters.length) offset = Math.floor((matchingWaters.length - 1) / pageLimit) * pageLimit;
waters = matchingWaters.slice(offset, offset + pageLimit);
allWaters = matchingWaters;
} catch { unavailable = true; } } catch { unavailable = true; }
if (unavailable) { if (unavailable) {
Astro.response.status = 503; Astro.response.status = 503;
@@ -21,8 +24,9 @@ if (unavailable) {
Astro.response.headers.set("Cache-Control", "no-store"); Astro.response.headers.set("Cache-Control", "no-store");
} }
--- ---
<Layout title="Все водоёмы Russian Fishing 4 — RF4 Spotter" description="Каталог водоёмов RF4 со свежими точками, рыбами, приманками и прозрачными источниками данных."> <Layout title="Все водоёмы Russian Fishing 4 — RF4 Spotter" description="Каталог водоёмов RF4 со свежими точками, рыбами, приманками и прозрачными источниками данных." noindex={unavailable} errorPage={unavailable}>
<PageHero eyebrow="Карта водоёмов RF4" title="Водоёмы" description="Откройте водоём, чтобы увидеть активные виды рыб и последние подтверждённые точки." variant="water" count={allWaters.length} /> <PageHero eyebrow="Карта водоёмов RF4" title="Водоёмы" description="Откройте водоём, чтобы увидеть активные виды рыб и последние подтверждённые точки." variant="water" count={allWaters.length} />
{unavailable ? <StatePanel tone="unavailable" title="Каталог временно недоступен" description="Не показываем непроверенный список. Попробуйте обновить страницу позже." /> : <nav class="catalog-grid catalog-grid--waters content-grid" aria-label="Водоёмы">{waters.map((water,index) => <a href={`/waterbodies/${water.slug}`}><span>Водоём · {String(offset + index + 1).padStart(2,"0")}</span><strong>{water.name_ru}</strong><i>Открыть <b>→</b></i><WaterbodyMark identity={water.slug}/></a>)}</nav>} <form class="record-filters content-grid" method="get" aria-label="Поиск водоёма"><label>Поиск по названию<input name="q" value={search} maxlength="100" placeholder="Например, Вьюнок" /></label><button data-action="primary">Найти</button>{search && <a data-action="quiet" href="/waterbodies">Сбросить</a>}</form>
{unavailable ? <StatePanel tone="unavailable" title="Каталог временно недоступен" description="Не показываем непроверенный список. Попробуйте обновить страницу позже." /> : waters.length ? <nav class="catalog-grid catalog-grid--waters content-grid" aria-label="Водоёмы">{waters.map((water,index) => <a href={`/waterbodies/${water.slug}`}><span>Водоём · {String(offset + index + 1).padStart(2,"0")}</span><strong>{water.name_ru}</strong><i>Открыть <b>→</b></i><WaterbodyMark identity={water.slug}/></a>)}</nav> : <StatePanel title="Ничего не найдено" description="Попробуйте изменить запрос или открыть полный каталог водоёмов." />}
{!unavailable && <Pagination path="/waterbodies" params={params} total={allWaters.length} limit={pageLimit} offset={offset} itemLabel="водоёмов" />} {!unavailable && <Pagination path="/waterbodies" params={params} total={allWaters.length} limit={pageLimit} offset={offset} itemLabel="водоёмов" />}
</Layout> </Layout>
+10
View File
@@ -3,3 +3,13 @@
/* Editorial atlas: catalog pages read as a field guide, not a utility list. */ /* Editorial atlas: catalog pages read as a field guide, not a utility list. */
.catalog-hero--illustrated{position:relative;display:grid;grid-template-columns:minmax(0,1fr) 210px;align-items:center;gap:48px;min-height:310px;overflow:hidden}.catalog-hero--illustrated:before{content:"";position:absolute;right:102px;width:330px;height:190px;border:1px solid color-mix(in srgb,var(--teal) 11%,transparent);border-radius:50%;box-shadow:0 0 0 32px color-mix(in srgb,var(--teal) 5%,transparent),0 0 0 64px color-mix(in srgb,var(--teal) 3%,transparent);transform:rotate(-9deg);pointer-events:none}.catalog-hero__copy{position:relative;z-index:1}.catalog-hero__copy p{max-width:660px;line-height:1.6}.catalog-hero__seal{position:relative;z-index:1;width:176px;height:176px;justify-self:end;display:grid;place-items:center;align-content:center;border:1px solid #345155;border-radius:50%;background:var(--deep);color:var(--lime);box-shadow:0 18px 48px #16383c1b}.catalog-hero__seal>span{height:60px;display:grid;place-items:center}.catalog-hero__seal .fish-silhouette{color:var(--lime)}.catalog-hero__seal strong{margin-top:5px;font:400 32px/1 Georgia,serif;color:var(--white)}.catalog-hero__seal small{margin-top:4px;color:#a9b8b5;font-size:9px;text-transform:uppercase;letter-spacing:.13em}.catalog-grid{grid-template-columns:repeat(auto-fit,minmax(min(100%,330px),1fr));gap:14px}.catalog-grid>a{min-height:146px;align-content:start;padding:24px 25px;border-color:var(--border-soft);background:linear-gradient(145deg,var(--surface),var(--surface-soft))}.catalog-grid>a:before{content:"";position:absolute;inset:0;border-top:3px solid transparent;transition:border-color var(--motion-base) var(--ease-out)}.catalog-grid>a:hover:before{border-color:var(--lime)}.catalog-grid>a>span{color:var(--text-muted)}.catalog-grid>a>strong{position:relative;z-index:1;margin-top:10px;font-size:28px}.catalog-grid>a>i{position:relative;z-index:1;align-self:end;display:flex;align-items:center;gap:8px;margin-top:20px;color:var(--text-muted);font:700 10px Inter,sans-serif;text-transform:uppercase;letter-spacing:.09em}.catalog-grid>a>i b{color:#6d8d2a;font-size:16px}.catalog-grid>a>.fish-silhouette{right:20px;bottom:12px;opacity:.095}.waterbody-mark{position:absolute;right:14px;bottom:8px;fill:none;stroke:#315f63;stroke-width:1.2;opacity:.12;pointer-events:none}.waterbody-mark__shore{stroke-width:2}.waterbody-mark circle{fill:var(--lime);stroke:none} .catalog-hero--illustrated{position:relative;display:grid;grid-template-columns:minmax(0,1fr) 210px;align-items:center;gap:48px;min-height:310px;overflow:hidden}.catalog-hero--illustrated:before{content:"";position:absolute;right:102px;width:330px;height:190px;border:1px solid color-mix(in srgb,var(--teal) 11%,transparent);border-radius:50%;box-shadow:0 0 0 32px color-mix(in srgb,var(--teal) 5%,transparent),0 0 0 64px color-mix(in srgb,var(--teal) 3%,transparent);transform:rotate(-9deg);pointer-events:none}.catalog-hero__copy{position:relative;z-index:1}.catalog-hero__copy p{max-width:660px;line-height:1.6}.catalog-hero__seal{position:relative;z-index:1;width:176px;height:176px;justify-self:end;display:grid;place-items:center;align-content:center;border:1px solid #345155;border-radius:50%;background:var(--deep);color:var(--lime);box-shadow:0 18px 48px #16383c1b}.catalog-hero__seal>span{height:60px;display:grid;place-items:center}.catalog-hero__seal .fish-silhouette{color:var(--lime)}.catalog-hero__seal strong{margin-top:5px;font:400 32px/1 Georgia,serif;color:var(--white)}.catalog-hero__seal small{margin-top:4px;color:#a9b8b5;font-size:9px;text-transform:uppercase;letter-spacing:.13em}.catalog-grid{grid-template-columns:repeat(auto-fit,minmax(min(100%,330px),1fr));gap:14px}.catalog-grid>a{min-height:146px;align-content:start;padding:24px 25px;border-color:var(--border-soft);background:linear-gradient(145deg,var(--surface),var(--surface-soft))}.catalog-grid>a:before{content:"";position:absolute;inset:0;border-top:3px solid transparent;transition:border-color var(--motion-base) var(--ease-out)}.catalog-grid>a:hover:before{border-color:var(--lime)}.catalog-grid>a>span{color:var(--text-muted)}.catalog-grid>a>strong{position:relative;z-index:1;margin-top:10px;font-size:28px}.catalog-grid>a>i{position:relative;z-index:1;align-self:end;display:flex;align-items:center;gap:8px;margin-top:20px;color:var(--text-muted);font:700 10px Inter,sans-serif;text-transform:uppercase;letter-spacing:.09em}.catalog-grid>a>i b{color:#6d8d2a;font-size:16px}.catalog-grid>a>.fish-silhouette{right:20px;bottom:12px;opacity:.095}.waterbody-mark{position:absolute;right:14px;bottom:8px;fill:none;stroke:#315f63;stroke-width:1.2;opacity:.12;pointer-events:none}.waterbody-mark__shore{stroke-width:2}.waterbody-mark circle{fill:var(--lime);stroke:none}
@media(max-width:720px){.catalog-hero--illustrated{grid-template-columns:1fr 106px;gap:18px;min-height:230px}.catalog-hero--illustrated:before{right:-35px;width:210px;height:120px}.catalog-hero__seal{width:96px;height:96px}.catalog-hero__seal>span{height:38px}.catalog-hero__seal .fish-icon{width:36px;height:36px}.catalog-hero__seal .fish-silhouette{width:62px}.catalog-hero__seal strong{font-size:20px}.catalog-hero__seal small{display:none}.catalog-grid>a{min-height:132px}.catalog-grid>a>strong{font-size:25px}} @media(max-width:720px){.catalog-hero--illustrated{grid-template-columns:1fr 106px;gap:18px;min-height:230px}.catalog-hero--illustrated:before{right:-35px;width:210px;height:120px}.catalog-hero__seal{width:96px;height:96px}.catalog-hero__seal>span{height:38px}.catalog-hero__seal .fish-icon{width:36px;height:36px}.catalog-hero__seal .fish-silhouette{width:62px}.catalog-hero__seal strong{font-size:20px}.catalog-hero__seal small{display:none}.catalog-grid>a{min-height:132px}.catalog-grid>a>strong{font-size:25px}}
.catalog-grid>.catalog-card{display:grid;grid-template-columns:1fr auto;gap:7px;min-height:146px;align-content:start;padding:24px 25px;position:relative;overflow:hidden;border:1px solid var(--border-soft);border-radius:14px;background:linear-gradient(145deg,var(--surface),var(--surface-soft));transition:transform var(--motion-base) var(--ease-out),border-color var(--motion-base) var(--ease-out),box-shadow var(--motion-base) var(--ease-out)}
.catalog-grid>.catalog-card:hover{transform:translateY(-2px);border-color:var(--border-strong);box-shadow:0 14px 30px var(--shadow-color)}
.catalog-card>span{grid-column:1/-1;color:var(--text-muted)}
.catalog-card__title{grid-column:1/-1;margin-top:10px;color:inherit;text-decoration:none}
.catalog-card__title strong{font:400 28px Georgia,serif}
.catalog-card__title:hover{text-decoration:underline;text-underline-offset:4px}
.catalog-card>small{color:var(--text-muted)}
.catalog-card .tackle-card-passport{grid-column:1/-1;min-width:0}
@media(max-width:720px){.catalog-grid>.catalog-card{min-height:132px}.catalog-card__title strong{font-size:25px}}
+2
View File
@@ -1 +1,3 @@
.dashboard:has(>.results-column:only-child){grid-template-columns:1fr} .dashboard:has(>.results-column:only-child){grid-template-columns:1fr}
.result-tools{display:flex;align-items:center;gap:10px}.view-toggle{display:flex;padding:3px;border:1px solid var(--border);border-radius:999px;background:var(--surface-soft)}.view-toggle a{padding:7px 10px;border-radius:999px;color:var(--text-muted);font-size:11px;font-weight:750;text-decoration:none}.view-toggle a:hover,.view-toggle__active{background:var(--surface);color:var(--text)!important;box-shadow:0 2px 8px color-mix(in srgb,var(--deep) 10%,transparent)}
@media(max-width:720px){.section-heading{align-items:start}.result-tools{display:grid;justify-items:end;gap:7px}.view-toggle a{padding:6px 9px}}
+5 -3
View File
@@ -1,5 +1,7 @@
.data-passport{margin-top:18px;padding:14px;border:1px solid var(--border);border-radius:13px;background:var(--surface-soft);color:var(--deep)} .data-passport{margin-top:18px;padding:14px;border:1px solid var(--border);border-radius:13px;background:var(--surface-soft);color:var(--deep)}
.data-passport header{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:11px}.data-passport header>span{font:italic 15px Georgia,serif}.data-passport header strong{padding:4px 8px;border-radius:999px;background:var(--success-soft);color:var(--success);font-size:9px;text-transform:uppercase;letter-spacing:.06em}.data-passport header strong[data-passport-status="unverified"]{background:var(--info-soft);color:var(--info)}.data-passport header strong[data-passport-status="incomplete"]{background:var(--warning-soft);color:var(--warning)} .data-passport header{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:11px}.data-passport header>span{font:italic 15px Georgia,serif}.data-passport header strong{padding:4px 8px;border-radius:999px;background:var(--success-soft);color:var(--success);font-size:9px;text-transform:uppercase;letter-spacing:.06em}.data-passport header strong[data-passport-status="unverified"]{background:var(--info-soft);color:var(--info)}.data-passport header strong[data-passport-status="incomplete"],.data-passport header strong[data-passport-status="insufficient"],.data-passport header strong[data-passport-status="blocked"],.data-passport header strong[data-passport-status="stale"]{background:var(--warning-soft);color:var(--warning)}
.data-passport__sources{display:flex;flex-wrap:wrap;gap:5px;margin-bottom:12px}.data-passport dl{display:grid;grid-template-columns:repeat(3,1fr);gap:8px;margin:0}.data-passport dl div{padding-top:8px;border-top:1px solid var(--border-soft)}.data-passport dt{font-size:8px;text-transform:uppercase;letter-spacing:.08em;color:var(--text-subtle)}.data-passport dd{margin:3px 0 0;font:400 12px Georgia,serif;color:var(--deep)} .data-passport__sources{display:flex;flex-wrap:wrap;gap:5px;margin-bottom:12px}.data-passport dl{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;margin:0}.data-passport dl div{padding-top:8px;border-top:1px solid var(--border-soft)}.data-passport dt{font-size:8px;text-transform:uppercase;letter-spacing:.08em;color:var(--text-subtle)}.data-passport dd{margin:3px 0 0;font:400 12px Georgia,serif;color:var(--deep)}
.data-passport__minimum{margin:12px 0 0;color:var(--warning);font-size:11px;line-height:1.4}
.data-passport__conflict{margin:12px 0 0;padding:9px 10px;border-left:3px solid var(--warning);background:var(--warning-soft);color:var(--warning);font-size:11px;line-height:1.4}.data-passport__conflict strong{font-weight:750}.data-passport__coordinate-sources{margin-top:12px;border-top:1px solid var(--border-soft);padding-top:10px}.data-passport__coordinate-sources summary{cursor:pointer;color:var(--text-secondary);font-size:10px;font-weight:750;text-transform:uppercase;letter-spacing:.06em}.data-passport__coordinate-sources>div{display:flex;flex-wrap:wrap;gap:5px;margin-top:8px}
.detail-card .data-passport,.detail-grid aside .data-passport{border-color:#ffffff20;background:#ffffff08;color:#fff}.detail-card .data-passport dd,.detail-grid aside .data-passport dd{color:#fff}.detail-card .data-passport dl div,.detail-grid aside .data-passport dl div{border-color:#ffffff1c}.detail-card .data-passport dt,.detail-grid aside .data-passport dt{color:#a9b8b5}.signal-card .data-passport{position:relative;z-index:1;margin-top:15px;background:#fffdf7;border-color:#ddd3af} .detail-card .data-passport,.detail-grid aside .data-passport{border-color:#ffffff20;background:#ffffff08;color:#fff}.detail-card .data-passport dd,.detail-grid aside .data-passport dd{color:#fff}.detail-card .data-passport dl div,.detail-grid aside .data-passport dl div{border-color:#ffffff1c}.detail-card .data-passport dt,.detail-grid aside .data-passport dt{color:#a9b8b5}.signal-card .data-passport{position:relative;z-index:1;margin-top:15px;background:#fffdf7;border-color:#ddd3af}
@media(max-width:420px){.data-passport dl{grid-template-columns:1fr}.data-passport dl div{display:flex;justify-content:space-between;gap:10px}} @media(max-width:720px){.data-passport dl{grid-template-columns:repeat(2,minmax(0,1fr))}}@media(max-width:420px){.data-passport dl{grid-template-columns:1fr}.data-passport dl div{display:flex;justify-content:space-between;gap:10px}}
+2 -1
View File
@@ -17,6 +17,7 @@
.admin-queue-filters{display:grid;grid-template-columns:1.3fr repeat(3,1fr) auto;gap:10px;align-items:end;margin:0 0 18px;padding:16px;border-radius:12px;background:var(--deep)}.admin-queue-filters[hidden]{display:none}.admin-queue-filters label{color:#b8c5c2;font-size:11px;text-transform:uppercase;letter-spacing:.08em}.admin-queue-filters input,.admin-queue-filters select{display:block;width:100%;height:42px;margin-top:6px;padding:0 10px;border:1px solid #ffffff29;border-radius:8px;background:#ffffff0c;color:#fff}.admin-queue-filters option{color:var(--ink)}.admin-queue-filters button{height:42px} .admin-queue-filters{display:grid;grid-template-columns:1.3fr repeat(3,1fr) auto;gap:10px;align-items:end;margin:0 0 18px;padding:16px;border-radius:12px;background:var(--deep)}.admin-queue-filters[hidden]{display:none}.admin-queue-filters label{color:#b8c5c2;font-size:11px;text-transform:uppercase;letter-spacing:.08em}.admin-queue-filters input,.admin-queue-filters select{display:block;width:100%;height:42px;margin-top:6px;padding:0 10px;border:1px solid #ffffff29;border-radius:8px;background:#ffffff0c;color:#fff}.admin-queue-filters option{color:var(--ink)}.admin-queue-filters button{height:42px}
.admin-shortcuts{margin:14px 0;color:var(--text-muted);font-size:12px}.admin-shortcuts kbd{padding:2px 6px;border:1px solid var(--line);border-bottom-width:2px;border-radius:5px;background:var(--surface);font:700 11px Inter,sans-serif}.moderation-card:focus-within{outline:2px solid var(--focus);outline-offset:3px} .admin-shortcuts{margin:14px 0;color:var(--text-muted);font-size:12px}.admin-shortcuts kbd{padding:2px 6px;border:1px solid var(--line);border-bottom-width:2px;border-radius:5px;background:var(--surface);font:700 11px Inter,sans-serif}.moderation-card:focus-within{outline:2px solid var(--focus);outline-offset:3px}
.moderation-provenance{margin-top:18px;border-top:1px solid var(--border-soft);padding-top:14px}.moderation-provenance summary{cursor:pointer;color:var(--deep);font-weight:700}.moderation-provenance dl{margin-top:14px}.moderation-provenance p{margin:12px 0 0;color:var(--text-muted);font-size:12px;line-height:1.5} .moderation-provenance{margin-top:18px;border-top:1px solid var(--border-soft);padding-top:14px}.moderation-provenance summary{cursor:pointer;color:var(--deep);font-weight:700}.moderation-provenance dl{margin-top:14px}.moderation-provenance p{margin:12px 0 0;color:var(--text-muted);font-size:12px;line-height:1.5}
.queue-select-all{display:inline-flex;align-items:center;gap:8px;margin:0 0 12px;color:var(--text-muted);font-size:13px}.moderation-select{display:block;grid-column:1/-1}.moderation-select input{width:18px;height:18px}.moderation-bulk,[data-external-bulk]{display:flex;align-items:end;flex-wrap:wrap;gap:12px;margin:0 0 18px;padding:14px;border:1px solid var(--border);border-radius:12px;background:var(--surface);color:var(--text)}.moderation-bulk strong,[data-external-bulk] strong{margin-right:auto}.moderation-bulk label,[data-external-bulk] label{min-width:180px;color:var(--text-muted);font-size:11px;text-transform:uppercase;letter-spacing:.08em}.moderation-bulk textarea,[data-external-bulk] textarea,.moderation-bulk select,[data-external-bulk] select{display:block;width:100%;margin-top:5px;padding:9px;border:1px solid var(--border);border-radius:7px;background:var(--surface-field);color:var(--text);resize:vertical}.moderation-bulk button,[data-external-bulk] button{min-height:42px;padding:0 15px;border:0;border-radius:8px;background:var(--lime);color:var(--deep);font-weight:750}.moderation-bulk button[data-action="danger"],[data-external-bulk] button[data-action="danger"]{background:var(--danger-soft);color:var(--danger)}
@media(max-width:900px){.admin-queue-filters{grid-template-columns:1fr 1fr}}@media(max-width:520px){.admin-queue-filters{grid-template-columns:1fr}} @media(max-width:900px){.admin-queue-filters{grid-template-columns:1fr 1fr}}@media(max-width:520px){.admin-queue-filters{grid-template-columns:1fr}}
.admin-dashboard{width:min(1120px,calc(100% - 64px));margin:0 auto 100px}.admin-dashboard>.privacy{margin:10px 4px 25px}.admin-kpis{display:grid;grid-template-columns:repeat(4,1fr);gap:14px}.admin-kpis>a,.admin-kpis>article,.admin-dashboard-grid>section{padding:22px;border:1px solid var(--line);border-radius:14px;background:var(--surface)}.admin-kpis>a{color:inherit;text-decoration:none}.admin-kpis span,.admin-kpis small{display:block;color:var(--text-muted)}.admin-kpis strong{display:block;margin:10px 0;font:400 42px Georgia,serif;color:var(--deep)}.admin-kpis>a:hover{border-color:var(--focus);transform:translateY(-2px)}.admin-dashboard-grid{display:grid;grid-template-columns:1fr 1fr;gap:18px;margin-top:18px}.admin-dashboard-grid h2{margin:0 0 16px;font:400 25px Georgia,serif}.admin-dashboard-grid ul{list-style:none;margin:0 0 16px;padding:0}.admin-dashboard-grid li{display:flex;justify-content:space-between;gap:14px;padding:10px 0;border-bottom:1px solid var(--border-soft);font-size:13px}.admin-dashboard-grid li span{display:flex;align-items:center;gap:8px}.admin-dashboard-grid time{color:var(--text-muted)} .admin-dashboard{width:min(1120px,calc(100% - 64px));margin:0 auto 100px}.admin-dashboard>.privacy{margin:10px 4px 25px}.admin-kpis{display:grid;grid-template-columns:repeat(4,1fr);gap:14px}.admin-kpis>a,.admin-kpis>article,.admin-dashboard-grid>section{padding:22px;border:1px solid var(--line);border-radius:14px;background:var(--surface)}.admin-kpis>a{color:inherit;text-decoration:none}.admin-kpis span,.admin-kpis small{display:block;color:var(--text-muted)}.admin-kpis strong{display:block;margin:10px 0;font:400 42px Georgia,serif;color:var(--deep)}.admin-kpis>a:hover{border-color:var(--focus);transform:translateY(-2px)}.admin-dashboard-grid{display:grid;grid-template-columns:1fr 1fr;gap:18px;margin-top:18px}.admin-dashboard-grid h2{margin:0 0 16px;font:400 25px Georgia,serif}.admin-dashboard-grid ul{list-style:none;margin:0 0 16px;padding:0}.admin-dashboard-grid li{display:flex;justify-content:space-between;gap:14px;padding:10px 0;border-bottom:1px solid var(--border-soft);font-size:13px}.admin-dashboard-grid li span{display:flex;align-items:center;gap:8px}.admin-dashboard-grid time{color:var(--text-muted)}
@media(max-width:900px){.admin-kpis{grid-template-columns:1fr 1fr}}@media(max-width:720px){.admin-dashboard{width:calc(100% - 28px)}.admin-kpis,.admin-dashboard-grid{grid-template-columns:1fr}} @media(max-width:900px){.admin-kpis{grid-template-columns:1fr 1fr}}@media(max-width:720px){.admin-dashboard{width:calc(100% - 28px)}.admin-kpis,.admin-dashboard-grid{grid-template-columns:1fr}}
@@ -35,7 +36,7 @@ footer{min-height:118px;background:var(--deep);color:#dbe4df;padding:28px max(32
@media(max-width:720px){.moderation-app{width:calc(100% - 28px)}.moderation-card{grid-template-columns:1fr}.moderation-proof{grid-row:2}.moderation-actions{grid-column:1;display:block}.moderation-actions>div{margin-top:12px}.admin-login{display:block}.admin-login button{width:100%;margin-top:12px}} @media(max-width:720px){.moderation-app{width:calc(100% - 28px)}.moderation-card{grid-template-columns:1fr}.moderation-proof{grid-row:2}.moderation-actions{grid-column:1;display:block}.moderation-actions>div{margin-top:12px}.admin-login{display:block}.admin-login button{width:100%;margin-top:12px}}
@media(max-width:480px){.filters{grid-template-columns:1fr 1fr}.spot-stats strong{font-size:16px}.topbar nav{gap:4px}.topbar nav a{padding:0 5px}.brand-name strong{font-size:14px}.brand-name span{font-size:11px}.moderation-actions>div{display:grid}.moderation-actions button{width:100%}} @media(max-width:480px){.filters{grid-template-columns:1fr 1fr}.spot-stats strong{font-size:16px}.topbar nav{gap:4px}.topbar nav a{padding:0 5px}.brand-name strong{font-size:14px}.brand-name span{font-size:11px}.moderation-actions>div{display:grid}.moderation-actions button{width:100%}}
@media(max-width:720px){.filter-advanced-fallback .filter-advanced-field{display:flex!important;align-items:center;gap:6px}.filter-advanced-fallback .filter-compact-hidden{display:flex!important}} @media(max-width:720px){.filter-advanced-fallback .filter-advanced-field{display:flex!important;align-items:center;gap:6px}.filter-advanced-fallback .filter-compact-hidden{display:flex!important}}
@media(prefers-reduced-motion:reduce){*,*:before,*:after{scroll-behavior:auto!important;transition-duration:.01ms!important;animation-duration:.01ms!important;animation-iteration-count:1!important}} @media(prefers-reduced-motion:reduce){*,*:before,*:after{scroll-behavior:auto!important;transition-duration:.01ms!important;animation-duration:.01s!important;animation-iteration-count:1!important}}
.activity-legend{display:flex;gap:10px;flex-wrap:wrap;margin:8px 0;color:#7d918b;font-size:11px}.activity-legend span:before{content:"";display:inline-block;width:7px;height:7px;border-radius:50%;margin-right:4px;background:var(--lime)}.activity-legend span:nth-child(2):before{background:#e5b95c}.activity-legend span:nth-child(3):before{background:#ef795e} .activity-legend{display:flex;gap:10px;flex-wrap:wrap;margin:8px 0;color:#7d918b;font-size:11px}.activity-legend span:before{content:"";display:inline-block;width:7px;height:7px;border-radius:50%;margin-right:4px;background:var(--lime)}.activity-legend span:nth-child(2):before{background:#e5b95c}.activity-legend span:nth-child(3):before{background:#ef795e}
/* RF4 field-guide iconography and float activity gauge */ /* RF4 field-guide iconography and float activity gauge */
+5
View File
@@ -1,4 +1,9 @@
.entity-media{margin:0;min-width:0}.entity-media__frame{position:relative;display:grid;place-items:center;overflow:hidden;min-height:190px;padding:18px;border:1px solid var(--border-soft);border-radius:16px;background:radial-gradient(circle at 50% 46%,color-mix(in srgb,var(--lime) 15%,var(--surface)) 0 18%,var(--surface-soft) 62%)}.entity-media__frame:after{content:"";position:absolute;inset:12px;border:1px solid color-mix(in srgb,var(--border) 55%,transparent);border-radius:11px;pointer-events:none}.entity-media img{position:relative;z-index:1;display:block;width:100%;height:180px;object-fit:contain;filter:drop-shadow(0 12px 18px #08222624);image-rendering:auto}.entity-media figcaption{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-top:9px;color:var(--text-muted);font-size:11px}.entity-media figcaption>span:last-child{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.entity-media--compact{grid-column:2;grid-row:1/4;width:118px}.entity-media--compact .entity-media__frame{min-height:88px;height:88px;padding:10px;border:0;background:color-mix(in srgb,var(--lime) 8%,var(--surface-soft))}.entity-media--compact img{height:72px}.entity-media--compact figcaption{justify-content:flex-end}.entity-media--compact figcaption>span:last-child{display:none}.entity-media--compact .source-chip{transform:scale(.9);transform-origin:right center}.media-library{padding:34px 0 100px}.media-library__intro{display:flex;justify-content:space-between;align-items:center;gap:20px;margin-bottom:24px;color:var(--text-muted)}.media-library__grid{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:16px}.media-library__card{padding:12px;border:1px solid var(--border-soft);border-radius:18px;background:var(--surface)}.media-library__card .entity-media__frame{min-height:170px}.media-library__card h2{margin:12px 3px 3px;font:400 19px Georgia,serif}.media-library__card>span{margin-left:3px;color:var(--text-subtle);font-size:10px;text-transform:uppercase;letter-spacing:.09em}@media(max-width:1050px){.media-library__grid{grid-template-columns:repeat(3,1fr)}}@media(max-width:720px){.media-library__grid{grid-template-columns:repeat(2,1fr)}.entity-media--compact{width:90px}.entity-media--compact .entity-media__frame{height:76px}.media-library__intro{display:block}}@media(max-width:440px){.media-library__grid{grid-template-columns:1fr}} .entity-media{margin:0;min-width:0}.entity-media__frame{position:relative;display:grid;place-items:center;overflow:hidden;min-height:190px;padding:18px;border:1px solid var(--border-soft);border-radius:16px;background:radial-gradient(circle at 50% 46%,color-mix(in srgb,var(--lime) 15%,var(--surface)) 0 18%,var(--surface-soft) 62%)}.entity-media__frame:after{content:"";position:absolute;inset:12px;border:1px solid color-mix(in srgb,var(--border) 55%,transparent);border-radius:11px;pointer-events:none}.entity-media img{position:relative;z-index:1;display:block;width:100%;height:180px;object-fit:contain;filter:drop-shadow(0 12px 18px #08222624);image-rendering:auto}.entity-media figcaption{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-top:9px;color:var(--text-muted);font-size:11px}.entity-media figcaption>span:last-child{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.entity-media--compact{grid-column:2;grid-row:1/4;width:118px}.entity-media--compact .entity-media__frame{min-height:88px;height:88px;padding:10px;border:0;background:color-mix(in srgb,var(--lime) 8%,var(--surface-soft))}.entity-media--compact img{height:72px}.entity-media--compact figcaption{justify-content:flex-end}.entity-media--compact figcaption>span:last-child{display:none}.entity-media--compact .source-chip{transform:scale(.9);transform-origin:right center}.media-library{padding:34px 0 100px}.media-library__intro{display:flex;justify-content:space-between;align-items:center;gap:20px;margin-bottom:24px;color:var(--text-muted)}.media-library__grid{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:16px}.media-library__card{padding:12px;border:1px solid var(--border-soft);border-radius:18px;background:var(--surface)}.media-library__card .entity-media__frame{min-height:170px}.media-library__card h2{margin:12px 3px 3px;font:400 19px Georgia,serif}.media-library__card>span{margin-left:3px;color:var(--text-subtle);font-size:10px;text-transform:uppercase;letter-spacing:.09em}@media(max-width:1050px){.media-library__grid{grid-template-columns:repeat(3,1fr)}}@media(max-width:720px){.media-library__grid{grid-template-columns:repeat(2,1fr)}.entity-media--compact{width:90px}.entity-media--compact .entity-media__frame{height:76px}.media-library__intro{display:block}}@media(max-width:440px){.media-library__grid{grid-template-columns:1fr}}
.entity-feature{display:grid;grid-template-columns:minmax(280px,420px) 1fr;align-items:center;gap:48px;padding-block:36px;border-bottom:1px solid var(--border)}.entity-feature .entity-media__frame{min-height:260px}.entity-feature .entity-media img{height:230px}.entity-feature h2{margin:10px 0 12px;font:400 clamp(34px,4vw,58px)/.95 Georgia,serif}.entity-feature p{max-width:620px;color:var(--text-muted);line-height:1.6}@media(max-width:720px){.entity-feature{grid-template-columns:1fr;gap:24px;padding-block:26px}} .entity-feature{display:grid;grid-template-columns:minmax(280px,420px) 1fr;align-items:center;gap:48px;padding-block:36px;border-bottom:1px solid var(--border)}.entity-feature .entity-media__frame{min-height:260px}.entity-feature .entity-media img{height:230px}.entity-feature h2{margin:10px 0 12px;font:400 clamp(34px,4vw,58px)/.95 Georgia,serif}.entity-feature p{max-width:620px;color:var(--text-muted);line-height:1.6}@media(max-width:720px){.entity-feature{grid-template-columns:1fr;gap:24px;padding-block:26px}}
.waterbody-media-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:18px;padding-block:28px}.waterbody-media-grid article{min-width:0;padding:18px;border:1px solid var(--border-soft);border-radius:16px;background:var(--surface-soft)}.waterbody-media-grid article>.overline{display:block;margin-bottom:10px}.waterbody-media-grid .entity-media__frame{min-height:220px}@media(max-width:720px){.waterbody-media-grid{grid-template-columns:1fr;padding-block:20px}.waterbody-media-grid .entity-media__frame{min-height:190px}}
.catalog-media-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(min(100%,320px),1fr));gap:18px;padding-block:28px 70px}.catalog-media-grid article{min-width:0;padding:18px;border:1px solid var(--border-soft);border-radius:16px;background:var(--surface-soft)}.catalog-media-grid article>.overline{display:block;margin-bottom:10px}.catalog-media-grid .entity-media__frame{min-height:220px}
.media-role-filter{display:flex;align-items:end;gap:10px;margin:0 0 22px;padding:14px 16px;border:1px solid var(--border-soft);border-radius:12px;background:var(--surface-soft)}.media-role-filter label{display:grid;gap:6px;color:var(--text-muted);font-size:11px;font-weight:750;text-transform:uppercase;letter-spacing:.08em}.media-role-filter select{min-width:220px;height:40px;padding:0 10px;border:1px solid var(--border);border-radius:8px;background:var(--surface);color:var(--text)}.media-role-filter a{padding:11px 4px;color:var(--text-muted);font-size:12px}@media(max-width:720px){.media-role-filter{align-items:stretch;flex-wrap:wrap}.media-role-filter label{flex:1 1 100%}.media-role-filter select{width:100%}}
@media (min-width:721px) and (max-width:1050px){.media-library__grid{grid-template-columns:repeat(3,minmax(0,1fr))}} @media (min-width:721px) and (max-width:1050px){.media-library__grid{grid-template-columns:repeat(3,minmax(0,1fr))}}
.entity-media__quality{color:var(--warning);font-weight:700}
+3
View File
@@ -0,0 +1,3 @@
.plan-hero{padding:70px 0 45px;display:flex;justify-content:space-between;align-items:center;gap:40px}.plan-hero h1{margin:18px 0 20px;font:400 clamp(58px,7vw,100px)/.88 Georgia,serif;letter-spacing:-.06em}.plan-hero h1 em{color:#497074;font-style:normal}.plan-hero p{max-width:620px;color:var(--text-muted);font-size:17px;line-height:1.6}.plan-hero__mark{width:150px;height:150px;display:grid;place-items:center;border:1px solid #345155;border-radius:50%;background:var(--deep);color:var(--lime);font-size:76px;transform:rotate(45deg)}.plan-toolbar{display:flex;justify-content:space-between;align-items:center;padding:18px 0;border-top:1px solid var(--border);border-bottom:1px solid var(--border);color:var(--text-muted);font-size:13px}.plan-toolbar>div{display:flex;gap:8px}.plan-content{padding:30px 0 100px}.plan-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(min(100%,300px),1fr));gap:14px}.plan-card{display:flex;flex-direction:column;gap:8px;min-height:220px;padding:22px;border:1px solid var(--border-soft);border-radius:15px;background:var(--surface);box-shadow:0 12px 30px var(--shadow-color)}.plan-card h2{margin:0;font:400 27px Georgia,serif}.plan-card>strong{font:400 22px Georgia,serif;color:var(--success)}.plan-card p{margin:5px 0 0;color:var(--text-muted);font-size:13px}.plan-card small{color:var(--text-subtle);font-size:11px}.plan-card__actions{display:flex;align-items:center;gap:15px;margin-top:auto}.plan-card__actions a{color:var(--text);font-size:13px;text-underline-offset:3px}.plan-card__actions button{border:0;background:none;color:var(--text-muted);font-size:12px;text-decoration:underline;text-underline-offset:3px}.plan-content>.state[hidden]{display:none!important}@media(max-width:720px){.plan-hero{padding:36px 0 25px}.plan-hero__mark{width:90px;height:90px;font-size:46px}.plan-toolbar{display:block}.plan-toolbar>div{margin-top:12px;flex-wrap:wrap}.plan-content{padding-top:20px}}@media print{ @page{size:auto;margin:12mm} .topbar,.alpha-banner,footer,.plan-hero__mark,.plan-toolbar button,.plan-card__actions button{display:none!important}.plan-hero{padding:0 0 20px}.plan-content{padding-top:0}.plan-card{break-inside:avoid;box-shadow:none}}
.plan-toolbar>div{align-items:center;flex-wrap:wrap}.plan-toolbar [data-plan-share-status]{color:var(--text-muted);font-size:11px}
@media(max-width:900px){.plan-hero__mark{display:none}}
+12
View File
@@ -0,0 +1,12 @@
.query-summary{display:flex;justify-content:space-between;align-items:end;gap:24px;padding-top:20px}
.query-summary h2{margin:5px 0 4px;font:400 27px Georgia,serif;letter-spacing:-.035em}
.query-summary p{margin:0;color:var(--text-muted);font-size:13px}
.query-summary__filters{display:flex;align-items:center;justify-content:flex-end;flex-wrap:wrap;gap:8px}
.query-summary__filters span{padding:6px 10px;border:1px solid #c8d3cb;border-radius:20px;background:#f8faf5;color:#526662;font-size:12px}
.query-summary__filters a{margin-left:4px;color:#4d625e;font-size:13px;text-underline-offset:3px}
.detail-action-heading{margin:27px 0 8px;font:400 24px Georgia,serif;color:var(--success)}
.tackle-card-passport{grid-column:1/-1;min-width:0}.tackle-card-passport .data-passport{margin-top:14px}
.spot-hero__actions{display:flex;align-items:center;flex-wrap:wrap;gap:8px}.spot-hero__actions small{color:#a9b8b5;font-size:11px}.plan-save[data-saved="true"]{background:var(--lime);color:var(--deep)}
.card-cta{display:inline-flex;align-items:center;gap:8px;margin-top:16px;color:var(--text);font-size:12px;font-weight:750;text-underline-offset:3px}.card-cta span{color:var(--success);font-size:17px;line-height:1}
@media(max-width:720px){.spot-hero__actions{align-items:flex-start;flex-direction:column}.spot-hero__actions small{min-height:15px}}
@media(max-width:720px){.query-summary{display:block;padding:16px 14px 0;width:100%}.query-summary h2{font-size:23px}.query-summary__filters{justify-content:flex-start;flex-wrap:nowrap;overflow-x:auto;padding-top:11px;scroll-snap-type:x proximity;scrollbar-width:none}.query-summary__filters::-webkit-scrollbar{display:none}.query-summary__filters span{flex:0 0 auto;scroll-snap-align:start}.query-summary__filters a{position:sticky;right:0;flex:0 0 auto;padding:6px 10px;background:var(--paper)}}
+11 -4
View File
@@ -6,7 +6,7 @@
--surface-control: light-dark(#f3f6f1, #0a1d1f); --surface-control: light-dark(#f3f6f1, #0a1d1f);
--text-primary: light-dark(#092226, #edf5ef); --text-primary: light-dark(#092226, #edf5ef);
--text-secondary: light-dark(#526662, #b8c7c3); --text-secondary: light-dark(#526662, #b8c7c3);
--text-tertiary: light-dark(#647572, #93a7a2); --text-tertiary: light-dark(#5b6b68, #93a7a2);
--text-on-dark: #f5f8f3; --text-on-dark: #f5f8f3;
--border-strong: light-dark(#cbd6ce, #3a5658); --border-strong: light-dark(#cbd6ce, #3a5658);
--border-subtle: light-dark(#d6dfd7, #294244); --border-subtle: light-dark(#d6dfd7, #294244);
@@ -41,7 +41,7 @@
--source-official: light-dark(#815713, #e3b65b); --source-official: light-dark(#815713, #e3b65b);
--source-rf4db: light-dark(#245d78, #74bee3); --source-rf4db: light-dark(#245d78, #74bee3);
--source-rf4stat: light-dark(#60499a, #b7a2ed); --source-rf4stat: light-dark(#60499a, #b7a2ed);
--source-rf4map: light-dark(#2f704f, #79c79e); --source-rf4map: light-dark(#276044, #79c79e);
--source-rf4posts: light-dark(#984a33, #ee9a7e); --source-rf4posts: light-dark(#984a33, #ee9a7e);
--source-players: light-dark(#4b6419, #add066); --source-players: light-dark(#4b6419, #add066);
--graphic-line: light-dark(#3f7779, #79b5b8); --graphic-line: light-dark(#3f7779, #79b5b8);
@@ -76,6 +76,7 @@
.active-filters span, .spot-card, .record-table, .report-form, .active-filters span, .spot-card, .record-table, .report-form,
.periods, .detail-grid aside, .screenshot-retry, .moderation-card, .periods, .detail-grid aside, .screenshot-retry, .moderation-card,
.moderation-bulk, [data-external-bulk],
.admin-kpis > a, .admin-kpis > article, .admin-dashboard-grid > section, .admin-kpis > a, .admin-kpis > article, .admin-dashboard-grid > section,
.source-health-grid article, .state, .load-more, .signal-more { .source-health-grid article, .state, .load-more, .signal-more {
background: var(--surface-elevated); background: var(--surface-elevated);
@@ -88,7 +89,8 @@
.spot-card:hover { background: var(--surface-raised); border-color: var(--border-strong); box-shadow: 0 18px 40px var(--shadow-color); } .spot-card:hover { background: var(--surface-raised); border-color: var(--border-strong); box-shadow: 0 18px 40px var(--shadow-color); }
.report-form input, .report-form textarea, .report-form select, .report-form input, .report-form textarea, .report-form select,
.moderation-actions textarea { background: var(--surface-control); color: var(--text-primary); border-color: var(--border-strong); } .moderation-actions textarea, .moderation-bulk textarea, .moderation-bulk select,
[data-external-bulk] textarea, [data-external-bulk] select { background: var(--surface-control); color: var(--text-primary); border-color: var(--border-strong); }
.record-head, .no-proof { background: var(--surface-raised); } .record-head, .no-proof { background: var(--surface-raised); }
.record-row, .periods > div, .catch-list article, .detail-grid aside li, .record-row, .periods > div, .catch-list article, .detail-grid aside li,
.bait-line, .spot-stats, .moderation-summary dl div, .bait-line, .spot-stats, .moderation-summary dl div,
@@ -127,6 +129,11 @@
.timeline-chart { border-color: var(--border-strong); background: repeating-linear-gradient(to top, transparent 0, transparent 35px, var(--border-subtle) 36px); } .timeline-chart { border-color: var(--border-strong); background: repeating-linear-gradient(to top, transparent 0, transparent 35px, var(--border-subtle) 36px); }
.timeline-slot strong { color: var(--text-primary); } .timeline-slot strong { color: var(--text-primary); }
.timeline-slot small, .activity-legend { color: var(--text-tertiary); } .timeline-slot small, .activity-legend { color: var(--text-tertiary); }
.spot-hero .eyebrow { color: var(--text-on-dark); }
.activity-legend { color: var(--text-secondary); }
.catch-list .tackle-label > span { color: var(--text-secondary); }
.catch-list span { color: var(--text-secondary); }
.catch-list .source-chip > span { color: var(--chip) !important; }
.catalog-hero { border-color: var(--border-strong); } .catalog-hero { border-color: var(--border-strong); }
.catalog-hero p, .catalog-results aside a, .catalog-grid span { color: var(--text-secondary); } .catalog-hero p, .catalog-results aside a, .catalog-grid span { color: var(--text-secondary); }
@@ -185,7 +192,7 @@
@media (forced-colors: active) { @media (forced-colors: active) {
.theme-switcher, .theme-switcher button, .spot-card, .record-table, .theme-switcher, .theme-switcher button, .spot-card, .record-table,
.report-form, .moderation-card, .catalog-grid > a, .data-passport, .report-form, .moderation-card, .moderation-bulk, [data-external-bulk], .catalog-grid > a, .data-passport,
.source-chip, .notice, .state { border: 1px solid CanvasText; } .source-chip, .notice, .state { border: 1px solid CanvasText; }
.theme-switcher button[aria-pressed="true"] { background: Highlight; color: HighlightText; } .theme-switcher button[aria-pressed="true"] { background: Highlight; color: HighlightText; }
.source-chip i, .health-state i, .quality-chip i, .activity-pill i { forced-color-adjust: none; } .source-chip i, .health-state i, .quality-chip i, .activity-pill i { forced-color-adjust: none; }
+1 -1
View File
@@ -2,7 +2,7 @@ import AxeBuilder from "@axe-core/playwright";
import { expect, test } from "@playwright/test"; import { expect, test } from "@playwright/test";
for (const path of [ for (const path of [
"/", "/records", "/report", "/rules", "/privacy", "/", "/records", "/report", "/tackle", "/tackle/analytics", "/tackle/items/00000000-0000-0000-0000-000000000000", "/rules", "/privacy",
"/admin", "/admin/moderation", "/admin/external-sources", "/admin/media", "/admin", "/admin/moderation", "/admin/external-sources", "/admin/media",
]) { ]) {
test(`${path} has no serious accessibility violations`, async ({ page }) => { test(`${path} has no serious accessibility violations`, async ({ page }) => {
+12
View File
@@ -0,0 +1,12 @@
import { expect, test } from "@playwright/test";
test("waterbody passport and honest empty tackle catalog are explicit", async ({ page }) => {
await page.goto("/waterbodies/р-вьюнок");
const waterPassport = page.locator('.data-passport[aria-label="Паспорт данных"]');
await expect(waterPassport).toBeVisible();
await expect(waterPassport.getByText("Паспорт данных")).toBeVisible();
await expect(waterPassport.getByText("Свежесть")).toBeVisible();
await page.goto("/tackle");
await expect(page.getByText("Подтверждённых карточек пока нет")).toBeVisible();
});
+29
View File
@@ -0,0 +1,29 @@
import { expect, test } from "@playwright/test";
const unavailableRun = process.env.EXPECT_UNAVAILABLE === "1";
for (const path of [
"/waterbodies",
"/waterbodies/vyunok",
"/waterbodies/vyunok/pike",
"/fish",
"/media?type=waterbody",
"/tackle",
"/tackle/analytics",
"/tackle/items/00000000-0000-0000-0000-000000000000",
"/records",
"/spots/unknown-0x0",
"/report",
"/status",
]) {
test(`${path} exposes a cache-safe unavailable state`, async ({ page }) => {
test.skip(!unavailableRun, "Run with EXPECT_UNAVAILABLE=1 and an API-unavailable web process.");
const response = await page.goto(path);
expect(response?.status(), `${path} status`).toBe(503);
expect(response?.headers()["retry-after"], `${path} retry header`).toBe("60");
expect(response?.headers()["cache-control"], `${path} cache header`).toBe("no-store");
await expect(page.getByRole("alert")).toContainText(/временно недоступ|недоступ/i);
await expect(page.locator('meta[name="robots"]')).toHaveAttribute("content", "noindex, nofollow");
await expect(page.locator("body")).not.toContainText(/Traceback|localhost:8000|API \d+/i);
});
}
@@ -0,0 +1,17 @@
import AxeBuilder from "@axe-core/playwright";
import { expect, test } from "@playwright/test";
for (const path of [
"/waterbodies",
"/waterbodies/р-вьюнок",
"/spots/vyunok-321x654",
"/media",
"/tackle/analytics",
"/tackle/items/00000000-0000-0000-0000-000000000000",
]) {
test(`${path} has no serious accessibility violations`, async ({ page }) => {
await page.goto(path);
const results = await new AxeBuilder({ page }).withTags(["wcag2a", "wcag2aa", "wcag21aa"]).analyze();
expect(results.violations.filter(item => ["critical", "serious"].includes(item.impact ?? ""))).toEqual([]);
});
}
+21
View File
@@ -0,0 +1,21 @@
import { expect, test } from "@playwright/test";
test("activity cards explain freshness, sample size and coordinate precision", async ({ page }) => {
await page.goto("/");
const passport = page.locator(".spot-card .data-passport");
const count = await passport.count();
expect(count).toBeGreaterThan(0);
const first = passport.first();
const firstCard = page.locator(".spot-card").first();
await expect(first).toContainText("Свежесть");
await expect(first).toContainText("Наблюдения");
await expect(first).toContainText("Игроки");
await expect(first).toContainText("Координаты");
await expect(first).toContainText("Период");
await expect(firstCard).toContainText("Открыть точку");
if (await first.locator('[data-passport-status="insufficient"]').count()) {
await expect(first).toContainText("Недостаточно данных");
await expect(first).toContainText("Минимум для рекомендации: 3 наблюдения");
}
});
+13
View File
@@ -0,0 +1,13 @@
import { expect, test } from "@playwright/test";
test("home focuses the first screen on five results and keeps pagination", async ({ page }) => {
await page.setViewportSize({ width: 390, height: 844 });
await page.goto("/");
await expect(page.locator(".spot-card")).toHaveCount(5);
await expect(page.getByRole("navigation", { name: "Пагинация" })).toBeVisible();
await expect(page.getByRole("link", { name: "Следующая →" })).toHaveAttribute("href", /offset=5/);
const overflow = await page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth);
expect(overflow).toBeLessThanOrEqual(0);
});
+46
View File
@@ -0,0 +1,46 @@
import { expect, test } from "@playwright/test";
test("media catalog keeps image provenance and loaded assets healthy", async ({ page }) => {
await page.setViewportSize({ width: 1280, height: 900 });
await page.goto("/media");
await page.waitForLoadState("networkidle");
const state = await page.evaluate(() => ({
images: Array.from(document.images).map(image => ({
alt: image.alt,
complete: image.complete,
naturalWidth: image.naturalWidth,
})),
width: document.documentElement.clientWidth,
scrollWidth: document.documentElement.scrollWidth,
}));
expect(state.images.length).toBeGreaterThan(0);
expect(state.images.every(image => image.alt.trim().length > 0)).toBe(true);
expect(state.images.filter(image => image.complete && image.naturalWidth === 0)).toEqual([]);
expect(state.scrollWidth).toBeLessThanOrEqual(state.width);
});
for (const theme of ["light", "dark"] as const) {
test(`media catalog respects ${theme} theme on a narrow viewport`, async ({ page, context }) => {
await context.addCookies([{ name: "rf4-theme", value: theme, url: "http://127.0.0.1:4321" }]);
await page.setViewportSize({ width: 320, height: 800 });
await page.goto("/media");
const state = await page.evaluate(() => ({
theme: document.documentElement.dataset.theme,
width: document.documentElement.clientWidth,
scrollWidth: document.documentElement.scrollWidth,
}));
expect(state.theme).toBe(theme);
expect(state.scrollWidth).toBeLessThanOrEqual(state.width);
});
}
for (const type of ["waterbody", "tackle", "reference"]) {
test(`media ${type} section has a stable page state`, async ({ page }) => {
await page.goto(`/media?type=${type}`);
await expect(page.getByRole("heading", { name: "Медиатека" })).toBeVisible();
await expect(page.locator("main")).toBeVisible();
});
}
+115
View File
@@ -0,0 +1,115 @@
import { expect, test } from "@playwright/test";
test("saved spot appears on the plan page and can be removed or cleared", async ({ page }) => {
await page.goto("/spots/vyunok-6331x6332");
await page.evaluate(() => localStorage.setItem("rf4spotter:fishing-plan", JSON.stringify([{ key: "/spots/vyunok-6331x6332", waterbody: "Вьюнок", coordinates: "6331:6332", baits: "Тестовая приманка", method: "Спиннинг", retrieve: "равномерная", risk: "Подтверждено", freshness: "2026-09-20T12:55:11.236309Z", confidence: "24" }])));
await page.goto("/plan");
await expect(page.getByRole("heading", { name: "Вьюнок" })).toBeVisible();
await expect(page.getByText("6331:6332")).toBeVisible();
await expect(page.getByText("Спиннинг · равномерная")).toBeVisible();
await expect(page.getByText(/Риск: Подтверждено/)).toBeVisible();
await expect(page.getByText("1 из 5 точек")).toBeVisible();
await page.getByRole("button", { name: "Убрать" }).click();
await expect(page.getByRole("heading", { name: "План пока пуст" })).toBeVisible();
await page.goto("/spots/vyunok-6331x6332");
await page.evaluate(() => localStorage.setItem("rf4spotter:fishing-plan", JSON.stringify([{ key: "/spots/vyunok-6331x6332", waterbody: "Вьюнок", coordinates: "6331:6332", baits: "Тестовая приманка", freshness: "", confidence: "" }])));
await page.goto("/plan");
await page.getByRole("button", { name: "Очистить план" }).click();
await expect(page.getByRole("heading", { name: "План пока пуст" })).toBeVisible();
});
test("plan can be restored from a shareable URL", async ({ page }) => {
const shared = encodeURIComponent(JSON.stringify([{ key: "/spots/vyunok-6331x6332", waterbody: "Вьюнок", coordinates: "6331:6332", baits: "Тестовая приманка", freshness: "", confidence: "" }]));
await page.goto(`/plan?plan=${shared}`);
await expect(page.getByRole("heading", { name: "Вьюнок" })).toBeVisible();
await expect(page.getByRole("button", { name: "Поделиться планом" })).toBeVisible();
await expect(page.getByText("1 из 5 точек")).toBeVisible();
});
test("plan caps imported entries, stays printable and fits narrow viewports", async ({ page }) => {
const plan = Array.from({ length: 6 }, (_, index) => ({
key: `/spots/vyunok-6331x633${index + 2}`,
waterbody: "Вьюнок",
coordinates: `6331:633${index + 2}`,
baits: "Тестовая приманка",
freshness: "",
confidence: "",
}));
await page.goto("/plan");
await page.evaluate((value) => localStorage.setItem("rf4spotter:fishing-plan", JSON.stringify(value)), plan);
await page.reload();
await expect(page.getByText("5 из 5 точек")).toBeVisible();
await expect(page.locator(".plan-card")).toHaveCount(5);
for (const width of [320, 390]) {
await page.setViewportSize({ width, height: 800 });
const overflow = await page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth);
expect(overflow, `${width}px plan overflows`).toBeLessThanOrEqual(0);
}
await page.emulateMedia({ media: "print" });
await expect(page.getByRole("button", { name: "Печать / PDF" })).toBeHidden();
await expect(page.locator(".plan-card")).toHaveCount(5);
});
test("plan preserves a real zero confidence and bounds imported text", async ({ page }) => {
await page.goto("/plan");
await page.evaluate(() => localStorage.setItem("rf4spotter:fishing-plan", JSON.stringify([{
key: "/spots/" + "x".repeat(600),
waterbody: "Вьюнок",
coordinates: "6331:6332",
baits: "Приманка",
confidence: "0",
risk: "Малая выборка",
method: "Спиннинг",
retrieve: "равномерная",
oversized: "x".repeat(5000),
}, {
key: "/spots/vyunok-7450x7451",
waterbody: "Вьюнок",
coordinates: "7450:7451",
confidence: "999",
}])));
await page.reload();
await expect(page.getByText(/Доверие: 0%/)).toBeVisible();
const stored = await page.evaluate(() => JSON.parse(localStorage.getItem("rf4spotter:fishing-plan") || "[]"));
expect(stored[0].key.length).toBeLessThanOrEqual(512);
expect(stored[0].confidence).toBe("0");
expect(stored[1].confidence).toBe("");
expect(stored[0].oversized).toBeUndefined();
});
test("plan import deduplicates the same point before applying the five-item cap", async ({ page }) => {
await page.goto("/plan");
await page.evaluate(() => localStorage.setItem("rf4spotter:fishing-plan", JSON.stringify([
{ key: "/spots/vyunok-6331x6332", waterbody: "Вьюнок", coordinates: "6331:6332", confidence: "0" },
{ key: "/spots/vyunok-6331x6332", waterbody: "Вьюнок", coordinates: "6331:6332", confidence: "80" },
{ key: "/spots/vyunok-7450x7451", waterbody: "Вьюнок", coordinates: "7450:7451", confidence: "40" },
])));
await page.reload();
await expect(page.getByText("2 из 5 точек")).toBeVisible();
await expect(page.locator(".plan-card")).toHaveCount(2);
const stored = await page.evaluate(() => JSON.parse(localStorage.getItem("rf4spotter:fishing-plan") || "[]"));
expect(stored.map((item: { key: string }) => item.key)).toEqual([
"/spots/vyunok-6331x6332",
"/spots/vyunok-7450x7451",
]);
});
test("plan explains empty and malformed share states", async ({ page }) => {
await page.goto("/plan");
await page.getByRole("button", { name: "Поделиться планом" }).click();
await expect(page.locator("[data-plan-share-status]")).toHaveText("Сначала добавьте точку в план");
await page.goto("/plan?plan=not-json");
await expect(page.locator("[data-plan-share-status]")).toHaveText("Ссылка плана не распознана");
const emptyPlan = encodeURIComponent(JSON.stringify([]));
await page.goto(`/plan?plan=${emptyPlan}`);
await expect(page.locator("[data-plan-share-status]")).toHaveText("В ссылке нет сохранённых точек");
});
@@ -1,6 +1,10 @@
import { expect, test } from "@playwright/test"; import { expect, test } from "@playwright/test";
test("production bootstrap supports submission and moderation", async ({ page, request }) => { test("production bootstrap supports submission and moderation", async ({ page, request }) => {
test.skip(
!process.env.BOOTSTRAP_API_URL || !process.env.BOOTSTRAP_ADMIN_TOKEN,
"requires BOOTSTRAP_API_URL and BOOTSTRAP_ADMIN_TOKEN; run deploy/test-production-bootstrap.sh",
);
const player = `Bootstrap Player ${Date.now()}`; const player = `Bootstrap Player ${Date.now()}`;
const x = 7000 + Date.now() % 1000; const x = 7000 + Date.now() % 1000;
const y = x + 1; const y = x + 1;
+26
View File
@@ -0,0 +1,26 @@
import { expect, test } from "@playwright/test";
test("home makes the selected query context explicit and shareable", async ({ page }) => {
await page.setViewportSize({ width: 390, height: 844 });
await page.goto("/?waterbody=kuori&fish=lake-trout&hours=72&sort=freshness");
await expect(page.getByRole("heading", { name: "Озёрная форель · Куори" })).toBeVisible();
await expect(page.getByText("72 часа · Сначала свежие")).toBeVisible();
await expect(page.getByRole("link", { name: "Сбросить запрос" })).toHaveAttribute("href", "/#results");
await expect(page.getByLabel("Водоём")).toHaveValue("kuori");
await expect(page.getByLabel("Рыба")).toHaveValue("lake-trout");
await expect(page.getByLabel("Период")).toHaveValue("72");
await expect(page.getByLabel("Сначала")).toHaveValue("freshness");
const overflow = await page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth);
expect(overflow).toBeLessThanOrEqual(0);
});
test("empty filtered result offers a clear way back to the full dataset", async ({ page }) => {
await page.goto("/?waterbody=kuori&fish=lake-trout&hours=6&sort=freshness");
const emptyState = page.getByRole("heading", { name: "Пока нет свежих данных" });
if (await emptyState.isVisible()) {
await expect(page.getByRole("link", { name: "Показать все данные" })).toHaveAttribute("href", "/#results");
}
});
+18
View File
@@ -0,0 +1,18 @@
import { expect, test } from "@playwright/test";
test("spot can be saved to a five-item local fishing plan and survives reload", async ({ page }) => {
await page.goto("/spots/vyunok-6331x6332");
await page.evaluate(() => localStorage.removeItem("rf4spotter:fishing-plan"));
await page.reload();
const save = page.getByRole("button", { name: "Сохранить в план" });
await expect(save).toHaveAttribute("aria-pressed", "false");
await save.click();
await expect(page.getByRole("button", { name: "В плане" })).toHaveAttribute("aria-pressed", "true");
await expect(page.getByText("Добавлено в план")).toBeVisible();
await page.reload();
await expect(page.getByRole("button", { name: "В плане" })).toHaveAttribute("aria-pressed", "true");
await page.getByRole("button", { name: "В плане" }).click();
await expect(page.getByRole("button", { name: "Сохранить в план" })).toHaveAttribute("aria-pressed", "false");
});
+1 -1
View File
@@ -108,7 +108,7 @@ for (const viewport of [{ name: "desktop", width: 1280, height: 900 }, { name: "
test("public pages fit the narrow viewport and expose the skip link", async ({ page }) => { test("public pages fit the narrow viewport and expose the skip link", async ({ page }) => {
await page.setViewportSize({ width: 320, height: 800 }); await page.setViewportSize({ width: 320, height: 800 });
for (const path of ["/", "/records", "/report", "/waterbodies", "/status"]) { for (const path of ["/", "/records", "/report", "/waterbodies", "/tackle", "/status"]) {
await page.goto(path); await page.goto(path);
const dimensions = await page.evaluate(() => ({ const dimensions = await page.evaluate(() => ({
clientWidth: document.documentElement.clientWidth, clientWidth: document.documentElement.clientWidth,
+14
View File
@@ -0,0 +1,14 @@
import { expect, test } from "@playwright/test";
test("spot detail exposes the same evidence passport as activity cards", async ({ page }) => {
await page.goto("/spots/vyunok-6331x6332");
const passport = page.locator(".detail-grid aside .data-passport");
await expect(passport).toBeVisible();
await expect(passport).toContainText("Свежесть");
await expect(passport).toContainText("Наблюдения");
await expect(passport).toContainText("Игроки");
await expect(passport).toContainText("Координаты");
await expect(page.locator(".coordinate-precision")).toHaveText(/Точность координат: (точные|приблизительные|район|не указаны)/i);
await expect(page.getByRole("heading", { name: "Что взять" })).toBeVisible();
});
+10
View File
@@ -0,0 +1,10 @@
import { expect, test } from "@playwright/test";
test("unknown spot exposes an unavailable state without a misleading coordinate", async ({ page }) => {
await page.goto("/spots/not-a-real-spot");
await expect(page.getByRole("heading", { name: "Точка недоступна" })).toBeVisible();
await expect(page.getByText("API не ответил или такой точки нет.")).toBeVisible();
await expect(page.getByRole("navigation", { name: "Навигационная цепочка" })).toContainText("Точка недоступна");
await expect(page.getByText(/Точность координат:/)).toHaveCount(0);
});
+45
View File
@@ -0,0 +1,45 @@
import { expect, test } from "@playwright/test";
test("tackle catalog exposes an explicit empty state for unmatched filters", async ({ page }) => {
await page.setViewportSize({ width: 320, height: 800 });
await page.goto("/tackle?category=lure&brand=NoSuchBrand&family=NoSuchFamily");
await expect(page.getByRole("heading", { name: "Подтверждённых карточек пока нет" })).toBeVisible();
await expect(page.getByRole("link", { name: "Сбросить" })).toHaveAttribute("href", "/tackle");
await expect(page.getByLabel("Категория")).toHaveValue("lure");
await expect(page.getByLabel("Бренд")).toHaveValue("NoSuchBrand");
await expect(page.getByLabel("Семейство")).toHaveValue("NoSuchFamily");
const dimensions = await page.evaluate(() => ({
clientWidth: document.documentElement.clientWidth,
scrollWidth: document.documentElement.scrollWidth,
}));
expect(dimensions.scrollWidth).toBeLessThanOrEqual(dimensions.clientWidth);
});
test("unknown tackle detail has a navigable not-found state", async ({ page }) => {
await page.goto("/tackle/items/00000000-0000-0000-0000-000000000000");
await expect(page.getByRole("heading", { name: "Такой карточки нет в каталоге" })).toBeVisible();
await expect(page.getByRole("link", { name: "Открыть каталог" })).toHaveAttribute("href", "/tackle");
});
test("tackle analytics keeps an honest empty state", async ({ page }) => {
await page.goto("/tackle/analytics");
await expect(page.getByRole("heading", { name: "Сочетания снастей" })).toBeVisible();
await expect(page.getByLabel("Фильтры сочетаний снастей")).toBeVisible();
await expect(page.locator("[data-analytics-results]")).toBeVisible();
await expect(page.getByText(/не рейтинг снасти/i)).toBeVisible();
});
test("tackle analytics keeps selected filters and exposes a clean reset", async ({ page }) => {
await page.goto("/tackle/analytics?waterbody=kuori&fish=pike&method=spinning&hours=168");
await expect(page.getByLabel("Фильтры сочетаний снастей")).toBeVisible();
await expect(page.getByLabel("Водоём")).toHaveValue("kuori");
await expect(page.getByLabel("Рыба")).toHaveValue("pike");
await expect(page.getByLabel("Метод")).toHaveValue("spinning");
await expect(page.getByLabel("Период")).toHaveValue("168");
await expect(page.getByRole("link", { name: "Сбросить" })).toHaveAttribute("href", "/tackle/analytics");
});
+31
View File
@@ -0,0 +1,31 @@
import { expect, test } from "@playwright/test";
test("player can complete the first useful answer journey", async ({ page }) => {
const query = "/?hours=24&sort=activity";
await page.setViewportSize({ width: 390, height: 844 });
await page.goto(query);
await page.evaluate(() => localStorage.removeItem("rf4spotter:fishing-plan"));
const firstCard = page.locator(".spot-card").first();
await expect(firstCard).toBeVisible();
await expect(firstCard).toContainText("Свежесть");
await expect(firstCard).toContainText("Наблюдения");
await expect(firstCard).toContainText("Координаты");
await expect(firstCard.locator(".source-chip").first()).toBeVisible();
await expect(firstCard.getByText("Открыть точку")).toBeVisible();
await firstCard.getByText("Открыть точку").click();
await expect(page.getByRole("heading", { name: /^Точка / })).toBeVisible();
await expect(page.getByRole("heading", { name: "Что взять" })).toBeVisible();
await expect(page.locator("aside .data-passport")).toContainText("Доверие");
await expect(page.locator("aside .data-passport")).toContainText("Наблюдения");
const save = page.getByRole("button", { name: "Сохранить в план" });
await save.click();
await expect(page.getByRole("button", { name: "В плане" })).toHaveAttribute("aria-pressed", "true");
await page.goBack();
await expect(page).toHaveURL(query);
await page.goto("/plan");
await expect(page.getByText("1 из 5 точек")).toBeVisible();
await expect(page.getByRole("link", { name: "Открыть точку" })).toBeVisible();
});
+39
View File
@@ -0,0 +1,39 @@
import { expect, test } from "@playwright/test";
test("theme switcher persists the explicit choice and keeps browser metadata in sync", async ({ page, context }) => {
await context.clearCookies();
await page.goto("/");
await expect(page.locator("html")).not.toHaveAttribute("data-theme");
await expect(page.locator('[data-theme-option="system"]')).toHaveAttribute("aria-pressed", "true");
await page.locator('[data-theme-option="dark"]').click();
await expect(page.locator("html")).toHaveAttribute("data-theme", "dark");
await expect(page.locator('[data-theme-option="dark"]')).toHaveAttribute("aria-pressed", "true");
await expect(page.locator('meta[data-theme-color="dark"]')).toHaveAttribute("media", "all");
await expect(page.locator('meta[data-theme-color="light"]')).toHaveAttribute("media", "not all");
const cookies = await context.cookies();
expect(cookies.find(cookie => cookie.name === "rf4-theme")).toMatchObject({ value: "dark", sameSite: "Lax" });
await page.reload();
await expect(page.locator("html")).toHaveAttribute("data-theme", "dark");
await expect(page.locator('[data-theme-option="dark"]')).toHaveAttribute("aria-pressed", "true");
await page.locator('[data-theme-option="system"]').click();
await expect(page.locator("html")).not.toHaveAttribute("data-theme");
await expect(page.locator('[data-theme-option="system"]')).toHaveAttribute("aria-pressed", "true");
await expect(page.locator('meta[data-theme-color="dark"]')).toHaveAttribute("media", "(prefers-color-scheme: dark)");
});
test("reduced motion disables decorative animation loops", async ({ page }) => {
await page.emulateMedia({ reducedMotion: "reduce" });
await page.goto("/");
const motion = await page.locator(".pulse-orb span").evaluate(element => {
const style = getComputedStyle(element);
return { duration: style.animationDuration, iterations: style.animationIterationCount };
});
expect(motion.duration).toBe("0.01s");
expect(motion.iterations).toBe("1");
});
+56 -1
View File
@@ -1,12 +1,14 @@
import assert from "node:assert/strict"; import assert from "node:assert/strict";
import test from "node:test"; import test from "node:test";
import { activityLevel, plural } from "../../src/lib/presentation.ts"; import { activityLevel, coordinatePrecisionLabel, freshnessStatus, passportDisplayStatus, plural, sourceStatusLabel } from "../../src/lib/presentation.ts";
import { fishVisualFamily } from "../../src/lib/fish-visuals.ts"; import { fishVisualFamily } from "../../src/lib/fish-visuals.ts";
import { tackleVisualKind, tackleVisualTone } from "../../src/lib/tackle-visuals.ts"; import { tackleVisualKind, tackleVisualTone } from "../../src/lib/tackle-visuals.ts";
import { waterbodyVisual } from "../../src/lib/waterbody-visuals.ts"; import { waterbodyVisual } from "../../src/lib/waterbody-visuals.ts";
import { pageHref, pageWindow } from "../../src/lib/pagination.ts"; import { pageHref, pageWindow } from "../../src/lib/pagination.ts";
import { adminEndsSession, adminErrorMessage } from "../../src/lib/admin-errors.ts"; import { adminEndsSession, adminErrorMessage } from "../../src/lib/admin-errors.ts";
import { findMediaByLabel, mediaRoleLabel } from "../../src/lib/media.ts";
import { safeHttpUrl } from "../../src/lib/urls.ts";
test("activity levels share one complete 0-100 scale", () => { test("activity levels share one complete 0-100 scale", () => {
assert.deepEqual( assert.deepEqual(
@@ -23,6 +25,42 @@ test("Russian plural forms cover common and exceptional endings", () => {
); );
}); });
test("freshness status is explicit and deterministic around the 48-hour boundary", () => {
const now = Date.parse("2026-09-20T12:00:00Z");
assert.equal(freshnessStatus("2026-09-20T11:59:00Z", now), "fresh");
assert.equal(freshnessStatus("2026-09-18T11:59:00Z", now), "stale");
assert.equal(freshnessStatus(null, now), "unknown");
});
test("evidence passport prioritises conflict and stale states without hiding blocked data", () => {
assert.equal(passportDisplayStatus("verified", "fresh", false), "verified");
assert.equal(passportDisplayStatus("verified", "stale", false), "stale");
assert.equal(passportDisplayStatus("blocked", "fresh", false), "blocked");
assert.equal(passportDisplayStatus("incomplete", "fresh", true), "conflict");
});
test("coordinate precision keeps all four public states explicit", () => {
assert.deepEqual(
["exact", "approximate", "area", "missing"].map(coordinatePrecisionLabel),
["точные", "приблизительные", "район", "не указаны"],
);
assert.equal(coordinatePrecisionLabel("future"), "не указаны");
});
test("provenance links allow only credential-free HTTP(S) URLs", () => {
assert.equal(safeHttpUrl("https://rf4db.com/ru/maps"), "https://rf4db.com/ru/maps");
assert.equal(safeHttpUrl("http://localhost:8000/source"), "http://localhost:8000/source");
assert.equal(safeHttpUrl("javascript:alert(1)"), null);
assert.equal(safeHttpUrl("https://user:secret@rf4db.com/source"), null);
assert.equal(safeHttpUrl("not a url"), null);
});
test("source status makes a blocked provider explicit", () => {
assert.equal(sourceStatusLabel("temporarily_limited"), "Источник временно ограничен");
assert.equal(sourceStatusLabel("healthy"), "Актуален");
assert.equal(sourceStatusLabel("unexpected"), "Состояние не определено");
});
test("fish visual families follow body type instead of a name hash", () => { test("fish visual families follow body type instead of a name hash", () => {
assert.deepEqual( assert.deepEqual(
["Щука", "Озёрная форель", "Карп", "Окунь", "Сом", "Угорь", "Палтус", "Треска", "Неизвестная рыба"].map(fishVisualFamily), ["Щука", "Озёрная форель", "Карп", "Окунь", "Сом", "Угорь", "Палтус", "Треска", "Неизвестная рыба"].map(fishVisualFamily),
@@ -49,6 +87,23 @@ test("waterbody fingerprints are stable, bounded and entity-specific", () => {
assert.match(kuori.code, /^[0-9A-Z]{2}$/); assert.match(kuori.code, /^[0-9A-Z]{2}$/);
}); });
test("waterbody media lookup only accepts reviewed roles when constrained", () => {
const assets = [
{ id: "screenshot", entity_type: "waterbody", entity_key: "kuori", media_role: "waterbody_screenshot", label: "Куори", width: 1, height: 1, content_type: "image/webp", image_url: "", source_system: "rf4db", source_url: "" },
{ id: "map", entity_type: "waterbody", entity_key: "kuori", media_role: "waterbody_map", label: "Куори", width: 1, height: 1, content_type: "image/webp", image_url: "", source_system: "rf4db", source_url: "" },
] as const;
assert.equal(findMediaByLabel([...assets], "Куори", ["waterbody_cover", "waterbody_map"])?.id, "map");
assert.equal(findMediaByLabel([...assets], "Куори", ["waterbody_cover"]), undefined);
});
test("reviewed media roles keep human-readable labels with a safe fallback", () => {
assert.deepEqual(
["waterbody_cover", "waterbody_map", "waterbody_depth_map", "waterbody_screenshot", "tackle_card", "tackle_detail", "rig_diagram", "tackle_screenshot"].map(mediaRoleLabel),
["Заставка водоёма", "Карта водоёма", "Карта глубин", "Скриншот водоёма", "Карточка снасти", "Деталь снасти", "Схема монтажа", "Скриншот снасти"],
);
assert.equal(mediaRoleLabel("future_role"), "future_role");
});
test("45 records are reachable across three stable pages", () => { test("45 records are reachable across three stable pages", () => {
const pages = [pageWindow(45, 20, 0), pageWindow(45, 20, 20), pageWindow(45, 20, 40)]; const pages = [pageWindow(45, 20, 0), pageWindow(45, 20, 20), pageWindow(45, 20, 40)];
assert.deepEqual(pages.map(page => [page.start, page.end]), [[1, 20], [21, 40], [41, 45]]); assert.deepEqual(pages.map(page => [page.start, page.end]), [[1, 20], [21, 40], [41, 45]]);
+25
View File
@@ -0,0 +1,25 @@
import { expect, test } from "@playwright/test";
const routes = [
{ path: "/", heading: /Выбирай место/, action: ".spot-card" },
{ path: "/spots/vyunok-6331x6332", heading: /^Точка /, action: "[data-plan-save]" },
{ path: "/waterbodies/vyunok", heading: /Вьюнок/, action: ".catalog-results" },
{ path: "/plan", heading: /Мой план/, action: "[data-plan-share]" },
{ path: "/tackle", heading: /Снасти и приманки/, action: "[aria-label=\"Фильтры каталога снастей\"]" },
] as const;
test("key routes keep their first answer and action visible on mobile", async ({ page }) => {
await page.setViewportSize({ width: 390, height: 844 });
for (const route of routes) {
await page.goto(route.path);
await expect(page.locator("main h1")).toHaveText(route.heading);
await expect(page.locator(route.action).first()).toBeVisible();
const state = await page.evaluate(() => ({
clientWidth: document.documentElement.clientWidth,
scrollWidth: document.documentElement.scrollWidth,
main: Boolean(document.querySelector("main")),
}));
expect(state.main, `${route.path} has no main landmark`).toBe(true);
expect(state.scrollWidth, `${route.path} overflows at 390px`).toBeLessThanOrEqual(state.clientWidth);
}
});
+2 -2
View File
@@ -1,8 +1,8 @@
import { expect, test } from "@playwright/test"; import { expect, test } from "@playwright/test";
const routes = [ const routes = [
"/", "/waterbodies", "/tackle", "/records", "/report", "/status", "/media", "/rules", "/", "/spots/vyunok-6331x6332", "/plan", "/waterbodies", "/tackle", "/tackle/analytics", "/records", "/report", "/status", "/media", "/rules",
"/waterbodies/р-вьюнок", "/fish/pike", "/admin", "/admin/moderation", "/waterbodies/р-вьюнок", "/waterbodies/not-a-real-waterbody", "/waterbodies/р-вьюнок/not-a-real-fish", "/fish/pike", "/fish/not-a-real-fish", "/spots/not-a-real-spot", "/admin", "/admin/moderation",
"/admin/external-sources", "/admin/media", "/admin/external-sources", "/admin/media",
]; ];
const viewports = [ const viewports = [
+27
View File
@@ -0,0 +1,27 @@
import { expect, test } from "@playwright/test";
test("waterbody detail preserves confirmed facts and empty activity state", async ({ page }) => {
await page.goto("/waterbodies/р-вьюнок");
await expect(page.locator("h1")).toHaveText("р. Вьюнок");
await expect(page.getByText("В карточке источника указано видов рыб: 29.")).toBeVisible();
await expect(page.getByText("Изображений-кандидатов: 2; публикация требует отдельной проверки.")).toBeVisible();
await expect(page.getByText("Свежих подтверждённых видов пока нет.")).toBeVisible();
await expect(page.getByText("Свежих точек пока нет")).toBeVisible();
});
test("unknown waterbody slug has a navigable not-found state", async ({ page }) => {
await page.goto("/waterbodies/not-a-real-waterbody");
await expect(page.getByRole("heading", { name: "Водоём не найден" })).toBeVisible();
await expect(page.getByRole("alert")).toContainText("Такого водоёма нет в справочнике");
await expect(page.getByRole("link", { name: "Открыть каталог" })).toHaveAttribute("href", "/waterbodies");
});
test("unknown waterbody/fish pair keeps a clear not-found state", async ({ page }) => {
await page.goto("/waterbodies/р-вьюнок/not-a-real-fish");
await expect(page.getByRole("heading", { name: "Данные не найдены" })).toBeVisible();
await expect(page.getByRole("alert")).toContainText("Такого сочетания нет в справочнике");
await expect(page.getByRole("link", { name: "Вернуться на главную" })).toHaveAttribute("href", "/");
});
+25 -2
View File
@@ -123,6 +123,7 @@ services:
S3_ACCESS_KEY: ${S3_ACCESS_KEY:?Set S3_ACCESS_KEY} S3_ACCESS_KEY: ${S3_ACCESS_KEY:?Set S3_ACCESS_KEY}
S3_SECRET_KEY: ${S3_SECRET_KEY:?Set S3_SECRET_KEY} S3_SECRET_KEY: ${S3_SECRET_KEY:?Set S3_SECRET_KEY}
S3_BUCKET: ${S3_BUCKET:-catch-screenshots} S3_BUCKET: ${S3_BUCKET:-catch-screenshots}
MEDIA_ROOT: /app/runtime-media
OFFICIAL_RECORDS_URL: ${OFFICIAL_RECORDS_URL:-https://rf4game.de/records/region/RU/} OFFICIAL_RECORDS_URL: ${OFFICIAL_RECORDS_URL:-https://rf4game.de/records/region/RU/}
OFFICIAL_RECORDS_REGION: ${OFFICIAL_RECORDS_REGION:-RU} OFFICIAL_RECORDS_REGION: ${OFFICIAL_RECORDS_REGION:-RU}
OFFICIAL_RECORDS_CATEGORY: ${OFFICIAL_RECORDS_CATEGORY:-records} OFFICIAL_RECORDS_CATEGORY: ${OFFICIAL_RECORDS_CATEGORY:-records}
@@ -131,7 +132,9 @@ services:
IMPORT_INTERVAL_SECONDS: ${IMPORT_INTERVAL_SECONDS:-3600} IMPORT_INTERVAL_SECONDS: ${IMPORT_INTERVAL_SECONDS:-3600}
PUBLIC_CACHE_SECONDS: ${PUBLIC_CACHE_SECONDS:-20} PUBLIC_CACHE_SECONDS: ${PUBLIC_CACHE_SECONDS:-20}
RATE_LIMIT_SECRET: ${RATE_LIMIT_SECRET:?Set RATE_LIMIT_SECRET} RATE_LIMIT_SECRET: ${RATE_LIMIT_SECRET:?Set RATE_LIMIT_SECRET}
TRUSTED_PROXY_CIDRS: '${TRUSTED_PROXY_CIDRS:-"127.0.0.1/32,::1/128"}' # Caddy reaches API over the dedicated private edge network, not loopback.
# Keep this CIDR aligned with EDGE_NETWORK_SUBNET when customizing the network.
TRUSTED_PROXY_CIDRS: '${TRUSTED_PROXY_CIDRS:-"172.30.0.0/24,127.0.0.1/32,::1/128"}'
RETENTION_SUBMISSION_DAYS: ${RETENTION_SUBMISSION_DAYS:-1} RETENTION_SUBMISSION_DAYS: ${RETENTION_SUBMISSION_DAYS:-1}
RETENTION_UNREVIEWED_DAYS: ${RETENTION_UNREVIEWED_DAYS:-30} RETENTION_UNREVIEWED_DAYS: ${RETENTION_UNREVIEWED_DAYS:-30}
RETENTION_APPROVED_PERSONAL_DAYS: ${RETENTION_APPROVED_PERSONAL_DAYS:-180} RETENTION_APPROVED_PERSONAL_DAYS: ${RETENTION_APPROVED_PERSONAL_DAYS:-180}
@@ -144,6 +147,7 @@ services:
migrate: {condition: service_completed_successfully} migrate: {condition: service_completed_successfully}
minio: {condition: service_healthy} minio: {condition: service_healthy}
minio-init: {condition: service_completed_successfully} minio-init: {condition: service_completed_successfully}
media-init: {condition: service_completed_successfully}
healthcheck: healthcheck:
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/ready')"] test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/ready')"]
interval: 10s interval: 10s
@@ -152,6 +156,8 @@ services:
networks: [backend, edge] networks: [backend, edge]
security_opt: [no-new-privileges:true] security_opt: [no-new-privileges:true]
logging: *default-logging logging: *default-logging
volumes:
- media_data:/app/runtime-media
deploy: deploy:
resources: resources:
limits: {cpus: "1.00", memory: 1G} limits: {cpus: "1.00", memory: 1G}
@@ -173,6 +179,19 @@ services:
resources: resources:
limits: {cpus: "0.50", memory: 256M} limits: {cpus: "0.50", memory: 256M}
media-init:
build:
context: .
dockerfile: apps/api/Dockerfile
restart: "no"
user: "0:0"
command: ["sh", "-c", "python -c \"from pathlib import Path; from rf4_research.media_store import bootstrap_media_store; print(bootstrap_media_store(Path('/app/data/media'), Path('/app/runtime-media')))\" && chown -R 10001:10001 /app/runtime-media"]
volumes:
- media_data:/app/runtime-media
networks: [backend]
security_opt: [no-new-privileges:true]
logging: *default-logging
web: web:
build: build:
context: ./apps/web context: ./apps/web
@@ -213,7 +232,7 @@ services:
S3_SECRET_KEY: ${S3_SECRET_KEY:?Set S3_SECRET_KEY} S3_SECRET_KEY: ${S3_SECRET_KEY:?Set S3_SECRET_KEY}
SEED_DEMO_DATA: "false" SEED_DEMO_DATA: "false"
RATE_LIMIT_SECRET: ${RATE_LIMIT_SECRET:?Set RATE_LIMIT_SECRET} RATE_LIMIT_SECRET: ${RATE_LIMIT_SECRET:?Set RATE_LIMIT_SECRET}
TRUSTED_PROXY_CIDRS: '${TRUSTED_PROXY_CIDRS:-"127.0.0.1/32,::1/128"}' TRUSTED_PROXY_CIDRS: '${TRUSTED_PROXY_CIDRS:-"172.30.0.0/24,127.0.0.1/32,::1/128"}'
COMMUNITY_IMPORT_INTERVAL_SECONDS: ${COMMUNITY_IMPORT_INTERVAL_SECONDS:-1800} COMMUNITY_IMPORT_INTERVAL_SECONDS: ${COMMUNITY_IMPORT_INTERVAL_SECONDS:-1800}
RF4MAP_POINT_URL: ${RF4MAP_POINT_URL:-https://rf4map.ru/points/275} RF4MAP_POINT_URL: ${RF4MAP_POINT_URL:-https://rf4map.ru/points/275}
RF4POSTS_SPOT_URL: ${RF4POSTS_SPOT_URL:-https://rf4-posts.com/ru/spots/d0c6d9c6-4ebf-49a7-98a8-9a562553a8ee} RF4POSTS_SPOT_URL: ${RF4POSTS_SPOT_URL:-https://rf4-posts.com/ru/spots/d0c6d9c6-4ebf-49a7-98a8-9a562553a8ee}
@@ -243,11 +262,15 @@ services:
networks: networks:
edge: edge:
ipam:
config:
- subnet: ${EDGE_NETWORK_SUBNET:-172.30.0.0/24}
backend: backend:
internal: true internal: true
volumes: volumes:
postgres_data: postgres_data:
minio_data: minio_data:
media_data:
caddy_data: caddy_data:
caddy_config: caddy_config:
+4 -4
View File
@@ -20,8 +20,8 @@ services:
MINIO_ROOT_USER: ${S3_ACCESS_KEY:-rf4-local} MINIO_ROOT_USER: ${S3_ACCESS_KEY:-rf4-local}
MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY:-rf4-local-secret} MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY:-rf4-local-secret}
ports: ports:
- "9000:9000" - "${RF4_BIND_ADDRESS:-127.0.0.1}:9000:9000"
- "9001:9001" - "${RF4_BIND_ADDRESS:-127.0.0.1}:9001:9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-fsS", "http://localhost:9000/minio/health/live"] test: ["CMD", "curl", "-fsS", "http://localhost:9000/minio/health/live"]
interval: 5s interval: 5s
@@ -75,7 +75,7 @@ services:
minio-init: minio-init:
condition: service_completed_successfully condition: service_completed_successfully
ports: ports:
- "8000:8000" - "${RF4_BIND_ADDRESS:-127.0.0.1}:8000:8000"
healthcheck: healthcheck:
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/ready')"] test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/ready')"]
interval: 5s interval: 5s
@@ -104,7 +104,7 @@ services:
api: api:
condition: service_healthy condition: service_healthy
ports: ports:
- "4321:4321" - "${RF4_BIND_ADDRESS:-127.0.0.1}:4321:4321"
healthcheck: healthcheck:
test: ["CMD", "node", "-e", "fetch('http://localhost:4321').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"] test: ["CMD", "node", "-e", "fetch('http://localhost:4321').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"]
interval: 5s interval: 5s
+3 -3
View File
@@ -116,20 +116,20 @@ curl -fsS https://rf4spotter.ru/ready
## 6. Резервное копирование и восстановление ## 6. Резервное копирование и восстановление
Храните копии вне диска приложения. Скрипт создаёт PostgreSQL dump, архив MinIO и контрольные суммы в новом каталоге с UTC-временем: Храните копии вне диска приложения. Скрипт создаёт PostgreSQL dump, архив MinIO, архив persistent media store и контрольные суммы в новом каталоге с UTC-временем. Media manifest и файлы решений восстанавливаются вместе с provenance:
```bash ```bash
./deploy/backup.sh /srv/rf4-backups ./deploy/backup.sh /srv/rf4-backups
``` ```
Восстановление заменяет содержимое PostgreSQL и MinIO данными из выбранной копии, временно останавливая API и web. Это намеренно защищённая подтверждением операция: Восстановление заменяет содержимое PostgreSQL, MinIO и persistent media store данными из выбранной копии, временно останавливая API и web. Это намеренно защищённая подтверждением операция:
```bash ```bash
CONFIRM_RESTORE=rf4-spotter ./deploy/restore.sh /srv/rf4-backups/20260906T120000Z CONFIRM_RESTORE=rf4-spotter ./deploy/restore.sh /srv/rf4-backups/20260906T120000Z
curl -fsS https://rf4spotter.ru/ready curl -fsS https://rf4spotter.ru/ready
``` ```
Репозиторий содержит изолированный drill, который создаёт отдельные Compose volumes, портит тестовые данные, восстанавливает их и сравнивает PostgreSQL и MinIO: Репозиторий содержит изолированный drill, который создаёт отдельные Compose volumes, портит тестовые данные, восстанавливает их и сравнивает PostgreSQL, MinIO и media store:
```bash ```bash
./deploy/test-backup-restore.sh ./deploy/test-backup-restore.sh
+7 -1
View File
@@ -21,6 +21,9 @@ fi
mkdir -p "$target" mkdir -p "$target"
chmod 700 "$target" chmod 700 "$target"
export BACKUP_DIRECTORY="$backup_root" export BACKUP_DIRECTORY="$backup_root"
media_tmp=$(mktemp -d "$backup_root/.rf4-media-backup.XXXXXX")
cleanup() { rm -rf "$media_tmp"; }
trap cleanup EXIT INT TERM
env_file=${COMPOSE_ENV_FILE:-.env.production} env_file=${COMPOSE_ENV_FILE:-.env.production}
compose="docker compose --env-file $env_file -f compose.production.yaml" compose="docker compose --env-file $env_file -f compose.production.yaml"
@@ -28,6 +31,9 @@ $compose exec -T db sh -c 'pg_dump --format=custom --no-owner --no-acl -U "$POST
$compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null && mc stat "local/$S3_BUCKET" >/dev/null && mc mirror --overwrite "local/$S3_BUCKET" "/backup/'"$stamp"'/minio" && chmod -R a+rwX "/backup/'"$stamp"'/minio"' $compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null && mc stat "local/$S3_BUCKET" >/dev/null && mc mirror --overwrite "local/$S3_BUCKET" "/backup/'"$stamp"'/minio" && chmod -R a+rwX "/backup/'"$stamp"'/minio"'
tar -czf "$target/minio.tar.gz" -C "$target" minio tar -czf "$target/minio.tar.gz" -C "$target" minio
rm -rf "$target/minio" rm -rf "$target/minio"
(cd "$target" && sha256sum postgres.dump minio.tar.gz > SHA256SUMS) $compose cp api:/app/runtime-media/. "$media_tmp/"
tar -czf "$target/media.tar.gz" -C "$media_tmp" .
(cd "$target" && sha256sum postgres.dump minio.tar.gz media.tar.gz > SHA256SUMS)
chmod 600 "$target/postgres.dump" "$target/minio.tar.gz" "$target/SHA256SUMS" chmod 600 "$target/postgres.dump" "$target/minio.tar.gz" "$target/SHA256SUMS"
chmod 600 "$target/media.tar.gz"
echo "Backup created: $target" echo "Backup created: $target"
+4
View File
@@ -14,12 +14,15 @@ esac
source_dir=${1%/} source_dir=${1%/}
test -f "$source_dir/postgres.dump" test -f "$source_dir/postgres.dump"
test -f "$source_dir/minio.tar.gz" test -f "$source_dir/minio.tar.gz"
test -f "$source_dir/media.tar.gz"
(cd "$source_dir" && sha256sum -c SHA256SUMS) (cd "$source_dir" && sha256sum -c SHA256SUMS)
backup_root=$(dirname "$source_dir") backup_root=$(dirname "$source_dir")
export BACKUP_DIRECTORY="$backup_root" export BACKUP_DIRECTORY="$backup_root"
restore_tmp=$(mktemp -d "$backup_root/.rf4-restore.XXXXXX") restore_tmp=$(mktemp -d "$backup_root/.rf4-restore.XXXXXX")
trap 'rm -rf "$restore_tmp"' EXIT INT TERM trap 'rm -rf "$restore_tmp"' EXIT INT TERM
tar -xzf "$source_dir/minio.tar.gz" -C "$restore_tmp" tar -xzf "$source_dir/minio.tar.gz" -C "$restore_tmp"
mkdir -p "$restore_tmp/media"
tar -xzf "$source_dir/media.tar.gz" -C "$restore_tmp/media"
restore_name=$(basename "$restore_tmp") restore_name=$(basename "$restore_tmp")
env_file=${COMPOSE_ENV_FILE:-.env.production} env_file=${COMPOSE_ENV_FILE:-.env.production}
@@ -27,5 +30,6 @@ compose="docker compose --env-file $env_file -f compose.production.yaml"
$compose stop api web $compose stop api web
$compose exec -T db sh -c 'pg_restore --clean --if-exists --exit-on-error --no-owner --no-acl -U "$POSTGRES_USER" -d "$POSTGRES_DB"' < "$source_dir/postgres.dump" $compose exec -T db sh -c 'pg_restore --clean --if-exists --exit-on-error --no-owner --no-acl -U "$POSTGRES_USER" -d "$POSTGRES_DB"' < "$source_dir/postgres.dump"
$compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null && mc stat "local/$S3_BUCKET" >/dev/null && mc rm --recursive --force "local/$S3_BUCKET" >/dev/null 2>&1 && mc mirror --overwrite "/backup/'"$restore_name"'/minio" "local/$S3_BUCKET"' $compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null && mc stat "local/$S3_BUCKET" >/dev/null && mc rm --recursive --force "local/$S3_BUCKET" >/dev/null 2>&1 && mc mirror --overwrite "/backup/'"$restore_name"'/minio" "local/$S3_BUCKET"'
tar -cf - -C "$restore_tmp/media" . | $compose run --rm --no-deps -T api sh -c 'find /app/runtime-media -mindepth 1 -delete && tar -xf - -C /app/runtime-media'
$compose up -d ${RESTORE_START_SERVICES:-minio api web proxy} $compose up -d ${RESTORE_START_SERVICES:-minio api web proxy}
echo "Restore completed from: $source_dir" echo "Restore completed from: $source_dir"
+8 -1
View File
@@ -8,6 +8,8 @@ project="rf4-restore-drill-$$"
export COMPOSE_PROJECT_NAME="$project" export COMPOSE_PROJECT_NAME="$project"
export COMPOSE_ENV_FILE=.env.production.example export COMPOSE_ENV_FILE=.env.production.example
export BACKUP_DIRECTORY="$drill_root" export BACKUP_DIRECTORY="$drill_root"
export POSTGRES_PASSWORD=restore-drill-postgres-password
export DATABASE_URL=postgresql+psycopg://rf4:restore-drill-postgres-password@db:5432/rf4_spotter
compose="docker compose --env-file $COMPOSE_ENV_FILE -f compose.production.yaml" compose="docker compose --env-file $COMPOSE_ENV_FILE -f compose.production.yaml"
cleanup() { cleanup() {
@@ -18,8 +20,11 @@ trap cleanup EXIT INT TERM
$compose up -d --wait db minio $compose up -d --wait db minio
$compose run --rm minio-init $compose run --rm minio-init
$compose run --rm media-init
$compose up -d --wait api
$compose exec -T db sh -c 'psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "create table restore_drill (value text primary key); insert into restore_drill values ('"'"'database-ok'"'"');"' >/dev/null $compose exec -T db sh -c 'psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "create table restore_drill (value text primary key); insert into restore_drill values ('"'"'database-ok'"'"');"' >/dev/null
$compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null; mc stat "local/$S3_BUCKET" >/dev/null; printf object-ok | mc pipe "local/$S3_BUCKET/restore-drill.txt"' >/dev/null $compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null; mc stat "local/$S3_BUCKET" >/dev/null; printf object-ok | mc pipe "local/$S3_BUCKET/restore-drill.txt"' >/dev/null
$compose exec -T api sh -c 'printf media-ok > /app/runtime-media/restore-drill.txt'
./deploy/backup.sh "$drill_root" ./deploy/backup.sh "$drill_root"
backup=$(find "$drill_root" -mindepth 1 -maxdepth 1 -type d ! -name '.rf4-restore.*' | head -n 1) backup=$(find "$drill_root" -mindepth 1 -maxdepth 1 -type d ! -name '.rf4-restore.*' | head -n 1)
@@ -29,6 +34,8 @@ $compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http:
CONFIRM_RESTORE=rf4-spotter RESTORE_START_SERVICES=minio ./deploy/restore.sh "$backup" CONFIRM_RESTORE=rf4-spotter RESTORE_START_SERVICES=minio ./deploy/restore.sh "$backup"
db_value=$($compose exec -T db sh -c 'psql -At -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "select value from restore_drill;"') db_value=$($compose exec -T db sh -c 'psql -At -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "select value from restore_drill;"')
object_value=$($compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null; mc cat "local/$S3_BUCKET/restore-drill.txt"') object_value=$($compose run --rm --entrypoint /bin/sh storage-tool -c 'mc alias set local http://minio:9000 "$S3_ACCESS_KEY" "$S3_SECRET_KEY" >/dev/null; mc cat "local/$S3_BUCKET/restore-drill.txt"')
media_value=$($compose run --rm --no-deps api sh -c 'cat /app/runtime-media/restore-drill.txt')
test "$db_value" = "database-ok" test "$db_value" = "database-ok"
test "$object_value" = "object-ok" test "$object_value" = "object-ok"
echo "Backup/restore drill passed for PostgreSQL and MinIO" test "$media_value" = "media-ok"
echo "Backup/restore drill passed for PostgreSQL, MinIO, and media decisions"
Loaded 100 of 127 files, more files were not shown because too many files have changed in this diff. Show more