Documentation fixes and such

res/include/md/about.md

@@ -40,14 +40,17 @@ The following types of content are not allowed to be shared on pixeldrain. They
 will be removed when reported.
 
  * **Copyright violation**: Works which are shared without permission from the
-   copyright holder.
+   copyright holder. For copyright reports we need a formal DMCA takedown
+   request originating from the copyright holder or a representative. If your
+   request is not valid it will be ignored. Takedown requests which are sent to
+   any other address than abuse@pixeldrain.com will also be ignored.
  * **Abuse of minors**: Videos, images or audio fragments depicting abuse or
    inappropriate touching of minors will be removed and reported to the National
    Center for Missing and Exploited Children when found.
  * **Terrorism**: Videos, images or audio fragments which promote and
    glorify acts of terrorism.
  * **Gore**: Graphic and shocking videos or images depicting severe harm to
-   humans.
+   humans (or animals).
  * **Malware and computer viruses**: Software designed to cause harm to computer
    systems.
 

res/include/md/hosting.md

@@ -17,8 +17,8 @@ Keep in mind that these are maximums, you are allowed to go lower.
 
 | Requirement              | Max rate EUR | Max rate SC |
 |--------------------------|--------------|-------------|
-| Storage price per month  | € 2.00 / TB  | {{ div 2.0 $price | formatSC }} / TB |
-| Download price           | € 3.00 / TB  | {{ div 3.0 $price | formatSC }} / TB |
+| Storage price per month  | € 1.80 / TB  | {{ div 1.8 $price | formatSC }} / TB |
+| Download price           | € 2.50 / TB  | {{ div 2.5 $price | formatSC }} / TB |
 | Upload price             | € 2.00 / TB  | {{ div 2.0 $price | formatSC }} / TB |
 | Collateral per month     | € 8.00 / TB  | {{ div 8.0 $price | formatSC }} / TB |
 | Contract formation price | € 0.10       | {{ div 0.1 $price | formatSC }} |

res/include/script/admin.js

@@ -208,7 +208,9 @@ function getStats(order) {
 			<td>${v.position}</td>
 			<td>${v.reachable}</td>
 			<td>${v.unreachable_count}</td>
-			<td>${v.load_1_min} ${v.load_5_min} ${v.load_15_min}</td>
+			<td>${v.load_1_min}</td>
+			<td>${v.load_5_min}</td>
+			<td>${v.load_15_min}</td>
 			<td>${formatDuration(v.latency)}</td>
 			<td>${formatDataVolume(v.free_space, 3)}</td>
 			<td>${formatDataVolume(v.min_free_space, 3)}</td>`
@@ -256,4 +258,4 @@ function getStats(order) {
 }
 getStats("calls")
 
-setInterval(() => { getStats(lastOrder) }, 5000)
+setInterval(() => { getStats(lastOrder) }, 10000)

res/include/script/dependencies/drawGraph.js

@@ -36,7 +36,7 @@ function drawGraph(element, label, dataType) {
 							position: "left",
 							id: "ax_1",
 							ticks: {
-								callback: function(value, index, values) {
+								callback: function (value, index, values) {
 									if (dataType == "bytes") {
 										return formatDataVolume(value, 3);
 									}
@@ -44,7 +44,7 @@ function drawGraph(element, label, dataType) {
 								},
 								beginAtZero: true
 							},
-							gridLines: { display: false },
+							gridLines: { display: true },
 						}
 					],
 					xAxes: [

res/include/script/file_viewer/viewer_scripts/AudioViewer.js

@@ -8,7 +8,7 @@ function AudioViewer(viewer, file, next) {
 	this.container.appendChild(document.createElement("br"))
 
 	this.icon = document.createElement("img")
-	this.icon.src = "/res/img/mime/audio.png"
+	this.icon.src = "/api/file/" + this.file.id + "/thumbnail"
 	this.container.appendChild(this.icon)
 
 	this.container.appendChild(document.createElement("br"))

res/include/style/file_manager.css

@@ -127,7 +127,6 @@ is collapsed */
 }
 .node > div > span {
 	margin: auto;
-	margin-top: 4px; /* I couldn't find another way to vertically align the text*/
 	box-sizing: border-box;
 	display: block;
 	text-overflow: ellipsis;

res/include/style/layout.css

@@ -298,6 +298,10 @@ p, .indent {
 	margin: 10px;
 }
 
+li {
+	margin-bottom: 0.5em;
+}
+
 hr{
 	height: 1px;
 	border: none;

res/template/admin.html

@@ -79,11 +79,13 @@
 						<thead>
 							<tr>
 								<td>Address</td>
-								<td>Pos.</td>
-								<td>Reachable</td>
-								<td>Errs</td>
-								<td>Load avg</td>
-								<td>Latency</td>
+								<td>Pos</td>
+								<td>Alive</td>
+								<td>Err</td>
+								<td>1m</td>
+								<td>5m</td>
+								<td>15m</td>
+								<td>Ping</td>
 								<td>Free</td>
 								<td>Min free</td>
 							</tr>

res/template/server_status.html

@@ -17,7 +17,7 @@
 	<body>
 		{{template "page_menu" .}}
 		<div id="page_body" class="page_body" style="padding: 0; top: 0; bottom: 0;">
-			<iframe src="https://status.pixeldrain.com" class="status_frame"></iframe>
+			<iframe src="https://stats.uptimerobot.com/p9v2ktzyjm" class="status_frame"></iframe>
 		</div>
 		{{template "analytics"}}
 	</body>

webcontroller/file_viewer.go

@@ -36,7 +36,7 @@ func adType() int {
 		soulStudio         = 3
 		amarulaSolutions   = 4
 		adMaven            = 5
-		propellerAds       = 7
+		brave              = 7
 		pdpro1             = 8
 		pdpro2             = 9
 		pdpro3             = 10
@@ -49,18 +49,20 @@ func adType() int {
 	switch i := rand.Intn(20); i {
 	case 0, 1: // 10%
 		return amarulaSolutions
-	case 2: // 5%, also shows propellerads
+	case 2: // 5%
 		return pdpro1
-	case 3: // 5%, also shows propellerads
+	case 3: // 5%
 		return pdpro2
-	case 4: // 5%, also shows propellerads
+	case 4: // 5%
 		return pdpro3
-	case 5: // 5%, also shows propellerads
+	case 5: // 5%
 		return pdpro4
-	default: // 70%, also shows a-ads
-		return propellerAds
-		// default:
-		// 	panic(fmt.Errorf("random number generator returned unrecognised number: %d", i))
+	case 6, 7, 8, 9, 10, 11, 12, 13, 14, 15: // 50%
+		return brave
+	case 16, 17, 18, 19: // 20%
+		return aAds
+	default:
+		panic(fmt.Errorf("random number generator returned unrecognised number: %d", i))
 	}
 }