Merge branch 'master' of github.com:iv-org/invidious
This commit is contained in:
commit
57694c8a02
2
.github/workflows/auto-close-duplicate.yaml
vendored
2
.github/workflows/auto-close-duplicate.yaml
vendored
|
@ -21,7 +21,7 @@ jobs:
|
|||
# Get issues with state to compare. Supported state: 'all', 'closed', 'open'.
|
||||
state: open
|
||||
# If similarity is higher than this threshold([0,1]), issue will be marked as duplicate.
|
||||
threshold: 0.6
|
||||
threshold: 0.9
|
||||
# Reactions to be add to comment when potential duplicates are detected.
|
||||
# Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes"
|
||||
reactions: ''
|
||||
|
|
|
@ -57,8 +57,9 @@ end
|
|||
# Simple alias to make code easier to read
|
||||
alias IV = Invidious
|
||||
|
||||
CONFIG = Config.load
|
||||
HMAC_KEY = CONFIG.hmac_key || Random::Secure.hex(32)
|
||||
CONFIG = Config.load
|
||||
HMAC_KEY_CONFIGURED = CONFIG.hmac_key != nil
|
||||
HMAC_KEY = CONFIG.hmac_key || Random::Secure.hex(32)
|
||||
|
||||
PG_DB = DB.open CONFIG.database_url
|
||||
ARCHIVE_URL = URI.parse("https://archive.org")
|
||||
|
@ -230,6 +231,10 @@ Kemal.config.host_binding = Kemal.config.host_binding != "0.0.0.0" ? Kemal.confi
|
|||
Kemal.config.port = Kemal.config.port != 3000 ? Kemal.config.port : CONFIG.port
|
||||
Kemal.config.app_name = "Invidious"
|
||||
|
||||
if !HMAC_KEY_CONFIGURED
|
||||
LOGGER.warn("Please configure hmac_key by July 1st, see more here: https://github.com/iv-org/invidious/issues/3854")
|
||||
end
|
||||
|
||||
# Use in kemal's production mode.
|
||||
# Users can also set the KEMAL_ENV environmental variable for this to be set automatically.
|
||||
{% if flag?(:release) || flag?(:production) %}
|
||||
|
|
|
@ -94,6 +94,14 @@
|
|||
<% end %>
|
||||
|
||||
<div class="bgippan">
|
||||
<% if env.get? "user" %>
|
||||
<% if !HMAC_KEY_CONFIGURED && CONFIG.admins.includes? env.get("user").as(Invidious::User).email %>
|
||||
<div class="h-box">
|
||||
<h3><p>Message for admin: please configure hmac_key, <a href="https://github.com/iv-org/invidious/issues/3854">see more here</a>.</p></h3>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= content %>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue