Remove intro popup, show username on home button

svelte/src/admin_panel/AbuseReport.svelte

@@ -59,6 +59,7 @@ let set_status = async (action, report_type) => {
 				<button on:click={() => {set_status("grant", "child_abuse")}}>child_abuse</button>
 				<button on:click={() => {set_status("grant", "malware")}}>malware</button>
 				<button on:click={() => {set_status("grant", "doxing")}}>doxing</button>
+				<button on:click={() => {set_status("grant", "copyright")}}>copyright</button>
 			</div>
 		</div>
 		<div style="text-align: center;">

svelte/src/file_viewer/BottomBanner.svelte

@@ -6,16 +6,13 @@ let ad_type = ""
 onMount(() => {
 	// 20% pixeldrain socials
 	// 20% reviews
-	// 10% battle cry
+	// 60% patreon
-	// 40% patreon
 
 	let rand = Math.random()
 	if (rand < 0.2) {
 		ad_type = "socials"
 	} else if (rand < 0.4) {
 		ad_type = "reviews"
-	} else if (rand < 0.5) {
-		ad_type = "slava_ukraini"
 	} else {
 		ad_type = "patreon_support"
 	}

svelte/src/file_viewer/FileViewer.svelte

@@ -3,7 +3,6 @@ import { onMount, tick } from "svelte";
 import { copy_text } from "../util/Util.svelte";
 import { file_struct, list_struct, file_set_href } from "./FileUtilities.svelte";
 import Modal from "../util/Modal.svelte";
-import PixeldrainLogo from "../util/PixeldrainLogo.svelte";
 import DetailsWindow from "./DetailsWindow.svelte";
 import FilePreview from "./viewers/FilePreview.svelte";
 import ListNavigator from "./ListNavigator.svelte";
@@ -11,7 +10,6 @@ import FileStats from "./FileStats.svelte";
 import EditWindow from "./EditWindow.svelte";
 import EmbedWindow from "./EmbedWindow.svelte";
 import ReportWindow from "./ReportWindow.svelte";
-import IntroPopup from "./IntroPopup.svelte";
 import BottomBanner from "./BottomBanner.svelte";
 import Sharebar from "./Sharebar.svelte";
 import GalleryView from "./GalleryView.svelte";
@@ -21,6 +19,7 @@ import LoadingIndicator from "../util/LoadingIndicator.svelte";
 import TransferLimit from "./TransferLimit.svelte";
 import ListStats from "./ListStats.svelte";
 import ListUpdater from "./ListUpdater.svelte";
+import HomeButton from "./HomeButton.svelte";
 
 let loading = true
 let embedded = false
@@ -34,7 +33,6 @@ let is_list = false
 let list_downloadable = false
 let file_preview
 
-let button_home
 let list_navigator
 let list_shuffle = false
 let toggle_shuffle = () => {
@@ -85,7 +83,6 @@ let report_window
 let report_visible = false
 let embed_window
 let embed_visible = false
-let skyscraper_visible = false
 
 onMount(() => {
 	let viewer_data = window.viewer_data
@@ -400,14 +397,7 @@ const keyboard_event = evt => {
 			</button>
 		{/if}
 
-		<a
+		<HomeButton embedded_viewer={embedded}/>
-			href="/"
-			bind:this={button_home}
-			class="button button_home round"
-			target={embedded ? "_blank" : ""}
-			title="Go to the pixeldrain home page">
-			<PixeldrainLogo style="height: 1.6em; width: 1.6em; margin: 0 4px 0 0;"></PixeldrainLogo>
-		</a>
 
 		<div class="file_viewer_headerbar_title">
 			{#if list.title !== ""}{list.title}<br/>{/if}
@@ -580,7 +570,6 @@ const keyboard_event = evt => {
 			class:checkers={!custom_background}
 			class:custom_background={!!custom_background}
 			class:toolbar_visible
-			class:skyscraper_visible
 		>
 			{#if view === "file"}
 				<FilePreview
@@ -633,10 +622,6 @@ const keyboard_event = evt => {
 		<ReportWindow file={file} list={list}></ReportWindow>
 	</Modal>
 
-	{#if ads_enabled}
-		<IntroPopup target={button_home}></IntroPopup>
-	{/if}
-
 	<Downloader bind:this={downloader} file={file} list={list}></Downloader>
 
 	{#if is_list && list.can_edit}
@@ -697,14 +682,6 @@ const keyboard_event = evt => {
 .headerbar > button > .icon {
 	font-size: 1.6em;
 }
-.headerbar > .button_home::after {
-	content: "pixeldrain";
-}
-@media (max-width: 600px) {
-	.headerbar > .button_home::after {
-		content: "pd";
-	}
-}
 
 /* File preview area (row 3) */
 .file_preview_row {
@@ -729,7 +706,6 @@ const keyboard_event = evt => {
 	border: 2px solid var(--separator);
 }
 .file_preview.toolbar_visible { left: 8.2em; }
-.file_preview.skyscraper_visible { right: 160px; }
 .file_preview.custom_background {
 	background-size: cover;
 	background-position: center;

svelte/src/file_viewer/HomeButton.svelte

@@ -0,0 +1,41 @@
+<script>
+import PixeldrainLogo from "../util/PixeldrainLogo.svelte";
+export let embedded_viewer = false
+</script>
+
+{#if window.user.username === ""}
+	<a
+		href="/"
+		class="button button_home round"
+		target={embedded_viewer ? "_blank" : ""}
+		title="Go to the pixeldrain home page">
+		<PixeldrainLogo style="height: 1.6em; width: 1.6em; margin: 0 4px 0 0;"></PixeldrainLogo>
+	</a>
+{:else}
+	<a
+		href="/user"
+		class="button round"
+		target={embedded_viewer ? "_blank" : ""}
+		title="My account">
+		<PixeldrainLogo style="height: 1.6em; width: 1.6em; margin: 0;"></PixeldrainLogo>
+		<span class="username">
+			{window.user.username}
+		</span>
+	</a>
+{/if}
+
+<style>
+.button_home::after {
+	content: "pixeldrain";
+}
+
+@media (max-width: 600px) {
+	.button_home::after {
+		content: "pd";
+	}
+
+	.username {
+		display: none;
+	}
+}
+</style>