Here you can set a custom color scale for speed colored routes. It uses color stops at specified km/h values and creates a gradient from it. The default value is 0:#00ff00|15:#00ffff|30:#ff00ff|50:#ffff00|100:#ff3300
+
+ You can also use the 'Edit Scale' button to edit it using an UI.
+
From a9041c74ac3fc2462efc2b2349f574c83e861ce7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Apr 2025 17:57:50 +0000
Subject: [PATCH 04/16] Bump pry-byebug from 3.10.1 to 3.11.0
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.10.1...v3.11.0)
---
updated-dependencies:
- dependency-name: pry-byebug
dependency-version: 3.11.0
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
Gemfile.lock | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b682dbc..df02da8a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,7 +104,7 @@ GEM
brakeman (7.0.2)
racc
builder (3.3.0)
- byebug (11.1.3)
+ byebug (12.0.0)
chartkick (5.1.4)
coderay (1.1.3)
concurrent-ruby (1.3.5)
@@ -263,12 +263,12 @@ GEM
prism (1.4.0)
prometheus_exporter (2.2.0)
webrick
- pry (0.14.2)
+ pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
- pry-byebug (3.10.1)
- byebug (~> 11.0)
- pry (>= 0.13, < 0.15)
+ pry-byebug (3.11.0)
+ byebug (~> 12.0)
+ pry (>= 0.13, < 0.16)
pry-rails (0.3.11)
pry (>= 0.13.0)
psych (5.2.3)
From e2d0b73f565623893d439c16d05c9c2c1c0ba7d0 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin
Date: Fri, 18 Apr 2025 20:04:32 +0200
Subject: [PATCH 05/16] Update changelog
---
CHANGELOG.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 095e92e0..06a9b5c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,19 +22,23 @@ This is optional feature and is not required for the app to work.
## Removed
-- Optional telemetry was removed from the app.
-- Sidekiq Web UI is now protected by basic auth in non-self-hosted mode.
+- Optional telemetry was removed from the app. The `ENABLE_TELEMETRY` env var can be safely removed from docker compose.
## Changed
- `rake points:migrate_to_lonlat` task now also tries to extract latitude and longitude from `raw_data` column before using `longitude` and `latitude` columns to fill `lonlat` column.
- Docker entrypoints are now using `DATABASE_NAME` environment variable to check if Postgres is existing/available.
+- Sidekiq web UI is now protected by basic auth. Use `SIDEKIQ_USERNAME` and `SIDEKIQ_PASSWORD` environment variables to set the credentials.
## Added
- You can now provide SMTP settings in ENV vars to send emails.
- You can now edit imports. #1044 #623
+## Fixed
+
+- Importing data from Immich now works correctly. #1019
+
# 0.25.4 - 2025-04-02
From 2e53f39a7fd1aa1894a39f52b9ef75b0be82ca78 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin
Date: Sat, 19 Apr 2025 13:18:39 +0200
Subject: [PATCH 06/16] Update import edit view
---
.app_version | 2 +-
CHANGELOG.md | 7 +
.../api/v1/subscriptions_controller.rb | 31 ++++
.../settings/subscriptions_controller.rb | 34 -----
app/services/imports/create.rb | 23 ++-
app/services/subscription/decode_jwt_token.rb | 18 +++
app/views/imports/edit.html.erb | 18 ++-
config/routes.rb | 7 +-
spec/jobs/import/process_job_spec.rb | 4 -
spec/requests/api/v1/subscriptions_spec.rb | 129 ++++++++++++++++
spec/requests/settings/subscriptions_spec.rb | 141 ------------------
spec/services/imports/create_spec.rb | 42 ++++--
12 files changed, 246 insertions(+), 210 deletions(-)
create mode 100644 app/controllers/api/v1/subscriptions_controller.rb
delete mode 100644 app/controllers/settings/subscriptions_controller.rb
create mode 100644 app/services/subscription/decode_jwt_token.rb
create mode 100644 spec/requests/api/v1/subscriptions_spec.rb
delete mode 100644 spec/requests/settings/subscriptions_spec.rb
diff --git a/.app_version b/.app_version
index 16c6b58f..3f44db94 100644
--- a/.app_version
+++ b/.app_version
@@ -1 +1 @@
-0.25.5
+0.25.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a9b5c6..3a8aeaed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+# 0.25.6 - 2025-04-19
+
+## Changed
+
+- Import edit page now allows to edit import name.
+- Importing data now does not create a notification for the user.
+
# 0.25.5 - 2025-04-18
This release introduces a new way to send transactional emails using SMTP. Example may include password reset, email confirmation, etc.
diff --git a/app/controllers/api/v1/subscriptions_controller.rb b/app/controllers/api/v1/subscriptions_controller.rb
new file mode 100644
index 00000000..ef82856a
--- /dev/null
+++ b/app/controllers/api/v1/subscriptions_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Api::V1::SubscriptionsController < ApplicationController
+ before_action :authenticate_user!
+ before_action :authenticate_non_self_hosted!
+
+ # rubocop:disable Metrics/MethodLength
+ def callback
+ token = params[:token]
+
+ begin
+ decoded_token = Subscription::DecodeJwtToken.new(token).call
+
+ unless decoded_token[:user_id] == current_user.id
+ render json: { message: 'Invalid subscription update request.' }, status: :unauthorized
+ return
+ end
+
+ current_user.update!(status: decoded_token[:status], active_until: decoded_token[:active_until])
+
+ render json: { message: 'Subscription updated successfully' }
+ rescue JWT::DecodeError => e
+ Sentry.capture_exception(e)
+ render json: { message: 'Failed to verify subscription update.' }, status: :unauthorized
+ rescue ArgumentError => e
+ Sentry.capture_exception(e)
+ render json: { message: 'Invalid subscription data received.' }, status: :unprocessable_entity
+ end
+ end
+ # rubocop:enable Metrics/MethodLength
+end
diff --git a/app/controllers/settings/subscriptions_controller.rb b/app/controllers/settings/subscriptions_controller.rb
deleted file mode 100644
index 05c39cbd..00000000
--- a/app/controllers/settings/subscriptions_controller.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class Settings::SubscriptionsController < ApplicationController
- before_action :authenticate_user!
- before_action :authenticate_non_self_hosted!
-
- def index; end
-
- def subscription_callback
- token = params[:token]
-
- begin
- decoded_token = JWT.decode(
- token,
- ENV['JWT_SECRET_KEY'],
- true,
- { algorithm: 'HS256' }
- ).first.symbolize_keys
-
- unless decoded_token[:user_id] == current_user.id
- redirect_to settings_subscriptions_path, alert: 'Invalid subscription update request.'
- return
- end
-
- current_user.update!(status: decoded_token[:status], active_until: decoded_token[:active_until])
-
- redirect_to settings_subscriptions_path, notice: 'Your subscription has been updated successfully!'
- rescue JWT::DecodeError
- redirect_to settings_subscriptions_path, alert: 'Failed to verify subscription update.'
- rescue ArgumentError
- redirect_to settings_subscriptions_path, alert: 'Invalid subscription data received.'
- end
- end
-end
diff --git a/app/services/imports/create.rb b/app/services/imports/create.rb
index 7ad60d36..4f2b22c8 100644
--- a/app/services/imports/create.rb
+++ b/app/services/imports/create.rb
@@ -11,8 +11,6 @@ class Imports::Create
def call
parser(import.source).new(import, user.id).call
- create_import_finished_notification(import, user)
-
schedule_stats_creating(user.id)
schedule_visit_suggesting(user.id, import)
update_import_points_count(import)
@@ -53,21 +51,22 @@ class Imports::Create
VisitSuggestingJob.perform_later(user_id:, start_at:, end_at:)
end
- def create_import_finished_notification(import, user)
- Notifications::Create.new(
- user:,
- kind: :info,
- title: 'Import finished',
- content: "Import \"#{import.name}\" successfully finished."
- ).call
- end
-
def create_import_failed_notification(import, user, error)
+ message = import_failed_message(import, error)
+
Notifications::Create.new(
user:,
kind: :error,
title: 'Import failed',
- content: "Import \"#{import.name}\" failed: #{error.message}, stacktrace: #{error.backtrace.join("\n")}"
+ content: message
).call
end
+
+ def import_failed_message(import, error)
+ if DawarichSettings.self_hosted?
+ "Import \"#{import.name}\" failed: #{error.message}, stacktrace: #{error.backtrace.join("\n")}"
+ else
+ "Import \"#{import.name}\" failed, please contact us at hi@dawarich.com"
+ end
+ end
end
diff --git a/app/services/subscription/decode_jwt_token.rb b/app/services/subscription/decode_jwt_token.rb
new file mode 100644
index 00000000..40a97fae
--- /dev/null
+++ b/app/services/subscription/decode_jwt_token.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Subscription::DecodeJwtToken
+ def initialize(token)
+ @token = token
+ end
+
+ # Merges multiple visits into one
+ # @return [Visit, nil] The merged visit or nil if merge failed
+ def call
+ JWT.decode(
+ token,
+ ENV['JWT_SECRET_KEY'],
+ true,
+ { algorithm: 'HS256' }
+ ).first.symbolize_keys
+ end
+end
diff --git a/app/views/imports/edit.html.erb b/app/views/imports/edit.html.erb
index 7a2cdd7d..aa576cc4 100644
--- a/app/views/imports/edit.html.erb
+++ b/app/views/imports/edit.html.erb
@@ -1,8 +1,20 @@