Updated some Nunjucks files and home.js
Updated options in _globals.njk to NOT use camelCase. Rephrased banned categories. Added toggle option for banned categories into faq.njk. Added FAQ message about Tor and/or VPNs being blocked. Updated faq.njk and cookiepolicy.njk for updated option names. Updated cookie settings for Cookie Consent in home.js. Now it will only enable Secure cookie if on HTTPS protocol. This should properly store the cookie in local installations. Bumped v1 version string and rebuilt client assets.
This commit is contained in:
Bobby Wibowo
parent
c36a76e981
commit
58cbcdd1fe
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1074,8 +1074,9 @@ window.onload = () => {
|
|||
window.cookieconsent.initialise({
|
||||
cookie: {
|
||||
name: 'cookieconsent_status',
|
||||
path: window.location.pathname,
|
||||
expiryDays: 730,
|
||||
secure: true
|
||||
secure: window.location.protocol === 'https:'
|
||||
},
|
||||
palette: {
|
||||
popup: {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"1": "1590439689",
|
||||
"1": "1590617686",
|
||||
"2": "1589010026",
|
||||
"3": "1581416390",
|
||||
"4": "1581416390",
|
||||
|
|
|
|||
|
|
@ -7,18 +7,21 @@
|
|||
{% set home_subtitle = "A <strong>modern</strong> self-hosted file upload service" %} {# HTML supported #}
|
||||
|
||||
{# Used in faq.njk and cookiepolicy.njk #}
|
||||
{% set rootDomain = "fiery.me" %}
|
||||
{% set wholeFaq = rootDomain + " website and sub-domains" %}
|
||||
{% set wholeCookie = "This site and " + rootDomain + " website and sub-domains" %}
|
||||
{% set root_domain = "fiery.me" %}
|
||||
{% set whole_faq = root_domain + " website and sub-domains" %}
|
||||
{% set whole_cookie = "This site and " + root_domain + " website and sub-domains" %}
|
||||
{% set email = "bobby@fiery.me" %}
|
||||
|
||||
{% set forkRepo = "https://github.com/BobbyWibowo/lolisafe" %}
|
||||
{% set forkHost = "GitHub" %}
|
||||
{% set forkIssues = forkRepo + "/issues/new/choose" %}
|
||||
{% set fork_repo = "https://github.com/BobbyWibowo/lolisafe" %}
|
||||
{% set fork_host = "GitHub" %}
|
||||
{% set fork_issues = fork_repo + "/issues/new/choose" %}
|
||||
|
||||
{% set takedownsUrl = "https://safe.fiery.me/takedowns" %}
|
||||
{% set supportFaq = 'Thanks! You can become a patron on my <a href="https://www.patreon.com/bobbywibowo" target="_blank" rel="noopener">Patreon</a>!' %} {# HTML supported #}
|
||||
{% set serverLocation = "Paris, <strong>France</strong>" %} {# HTML supported #}
|
||||
{% set takedowns_url = "https://safe.fiery.me/takedowns" %}
|
||||
{% set server_location = "Paris, <strong>France</strong>" %} {# HTML supported #}
|
||||
{% set support = 'Thanks! You can become a patron on my <a href="https://www.patreon.com/bobbywibowo" target="_blank" rel="noopener">Patreon</a>!' %} {# HTML supported #}
|
||||
|
||||
{% set enable_faq_banned_categories = true %}
|
||||
{% set enable_faq_tor = true %}
|
||||
|
||||
{#
|
||||
These are the footer links in the homepage and the No-JS uploader (home.njk & nojs.njk respectively).
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<div class="container has-text-left">
|
||||
<h1 class='title'>Cookie Policy</h1>
|
||||
<h1 class="subtitle">
|
||||
{{ globals.wholeCookie }} may use cookies. This page describe how and why we use cookies.
|
||||
{{ globals.whole_cookie }} may use cookies. This page describe how and why we use cookies.
|
||||
</h1>
|
||||
<hr>
|
||||
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
<h2 class='subtitle is-brighter'>What about cookies?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
{{ globals.wholeCookie }} may place cookies on your browser in order to identify you when you return to our website.
|
||||
{{ globals.whole_cookie }} may place cookies on your browser in order to identify you when you return to our website.
|
||||
</div>
|
||||
</article>
|
||||
|
||||
|
|
@ -84,103 +84,103 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<th>chunkSize</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>cid</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Analytics</td>
|
||||
<td>730</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>cookieconsent_status</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>730</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>fileLength</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>parallelUploads</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>previewImages</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>render</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>selectedUploads</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>selectedUploadsAll</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>selectedUsers</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>siBytes</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>stripTags</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>token</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>uploadAge</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>uploadsHistoryOrder</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Personalization</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>viewTypeUploads</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>viewTypeUploadsAll</th>
|
||||
<td>{{ globals.rootDomain }}</td>
|
||||
<td>{{ globals.root_domain }}</td>
|
||||
<td>Necessary</td>
|
||||
<td>LocalStorage</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -23,33 +23,36 @@
|
|||
<article class="message">
|
||||
<div class="message-body">
|
||||
This is a fork of <a href="https://github.com/WeebDev/lolisafe" target="_blank" rel="noopener">lolisafe</a>.<br>
|
||||
{{ globals.forkHost }} repository of the fork is located <a href="{{ globals.forkRepo }}" target="_blank" rel="noopener">here</a>.
|
||||
{{ globals.fork_host }} repository of the fork is located <a href="{{ globals.fork_repo }}" target="_blank" rel="noopener">here</a>.
|
||||
</div>
|
||||
</article>
|
||||
|
||||
{% if globals.enable_faq_banned_categories -%}
|
||||
<h2 class='subtitle is-brighter'>Are there any <strong>banned categories</strong>?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
Banned categories are the following, <i>but not limited to</i>:<br>
|
||||
<strong>Child pornography.</strong><br>
|
||||
Virus/malware, or anything Google Safe Search would categorize as <i>unwanted software</i> *.<br>
|
||||
Copyrighted content. Meaning I will respond to copyright takedown notices,... <i>if any</i>.<br>
|
||||
<strong>Full-length episodes of anime or TV shows.</strong> These include <strong>audio files from CD dramas</strong>.<br>
|
||||
Copyrighted content. Meaning I will respond to copyright takedown notices,.. if any.<br>
|
||||
<strong>Full-length episodes of cartoons, TV shows or movies of any kind.</strong> Japanese, Chinese, Antarcticaness, I don't care.<br>
|
||||
CD drama audio files. I only know of Japanese shows that have these, but regardless of nationality.<br>
|
||||
<br>
|
||||
Any of such uploads, when found, will be purged immediately without any prior notice.<br>
|
||||
Repeat offenders will have their IPs permanently blocked from accessing {{ globals.wholeFaq }}.<br>
|
||||
Repeat offenders will have their IPs permanently blocked from accessing {{ globals.whole_faq }}.<br>
|
||||
For child pornography specifically, first offenders will immediately be blocked permanently.<br>
|
||||
<br>
|
||||
* When Google Safe Search detects <i>unwanted software</i>, Chrome's users will be alerted that anything they download from {{ globals.wholeFaq }} are <i>unsafe</i>.
|
||||
* When Google Safe Search detects <i>unwanted software</i>, Chrome's users will be alerted that anything they download from {{ globals.whole_faq }} are <i>unsafe</i>.
|
||||
</div>
|
||||
</article>
|
||||
{%- endif %}
|
||||
|
||||
<h2 class='subtitle is-brighter'>Will you keep my uploads forever?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
Unless the uploads are included within the banned categories above, or some other bullshit, I will.<br>
|
||||
{% if globals.takedownsUrl -%}
|
||||
In case I have to take down any uploads, I will log their names and explanations in <a href="{{ globals.takedownsUrl }}" target="_blank">here</a>.<br>
|
||||
{% if globals.takedowns_url -%}
|
||||
In case I have to take down any uploads, I will log their names and explanations in <a href="{{ globals.takedowns_url }}" target="_blank">here</a>.<br>
|
||||
{%- endif %}
|
||||
<br>
|
||||
Otherwise, we also have temporary uploads feature, with which you can have your uploads be automatically deleted after a period of time.<br>
|
||||
|
|
@ -90,11 +93,11 @@
|
|||
</div>
|
||||
</article>
|
||||
|
||||
{% if globals.supportFaq -%}
|
||||
{% if globals.support -%}
|
||||
<h2 class='subtitle is-brighter'>How can I support {{ globals.name }}?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
{{ globals.supportFaq | safe }}
|
||||
{{ globals.support | safe }}
|
||||
</div>
|
||||
</article>
|
||||
{%- endif %}
|
||||
|
|
@ -131,11 +134,11 @@
|
|||
</div>
|
||||
</article>
|
||||
|
||||
{% if globals.serverLocation -%}
|
||||
{% if globals.server_location -%}
|
||||
<h2 class='subtitle is-brighter'>Where is the server located?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
{{ globals.serverLocation | safe }}.
|
||||
{{ globals.server_location | safe }}.
|
||||
{% if config.cloudflare.purgeCache -%}
|
||||
<br>
|
||||
We are using <a href="https://www.cloudflare.com/cdn/" target="_blank" rel="noopener">Cloudflare</a> though, so you can expect your uploads to be delivered quickly all over the world after they have been cached.
|
||||
|
|
@ -154,6 +157,18 @@
|
|||
</article>
|
||||
{%- endif %}
|
||||
|
||||
{% if globals.enable_faq_tor -%}
|
||||
<h2 class='subtitle is-brighter'>I cannot access this website with Tor and/or VPNs!?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
My server is actively refreshing and blacklisting Tor exit nodes.<br>
|
||||
There have been too many child pornography uploaders using Tor, that they simply didn't care about individual IPs being banned.<br>
|
||||
Sometimes I might also end up blacklisting IP ranges that were known to come from VPNs, if there had been attempts with multiple of those IPs.<br>
|
||||
Nothing much I can do about it. We live in a society.
|
||||
</div>
|
||||
</article>
|
||||
{%- endif %}
|
||||
|
||||
<h2 class='subtitle is-brighter'>Are there any Desktop clients?</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
|
|
@ -202,12 +217,12 @@
|
|||
</article>
|
||||
{%- endif %}
|
||||
|
||||
{% if globals.forkRepo -%}
|
||||
{% if globals.fork_repo -%}
|
||||
<h2 class='subtitle is-brighter'>I found a bug! -or- I want to request a feature!</h2>
|
||||
<article class="message">
|
||||
<div class="message-body">
|
||||
Feel free to create a {{ globals.forkHost }} issue <a href="{{ globals.forkIssues }}" target="_blank" rel="noopener">here</a>.</br>
|
||||
If you do not have a {{ globals.forkHost }} account, you can also email <a href="mailto:{{ globals.email }}">{{ globals.email }}</a>.
|
||||
Feel free to create a {{ globals.fork_host }} issue <a href="{{ globals.fork_issues }}" target="_blank" rel="noopener">here</a>.</br>
|
||||
If you do not have a {{ globals.fork_host }} account, you can also email <a href="mailto:{{ globals.email }}">{{ globals.email }}</a>.
|
||||
</div>
|
||||
</article>
|
||||
{%- endif %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue