summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/config.example.yml10
-rw-r--r--docker-compose.yml57
-rw-r--r--locales/en-US.json1
-rw-r--r--locales/es.json3
-rw-r--r--locales/is.json3
-rw-r--r--locales/pl.json35
-rw-r--r--locales/tr.json3
-rw-r--r--src/invidious/config.cr1
-rw-r--r--src/invidious/routes/preferences.cr5
-rw-r--r--src/invidious/routes/watch.cr2
-rw-r--r--src/invidious/user/preferences.cr1
-rw-r--r--src/invidious/views/user/preferences.ecr5
12 files changed, 92 insertions, 34 deletions
diff --git a/config/config.example.yml b/config/config.example.yml
index 59cb486b..e9f0e8f1 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -847,3 +847,13 @@ default_user_preferences:
## Default: false
##
#automatic_instance_redirect: false
+
+ ##
+ ## Show the entire video description by default (when set to 'false',
+ ## only the first few lines of the description are shown and a
+ ## "show more" button allows to expand it).
+ ##
+ ## Accepted values: true, false
+ ## Default: false
+ ##
+ #extend_desc: false
diff --git a/docker-compose.yml b/docker-compose.yml
index c76c314c..cd1df4ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,12 @@
-version: '3'
+# Warning: This docker-compose file is made for development purposes.
+# Using it will build an image from the locally cloned repository.
+#
+# If you want to use Invidious in production, see the docker-compose.yml file provided
+# in the installation documentation: https://docs.invidious.io/Installation.md
+
+version: "3"
services:
- postgres:
- image: postgres:10
- restart: unless-stopped
- volumes:
- - postgresdata:/var/lib/postgresql/data
- - ./config/sql:/config/sql
- - ./docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
- environment:
- POSTGRES_DB: invidious
- POSTGRES_PASSWORD: kemal
- POSTGRES_USER: kemal
- healthcheck:
- test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+
invidious:
build:
context: .
@@ -21,27 +15,42 @@ services:
ports:
- "127.0.0.1:3000:3000"
environment:
- # Adapted from ./config/config.yml
+ # Please read the following file for a comprehensive list of all available
+ # configuration options and their associated syntax:
+ # https://github.com/iv-org/invidious/blob/master/config/config.example.yml
INVIDIOUS_CONFIG: |
- channel_threads: 1
- check_tables: true
- feed_threads: 1
db:
+ dbname: invidious
user: kemal
password: kemal
- host: postgres
+ host: invidious-db
port: 5432
- dbname: invidious
- full_refresh: false
- https_only: false
- domain:
+ check_tables: true
+ # external_port:
+ # domain:
+ # https_only: false
+ # statistics_enabled: false
healthcheck:
test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/comments/jNQXAC9IVRw || exit 1
interval: 30s
timeout: 5s
retries: 2
depends_on:
- - postgres
+ - invidious-db
+
+ invidious-db:
+ image: docker.io/library/postgres:14
+ restart: unless-stopped
+ volumes:
+ - postgresdata:/var/lib/postgresql/data
+ - ./config/sql:/config/sql
+ - ./docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
+ environment:
+ POSTGRES_DB: invidious
+ POSTGRES_USER: kemal
+ POSTGRES_PASSWORD: kemal
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
volumes:
postgresdata:
diff --git a/locales/en-US.json b/locales/en-US.json
index c924c8aa..1335d384 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -65,6 +65,7 @@
"preferences_continue_autoplay_label": "Autoplay next video: ",
"preferences_listen_label": "Listen by default: ",
"preferences_local_label": "Proxy videos: ",
+ "preferences_watch_history_label": "Enable watch history: ",
"preferences_speed_label": "Default speed: ",
"preferences_quality_label": "Preferred video quality: ",
"preferences_quality_option_dash": "DASH (adaptative quality)",
diff --git a/locales/es.json b/locales/es.json
index 24f8dbdf..fbdb13ac 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -458,5 +458,6 @@
"Chinese (China)": "Chino (China)",
"Korean (auto-generated)": "Coreano (generados automáticamente)",
"Spanish (Mexico)": "Español (Méjico)",
- "Spanish (auto-generated)": "Español (generados automáticamente)"
+ "Spanish (auto-generated)": "Español (generados automáticamente)",
+ "preferences_watch_history_label": "Habilitar historial de reproducciones: "
}
diff --git a/locales/is.json b/locales/is.json
index 9258154e..99bd6574 100644
--- a/locales/is.json
+++ b/locales/is.json
@@ -318,5 +318,6 @@
"Videos": "Myndbönd",
"Playlists": "Spilunarlistar",
"Community": "Samfélag",
- "Current version: ": "Núverandi útgáfa: "
+ "Current version: ": "Núverandi útgáfa: ",
+ "preferences_watch_history_label": "Virkja áhorfssögu: "
}
diff --git a/locales/pl.json b/locales/pl.json
index 5c4667f0..0f4e0927 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -21,15 +21,15 @@
"No": "Nie",
"Import and Export Data": "Import i eksport danych",
"Import": "Import",
- "Import Invidious data": "Importuj dane Invidious",
- "Import YouTube subscriptions": "Importuj subskrybcje z YouTube",
+ "Import Invidious data": "Importuj dane JSON Invidious",
+ "Import YouTube subscriptions": "Importuj subskrybcje z YouTube/OPML",
"Import FreeTube subscriptions (.db)": "Importuj subskrybcje z FreeTube (.db)",
"Import NewPipe subscriptions (.json)": "Importuj subskrybcje z NewPipe (.json)",
"Import NewPipe data (.zip)": "Importuj dane NewPipe (.zip)",
"Export": "Eksport",
"Export subscriptions as OPML": "Eksportuj subskrybcje jako OPML",
"Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksportuj subskrybcje jako OPML (dla NewPipe i FreeTube)",
- "Export data as JSON": "Eksportuj dane jako JSON",
+ "Export data as JSON": "Eksportuj dane Invidious jako JSON",
"Delete account?": "Usunąć konto?",
"History": "Historia",
"An alternative front-end to YouTube": "Alternatywny front-end dla YouTube",
@@ -66,7 +66,7 @@
"preferences_related_videos_label": "Pokaż powiązane filmy? ",
"preferences_annotations_label": "Domyślnie pokazuj adnotacje: ",
"preferences_extend_desc_label": "Automatycznie rozwijaj opisy filmów: ",
- "preferences_vr_mode_label": "Interaktywne filmy 360 stopni: ",
+ "preferences_vr_mode_label": "Interaktywne filmy 360 stopni (wymaga WebGL): ",
"preferences_category_visual": "Preferencje Wizualne",
"preferences_player_style_label": "Styl odtwarzacza: ",
"Dark mode: ": "Ciemny motyw: ",
@@ -446,12 +446,35 @@
"Video unavailable": "Film niedostępny",
"preferences_save_player_pos_label": "Zapisz pozycję odtwarzania: ",
"preferences_region_label": "Region zawartości: ",
- "Released under the AGPLv3 on Github.": "Wydane na licencji AGPLv3 na Github'ie.",
+ "Released under the AGPLv3 on Github.": "Wydany na licencji AGPLv3 na Github.",
"short": "Krótkie (< 4 minutes)",
"long": "Długie (> 20 minutes)",
"footer_documentation": "Dokumentacja",
"footer_source_code": "Kod źródłowy",
"footer_modfied_source_code": "Zmodyfikowany Kod źródłowy",
"footer_original_source_code": "Oryginalny kod źródłowy",
- "adminprefs_modified_source_code_url_label": "Adres URL do repozytorium z zmodyfikowanym kodem źródłowym"
+ "adminprefs_modified_source_code_url_label": "Adres URL do repozytorium z zmodyfikowanym kodem źródłowym",
+ "English (United Kingdom)": "angielski (Wielka Brytania)",
+ "English (United States)": "angielski (Stany Zjednoczone)",
+ "Cantonese (Hong Kong)": "kantoński (Hong Kong)",
+ "Chinese": "chiński",
+ "Chinese (China)": "chiński (Chiny)",
+ "Chinese (Hong Kong)": "chiński (Hong Kong)",
+ "Chinese (Taiwan)": "chiński (Tajwan)",
+ "Dutch (auto-generated)": "niderlandzki (wygenerowany automatycznie)",
+ "French (auto-generated)": "francuski (wygenerowany automatycznie)",
+ "German (auto-generated)": "niemiecki (wygenerowany automatycznie)",
+ "Indonesian (auto-generated)": "indonezyjski (wygenerowany automatycznie)",
+ "Interlingue": "interlingue",
+ "Italian (auto-generated)": "włoski (wygenerowany automatycznie)",
+ "Korean (auto-generated)": "koreański (wygenerowany automatycznie)",
+ "Spanish (auto-generated)": "hiszpański (wygenerowany automatycznie)",
+ "Spanish (Mexico)": "hiszpański (Meksyk)",
+ "Spanish (Spain)": "hiszpański (Hiszpania)",
+ "Turkish (auto-generated)": "turecki (wygenerowany automatycznie)",
+ "Vietnamese (auto-generated)": "wietnamski (wygenerowany automatycznie)",
+ "Japanese (auto-generated)": "japoński (wygenerowany automatycznie)",
+ "Russian (auto-generated)": "rosyjski (wygenerowany automatycznie)",
+ "Portuguese (auto-generated)": "portugalski (wygenerowany automatycznie)",
+ "Portuguese (Brazil)": "portugalski (Brazylia)"
}
diff --git a/locales/tr.json b/locales/tr.json
index 65648fd7..094728fa 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -460,5 +460,6 @@
"German (auto-generated)": "Almanca (otomatik oluşturuldu)",
"Portuguese (auto-generated)": "Portekizce (otomatik oluşturuldu)",
"Spanish (Spain)": "İspanyolca (İspanya)",
- "Vietnamese (auto-generated)": "Vietnamca (otomatik oluşturuldu)"
+ "Vietnamese (auto-generated)": "Vietnamca (otomatik oluşturuldu)",
+ "preferences_watch_history_label": "İzleme geçmişini etkinleştir: "
}
diff --git a/src/invidious/config.cr b/src/invidious/config.cr
index 72e145da..280de702 100644
--- a/src/invidious/config.cr
+++ b/src/invidious/config.cr
@@ -23,6 +23,7 @@ struct ConfigPreferences
property listen : Bool = false
property local : Bool = false
property locale : String = "en-US"
+ property watch_history : Bool = true
property max_results : Int32 = 40
property notifications_only : Bool = false
property player_style : String = "invidious"
diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.cr
index 68d61fd1..570cba69 100644
--- a/src/invidious/routes/preferences.cr
+++ b/src/invidious/routes/preferences.cr
@@ -47,6 +47,10 @@ module Invidious::Routes::PreferencesRoute
local ||= "off"
local = local == "on"
+ watch_history = env.params.body["watch_history"]?.try &.as(String)
+ watch_history ||= "off"
+ watch_history = watch_history == "on"
+
speed = env.params.body["speed"]?.try &.as(String).to_f32?
speed ||= CONFIG.default_user_preferences.speed
@@ -149,6 +153,7 @@ module Invidious::Routes::PreferencesRoute
latest_only: latest_only,
listen: listen,
local: local,
+ watch_history: watch_history,
locale: locale,
max_results: max_results,
notifications_only: notifications_only,
diff --git a/src/invidious/routes/watch.cr b/src/invidious/routes/watch.cr
index 42bc4219..f5454bb5 100644
--- a/src/invidious/routes/watch.cr
+++ b/src/invidious/routes/watch.cr
@@ -75,7 +75,7 @@ module Invidious::Routes::Watch
end
env.params.query.delete_all("iv_load_policy")
- if watched && !watched.includes? id
+ if watched && preferences.watch_history && !watched.includes? id
Invidious::Database::Users.mark_watched(user.as(User), id)
end
diff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.cr
index bf7ea401..8ecbe7a0 100644
--- a/src/invidious/user/preferences.cr
+++ b/src/invidious/user/preferences.cr
@@ -23,6 +23,7 @@ struct Preferences
property latest_only : Bool = CONFIG.default_user_preferences.latest_only
property listen : Bool = CONFIG.default_user_preferences.listen
property local : Bool = CONFIG.default_user_preferences.local
+ property watch_history : Bool = CONFIG.default_user_preferences.watch_history
property vr_mode : Bool = CONFIG.default_user_preferences.vr_mode
property show_nick : Bool = CONFIG.default_user_preferences.show_nick
diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr
index 3606d140..dbb5e9db 100644
--- a/src/invidious/views/user/preferences.ecr
+++ b/src/invidious/views/user/preferences.ecr
@@ -207,6 +207,11 @@
<legend><%= translate(locale, "preferences_category_subscription") %></legend>
<div class="pure-control-group">
+ <label for="watch_history"><%= translate(locale, "preferences_watch_history_label") %></label>
+ <input name="watch_history" id="watch_history" type="checkbox" <% if preferences.watch_history %>checked<% end %>>
+ </div>
+
+ <div class="pure-control-group">
<label for="annotations_subscribed"><%= translate(locale, "preferences_annotations_subscribed_label") %></label>
<input name="annotations_subscribed" id="annotations_subscribed" type="checkbox" <% if preferences.annotations_subscribed %>checked<% end %>>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-17 19:16:52 +0000