From d103427932aa733e0677119d1bf7e83ee0720ee6 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 9 Apr 2019 21:07:46 +0900 Subject: [PATCH] Fix non media thumbnails (#4380) --- src/client/assets/thumbnail-not-available.png | Bin 0 -> 5705 bytes src/misc/get-drive-file-url.ts | 2 +- src/server/file/send-drive-file.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/client/assets/thumbnail-not-available.png diff --git a/src/client/assets/thumbnail-not-available.png b/src/client/assets/thumbnail-not-available.png new file mode 100644 index 0000000000000000000000000000000000000000..07cad9919c5a1c6a9398799fc75c989c602386ff GIT binary patch literal 5705 zcmchacTkg0x5qbuK%{8sNRg;C8(o?R0SO%pMWpv4O}Z3;<R=OW77*!D1d$qwQbUUd z0qG)5Bp^+CQIHOK!@V<i?)~G=yfb&^erI-e&)Lt}J<mLUoU>0b2Aa$aJPZH;W^FBX zBLJY(B^1DEs1xa(U^{i9byd|@1)$;u<AFVlY9k%BjPwBr6$SwJ5P&_Z3pWoypacMm zb^s`*0Knz*nqa6z-5_H0Owc3}sTQA;loT7Alv8_b<iukCQ?dVLlkiDYh>9F52~VQh zSZor$_Lxn=A1_HHY-|qo7-|fbO4O2a@T6L52>uwQ?obV?lBjsjvHKXLhU2L#{PD&3 zW98%|)z*^m_}Zl7Y_L=ZHa51Fnp#fI@!iMH<DeuePrWKOmO3aDO8cF=JJfH1IOuAs zt0+541X7I?K3eAf0GuQp4@jGLffLn9AE2#|rk|oed6NAMZ%UXf0PMcn>Z&HeqbnI6 zj-%}yQ5ieXv!4ux`dyw`>q@rxE(Q9#jaL5Xq)^OZg8#^*bt;%4?K9_e>npfVx{fRO z|0>EoPd)elSvZ=XgG<wF4L-H6Gnwf~ayyfl(~bO07$Ss?SrE#dW!sRO75t=uf<A|v zH74nf{r&Se`LBwWx|H_%Fe5W)j))Uvh@99XGd?ZtIboCz!+rUxiy)rMsB3y-^y3uB z0}p!tqPj^cEAbTXvYr>-p$O2Q%f$kbGL%^&!<QY0{lSCKD`%GLythpNzijaxWPtfu zT;=fU<)?ZGT)*RkOlv9YV7V1dwHvgE4`#5qkjs~G+aG$Q*Qe&*!coak9i#nnkaW1V zZoIv^ysMRW6N=ePwTHBj@2jkS(V899Q><Jv12J)@IZ>z5Y=>g`d=@TFzSnMpVk%S0 zf#21@3%I7ICJrGNNAW<$@xChSj;;!A-(hQ1!v#S<h@RqAlV9cK{u?5X!Nr>amw<kc z;2mp8XhEn$a7cd;q`>dpemD#2)K)dem%x612>XUh;gsfIOHenlUv9&Zu@VUa-0mL* z@GymW6F5=grqI?b=hAr-Ksc+lO4h!Xo5dxLQ!ozU515fAj~13Q&i7LeS#dcm_Z;6# zxh64Wlf;6(VSW0v?fxj=tVVk1V|uvVeT9uPaO96>HUn!0)c3=Ou)bYUPYP|{g2pxH z{)iDMx3zVbLIeuzV#f}5e`VA9D0XfeoQ%RMgh)c$1K8%a>*&v5v3pCqe<)*{`r!SI zQpTE_&7LpCX04jttO2<zb5Xd5OWIP{EeqzeJ$UQObZT`shyO33gk(W55%i+DJC*sh zU?V$mii>Q0MZaRTvjbbx+HuangB{Vm@rc*=&VmN`c*q;Inx2xi63U&z_;YW&c<mCK zm)t~w^rMnxiojipEZbp=k}YA(AEN%xo_9%*x6-K(S`}&n_2HoemJ>vYKi&Qb6Spdw z#~-(<6|vkagJHVEh7M{)@7xW-1aEB>rRlqV>^%%$*ftRdozbs;taqSN?q6IxDSQqB zU##l1k#2b8?YTe^D*mU8vyOB_^qmd104otZW5;2l`Hc<T?*7W7n((97RYfU1Xev}P z^{rQI+j;9!n;GbOOc}T6!L-I!@M@7gi@ef{w9dF8x{afQDF>sqhsjx|4+8?rZb6tP z^liJBqXu57bbR}~yCHG};!M3xReAZwE!cpgwKL8kD;~7vXC$!ejCR&Z`XJG%(PFjD z?a1CT91p|j4L`+OW)_jMzL|?wr*h3dHq!ddgw2QcF{{F$?N5I$g_()r9_6ppX)Us# zro5jlY4F`|m8k;drM_P`Q_Vm|rqdG(PLyNq@+M9l6t`qw-pVR#Oh9lzN*Jqq150QT zj|8hi1r^i)FPzA7ftT&4DMTH8qWEG#vUf$xa;Y^`RIV)P&Fo&)HH2&Hsd)Wy0Ro6B zYu;BwIUY>1p$r#u7;@rjyV|D^D4U+y&6N(V{7Ve__}Et&`6>Yr!J~9n9`r5&7t=P4 zX}Rm^SIL;2WOA9Fy$)UIFXrU%>mi;YyO^IT9gd9GOBL_vQVK`i02R_urspbUl%z*5 zaT*jpPL%S^S1QR5={Iw0SRw7n!CMA^?Fo1p=$yw28SySEuKK23buj4>J<ALkakVHG z%0D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 literal 0 HcmV?d00001 diff --git a/src/misc/get-drive-file-url.ts b/src/misc/get-drive-file-url.ts index 067db8a5d..f2b0f8b00 100644 --- a/src/misc/get-drive-file-url.ts +++ b/src/misc/get-drive-file-url.ts @@ -8,7 +8,7 @@ export default function(file: IDriveFile, thumbnail = false): string { if (file.metadata.withoutChunks) { if (thumbnail) { - return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : null); + return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : '/assets/thumbnail-not-available.png'); } else { return file.metadata.webpublicUrl || file.metadata.url; } diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts index e0208f3fa..b22124240 100644 --- a/src/server/file/send-drive-file.ts +++ b/src/server/file/send-drive-file.ts @@ -73,7 +73,7 @@ export default async function(ctx: Koa.BaseContext) { await sendRaw(); } else { ctx.status = 404; - await send(ctx as any, '/dummy.png', { root: assets }); + await send(ctx as any, '/thumbnail-not-available.png', { root: assets }); } } } else if ('web' in ctx.query) {