feat: データセーバー強化
This commit is contained in:
parent
f2ab7a5626
commit
c9b97d5e0d
|
@ -265,7 +265,8 @@ export class FileServerService {
|
||||||
'avatar' in request.query ||
|
'avatar' in request.query ||
|
||||||
'static' in request.query ||
|
'static' in request.query ||
|
||||||
'preview' in request.query ||
|
'preview' in request.query ||
|
||||||
'badge' in request.query
|
'badge' in request.query ||
|
||||||
|
'datasaver' in request.query
|
||||||
) {
|
) {
|
||||||
if (!isConvertibleImage) {
|
if (!isConvertibleImage) {
|
||||||
// 画像でないなら404でお茶を濁す
|
// 画像でないなら404でお茶を濁す
|
||||||
|
@ -330,6 +331,27 @@ export class FileServerService {
|
||||||
ext: 'png',
|
ext: 'png',
|
||||||
type: 'image/png',
|
type: 'image/png',
|
||||||
};
|
};
|
||||||
|
} else if ('datasaver' in request.query){
|
||||||
|
if (!isAnimationConvertibleImage && !('static' in request.query)) {
|
||||||
|
image = {
|
||||||
|
data: fs.createReadStream(file.path),
|
||||||
|
ext: file.ext,
|
||||||
|
type: file.mime,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
const data = (await sharpBmp(file.path, file.mime, { animated: !('static' in request.query) }))
|
||||||
|
.resize({
|
||||||
|
height: 64,
|
||||||
|
withoutEnlargement: true,
|
||||||
|
})
|
||||||
|
.webp(webpDefault);
|
||||||
|
|
||||||
|
image = {
|
||||||
|
data,
|
||||||
|
ext: 'webp',
|
||||||
|
type: 'image/webp',
|
||||||
|
};
|
||||||
|
}
|
||||||
}else if (file.mime === 'image/svg+xml') {
|
}else if (file.mime === 'image/svg+xml') {
|
||||||
image = this.imageProcessingService.convertToWebpStream(file.path, 2048, 2048);
|
image = this.imageProcessingService.convertToWebpStream(file.path, 2048, 2048);
|
||||||
} else if (!file.mime.startsWith('image/') || !FILE_TYPE_BROWSERSAFE.includes(file.mime)) {
|
} else if (!file.mime.startsWith('image/') || !FILE_TYPE_BROWSERSAFE.includes(file.mime)) {
|
||||||
|
|
|
@ -38,13 +38,20 @@ const rawUrl = computed(() => {
|
||||||
|
|
||||||
const url = computed(() => {
|
const url = computed(() => {
|
||||||
if (rawUrl.value == null) return null;
|
if (rawUrl.value == null) return null;
|
||||||
|
const useOriginalSize = props.useOriginalSize;
|
||||||
|
const enableDataSaverMode = defaultStore.state.enableDataSaverMode;
|
||||||
|
let datasaver_result ;
|
||||||
|
if (enableDataSaverMode) {
|
||||||
|
datasaver_result = useOriginalSize ? undefined : 'datasaver';
|
||||||
|
} else {
|
||||||
|
datasaver_result = useOriginalSize ? undefined : 'emoji';
|
||||||
|
}
|
||||||
const proxied =
|
const proxied =
|
||||||
(rawUrl.value.startsWith('/emoji/') || (props.useOriginalSize && isLocal.value))
|
(rawUrl.value.startsWith('/emoji/') || (props.useOriginalSize && isLocal.value))
|
||||||
? rawUrl.value
|
? rawUrl.value
|
||||||
: getProxiedImageUrl(
|
: getProxiedImageUrl(
|
||||||
rawUrl.value,
|
rawUrl.value,
|
||||||
props.useOriginalSize ? undefined : 'emoji',
|
datasaver_result,
|
||||||
false,
|
false,
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue