From e5aa506c5a166ca069329436a5e827f4bad0150b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 5 Aug 2020 01:50:34 -0600 Subject: [PATCH 1/3] Update Hashtag.vue, add nsfw toggle. Fixes #2225 --- .../Api/StatusHashtagTransformer.php | 2 +- resources/assets/js/components/Hashtag.vue | 31 ++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/Transformer/Api/StatusHashtagTransformer.php b/app/Transformer/Api/StatusHashtagTransformer.php index 1dfdba3b9..f5a8d79e2 100644 --- a/app/Transformer/Api/StatusHashtagTransformer.php +++ b/app/Transformer/Api/StatusHashtagTransformer.php @@ -18,7 +18,7 @@ class StatusHashtagTransformer extends Fractal\TransformerAbstract 'id' => (int) $status->id, 'type' => $status->type, 'url' => $status->url(), - 'thumb' => $status->thumb(), + 'thumb' => $status->thumb(true), 'filter' => $status->firstMedia()->filter_class, 'sensitive' => (bool) $status->is_nsfw, 'like_count' => $status->likes_count, diff --git a/resources/assets/js/components/Hashtag.vue b/resources/assets/js/components/Hashtag.vue index 89719331b..e737859b8 100644 --- a/resources/assets/js/components/Hashtag.vue +++ b/resources/assets/js/components/Hashtag.vue @@ -4,7 +4,7 @@
-
#
+
#
@@ -12,14 +12,20 @@

#{{hashtag}}

{{tags.length ? hashtagCount : '0'}} posts

-

- - -

+
+

+ + +

+
+ + +
+
@@ -30,7 +36,8 @@
-
+
+
@@ -50,7 +57,8 @@
-
+
+
@@ -105,6 +113,7 @@ following: false, tags: [], top: [], + forceNsfw: false, } }, beforeMount() { From 7150bda37afd0ba72a7a619744582524e754edc9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 5 Aug 2020 01:51:39 -0600 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 507566408..d7864560a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ - Updated PostComponent.vue, improve MetroUI and fixes ([#2363](https://github.com/pixelfed/pixelfed/issues/2363)). ([0c8ebf26](https://github.com/pixelfed/pixelfed/commit/0c8ebf26)) - Updated Timeline.vue, fixes ([#2363](https://github.com/pixelfed/pixelfed/issues/2363)). ([f53f10fd](https://github.com/pixelfed/pixelfed/commit/f53f10fd)) - Updated Profile.vue, add atom feed link to context menu. Fixes ([#2313](https://github.com/pixelfed/pixelfed/issues/2313)). ([89f29072](https://github.com/pixelfed/pixelfed/commit/89f29072)) +- Update Hashtag.vue, add nsfw toggle. Fixes ([#2225](https://github.com/pixelfed/pixelfed/issues/2225)). ([e5aa506c](https://github.com/pixelfed/pixelfed/commit/e5aa506c)) ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9) ### Added From cdc06aca4fb57ee761a0f122d48197d7d9454ca7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 5 Aug 2020 01:52:28 -0600 Subject: [PATCH 3/3] Update compiled assets --- public/js/hashtag.js | Bin 12731 -> 13786 bytes public/mix-manifest.json | Bin 1939 -> 1939 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/hashtag.js b/public/js/hashtag.js index 1ba73386b02fce96cd7749db641728697e8e2f67..73ba54ec6108425eb25aff76a10e023279d032bd 100644 GIT binary patch delta 1644 zcmb_cL1-LR7-o{%Y-yzHCFE;brwGYRdQQfw2YIW({=b@uJs&7^PN zEbqP9&9dEwf)^=xc?ZFRcn}2fP@IB-2f^Y^M3JI+^6EwFK?M)u+u7Y@gWyT#FuZ@h z`TpKB=U!&KqofCw2YaHA+fpegpaPrh0Bz?RDn`s6O+WQ zgcJ!spdN8k835VrtV!f6V>23x@K{2dBKA$r*>zm?xlm*XIG%za`9@-85dptq4pV@( zg8Os_Be5x31alYV8XnUt?m$hB$UhTjcaV)dLQD)`#S{>OP6rc?+g)s^uq9jx7|t{7 z37k88bi>s`(MAD9o-jkG^b}CB!>|Y$ZR6c~zyx;$4C>uWafiq|$IeF^$N$pCq2fe% zgIAhPDjQunv32A~Z40kQ?>}{IM7B>(E|#qd!MplS$c0~NS*nM?R9Gb}nix~vBYu@y zzQ8qZA@u<>qXP@_@u`=d&}+=PAm=7NlHX3u$e$plrw#z)ie?t86)=qCCXz(m}8a zU71Ay9HylH3&e?!u$h4j4Di(M)mSA7B~(*aNkX_$s?0H{1CUa4zr z`@g)2F}l1voy;4s?~ro#uq7%&J>t#nps8hTV?*?vmHscOYTK<}xlJ_R9XBJd=nODUNG_X{>8a{5?by@{R2RQO^ax%I%xi$Jf z6F$WJktr>fDw*sB`J8^%xUsZ$HN#x;s>+sbZGl(o$kJ>78c0i6<1{^w0S*_0)|=883b3a$@RGhddbAf z@7OZ{8}XKd_yAOrDRW&l56t`Hm2^5sU2^-jN!(flfv0ID`PO_=TazEoU)5^SAM>A% z7|6}!(6VpWJ+wGsR*NuB!0(F*MCT*}*yDS<|g8^ew6Vx;f*$y+fFih+2l!B!i z^yI-9opAA>9z7T(*$e8ygv5geh8VYvD3{56FYkTx&3oUs`FD7ID-ar= zn#;=3)I>Nc9sJau6LoDAa9e{aXl`uGh(X{J2Su$(8!f(dZjOA09{LwTr%v77g zy)D$LPq+CT!QzToX2dm_v1mEnWpj5LWA`F&_C@Cy!WLtYsCpR+ov5`MVJ@lGCDfM` z2rW8f%psN_zHo18(lfa{!bOfP0jchfm1FsuLqyr(RkBnnI>OBey;!RM&COuB9qtcJ z4xOKppL(NVlfziU!n3{iy-4#f;C1Z377B5E^}4rsa55lUTGR4k>r45wwM`z1tjQOV zsC?a_C>epK3G`N@TR;|$MdgFGL9e}C3;rvbJLf}9_7Y)~%y_qY?tuRZf!`IaI^_^h~LFilhcLOCY$ z$)id|A2VS^-cGiMD>;$(x31znOKt*?^$J5zLBm_wq;$pW;ra^*WA!v*s=*P5u8OQ$ PP0!_$C-p==pI41P`M&)b diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 27f00d9ba86e1fcc014b31ee724d54d0b1c861ef..274109d4964f9ec543bf182b899b8b7eb21e54ac 100644 GIT binary patch delta 33 ocmbQtKbe0+G>eFNs;Rk&iBWP=s+oyllA%FTT4L(vd=?dE0HaI^Z2$lO delta 33 ocmbQtKbe0+G>b^8S(1ria$=I9p?PwWfpM~Vic#X`d=?dE0I6sRj{pDw