Merge remote-tracking branch 'thatonecalculator/self-host-images' into develop

packages/backend/src/server/web/views/base.pug

@@ -31,9 +31,9 @@ html
 		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png')
 		link(rel='manifest' href='/manifest.json')
-		link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg')
+		link(rel='prefetch' href='/static-assets/badges/info.jpg')
-		link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg')
+		link(rel='prefetch' href='/static-assets/badges/not-found.jpg')
-		link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg')
+		link(rel='prefetch' href='/static-assets/badges/error.jpg')
 		link(rel='stylesheet' href='/assets/fontawesome/css/all.css')
 		link(rel='modulepreload' href=`/assets/${clientEntry.file}`)
 

packages/client/src/components/global/error.vue

@@ -1,7 +1,7 @@
 <template>
 <transition :name="$store.state.animation ? 'zoom' : ''" appear>
 	<div class="mjndxjcg">
-		<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
+		<img src="/static-assets/badges/error.jpg" class="_ghost" alt="Error"/>
 		<p><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</p>
 		<MkButton class="button" @click="() => $emit('retry')">{{ $ts.retry }}</MkButton>
 	</div>

packages/client/src/components/notes.vue

@@ -2,7 +2,7 @@
 <MkPagination ref="pagingComponent" :pagination="pagination">
 	<template #empty>
 		<div class="_fullinfo">
-			<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+			<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 			<div>{{ $ts.noNotes }}</div>
 		</div>
 	</template>

packages/client/src/components/notifications.vue

@@ -2,7 +2,7 @@
 <MkPagination ref="pagingComponent" :pagination="pagination">
 	<template #empty>
 		<div class="_fullinfo">
-			<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+			<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 			<div>{{ $ts.noNotifications }}</div>
 		</div>
 	</template>

packages/client/src/components/ui/pagination.vue

@@ -7,7 +7,7 @@
 	<div v-else-if="empty" key="_empty_" class="empty">
 		<slot name="empty">
 			<div class="_fullinfo">
-				<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+				<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Error"/>
 				<div>{{ $ts.nothing }}</div>
 			</div>
 		</slot>

packages/client/src/components/user-list.vue

@@ -2,7 +2,7 @@
 <MkPagination ref="pagingComponent" :pagination="pagination">
 	<template #empty>
 		<div class="_fullinfo">
-			<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+			<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 			<div>{{ $ts.noUsers }}</div>
 		</div>
 	</template>

packages/client/src/pages/_error_.vue

@@ -2,7 +2,7 @@
 <MkLoading v-if="!loaded"/>
 <transition :name="$store.state.animation ? 'zoom' : ''" appear>
 	<div v-show="loaded" class="mjndxjch">
-		<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
+		<img src="/static-assets/badges/error.jpg" class="_ghost" alt="Error"/>
 		<p><b><i class="fas fa-exclamation-triangle"></i> {{ i18n.ts.pageLoadError }}</b></p>
 		<p v-if="meta && (version === meta.version)">{{ i18n.ts.pageLoadErrorDescription }}</p>
 		<p v-else-if="serverIsDead">{{ i18n.ts.serverIsDead }}</p>

packages/client/src/pages/favorites.vue

@@ -5,7 +5,7 @@
 		<MkPagination ref="pagingComponent" :pagination="pagination">
 			<template #empty>
 				<div class="_fullinfo">
-					<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+					<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 					<div>{{ $ts.noNotes }}</div>
 				</div>
 			</template>

packages/client/src/pages/follow-requests.vue

@@ -1,11 +1,9 @@
 <template>
-<MkStickyContainer>
+<div>
-	<template #header><MkPageHeader/></template>
-	<MkSpacer :content-max="800">
 	<MkPagination ref="paginationComponent" :pagination="pagination">
 		<template #empty>
 			<div class="_fullinfo">
-					<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+				<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 				<div>{{ $ts.noFollowRequests }}</div>
 			</div>
 		</template>
@@ -27,7 +25,6 @@
 						</div>
 					</div>
 				</div>
-				</div>
 			</template>
 		</MkPagination>
 	</MkSpacer>

packages/client/src/pages/messaging/index.vue

@@ -33,7 +33,7 @@
 				</MkA>
 			</div>
 			<div v-if="!fetching && messages.length == 0" class="_fullinfo">
-				<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+				<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 				<div>{{ $ts.noHistory }}</div>
 			</div>
 			<MkLoading v-if="fetching"/>

packages/client/src/pages/messaging/messaging-room.vue

@@ -10,7 +10,7 @@
 			<MkPagination v-if="pagination" ref="pagingComponent" :key="userAcct || groupId" :pagination="pagination">
 				<template #empty>
 					<div class="_fullinfo">
-						<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+						<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 						<div>{{ i18n.ts.noMessagesYet }}</div>
 					</div>
 				</template>

packages/client/src/pages/not-found.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="ipledcug">
 	<div class="_fullinfo">
-		<img src="https://xn--931a.moe/assets/not-found.jpg" class="_ghost"/>
+		<img src="/static-assets/badges/not-found.jpg" class="_ghost" alt="Not found"/>
 		<div>{{ $ts.notFoundDescription }}</div>
 	</div>
 </div>

packages/client/src/pages/settings/apps.vue

@@ -3,7 +3,7 @@
 	<FormPagination ref="list" :pagination="pagination">
 		<template #empty>
 			<div class="_fullinfo">
-				<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+				<img src="/static-assets/badges/info.jpg" class="_ghost" alt="Info"/>
 				<div>{{ i18n.ts.nothing }}</div>
 			</div>
 		</template>