Merge pull request #1633 from booklore-app/develop

Merge develop into master for the release

Author: acx10

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,28 +7,40 @@ assignees: ''
 
 ---
 
-# Bug Report Template for Booklore
+# 🐛 Bug Report for Booklore
 
-**What happened?**  
-Please describe the problem or issue you encountered in Booklore.
+Thank you for helping us improve Booklore! Please fill out the sections below.
+
+---
+
+## 📝 What happened?
+<!-- Describe the bug in a few sentences -->
+
+
+## 🔄 Steps to Reproduce
+<!-- Walk us through the exact steps to see the bug -->
+1. Go to '...'
+2. Click on '...'
+3. Scroll down to '...'
+4. See error
+
+## ✅ Expected Behavior
+<!-- What should have happened instead? -->
+
+
+## 📸 Screenshots / Error Messages
+<!-- Add screenshots or paste error messages (drag & drop images here) -->
 
-**How can we see it happen?**  
-Steps to reproduce the issue:  
-1. Open Booklore and go to ‘…’  
-2. Do ‘…’ (like adding a book, editing details, etc.)  
-3. Notice what goes wrong  
 
-**What did you expect to happen?**  
-Tell us what you thought should happen instead.
+## 💻 Environment
+- **Version:** (e.g., v1.1.0)
+- **OS:** (e.g., Windows 11, macOS Sonoma, Ubuntu 22.04)
+- **Browser:** (e.g., Chrome 120, Firefox 121, Safari 17)
+- **Installation:** (e.g., Docker, Unraid, Manual)
 
-**Screenshots or Error Messages**  
-If you can, please share screenshots or any error messages you saw. It really helps!
+## 📌 Additional Context
+<!-- Recent changes? Specific books? Anything else that might help? -->
 
-**About your setup:**  
-- Booklore version (e.g., v0.35.0)  
-- What computer or device are you using? (Windows, Mac, Linux, etc.)  
-- Which browser and version? (Chrome, Firefox, Safari, etc.)  
-- How did you install Booklore? (Docker, manual install, etc.)
 
-**Anything else we should know?**  
-Any other info that might help us understand the issue better.
+## ✨ Possible Solution _(Optional)_
+<!-- Have ideas on how to fix this? Share them here! -->

README.md

@@ -6,13 +6,6 @@
 ![Docker Pulls](https://img.shields.io/docker/pulls/booklore/booklore?color=2496ED)
 [![Join us on Discord](https://img.shields.io/badge/Chat-Discord-5865F2?logo=discord&style=flat)](https://discord.gg/Ee5hd458Uz)
 [![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/booklore?label=Open%20Collective&logo=opencollective&color=7FADF2)](https://opencollective.com/booklore)
-> 🚨 **Important Announcement:**  
-> Docker images have moved to new repositories:
-> - Docker Hub: `https://hub.docker.com/r/booklore/booklore`
-> - GitHub Container Registry: `https://ghcr.io/booklore-app/booklore`
->
-> The legacy repo (`https://ghcr.io/adityachandelgit/booklore-app`) will remain available for existing images but will not receive further updates.
-
 
 BookLore is a self-hosted web app for organizing and managing your personal book collection. It provides an intuitive interface to browse, read, and track your progress across PDFs and eBooks. With robust metadata management, multi-user support, and a sleek, modern UI, BookLore makes it easy to
 build and explore your personal library.
@@ -44,7 +37,6 @@ If you find **BookLore** helpful, please consider supporting its development:
 - 💸 Contribute via [Open Collective](https://opencollective.com/booklore) to help fund development, hosting, and testing costs.
   > 📌 Currently raising funds for a **Kobo device** to implement and test native Kobo sync support.  
   > 💡 [Support the Kobo Sync Bounty →](https://opencollective.com/booklore/projects/kobo-device-for-testing)
-- ⚡ Prefer one-time support? You can also donate via [Venmo](https://venmo.com/AdityaChandel).
 
 ## 🌐 Live Demo: Explore BookLore in Action
 
@@ -71,9 +63,6 @@ Our up-to-date docs walk you through installation, setup, configuration, and key
 > 💡 **Want to improve the documentation?**  
 > You can update the docs at [booklore-app/booklore-docs](https://github.com/booklore-app/booklore-docs) and create a pull request to contribute your changes!
 
-🎥 [BookLore Tutorials: YouTube](https://www.youtube.com/watch?v=UMrn_fIeFRo&list=PLi0fq0zaM7lqY7dX0R66jQtKW64z4_Tdz)  
-These older videos provide useful walkthroughs and visual guidance, but note that some content may be outdated compared to the current docs.
-
 ## 🐳 Deploy with Docker
 
 You can quickly set up and run BookLore using Docker.
@@ -202,26 +191,6 @@ services:
       - ./bookdrop:/bookdrop # 👈 Bookdrop directory
 ```
 
-## 🔑 OIDC/OAuth2 Authentication (Authentik, Pocket ID, etc.)
-
-BookLore supports optional OIDC/OAuth2 authentication for secure access. This feature allows you to integrate external authentication providers for a seamless login experience.
-
-While the integration has been tested with **Authentik** and **Pocket ID**, it should work with other OIDC providers like **Authelia** as well. The setup allows you to use either JWT-based local authentication or external providers, giving users the flexibility to choose their preferred method.
-
-For detailed instructions on setting up OIDC authentication:
-
-- 📺 [YouTube video on configuring Authentik with BookLore](https://www.youtube.com/watch?v=r6Ufh9ldF9M)
-- 📘 [Step-by-step setup guide for Pocket ID](docs/OIDC-Setup-With-PocketID.md)
-
-## 🛡️ Forward Auth with Reverse Proxy
-
-BookLore also supports **Forward Auth** (also known as Remote Auth) for authentication through reverse proxies like **Traefik**, **Nginx**, or **Caddy**. Forward Auth works by having your reverse proxy handle authentication and pass user information via HTTP headers to BookLore. This can be set up
-with providers like **Authelia** and **Authentik**.
-
-For detailed setup instructions and configuration examples:
-
-- 📘 [Complete Forward Auth Setup Guide](docs/forward-auth-with-proxy.md)
-
 ## 🤝 Community & Support
 
 - 🐞 Found a bug? [Open an issue](https://github.com/adityachandelgit/BookLore/issues)

booklore-api/src/main/java/com/adityachandel/booklore/config/BeanConfig.java

@@ -2,15 +2,26 @@
 
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.socket.config.WebSocketMessageBrokerStats;
 
+import java.time.Duration;
+
 @Configuration
 public class BeanConfig {
 
     @Autowired
     private WebSocketMessageBrokerStats webSocketMessageBrokerStats;
 
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder builder) {
+        return builder.connectTimeout(Duration.ofSeconds(10)).readTimeout(Duration.ofSeconds(15))
+                .build();
+    }
+
     @PostConstruct
     public void init() {
         webSocketMessageBrokerStats.setLoggingPeriod(30 * 24 * 60 * 60 * 1000L); // 30 days

booklore-api/src/main/java/com/adityachandel/booklore/model/DuplicateFileInfo.java

@@ -14,6 +14,4 @@
 public class FileProcessResult {
     private final Book book;
     private final FileProcessStatus status;
-    @Builder.Default
-    private final DuplicateFileInfo duplicate = null;
 }

booklore-api/src/main/java/com/adityachandel/booklore/model/FileProcessResult.java

@@ -25,5 +25,6 @@ public class KoboSnapshotBookEntity {
     private Long bookId;
 
     @Column(nullable = false)
+    @Builder.Default
     private boolean synced = false;
 }

booklore-api/src/main/java/com/adityachandel/booklore/model/dto/DuplicateFileNotification.java

@@ -23,9 +23,11 @@ public class KoboUserSettingsEntity {
     private String token;
 
     @Column(name = "sync_enabled")
+    @Builder.Default
     private boolean syncEnabled = true;
 
     @Column(name = "progress_mark_as_reading_threshold")
+    @Builder.Default
     private Float progressMarkAsReadingThreshold = 1f;
 
     @Column(name = "progress_mark_as_finished_threshold")

booklore-api/src/main/java/com/adityachandel/booklore/model/entity/KoboSnapshotBookEntity.java

@@ -28,12 +28,14 @@ public class KoreaderUserEntity {
     private String passwordMD5;
 
     @Column(name = "created_at", nullable = false, updatable = false)
+    @Builder.Default
     private Instant createdAt = Instant.now();
 
     @Column(name = "updated_at")
     private Instant updatedAt;
 
     @Column(name = "sync_enabled", nullable = false)
+    @Builder.Default
     private boolean syncEnabled = false;
 
     @OneToOne(fetch = FetchType.LAZY)

booklore-api/src/main/java/com/adityachandel/booklore/model/entity/KoboUserSettingsEntity.java

@@ -37,9 +37,11 @@ public class MagicShelfEntity {
     private boolean isPublic = false;
 
     @Column(name = "created_at", nullable = false, updatable = false)
+    @lombok.Builder.Default
     private LocalDateTime createdAt = LocalDateTime.now();
 
     @Column(name = "updated_at", nullable = false)
+    @lombok.Builder.Default
     private LocalDateTime updatedAt = LocalDateTime.now();
 
     @PreUpdate