starred/shiori
1
0
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2026-04-25 06:25:54 +03:00
Code Issues 103 Projects Releases 10 Packages Wiki Activity

[PR #775] [MERGED] refactor: migrate bookmark static pages to new http server #783

New issue
Closed
opened 2026-02-25 23:35:27 +03:00 by kerem · 0 comments
kerem commented 2026-02-25 23:35:27 +03:00
Owner
Copy link

📋 Pull Request Information

Original PR: https://github.com/go-shiori/shiori/pull/775
Author: @fmartingr
Created: 11/11/2023
Status: ✅ Merged
Merged: 12/28/2023
Merged by: @fmartingr

Base: master ← Head: feat/bookmark-http-new

📝 Commits (10+)

  • e08a22c migrate bookmark content route to new http server
  • 4159d5e new archive page
  • 776b86b Merge remote-tracking branch 'origin/master' into feat/bookmark-http-new
  • 46f5645 Merge remote-tracking branch 'origin/master' into feat/bookmark-http-new
  • 1b49d90 remove unused go generate comment
  • bb84c19 database mock
  • 600e741 utils cleanup
  • 887d23f unused var
  • 68f12ef domains refactor and tests
  • 7a2ad09 Merge remote-tracking branch 'origin/master' into feat/bookmark-http-new

📊 Changes

65 files changed (+1319 additions, -916 deletions)

View changed files

📝 Makefile (+5 -0)
📝 docs/Configuration.md (+30 -12)
📝 go.mod (+1 -1)
📝 go.sum (+2 -0)
📝 internal/cmd/add.go (+2 -2)
📝 internal/cmd/check.go (+1 -1)
📝 internal/cmd/import.go (+2 -2)
📝 internal/cmd/pocket.go (+2 -2)
📝 internal/cmd/root.go (+8 -4)
📝 internal/cmd/server.go (+5 -2)
📝 internal/cmd/update.go (+2 -2)
📝 internal/cmd/utils.go (+1 -1)
📝 internal/config/config.go (+3 -3)
➖ internal/config/dependencies.go (+0 -25)
📝 internal/core/ebook.go (+7 -8)
📝 internal/core/ebook_test.go (+55 -57)
📝 internal/core/processing.go (+14 -42)
📝 internal/core/processing_test.go (+31 -56)
📝 internal/database/database.go (+3 -3)
📝 internal/database/database_test.go (+15 -15)

...and 45 more files

📄 Description

  • Migrate /bookmark/:id/content to new http server
  • Migrate /bookmark/:id/thumb to new http server
  • Migrate /bookmark/:id/archive to new http server
    • Refactor archive bookmark template to be a static file with an iframe to the actual archive rather than modifying the archive HTML to include arbitrary HTML
  • Rename symbol model.Bookmark into model.BookmarkDTO to prepare future changes
  • Create BookmarkDomain to perform operations with Bookmarks
    • HasEbook
    • HasArchive
    • GetThumbnailPath
    • HasThumbnail
    • GetBookmark
    • GetBookmarkContentsFromArchive
  • ArchiverDomain
    • GetBookmarkArchive
  • StorageDomain
  • Domain unit testing
  • Database mock
  • Use afero as filesystem abstraction

Fixes #751

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-shiori/shiori/pull/775 **Author:** [@fmartingr](https://github.com/fmartingr) **Created:** 11/11/2023 **Status:** ✅ Merged **Merged:** 12/28/2023 **Merged by:** [@fmartingr](https://github.com/fmartingr) **Base:** `master` ← **Head:** `feat/bookmark-http-new` --- ### 📝 Commits (10+) - [`e08a22c`](https://github.com/go-shiori/shiori/commit/e08a22c5bf807b43226b92d194209f0e939b6087) migrate bookmark content route to new http server - [`4159d5e`](https://github.com/go-shiori/shiori/commit/4159d5e810735fa4b5e99e8d2d659d9d4e70caca) new archive page - [`776b86b`](https://github.com/go-shiori/shiori/commit/776b86ba5303165c3c43b4cb9949af07f8ead968) Merge remote-tracking branch 'origin/master' into feat/bookmark-http-new - [`46f5645`](https://github.com/go-shiori/shiori/commit/46f56454014397d8713219cc821fa2233093c6c1) Merge remote-tracking branch 'origin/master' into feat/bookmark-http-new - [`1b49d90`](https://github.com/go-shiori/shiori/commit/1b49d90ede7eaa7898012721cbb21cc68fa2179d) remove unused go generate comment - [`bb84c19`](https://github.com/go-shiori/shiori/commit/bb84c19c47d794e8679db3b38f89e8b1e9695062) database mock - [`600e741`](https://github.com/go-shiori/shiori/commit/600e74192705809f58b12122d83862569cebf0fa) utils cleanup - [`887d23f`](https://github.com/go-shiori/shiori/commit/887d23fab2115c3deb0889157cef7ab837f0b4e4) unused var - [`68f12ef`](https://github.com/go-shiori/shiori/commit/68f12efb33a486133da999da0f031a4d2eb397dd) domains refactor and tests - [`7a2ad09`](https://github.com/go-shiori/shiori/commit/7a2ad09d7ecf574feb20158cf900b9d1578f4af4) Merge remote-tracking branch 'origin/master' into feat/bookmark-http-new ### 📊 Changes **65 files changed** (+1319 additions, -916 deletions) <details> <summary>View changed files</summary> 📝 `Makefile` (+5 -0) 📝 `docs/Configuration.md` (+30 -12) 📝 `go.mod` (+1 -1) 📝 `go.sum` (+2 -0) 📝 `internal/cmd/add.go` (+2 -2) 📝 `internal/cmd/check.go` (+1 -1) 📝 `internal/cmd/import.go` (+2 -2) 📝 `internal/cmd/pocket.go` (+2 -2) 📝 `internal/cmd/root.go` (+8 -4) 📝 `internal/cmd/server.go` (+5 -2) 📝 `internal/cmd/update.go` (+2 -2) 📝 `internal/cmd/utils.go` (+1 -1) 📝 `internal/config/config.go` (+3 -3) ➖ `internal/config/dependencies.go` (+0 -25) 📝 `internal/core/ebook.go` (+7 -8) 📝 `internal/core/ebook_test.go` (+55 -57) 📝 `internal/core/processing.go` (+14 -42) 📝 `internal/core/processing_test.go` (+31 -56) 📝 `internal/database/database.go` (+3 -3) 📝 `internal/database/database_test.go` (+15 -15) _...and 45 more files_ </details> ### 📄 Description - [x] Migrate `/bookmark/:id/content` to new http server - [x] Migrate `/bookmark/:id/thumb` to new http server - [x] Migrate `/bookmark/:id/archive` to new http server - [x] Refactor archive bookmark template to be a static file with an iframe to the actual archive rather than modifying the archive HTML to include arbitrary HTML - [x] Rename symbol `model.Bookmark` into `model.BookmarkDTO` to prepare future changes - [x] Create `BookmarkDomain` to perform operations with Bookmarks - [x] `HasEbook` - [x] `HasArchive` - [x] `GetThumbnailPath` - [x] `HasThumbnail` - [x] `GetBookmark` - [x] `GetBookmarkContentsFromArchive` - [x] `ArchiverDomain` - [x] `GetBookmarkArchive` - [x] `StorageDomain` - [x] Domain unit testing - [x] Database mock - [x] Use [`afero`](https://github.com/spf13/afero) as filesystem abstraction Fixes #751 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-25 23:35:27 +03:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
master
dependabot/go_modules/all-ad9dc7761f
dependabot/github_actions/all-7ab03d418b
dependabot/go_modules/golang.org/x/crypto-0.45.0
dependabot/go_modules/github.com/docker/docker-28.3.3incompatible
feat/bookmarks-api-v1
dependabot/npm_and_yarn/webapp/npm_and_yarn-7372c7abf2
deps/update202509
feat/pdf-archiver
feat/apiv1/tags
release/v1.7
fix/thumbnail-cache
gh-pages
fix/openbsd-test-speed
release/v1.6.1
release/v1.6.0
fmartingr/windows-tests
afero-removal
ci/windows-macos
feat/cookie-auth
webroot-support-new-server
fix/secret-key-makefile
frontend-jwt-auth
fmartingr/issue663
fix/remove-tag-package-name
fmartingr/issue455
fix/delete-pr-tags
feat/cross-api-authentication
feat/api-v1-to-master
release/v1.5.5
feat/api-next
release/v1.5.5-rc.2
deps/go-1.20
fix/bookmark-update
draft/gorm
v1.8.0
v1.8.0-rc.1
v1.7.4
v1.7.3
v1.7.2
v1.7.2-rc.1
v1.7.1
v1.7.0
v1.7.0-rc.3
v1.7.0-rc.2
v1.7.0-rc.1
v1.6.3
v1.6.2
v1.6.1
v1.6.0
v1.6.0-rc.7
v1.6.0-rc.6
v1.6.0-rc.5
v1.6.0-rc.4
v1.6.0-rc.3
v1.6.0-rc.2
v1.6.0-rc.1
v1.5.5
v1.5.5-rc.2
v1.5.5-rc.1
v1.5.4
v1.5.3
v1.5.2
v1.5.1
v1.5.0
v1.0
v0.9
Labels
Clear labels   
component:backend

   
component:builds

   
component:builds

   
component:extension

   
component:frontend

   
component:readability

   
database

   
database:mysql

   
database:postgres

   
database:sqlite

   
feature:ebooks

   
github_actions

   
good first issue

   
hacktoberfest

   
note:duplicate?

   
note:fixed?

   
note:out-of-scope?

   
os:windows

   
priority:high

   
priority:low

   
pull-request

Mirrored from GitHub Pull Request

  
resolution:as-intended

   
resolution:cant-reproduce

   
resolution:duplicate

   
resolution:fixed

   
resolution:wontfix

   
tag:TBD

   
tag:big-task

   
tag:help-wanted

   
tag:huge-data

   
tag:meta

   
tag:more-info

   
tag:next

   
tag:no-stale

   
tag:requires-migrations

   
tag:research

   
tag:security 🛡️

   
tag:stale

   
tag:waiting-for-assignee

   
type:bug

   
type:documentation

   
type:enhancement

   
type:meta

   
type:ux

   
user:cli

   
user:web
No labels
component:backend
component:builds
component:builds
component:extension
component:frontend
component:readability
database
database:mysql
database:postgres
database:sqlite
feature:ebooks
github_actions
good first issue
hacktoberfest
note:duplicate?
note:fixed?
note:out-of-scope?
os:windows
priority:high
priority:low
pull-request
resolution:as-intended
resolution:cant-reproduce
resolution:duplicate
resolution:fixed
resolution:wontfix
tag:TBD
tag:big-task
tag:help-wanted
tag:huge-data
tag:meta
tag:more-info
tag:next
tag:no-stale
tag:requires-migrations
tag:research
tag:security 🛡️
tag:stale
tag:waiting-for-assignee
type:bug
type:documentation
type:enhancement
type:meta
type:ux
user:cli
user:web
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/shiori#783
No description provided.