From 13aaf6441273d6fb6e83c7ea2937645132c713de Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 3 Dec 2018 13:17:46 -0700 Subject: [PATCH 1/2] Update StatusController --- app/Http/Controllers/StatusController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 605470f78..f25042318 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -142,7 +142,6 @@ class StatusController extends Controller $this->authCheck(); $this->validate($request, [ - 'type' => 'required|string', 'item' => 'required|integer|min:1', ]); From e4abd9b03f462212f5616b5c0b9309f6ede37cc7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 3 Dec 2018 13:23:22 -0700 Subject: [PATCH 2/2] Fixes #596 --- config/pixelfed.php | 2 +- public/js/components.js | Bin 557668 -> 557836 bytes public/mix-manifest.json | Bin 321 -> 321 bytes .../assets/js/components/PostComponent.vue | 214 +++++++++++++----- 4 files changed, 153 insertions(+), 63 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index b722e8f47..26bafa108 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.4.0', + 'version' => '0.4.1', /* |-------------------------------------------------------------------------- diff --git a/public/js/components.js b/public/js/components.js index 5e94f3a611f711fe5047e24ecbd26a74ce952bfd..02c71c18d7aca78a7753a9f330ee1082b691571f 100644 GIT binary patch delta 4117 zcmeHKdvp}l89(>VY<49OHV=}JK$)GS$!?gPBx3PoaZSS0GopDQW{}1>WGBh6o0(*0 zHV>C2;^7pIM-iCnt$iqJv1;`QjWAWjV@q4>KNRdA#ezN11BYr4(Dbx_s7LHKvw0c9 z>ErMIv2$m>`@8r4zQ_H(Z!hj-AO8+}Xl#?GuC67?l3yJ692%|Je91#M)@f_WzR&38 zv(1OuqVn61hQL{%e_@p80yb`M~53+opW|(2A(^NFoVEA5HO@^hU*`w*!;r`-9 zk()rA9RRSM)1<i%5wr$zJQiPzg+Utha|+m%Eb#N=zP~ zWFynyUz6*ynbcKgKvQCjHDA~7Xp@;vNmVtINoZ1xaTqa<8JIp@>y!1wFweBfmAcFf zYIRqGj zn$B{hsR1vru4h$dyAk11Gpy78!U<|4(vYGVuE&FHwNmZEST3cQa&Ke?;}CE5$ZD`F zsk)&NltU?#A9tHBZ%Js~Mu)2au>ZO?<}__Gp;x zMY!L|&NZWVrb-tf!Fqs{B5`zp99#?^i;mojL@R!z3f`YS@*F&uA6*U4)X@=mesT0^ zfbO^dS_U86&u()>XTw;Kt)`bs$%7cpwOY=FVS|x#MFpZ9G&z}5L+J_a8FBR0a|_n7 zg32ZP;4;b)c#Fw~scXYiCNe`Qfm|p<`AD$;S%%hQ*stY@1*EM44IQEIxI_i*u0P;Zu9rMtl5|pjeSMtdZ8qnGjL5Xf=+vF{A z$oL$4kM=M;dkwao6Ui41=$S%6;S;jjZT75Cmo5#Z1|*$PqJsTuBf32cw*K=v^o9?{ z{mtl0AZG8~fR+_gVnqendz~(|FT~Lw5QyLEMe7kQY}@vL<^Ob{&1$Hl7zyOP-Kfz1 z-Y!(`V2w;jru{0&%Td-<$>|t1L(XD z#^+u^BbXL6fUvJQYy|S*o9I~>`j4O&0kGgGI#C7(eDo2z#L{=ir6$sN+*3}t5S~M| z^uw*+;Vbke*O-lLC{5nj;S1PP3QRg>!#y~|2p#8Kg+_8;E|qXkgYotl3_$3IA(SiY?ov(T~fG5 zmUNRb1EEx+$;mK4Ice_cLttC!w*O)IqAbT@gPIUzJ69%0SWvC8Hy6SX~U{9tCI!!a& zt}ER=<`nly{1haEm}%XW_%UCptw2vypf=QYV;!?8rNve=kzla(8 zSH)*el-*p^4g+g+-NIxR+i+{x*Pe$lM_+U{~EwJ>$t1 zRc=eG6jQW_XrJ6njctbY@7Yv0*opKX2mS6mMs25r;6~E?4z)8otS)8yhS+q76YP86 zp;#!J4s17&`209^mG(ltyjuZ%uKkj#$`%zT=Aa6I8Ol#k>ni}({|Pn3!Xck#(|c)3 z46Y{4)pUWq&rjds6v&f#G?NG8wQ_o~H(Su7tkI(lvYmH30g%(P*Wkkj^w z{^@-CPiN>*FYxiL^|U)dIyQ!j?DRvP;ahGI`HiNMFrq<%PS7Q!<2vmn%vO)TQsny* zQl|`6&NQO^oXD@v&^4k02Y+ZXA5n2v+g6X=wl!<}!xWTt(tnvQ$^0vS@-p3;TX%b{ zyzExF6Bq<$!sm)w`}73A@Gyy!P0D&&d84#2}WX delta 3379 zcmeHKYj6|S6`p%{B{_azJATL*TuW=PSN2Mlc_UZB*lwIGB(^c&<>7*Ct<7S2S7=wp zMiSscfOaSeY|9Pp5S&7X(wR&Gc3B!?lMKmp+9p$`olZMb7)TQ*(~=N-rZb&RQ_{0i z40uXg{`F6P=$^fIzx$nU@18y9=fZgHkyU}Fbp1?k1Nl`wW!1Ao zJ&4mk?sbmzht6V$)30rlR8LeDBOWPOUOtayJYhxE+<`7lQe;)ney&LWuF^D;9ey`W zrv?l43xh?vf3PHJ_Ybz~tor)Mu2>x!VfVMqMS>n5o`d+27l(gX0+T1kpGCa>?eR*u zzBGOcM&U{$j3=+`fwAPx;{Y9f^L80bhChs(OA~JWmlNsw;H!CLZwAWL)d@E+ygXrl zj2Bsr6FJ$X*G=S){B|O<|pQ8?DBemx;3o<&(i`v=i~hR5hx^NHFFuK<^`qP+soj4ZH}o%|bj`UymvQGE|Qw z1d!Ve=(5GaORVV9LlOEM^KT`IDobkfu=JrAfE}ic@(Wf7Cz$VBc!Dqm6BB-pe)SsMvsn0 zasW8z40_uF_SQLcD-G;h7tkI|3kpCQe`0D7$X~|LOJMYIbQ%Club``C!2I_=q6x;r ztP)zQ$kYwGnAF|2eqGX>ble!v00af)eLANA_Bw2KKhr|I# zIO1OD2uZy#O=45fHf=B@`eH#z4Tl1QJ|?w;Ne~-{owNxj)f_I#Onp0ykAWq!iNmMT zl25YK)j_BV93wZYaK3-0Lv>pql5&>x&2W$4acy!Fgc*DR0k;$chcz{t5>%#_?&+8T z>{6n#23XTWRP}TR`ju!z(!?#v8)P$wUrN26W#l}A=M!%+ethMBJ+enq+}x=sy?ud5 z@3g|C=(6eAJ-zo~irf{Fx_W&~GEIdeV!tSBjbe8o8q!$T17epSD`Jf=SbPoR8n1D! z3h&9VeJPrxaoCaG7u7^20Z}FDPKTY0ad;Lv$l-!4GyhFT&;5Jzw85~*aQ%T$RP-@s zeuT{sRu4tzWlRGBq(95D5csn)J2lw>KR1L`uRi2-Flw~353++P;vUa4Aj@IS9HtN5 zna|IVozWRmx_bY&y2~D>yWZ3_Q@GK*6vy!l`Tsxlhs4&SMa!d}I;te_Unl+LJO_J9*;=?-%kZ`dD z`zWY+wQU%=$lf@vB;9db4ApNaj&sb~e=LDF=7at8DBd{>ie%<#sCoy6u?TI#)N|O5 z1&!n!z%}H?Y3wl8zl;}J0sXDB_@^j~*SJ_XqJ&jn3o95c=kP0L#lHJv{2h}~zk*-! zWDBA{mP&a}ZvuLU<~w*LxH)ITq{Ra1V4O_2SoWGL~dg*s?8Tc6xKDvt~gP_<;mMVw70pQdcao%Pf{ zO9n4#Nl2 za)6conHpd~!i$;o3pB;Ejl}7t^Nkg`^jFP3DV|3=9tV4JK3!tV5F&m?-KOkh;8EY< z=p__v;FBA&IN4vXC?PQ*v#?a^rH$mh-Fb8&`OHh(;XG|MGz%WRHT3mwfX=K@dI*@G zAEob5V0T}l%b-CdKX{!!2h-J;>94`-BgfvL&%!3(7#*=vg5oDT3@TsWtEZ9pFX$2g z{^=?`N-Y$W@^V&@J;7A%S^;lN=}3*9R1e#r$lX#8+p0iY>GGLx^xDtpHRuU*XA%tr zNedjwPM1x-ccsHGM?)cKe?y{KN=#l?0-E0h)EPNI-kM7l8vQ?~4`rwRJe>assUP?`c;bC}*FvbU=iY_s`l2jPGx?#2!oIJ?k_nr20wNpbFqwtYpt!+D7WOTXI<5 z1I+JJZyRe*z-wVMhP} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 4fd418d4d5098574a3c3a09cb3aaaaca080f877d..aef4edbb9d49a91a532d43e145989be1bed1d6b0 100644 GIT binary patch delta 30 lcmX@ebdYI+p-5_~sYzmzv6+E!nu(F2ahj2dk?BO&KLCz(2~z+7 delta 30 lcmX@ebdYI+p@^YHYMP;;si9$Vnz@-}im_R;dD2AJKLCsd36lT- diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 0816fc09b..6a7548a1f 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -20,26 +20,21 @@
-
+
- Report -
-
- - - - -
-
- - - - -
+ + Report + Mute Profile + Block Profile + + + Edit + Delete +
@@ -65,26 +60,21 @@
-
+
- Report -
-
- - - - -
-
- - - - -
+ + Report + Mute Profile + Block Profile + + + Edit + Delete +
@@ -102,31 +92,10 @@
- +

