From 02ad300443c8a01e8930f480f6cd36f0badcd61a Mon Sep 17 00:00:00 2001 From: trwnh Date: Sat, 6 Feb 2021 19:30:58 -0600 Subject: [PATCH 1/4] increase default upload limit from 1M to 15M --- contrib/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/nginx.conf b/contrib/nginx.conf index ecb90e15f..6d6fd15f8 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -18,6 +18,7 @@ server { index index.html index.htm index.php; charset utf-8; + client_max_body_size 15M; location / { try_files $uri $uri/ /index.php?$query_string; From aa99784fedf55f151e03a6e6694d9ae6e9423981 Mon Sep 17 00:00:00 2001 From: trwnh Date: Sat, 6 Feb 2021 20:53:56 -0600 Subject: [PATCH 2/4] change default client to phpredis --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index b5020f740..46fde4ba4 100644 --- a/config/database.php +++ b/config/database.php @@ -106,7 +106,7 @@ return [ 'redis' => [ - 'client' => env('REDIS_CLIENT', 'predis'), + 'client' => env('REDIS_CLIENT', 'phpredis'), 'default' => [ 'scheme' => env('REDIS_SCHEME', 'tcp'), From 1f09b4f5c5e06bdfe1f370474008effebd1b9513 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 6 Feb 2021 21:00:42 -0700 Subject: [PATCH 3/4] Revert ComposeModal --- .../assets/js/components/ComposeModal.vue | 114 ++---------------- 1 file changed, 12 insertions(+), 102 deletions(-) diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index fc058a5f5..393a1d6dc 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -59,13 +59,11 @@ - - - - {{media.length}} - - {{pageTitle}} - + + + {{media.length}} + + {{pageTitle}} @@ -563,34 +561,6 @@

-
-
- -

- Processing Media -

-

- This may take a few seconds. -

-
-
- -
-
- -

- Processing Media -

-

- This may take a few seconds. -

-
-
- @@ -715,17 +685,12 @@ export default { 'editMedia', 'cameraRoll', 'tagPeopleHelp', - 'textOptions', - 'processingVideo', - 'processingPhoto' + 'textOptions' ], cameraRollMedia: [], taggedUsernames: [], taggedPeopleSearch: null, - textMode: false, - isProcessingMedia: false, - processPhotoInterval: undefined, - processVideoInterval: undefined + textMode: false } }, @@ -825,14 +790,9 @@ export default { self.ids.push(e.data.id); self.media.push(e.data); self.uploading = false; - - if(e.data.mime == 'video/mp4') { - self.processVideo(e.data); - return; - } else { - self.processPhoto(e.data); - return; - } + setTimeout(function() { + self.page = 2; + }, 300); }).catch(function(e) { switch(e.response.status) { case 451: @@ -1205,6 +1165,7 @@ export default { ctx.clearRect(0, 0, image.width, image.height); } } + }, tagSearch(input) { @@ -1247,58 +1208,7 @@ export default { showTextOptions() { this.page = 'textOptions'; this.pageTitle = 'Text Post Options'; - }, - - processPhoto(media) { - this.page = 'processingPhoto'; - this.pageTitle = ''; - this.processPhotoCheck(media); - }, - - processPhotoCheck(media) { - this.isProcessingMedia = true; - this.processMediaCheck(media); - this.processPhotoInterval = setInterval(() => { - this.processMediaCheck(media); - }, 2500); - }, - - processVideo(media) { - this.page = 'processingVideo'; - this.pageTitle = ''; - this.processVideoCheck(media); - }, - - processVideoCheck(media) { - this.isProcessingMedia = true; - this.processMediaCheck(media, 'video'); - this.processVideoInterval = setInterval(() => { - this.processMediaCheck(media, 'video'); - }, 2500); - }, - - processMediaCheck(media, type = 'photo') { - return axios.get('/api/compose/v0/media/processing', { - params: { - id: media.id - } - }).then(res => { - let data = res.data; - if(data.finished === true) { - this.isProcessingMedia = false; - this.page = 3; - if(type == 'photo') { - clearInterval(this.processPhotoInterval); - } else if (type == 'video') { - clearInterval(this.processVideoInterval); - } else { - } - return; - } - }); } - - } } - + \ No newline at end of file From e462b2af138ee686f0f0374d508b420cbc1b8ba9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 6 Feb 2021 21:03:55 -0700 Subject: [PATCH 4/4] Update compiled assets --- public/js/components.js | Bin 633574 -> 633574 bytes public/js/compose.js | Bin 112373 -> 109768 bytes public/mix-manifest.json | Bin 2139 -> 2139 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/components.js b/public/js/components.js index c8164057d097570adb7c4bcc12c1dd96fa042e21..94d40780874983607677a0967d9155682f4c0dce 100644 GIT binary patch delta 38 ucmaEMRqfeTwT2eP7N!>F7M2#)7Pc+y?mJn6GxE#Zy?3&2_uk1d`y&7}ybrMe delta 38 ucmaEMRqfeTwT2eP7N!>F7M2#)7Pc+y?mJn6QWI0!y?3&2_uk1d`y&7|4iAg~ diff --git a/public/js/compose.js b/public/js/compose.js index 053e2c30469ae85dc0c060a043b8965a9ca2a0fd..3a1341e4e0d189fcc37d662367de763d141784c7 100644 GIT binary patch delta 1218 zcmZ8hZ%kWN6wiSUTDF0JI046>+I8>A?dtOvW7@en}Y2t_Te&=`3 zIrpA(?s@n3jgn9Am8`zktm_Vhd)Td!hNn|XvPq#)&e-SmcNlqlR7h|NFDTmeJz}vg zzsPPo>U06wGt0hpoYx+3M~ihw`$v!Dm$i%JWaXwU<7{Ue%}x5zz`o!MN^2XdF&-|E zN#kUJ{A5fONaWeY0+}?{u~L(@u;4HS3gm4QEszaUtU#1KN3GLA!W>?PahavXk znZ2l2p4|_A<~iE}er@LL93c7i)mG?ZrgR7NvzO9d)Gw!xL7%2S_gz_&L=_>f%=Uz$ z;fP9Pni`LeG>Mc_$=PZZZ4xtNELHBpvdbyjT*Su??yF@te=rmeP#=qD+PBGzJn^#A znOb%$V*oe%EVFl~SD1;8s1Y*C^Q4#kop}b+uV1!eb)IE2`XrZAwZ1JMYT~+h;u9j9 zc_8a$z?ygW@?=1mQc@uV0g)@YTB*WWAsU*M?nZ17FBA(5EWUoL7-DxaB zNPpR$hqb#M@T8Yhd8cYqS`JOe1EC}`;?+vN`mnk|A~HElqyM&R5VftdiHjzPn|<@3 zzDA-VZ*v`>qLVvLEiSZ(L}KOZjW{vFdfk%y0JQ`c7Tk_OC+9|6C(0O#oR32z#*I;n zo8)aW?WD4zMud1Y!3~mNi<{r{88n;G>3{Yh8ML6?p8w~3^q7md$w|^VY>$p|l0!6` zWrxVmr*@-tfX1y!yHA*yo{DhCpBo@!C=!ayzF#Lez?BbYz^k2qxKxCrZTPtc5E_3` z^w^+ReoL3(C6+$^tIE#>$uv(wLU=kl5}I0A@UOfK;z~E{g1qL@`MGhDodkGl z_j55EFmw+l$0yw5v+{UK3B*EJiht!1@S8DW)&sD8OU=CopexN@(L*#hXMo2g+0#$p zT*lXSm8-&p5)RQeyzu8mG1pKDJL-2XE|MVS@U6+eKDm2Vux-!T?C=R>MLS424~6a* cb8o!?>DuaH(%ecC)3F#a{`aJ0?_3A&AH)HSj{pDw delta 2782 zcmcgue{3699oIKW)1>K^w&~KQ>Du$PbMNT$<(!gcv3v32IMKY|#Y?Iz(1iA4U*aP^ z+r4{n(_6Jl&7dHru?_wK1ZyY$VgDd)0y+d}tYQKQvGKig zTs!TM5C~-5z4yMq-uLr)-|s#DS8woTtin^x4*Od{vNg` zc)YU62TxZP9|rT4g>h`DvbcFHT3PffQ36ppp^4pfY$dmk!&N66ml-Q%KQ z58U@m@%3KV46))H19vy#@b<%vK8UejE$oK~``f|{#EYjEhif3ruAX}U-yfapgeW^$ zco2q}QJ^qfe82GX8W>~Wd9nuv+3%k`g!Ap^dtjUmoj(lY#WUw016fJ5J;}+6qQpY}4ml8GjVrz#@rt-F zBnSFPm|efp#@_gCW9^6%X2wd_rpS^=qU`aNHumO9BgEOyRu0`2mCoo%nj+JpNQT)b zD|<2h_6r?|Zs>v+ZOjY#ws6TtIVcQ>BrK)eJa9G4fO+m67RiWYsd-IsCe&0jR$8T+ zFwoJ75ku@X2p9j(lC_BPl>KcaVe9h;5xD>Pg)J~xy!_31z`^_Sz6KlyF8S&j9ug>- z7lVWBv8(SR5tFaHgH9c= zDdFVjM#wBaF?=HIH#Z0t@b(YRK(zSG2Zb6e?Z!Xc132vequPK3J@J?2EqI8VKmEs! zaUntGM50MEb9z#<78l1?zYOx~AnXEXHdHq*WQlzmpmp`f(9%9Gq_M!zJYi;Y;p}`Y zn^&jO8bTRg{Rl+YN4AFmno85PuL9IvnweMAJSp|jMiY0R+fCMPHUMn4jRG{BYcCotsNpXTR45JJ%Ms!C&{>MXHm1 zZY#95C{;YTZalHC?SFX;}R6pu_?&HBbJ zdF6N;G#mI+ERB|l5`^iwOoHm!j36#(W%yNrc4KBD>Fko_N`@{wcK~#y8v(kaazeKN zR;2$8KvFtNUfclGja>%!Zvpk`>UxH^BHjVG!iSS_y~8=t+2wEa)aRU9=IvDv9I)SR zhWfqhM}dXUlZBjWs)iL<(31fw=}EgFLTdqg+vD5;v{Zf5dPcWWT2eGMI%j4$?X%9= zk1d!}XEf!ATl)fE+E-EZP$I3VW*IS-Wpxpj#bRKcEOhAcdjEyX2JS>Wc5!KGi6j&O z?_B2=UVHp71e)5bTF8SS45wpH$dgVRtz9_^*P)S0C-F|16a)6vqYzp9(fu&^CHvYS zG;OQu2X{Byp9Wv;yzhv8PKDjJ^di*T-G106}ON&%