diff --git a/svelte/src/admin_panel/AbuseReport.svelte b/svelte/src/admin_panel/AbuseReport.svelte index 545a173..c5a6f00 100644 --- a/svelte/src/admin_panel/AbuseReport.svelte +++ b/svelte/src/admin_panel/AbuseReport.svelte @@ -61,7 +61,6 @@ let set_status = async (action, report_type) => {
- diff --git a/svelte/src/admin_panel/BlockFiles.svelte b/svelte/src/admin_panel/BlockFiles.svelte index 78eb727..cec6e78 100644 --- a/svelte/src/admin_panel/BlockFiles.svelte +++ b/svelte/src/admin_panel/BlockFiles.svelte @@ -16,7 +16,6 @@ let block_form = { type: "radio", radio_values: [ "copyright", - "porn", "child_abuse", "zoophilia", "terrorism", diff --git a/svelte/src/admin_panel/IPBans.svelte b/svelte/src/admin_panel/IPBans.svelte index ff3e523..5a8e18f 100644 --- a/svelte/src/admin_panel/IPBans.svelte +++ b/svelte/src/admin_panel/IPBans.svelte @@ -13,7 +13,6 @@ const abuse_types = [ "malware", "doxing", "revenge_porn", - "porn", ] let loading = true diff --git a/svelte/src/admin_panel/PeerTable.svelte b/svelte/src/admin_panel/PeerTable.svelte index c7ead31..50aea63 100644 --- a/svelte/src/admin_panel/PeerTable.svelte +++ b/svelte/src/admin_panel/PeerTable.svelte @@ -8,6 +8,7 @@ $: update_peers(peers) let update_peers = (peers) => { for (let peer of peers) { peer.avg_network_total = peer.avg_network_tx + peer.avg_network_rx + peer.usage_percent = (peer.avg_network_tx / peer.port_speed) * 100 peer.network_ratio = Math.max(peer.avg_network_tx, peer.avg_network_rx) / Math.min(peer.avg_network_tx, peer.avg_network_rx) if (peer.network_ratio === NaN) { peer.network_ratio = 1 @@ -55,7 +56,6 @@ let sort = (field) => { Hostname - Address Err Load Ping @@ -63,6 +63,7 @@ let sort = (field) => { RX Rat Tot + Use% Free Min free @@ -77,7 +78,6 @@ let sort = (field) => { animate:flip={{duration: 1000}} > {peer.hostname} - {peer.ip} {peer.unreachable_count} {peer.load_1_min.toFixed(1)} / {peer.load_5_min.toFixed(1)} / {peer.load_15_min.toFixed(1)} {(peer.latency/1000).toFixed(3)} @@ -85,13 +85,14 @@ let sort = (field) => { {formatDataVolume(peer.avg_network_rx, 3)}/s {peer.network_ratio.toFixed(2)} {formatDataVolume(peer.avg_network_total, 3)}/s + {Math.round(peer.usage_percent)}% {formatDataVolume(peer.free_space, 4)} {formatDataVolume(peer.min_free_space, 3)} {/each} - Total ({peers.length}) + Total ({peers.length}) {peers.reduce((acc, val) => acc += val.unreachable_count, 0)} {peers.reduce((acc, val) => acc += val.load_1_min, 0).toFixed(1)} / @@ -103,11 +104,12 @@ let sort = (field) => { {formatDataVolume(peers.reduce((acc, val) => acc += val.avg_network_rx, 0), 3)}/s {peers.reduce((acc, val) => acc += val.network_ratio, 0).toFixed(2)} {formatDataVolume(peers.reduce((acc, val) => acc += val.avg_network_total, 0), 3)}/s + {Math.round(peers.reduce((acc, val) => acc += val.usage_percent, 0))}% {formatDataVolume(peers.reduce((acc, val) => acc += val.free_space, 0), 4)} {formatDataVolume(peers.reduce((acc, val) => acc += val.min_free_space, 0), 3)} - Average + Average {(peers.reduce((acc, val) => acc += val.load_1_min, 0) / peers.length).toFixed(1)} / @@ -119,6 +121,7 @@ let sort = (field) => { {formatDataVolume(peers.reduce((acc, val) => acc += val.avg_network_rx, 0) / peers.length, 3)}/s {(peers.reduce((acc, val) => acc += val.network_ratio, 0) / peers.length).toFixed(2)} {formatDataVolume(peers.reduce((acc, val) => acc += val.avg_network_total, 3) / peers.length, 4)}/s + {Math.round(peers.reduce((acc, val) => acc += val.usage_percent, 0) / peers.length)}% {formatDataVolume(peers.reduce((acc, val) => acc += val.free_space, 0) / peers.length, 4)} {formatDataVolume(peers.reduce((acc, val) => acc += val.min_free_space, 0) / peers.length, 3)} diff --git a/svelte/src/file_viewer/ReportWindow.svelte b/svelte/src/file_viewer/ReportWindow.svelte index 887a275..e84d510 100644 --- a/svelte/src/file_viewer/ReportWindow.svelte +++ b/svelte/src/file_viewer/ReportWindow.svelte @@ -31,38 +31,41 @@ const filter_app = type => { const abuse_categories = [ { - type: "porn", name: "Porn", - desc: `Sexually explicit videos or images`, - filter: filter_visual, - }, { - type: "terrorism", name: "Terrorism", + type: "terrorism", + name: "Terrorism", desc: `Videos, images or audio fragments showing or promoting the use of intentional violence to achieve political aims`, filter: filter_audiovisual, }, { - type: "gore", name: "Gore", + type: "gore", + name: "Gore", desc: `Graphic and shocking videos or images depicting severe harm to humans (or animals)`, filter: filter_visual, }, { - type: "child_abuse", name: "Child abuse", + type: "child_abuse", + name: "Child abuse", desc: `Videos or images depicting inappropriate touching or nudity of children under 18 years old`, }, { - type: "zoophilia", name: "Zoophilia", + type: "zoophilia", + name: "Zoophilia", desc: `Videos or images depicting of sexual acts being performed on animals`, }, { - type: "revenge_porn", name: "Revenge porn", - desc: `The distribution of sexually explicit images or videos of - individuals without their consent`, + type: "revenge_porn", + name: "Revenge porn", + desc: `Sexually explicit images or videos of individuals without their + consent and blackmail content`, }, { - type: "doxing", name: "Doxing", + type: "doxing", + name: "Doxing", desc: `Personally identifiable information being shared without the consent of the owner. This includes things like passport scans, e-mail addresses, telephone numbers and passwords`, }, { - type: "malware", name: "Malware", + type: "malware", + name: "Malware", desc: `Software programs designed to cause harm to computer systems`, filter: filter_app, }, @@ -197,8 +200,7 @@ const report_description = () => {

The child abuse category is only for cases where real - children were abused. This is not for fictional works. Use - the 'porn' category in case of animated porn. + children were abused. This is not for fictional works.


diff --git a/svelte/src/file_viewer/viewers/Abuse.svelte b/svelte/src/file_viewer/viewers/Abuse.svelte index 47ae5f6..00d3824 100644 --- a/svelte/src/file_viewer/viewers/Abuse.svelte +++ b/svelte/src/file_viewer/viewers/Abuse.svelte @@ -37,13 +37,11 @@ let file = { {/if}

- {#if file.abuse_type !== "porn"} -

- Pixeldrain has zero tolerance towards abuse. The IP address this file - originated from has been banned and is no longer able to upload files to - pixeldrain. -

- {/if} +

+ Pixeldrain has zero tolerance towards abuse. The IP address this file + originated from has been banned and is no longer able to upload files to + pixeldrain. +

{#if file.can_download}