From d1d464a3ad3738c74544be349a307b60bbac418a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 22 Jul 2019 18:31:48 -0600
Subject: [PATCH 1/2] Fixes #1544, allow read more to be disabled on posts

---
 resources/assets/js/components/PostComponent.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 1e4878e3..06837f1a 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -499,6 +499,7 @@ export default {
             replyingToId: this.statusId,
             replyToIndex: 0,
             emoji: ['😀','🤣','😃','😄','😆','😉','😊','😋','😘','😗','😙','😚','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','🙁','😖','😞','😟','😤','😭','😦','😧','😨','😩','🤯','😬','😰','😱','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾','🤲','👐','🤝','👍','👎','👊','✊','🤛','🤜','🤞','✌️','🤟','🤘','👈','👉','👆','👇','☝️','✋','🤚','🖐','🖖','👋','🤙','💪','🖕','✍️','🙏','💍','💄','💋','👄','👅','👂','👃','👣','👁','👀','🧠','🗣','👤','👥'],
+            showReadMore: true,
           }
     },
 
@@ -514,11 +515,18 @@ export default {
 
     mounted() {
       this.fetchRelationships();
+      if(localStorage.getItem('pf_metro_ui.exp.rm') == 'false') {
+        this.showReadMore = false;
+      } else {
+        this.showReadMore = true;
+      }
     },
 
     updated() {
       $('.carousel').carousel();
-      window.pixelfed.readmore();
+      if(this.showReadMore == true) {
+        window.pixelfed.readmore();
+      }
     },
 
     methods: {

From 1b1d77d5861ff17603d44d9d19507a03ebaaf364 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 22 Jul 2019 18:33:10 -0600
Subject: [PATCH 2/2] Update compiled assets

---
 public/js/status.js      | Bin 61152 -> 61288 bytes
 public/mix-manifest.json | Bin 1575 -> 1575 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/status.js b/public/js/status.js
index 7da28904f9fb35fec09475523c560a1f971f274b..e19e7c3211ea77a5c8809066c04c5bb0b6fe2a27 100644
GIT binary patch
delta 634
zcmaEGm-)p#<_$u80y@PR`Q<^Wi7CGMMX6Sb2AhTW%oyWzl+qG&ic^(rZFBOI6LW$~
z@{1DFQ}xnQOFT<bb2XF-(&BSdON#R2OEdLSD+=_Aa+NggOENNx^^lFTRW!81B4{w#
zgI{0F(AE}1PEBodIlqr8Uud#xk&>oPv4&EhcYy2WizbD^9BBqdsY#}3sgu1rVwocy
zvnJYGO*URCt_Bm2)rrZ|D@sjFF3HT#D~?V{EJ@TY(}l@SE?8=VFrr|o?Bt6}tq}qu
z%XAPNk7Y3k&YESj5gh;J76?xNa!Ul~!g4bNhi`=ug5$AbHG=bdMFN78yfPZWIkqyM
z)v_cYUup8kN!pvQbvW{}c$Io&O!i+Q#Zsl6QaX9ziB47}Z;ur1$q(4%H(O7O;bj2@
z&g6$|a+A9|I7LCKl{Br3_3|_lHT4o}bwGg#lVvF}4ojKLw8WE5DbY1VTWNB>ir8j{
zRSt5@AaRf#mcSqd*}+m-l$i|FraD=FH~;3`Q|T&fI!Yi1fWkZdq$I+{1xrOH&pBy|
f5V(0#1;K&HicIcb%+6D*6CG`;V-On~t7#1Y?FHY_

delta 476
zcmaEHkNLq}<_$u8o0a&?7$<Mz*Wdh`-$#|t->f28NmHj-Ln+WDsC;v%X<;x&l9{Qw
zv00MY<Z~Udo1^;*cv+RaJyNtMKVXyJJZnx2FAGT1<c}TdqG1JLp-P(8#d>)fiJE$e
zwK^a}Kr$>PNrh396IXe%f|OWI7ThY%rlAyG=;t>1?d(n#5M!c)<>ZV`aW$B2u{tq%
zdPS*;$t9WjdBxEwi6x1;Wx6og$s68@O#a)+Ir&hhJi>txK^KI8XO|9wQ`;4T;5_V_
z%?~pyR-rm3PeEbg9Qnzsx`hyGj&xfhIIKNp2##})5rR|Ovl_uM=uJRyX7olQIJI3;
zlSTVnH?Lk5Eyn^34p=CZ7336vLjlA9g+l*3NrbKq?>rG4#`h`+&W3jyli#i6*u3H7
Td=;Kro#<#&9fR1|SWRmH;m@P3

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0347b5ab11e3d00fac628eeb33c389f312073073..14b5e53396db9d9bf4a1409d34ef5ba83cf0b3f2 100644
GIT binary patch
delta 31
mcmZ3^vz%u`6RWU+Ws;>?Qc`lViFuNlfvJh5dD7&mtdjtmaS5UT

delta 31
mcmZ3^vz%u`6RWV9WlD0Qv00*JqOoC;d0I-Msp;gYtdjtqQVIP4