From 3610e07be32b4eea09f2b2a57bf98d6ae98da5b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2020 21:32:41 +0000 Subject: [PATCH 1/4] Bump websocket-extensions from 0.1.3 to 0.1.4 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] --- package-lock.json | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index e44656264..0e9cba405 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1312,7 +1312,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "requires": { "inherits": "2.0.1" @@ -1436,7 +1436,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -1453,7 +1453,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } @@ -2661,12 +2661,12 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, "regexpu-core": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "requires": { "regenerate": "^1.2.1", @@ -2676,12 +2676,12 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" }, "regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "requires": { "jsesc": "~0.5.0" @@ -3784,7 +3784,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -3796,7 +3796,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } @@ -4358,7 +4358,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { "code-point-at": "^1.0.0", @@ -5037,7 +5037,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" @@ -5091,7 +5091,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" @@ -5506,7 +5506,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -6030,7 +6030,7 @@ "dependencies": { "semver": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" } } @@ -6123,7 +6123,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -6153,7 +6153,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "yallist": { @@ -7498,7 +7498,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -7533,7 +7533,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -7654,7 +7654,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" } } @@ -7835,7 +7835,7 @@ "dependencies": { "convert-source-map": { "version": "0.3.5", - "resolved": "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", "dev": true } @@ -8022,7 +8022,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { "amdefine": ">=0.0.4" @@ -9873,9 +9873,9 @@ } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, "which": { "version": "1.3.1", From b289f2f6c10fd7aea77fc22766966e4df5e9f88a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 18 Jun 2020 01:10:21 -0600 Subject: [PATCH 2/4] Update PostComponent, add recent posts --- .../assets/js/components/PostComponent.vue | 83 ++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 18ce71e2d..38e01e151 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -253,6 +253,39 @@ +
+
+
+
+

More posts from {{this.statusUsername}}

+
+
+
+ +
+ + + +
+
+
+
+ + + {{s.favourites_count}} + + + + {{s.reblogs_count}} + +
+
+
+ +
+
+
+
@@ -676,7 +709,9 @@ export default { ctxEmbedShowLikes: false, ctxEmbedCompactMode: false, layout: this.profileLayout, - canEdit: false + canEdit: false, + showProfileMorePosts: false, + profileMorePosts: [] } }, watch: { @@ -782,6 +817,7 @@ export default { } } this.loaded = true; + this.fetchProfilePosts(); }).catch(error => { swal('Oops!', 'An error occured, please try refreshing the page.', 'error'); }); @@ -1270,7 +1306,50 @@ export default { reply.url : '/i/web/post/_/' + profile.id + '/' + reply.id; } - } + }, + + fetchProfilePosts() { + let self = this; + let apiUrl = '/api/pixelfed/v1/accounts/' + this.statusProfileId + '/statuses'; + axios.get(apiUrl, { + params: { + only_media: true, + min_id: 1, + limit: 9 + } + }) + .then(res => { + let data = res.data.filter(function(status) { + return status.media_attachments.length > 0 && + status.id != self.statusId && + status.sensitive == false + }); + let ids = data.map(status => status.id); + if(data.length >= 3) { + self.showProfileMorePosts = true; + } + self.profileMorePosts = data.slice(0,6); + }) + }, + + previewUrl(status) { + return status.sensitive ? '/storage/no-preview.png?v=' + new Date().getTime() : status.media_attachments[0].preview_url; + }, + + previewBackground(status) { + let preview = this.previewUrl(status); + return 'background-image: url(' + preview + ');'; + }, + + getStatusUrl(status) { + return status.url; + + if(status.local == true) { + return status.url; + } + + return '/i/web/post/_/' + status.account.id + '/' + status.id; + }, }, } From a6a595ab0253447b57931adc35238f8a39c9d88b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 18 Jun 2020 01:11:07 -0600 Subject: [PATCH 3/4] Update compiled assets --- public/js/status.js | Bin 74111 -> 76539 bytes public/mix-manifest.json | Bin 1939 -> 1939 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/status.js b/public/js/status.js index 7763df1eee08c8f3111e695a5958db2e87439aff..87f17bd88b0712f036e007ecdd6577c3d71e027f 100644 GIT binary patch delta 2172 zcmb7FZ)_7~7*AO@$2MSY-I!yJ>x-7Fz3aMl8?3VoCz1_fGX6(Kt#5m8+mrj}-P?8( z8vckHOqAd|LKH*77Zde^m;(|GAKVz2VMrjx5dGkQU<@%)(L{!T`d-`Z7SsgOG`Zh% z@AG?}=lA^X?yoWDov)q8x0aOz*YuKs^NY!!x8^R~vbr(+h z;DyJ{SISm9InGF_*#TWmh!T2M)zN@zU?b#i<+S@_gAsG0;`{PC4*L@b$5X|md;)uD zx1-tovi7qjHQYaLl21D7cX22TTA(JjXyOo(5=dytw6?%_Tum$3XaPQ)5)HqBAx;}b z;(oygS_%s)j#_FpIby8q}d|gm$QkG#r(YAi|J4z{#Q#6@^eMCyBC%LtVL? z*N;<3Vc7&Z!dH^lm&_}tb7G{k?BPpu9ku<)pHGfLjA1+_Bif5!LP`>+Rs=jA7d)OoIE?%TQVbD`8IL`(FeOy8~XT!a=gIgS!<$S=q0 zglKom8gjWDr-oUB1)bDzz{}CAK1Ef`_m(lebkN>Or|ghfzChxa3G;7m^Z|i5skEVXhVS3wg@sT zu$URmGA)zPRhb;?ZOHSvMrxdZ`ihLc>LMS!P)YVKtsxsmT;#xqwGBnxc}%sELF4EO39hkDy@$cIZ`TVygQvGh_QY@*l5b#0H@~0SoT7rfV0&!L1+Zl~- zrGH8n1Z2;PO}pYy7Z_1VsJxm%x&((AD`Fjpsk(r4o=!;pr&Bwpbd(5TYl{W3trZ}z zHSDx(JL36LgR@-N1B{o_P`9)xTrj{l%hzOkX%%_o$ExNCr2$$>#cBvjv9t^ZrSG2F~cq$>;bF`iu-#xE!_8xeQhA>^V zC2p#Nw070Gvndf%H}EixRVMGcf)nYgB*8jLuIzJr5>U4~Ng=3X>q1J>g|{&RpODZH zFDjO$s8UxqFCiaqEMsRPMbA=e87%TAU`9>rw4M>ozXiQyT}dtZWpf$1v9Ezts}H$# zgtG`eK#3LqQ9?&CNli}kdn2=cTpI_bT}&28_2h|nYRrqnuIiF@Z-lIr>&(0RFZ;;1 zCtOv-e7iL|qAKZ!M;AN#$X6#%moJOQ142C3ZXP~$rNU`F`DESsX6vJ~V6C#cZPrJ} zoIEF$IM?)T>LX24UF5{*LeF$^gxjY0bp+#BR25@TfEe-_e)=xCIr`*G9SR;L>&Lq7 zz@ahD1`}i3Y`~v6VuOokmfN6uyvqjb#yf3rV7$!+6XPG*VCUH$8=N^iXamo=*KBa& z9B-~YUsK|=#y_~S(YZaid=0sHd%qdE@LYw{`Vw2wybf0M)a84QdM!-N*M$dEs#hYd zZw-@WaKk)4yxj+l95vclnrn(tqM4jL=JmZU(t_V65sO!i)X z-XWV;uV0?y(9BPNNG>RpZ<<d9{Q z7TKjN4wTHd)hO0b%Bc!WRMOM|vPyGuJvT45QgE6)ZI;Mpg=P_f>DFS5{FC2wb8hyT zd|i8T_x?Q`hK9+hriKC$HZtkS?IhtTyC=Ac`*dX|GW({M|Sdt z^VSG~&*yaz9Q6w^2u}Bf*$9r_MGFKc@1iAwv;LwPg7fyG5rU(BX*Gg#>ykZ!qj)(Q z!D+eNhTsTY(cPSVI*WO;{S_hR&3~>(a&3D2mr*R&78pL3B?0+Ln$~HhdC4W2`FRQj zn}whLWnoO3Ecj{*WBlY}ujClxH$Q#F#mJbn`NQi(Mxa>G+jJmj*IPj*#)8Rb-p4T( zY}Wp8ory7bGxO(kewLilzzj(6X+IR1F3Q4~%>s&!NjK!C2QV>midN-iqyTL!*2~jK z)YMC?)hY7IPX}oTg1dP72_{BQ1W%HgQ3b&R%4tr|V`h{_2u);WG-d(CG~AN1^e7(` vOF#k>9i&)5mQ9T7+}^;#n6JjF19A*V7!>Cd<2rb1b)ut9bqr!-V>PV-)x+Gd diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 9518b494c15ed67481c7188e142206a2f0ba20b8..abe2c941903fe66a90cb131e8c5247300f5eaf6b 100644 GIT binary patch delta 32 ocmbQtKbe2SLN<|PV{;QDgG3Yaq{LL?M8h;wqqL;STiNab0HXH_jQ{`u delta 32 ocmbQtKbe2SLN*aYb7Mh($ From 16e55b0cae536c83193de1e46c77faa7d97a40cf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 18 Jun 2020 01:11:32 -0600 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1140d63f..bf5637584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ - Updated AP Inbox, remove trailing comma ([5c443548](https://github.com/pixelfed/pixelfed/commit/5c443548)) - Updated AP Helpers, update bio + name ([4bee8397](https://github.com/pixelfed/pixelfed/commit/4bee8397)) - Updated Profile component, add bookmark loader ([c8d5edc9](https://github.com/pixelfed/pixelfed/commit/c8d5edc9)) +- Updated PostComponent, add recent posts ([b289f2f6](https://github.com/pixelfed/pixelfed/commit/b289f2f6)) ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)