- - - -
- - - -
- +

+

@@ -150,7 +119,6 @@
-
@@ -159,7 +127,7 @@
- + pixelfed.postComponent = {}; + pixelfed.presenter = { show: { image: function(container, media) { @@ -344,7 +313,10 @@ export default { status: {}, media: {}, user: {}, - reactions: {}, + reactions: { + liked: false, + shared: false + }, likes: {}, likesPage: 1, shares: {}, @@ -353,13 +325,13 @@ export default { }, mounted() { + this.fetchData(); + this.authCheck(); let token = $('meta[name="csrf-token"]').attr('content'); $('input[name="_token"]').each(function(k, v) { let el = $(v); el.val(token); }); - this.fetchData(); - this.authCheck(); }, updated() { @@ -390,11 +362,14 @@ export default { $('.comment-form').removeClass('d-none'); } }, + showMuteBlock() { let sid = this.status.account.id; let uid = this.user.id; - if(sid != uid) { - $('.post-actions').removeClass('d-none'); + if(sid == uid) { + $('.post-actions .menu-author').removeClass('d-none'); + } else { + $('.post-actions .menu-user').removeClass('d-none'); } }, @@ -402,6 +377,10 @@ export default { return '/i/report?type=post&id=' + this.status.id; }, + editUrl() { + return this.status.url + '/edit'; + }, + timestampFormat() { let ts = new Date(this.status.created_at); return ts.toDateString() + ' ' + ts.toLocaleTimeString(); @@ -511,12 +490,16 @@ export default { if(container.children().length != 0) { return; } - switch(this.statusTemplate) { + + let template = this.status.pf_type ? this.status.pf_type : this.statusTemplate; + switch(template) { case 'image': + case 'photo': pixelfed.presenter.show.image(container, media); break; case 'album': + case 'photo:album': pixelfed.presenter.show.imageAlbum(container, media, this.status); break; @@ -524,6 +507,12 @@ export default { pixelfed.presenter.show.video(container, media); break; + case 'video:album': + case 'photo:video:album': + $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('We cannot load this post properly. We\'re working on a fix!'); + return; + break; + default: $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.'); break; @@ -537,6 +526,107 @@ export default { $('.postPresenterLoader').addClass('d-none'); $('.postPresenterContainer').removeClass('d-none'); }, + + likeStatus(event) { + if($('body').hasClass('loggedIn') == false) { + return; + } + + axios.post('/i/like', { + item: this.status.id + }).then(res => { + this.status.favourites_count = res.data.count; + if(this.reactions.liked == true) { + this.reactions.liked = false; + } else { + this.reactions.liked = true; + } + }).catch(err => { + swal('Error', 'Something went wrong, please try again later.', 'error'); + }); + }, + + shareStatus() { + if($('body').hasClass('loggedIn') == false) { + return; + } + + axios.post('/i/share', { + item: this.status.id + }).then(res => { + this.status.reblogs_count = res.data.count; + if(this.reactions.shared == true) { + this.reactions.shared = false; + } else { + this.reactions.shared = true; + } + }).catch(err => { + swal('Error', 'Something went wrong, please try again later.', 'error'); + }); + }, + + bookmarkStatus() { + if($('body').hasClass('loggedIn') == false) { + return; + } + + axios.post('/i/bookmark', { + item: this.status.id + }).then(res => { + if(this.reactions.bookmarked == true) { + this.reactions.bookmarked = false; + } else { + this.reactions.bookmarked = true; + } + }).catch(err => { + swal('Error', 'Something went wrong, please try again later.', 'error'); + }); + }, + + muteProfile() { + if($('body').hasClass('loggedIn') == false) { + return; + } + + axios.post('/i/mute', { + type: 'user', + item: this.status.account.id + }).then(res => { + swal('Success', 'You have successfully muted ' + this.status.account.acct, 'success'); + }).catch(err => { + swal('Error', 'Something went wrong. Please try again later.', 'error'); + }); + }, + + blockProfile() { + if($('body').hasClass('loggedIn') == false) { + return; + } + + axios.post('/i/block', { + type: 'user', + item: this.status.account.id + }).then(res => { + swal('Success', 'You have successfully blocked ' + this.status.account.acct, 'success'); + }).catch(err => { + swal('Error', 'Something went wrong. Please try again later.', 'error'); + }); + }, + + deletePost() { + if($('body').hasClass('loggedIn') == false) { + return; + } + + axios.post('/i/delete', { + type: 'status', + item: this.status.id + }).then(res => { + swal('Success', 'You have successfully deleted this post', 'success'); + }).catch(err => { + swal('Error', 'Something went wrong. Please try again later.', 'error'); + }); + } } } \ No newline at end of file