Merge pull request #1968 from syuilo/object-storage
Object storage support
This commit is contained in:
		@@ -43,7 +43,7 @@ export default Vue.extend({
 | 
			
		||||
		thumbnail(): any {
 | 
			
		||||
			return {
 | 
			
		||||
				'background-color': this.file.properties.avgColor && this.file.properties.avgColor.length == 3 ? `rgb(${this.file.properties.avgColor.join(',')})` : 'transparent',
 | 
			
		||||
				'background-image': `url(${this.file.url}?thumbnail&size=128)`
 | 
			
		||||
				'background-image': `url(${this.file.url})`
 | 
			
		||||
			};
 | 
			
		||||
		}
 | 
			
		||||
	},
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@ export default Vue.extend({
 | 
			
		||||
	},
 | 
			
		||||
	computed: {
 | 
			
		||||
		style(): any {
 | 
			
		||||
			let url = `url(${this.image.url}?thumbnail)`;
 | 
			
		||||
			let url = `url(${this.image.url})`;
 | 
			
		||||
 | 
			
		||||
			if (this.$store.state.device.loadRemoteMedia || this.$store.state.device.lightmode) {
 | 
			
		||||
				url = null;
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,7 @@ export default Vue.extend({
 | 
			
		||||
	computed: {
 | 
			
		||||
		imageStyle(): any {
 | 
			
		||||
			return {
 | 
			
		||||
				'background-image': `url(${this.video.url}?thumbnail&size=512)`
 | 
			
		||||
				'background-image': `url(${this.video.url})`
 | 
			
		||||
			};
 | 
			
		||||
		}
 | 
			
		||||
	},})
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
<div class="mk-note-card">
 | 
			
		||||
	<a :href="note | notePage">
 | 
			
		||||
		<header>
 | 
			
		||||
			<img :src="`${note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/><h3>{{ note.user | userName }}</h3>
 | 
			
		||||
			<img :src="note.user.avatarUrl" alt="avatar"/><h3>{{ note.user | userName }}</h3>
 | 
			
		||||
		</header>
 | 
			
		||||
		<div>
 | 
			
		||||
			{{ text }}
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@
 | 
			
		||||
			<div class="attaches" v-show="files.length != 0">
 | 
			
		||||
				<x-draggable class="files" :list="files" :options="{ animation: 150 }">
 | 
			
		||||
					<div class="file" v-for="file in files" :key="file.id">
 | 
			
		||||
						<div class="img" :style="`background-image: url(${file.url}?thumbnail&size=128)`" @click="detachMedia(file)"></div>
 | 
			
		||||
						<div class="img" :style="`background-image: url(${file.url})`" @click="detachMedia(file)"></div>
 | 
			
		||||
					</div>
 | 
			
		||||
				</x-draggable>
 | 
			
		||||
			</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,7 @@
 | 
			
		||||
	<transition name="nav">
 | 
			
		||||
		<div class="body" v-if="isOpen">
 | 
			
		||||
			<router-link class="me" v-if="$store.getters.isSignedIn" :to="`/@${$store.state.i.username}`">
 | 
			
		||||
				<img class="avatar" :src="`${$store.state.i.avatarUrl}?thumbnail&size=128`" alt="avatar"/>
 | 
			
		||||
				<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
 | 
			
		||||
				<p class="name">{{ $store.state.i | userName }}</p>
 | 
			
		||||
			</router-link>
 | 
			
		||||
			<div class="links">
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<template>
 | 
			
		||||
<div class="mk-user-card">
 | 
			
		||||
	<header :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=1024)` : ''">
 | 
			
		||||
	<header :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
 | 
			
		||||
		<mk-avatar class="avatar" :user="user"/>
 | 
			
		||||
	</header>
 | 
			
		||||
	<a class="name" :href="user | userPage" target="_blank">{{ user | userName }}</a>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user