Merge branch 'safe.fiery.me' into browser-ecma6

README.md

@@ -74,14 +74,14 @@ Here is a tutorial [on how to do this with nginx](https://www.digitalocean.com/c
 
 - [lolisafe.moe](https://lolisafe.moe): A small safe worth protecting.
 - [safe.moe](https://safe.moe): The world's most ~~un~~safe pomf clone
-- [updx.xyz](http://updx.xyz): A shitty clone. ~~At least the files are more secure!~~
 - [safe.fiery.me](https://safe.fiery.me): Just another clone.
-- [kayo.pics](https://kayo.pics): File hosting for all~
+- [kayo.moe](https://kayo.moe): File hosting for all~
 - [dmca.gripe](https://dmca.gripe): a dmca-resistant, permanent file hosting service.
 - [succmy.wang](https://succmy.wang): A private clone with a funny name
 - [i-want-to.2dgirls.date](https://i-want-to.2dgirls.date): A clone that screams what you want
 - [namir.in](https://namir.in): A private clone dedicated to best girl.
 - [safe.waliant.pw](https://safe.waliant.pw): A generic private clone for personal use.
+- [a.hyper.lol](https://a.hyper.lol): My personal clone with some ~~terrible~~ great changes.
 - Feel free to add yours here.
 
 ## Author

controllers/uploadController.js

@@ -63,7 +63,7 @@ const upload = multer({
     const extname = path.extname(file.originalname).toLowerCase()
     if (uploadsController.isExtensionFiltered(extname)) {
       // eslint-disable-next-line standard/no-callback-literal
-      cb(`${extname.substr(1).toUpperCase()} files are not permitted for security reasons.`)
+      return cb(`${extname.substr(1).toUpperCase()} files are not permitted due to security reasons.`)
     }
 
     // Re-map Dropzone keys so people can manually use the API without prepending 'dz'
@@ -163,7 +163,7 @@ uploadsController.actuallyUpload = async (req, res, user, albumid) => {
   }
 
   upload(req, res, async error => {
-    if (error) { return erred(error.message) }
+    if (error) { return erred(error) }
 
     if (!req.files || !req.files.length) { return erred('No files.') }
 
@@ -212,7 +212,7 @@ uploadsController.actuallyUploadByUrl = async (req, res, user, albumid) => {
     const original = path.basename(url).split(/[?#]/)[0]
     const extension = path.extname(original)
     if (uploadsController.isExtensionFiltered(extension)) {
-      return erred(`${extension.substr(1).toUpperCase()} files are not permitted for security reasons.`)
+      return erred(`${extension.substr(1).toUpperCase()} files are not permitted due to security reasons.`)
     }
 
     const head = await snekfetch.head(url)
@@ -322,7 +322,7 @@ uploadsController.actuallyFinishChunks = async (req, res, user, albumid) => {
 
       const extension = typeof file.original === 'string' ? path.extname(file.original) : ''
       if (uploadsController.isExtensionFiltered(extension)) {
-        return erred(`${extension.substr(1).toUpperCase()} files are not permitted for security reasons.`)
+        return erred(`${extension.substr(1).toUpperCase()} files are not permitted due to security reasons.`)
       }
 
       const length = uploadsController.getFileNameLength(req)

public/css/album.css

@@ -1,7 +1,3 @@
-html {
-  background-color: #232629;
-}
-
 .section {
   background: none;
 }

public/css/dashboard.css

@@ -3,10 +3,6 @@
   display: none
 }
 
-html {
-  background-color: #232629;
-}
-
 .section {
   background: none;
 }

public/css/style.css

@@ -1,9 +1,8 @@
 html {
-  overflow-y: auto;
+  background-color: #232629;
 }
 
-.hero {
-  background-color: #232629;
+body {
   color: #eff0f1;
 }
 

views/_globals.njk

@@ -13,7 +13,7 @@
   v2: Images and config files (manifest.json, browserconfig.xml, etc).
   v3: CSS and JS files (libs such as bulma, lazyload, etc).
 #}
-{% set v1 = "dSRVE9qwPF" %}
+{% set v1 = "BvoZYURztW" %}
 {% set v2 = "Ii3JYKIhb0" %}
 {% set v3 = "HrvcYD3KTh" %}
 

views/auth.njk

@@ -16,7 +16,7 @@
 
 {% block content %}
 {{ super() }}
-<section id="login" class="hero is-fullheight" style="background-color: #232629">
+<section id="login" class="hero is-fullheight">
   <div class="hero-body">
     <div class="container">
       <div class="columns is-centered">