From 1a7cbb21a72155bc7a3e00d445261be0eec26d2b Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 28 Jun 2020 19:51:10 -0600
Subject: [PATCH] Audio player work (change of sensitive content handling)

---
 app/soapbox/components/status.js              | Bin 16792 -> 16839 bytes
 app/soapbox/features/audio/index.js           | Bin 12644 -> 11827 bytes
 .../compose/components/upload_button.js       | Bin 2301 -> 2272 bytes
 .../report/components/status_check_box.js     | Bin 2944 -> 2936 bytes
 .../features/ui/components/audio_modal.js     | Bin 1974 -> 1475 bytes
 app/soapbox/locales/defaultMessages.json      |   2 +-
 app/soapbox/locales/en.json                   |   2 +-
 app/soapbox/reducers/media_attachments.js     | Bin 711 -> 787 bytes
 app/styles/components/audio-player.scss       |  53 +++++++++++-------
 9 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 9c308c2f2e2d9105bdabb1b723b5dc9420769c2f..cbb4b4e35a3dc71e38dd62e46e70525abdc5a50c 100644
GIT binary patch
delta 18
ZcmbQy%y_(+aRZCNWPe@5&1?pf1OY%11{eSU

delta 18
ZcmX@!%s8W&aRZCN<a>r}n=K9c1OY_!2Co1B

diff --git a/app/soapbox/features/audio/index.js b/app/soapbox/features/audio/index.js
index 256fa4ab99f87ee36c22040d32f4f9bb2b9c7606..c4b458e3d4617a2abda44029346ec6ae4182841c 100644
GIT binary patch
delta 274
zcmaEov^i$Nu8p@!xdjvyQY#7)^HPEf@-uT%i;5=~a*J&C=iy`7+%NE$Yw~HC8uswS
zqP)z!^vOQ*@{>=?s&4)!dzh6oCAB0Gs3FB_@>yj`86Aakh@$wi%;L<XoK!0X#iG=*
z)I^|)$<LJUb8sm@z~)+2A*RWPG)(x5Ar|UFHBLUFZZY|xo}49`czk?LVp3|3x}A+@
za(<pdW{RykREN4kT4qIRN_b{UNrr;Hox<dP4H>qi(vp(=yvcz&ij(&lC`&+{UW=r=
bBr`X)c=8_uiOIS;oSXM(G_g<CG_(c)QhH>8

delta 929
zcmZ`$&ubGw6h_pR#I{yw($ciywWZlCWK&QSNt0acK`&C;suy9IWL}bi$?UQ_Ne#<V
zym=DK_&0bIBp30o@Z?bsdbbz#sI$A>5V6i-<}vf$H{Xx(({HU;AC{O8A#^;a4+iV^
z2a>cnzI*%p+W2s8;Y!9wd5?%8@s)EuKhuuO@zLU0_N49fT}PmhPZ;M1*hV(Qea~_I
zvcP9Du1pBBpcm^vd4o+oRENxG`kxBO9`mbiG?w0(P%6O$BE5x;Mgs<dVuuN&8u%ne
zh6F&fJd{LYIRFobNI25k1sI{Z8&8FL53_okXxL-)kxL^4R|CZ4D-e}2?6i*bavrPc
zSDLW;UdS(K-mx4qpv*DVYT?byLCi+MT5;DAM^3lP@o^-baVAG8?74`<g@4=1raCR=
z)ThF2wYPp_oL_r?)nbCQr8c|<8!3wlP?Use=@nptYny84r<&XR(u{J5Rz1lOjv1A`
zMsVw92t8!oo=j>FJB=V#F-iUaJE8h*teo_bGGcWJ=je@WJ92{Iu~C5ljEmnatH&rs
zVbmtMKxl@r(~R6tR*(vaa<9kUP2NC{P56u#w|-o@taDRm<z-deo?q}?N9*;h)<8-}
zsQcS@)h{!*)#k+aACf*cjK4c<+Zm$A$;eQrW-gP26E?HzWo3Q$KdrXSNej8r433E>
znCOP}9p5FQIYn|zORr~DSjwmu#-{pQo?QVivecMviqr<`r+G)MmbTW?zv~a$jsQj*
T29D73HS?aKKAOwwtF`|Jo_#%Q

diff --git a/app/soapbox/features/compose/components/upload_button.js b/app/soapbox/features/compose/components/upload_button.js
index 6e8f5b82e96e494a2448e3242f9fdc4fc0c3e4e0..24a83a527a021160b817004f78b24e27f0c40a79 100644
GIT binary patch
delta 53
zcmew>_&{*Oenzgul9I&ajNH_`lFj!SA2W;SC?qB)rxuhr=jW9G1w$$eQj0eqV)bR3
Iti^E|08Y{sJpcdz

delta 75
zcmaDL_*ZblentfiuK-tf9fbftAmQ%mrlSy^n&hja;2U59B>clPH=ksD%)I#kt1pv?
Tx|W`nI+p?x(AS^L#&HV(MluuK

diff --git a/app/soapbox/features/report/components/status_check_box.js b/app/soapbox/features/report/components/status_check_box.js
index 2ccb0df390afa0c3291650007330bfea5cbd53b5..1e781fdd696b8f21a8636644b2d757eeadd36ec7 100644
GIT binary patch
delta 28
kcmZn={~@;FI@@GjX7<VFnT02RWb>G;#bUa-jGc=G0GpNxdjJ3c

delta 31
hcmew%)*!y&IvZow<Qr^>912h{S&PMVa~?Yv3jn332&4c2

diff --git a/app/soapbox/features/ui/components/audio_modal.js b/app/soapbox/features/ui/components/audio_modal.js
index 9496fd2ed650d4a4bfdd88f395144ee88a12521a..de8c719916be205469c586e2fc5cc8e061abd720 100644
GIT binary patch
delta 12
TcmdnSf0%niGt=fW76)bkAVCB<

delta 482
zcmb7=KS~8L5XNEc-YYzS&0v)WlFmxj!uJXrD-r9kMmLz93CXN~kYx*x;6((%3wR)}
zU=p({%4<v&=9`&se&5IPefRab8XM{yp+?@At2646#R{Gl5TCgQ!L13hA!Pl)(o@gc
zPclHP2Zq?e<R77iEzPp1M~l1?rf%u_(26LIX;xZl6dOY66t}24eE`nuJEQN<S+QQt
z<JqD|8$C6i&d$X}e%D1rsE-RpBFR(ElM9k?Z7FCGS0)8U7|M5ug(00eCvs`5y}<5&
zp=`S_xfTAup&pi0r=WhK2#Fl(y8azS#(Mdz_V;e+L^ZcFNjyFQWsJA6+U$G*VK|$h

diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index 14d3f14e97..e8c17f6e2c 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -1217,7 +1217,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+        "defaultMessage": "Add media attachment",
         "id": "upload_button.label"
       }
     ],
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 950098cf9d..6507a57619 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -450,7 +450,7 @@
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Add media attachment",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.description": "Describe for the visually impaired",
diff --git a/app/soapbox/reducers/media_attachments.js b/app/soapbox/reducers/media_attachments.js
index 4cc6cf1a22dceef4de3cee96d8db12b959a46477..134ccbf3064fbbe0c5fb44be80fadf2b20d6cbd7 100644
GIT binary patch
delta 80
zcmX@kI+<-lF{6N9Zh^774wnKDsO#mYr%%piY}E&{6H8Mv^YxJ=VFIb?Fy#;tke=6!
FcL00W7kvN#

delta 15
WcmbQtcARxXG2`TJ#@fj?OxFP}B?Zm^

diff --git a/app/styles/components/audio-player.scss b/app/styles/components/audio-player.scss
index 1bda56b8ca..68e7f065b6 100644
--- a/app/styles/components/audio-player.scss
+++ b/app/styles/components/audio-player.scss
@@ -41,20 +41,6 @@
   text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color;
 }
 
-.status__audio-player-spoiler {
-  display: none;
-  color: var(--primary-text-color);
-  left: 4px;
-  position: absolute;
-  text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color;
-  top: 4px;
-  z-index: 100;
-
-  &.status__audio-player-spoiler--visible {
-    display: block;
-  }
-}
-
 .status__audio-player-expand {
   bottom: 4px;
   z-index: 100;
@@ -86,6 +72,10 @@
   border-radius: 4px;
   height: 57px;
 
+  &.warning_visible {
+    height: 92px;
+  }
+
   &:focus {
     outline: 0;
   }
@@ -178,6 +168,35 @@
     padding-bottom: 10px;
   }
 
+  &__spoiler-warning {
+    font-size: 16px;
+    white-space: nowrap;
+    overlow: hidden;
+    text-overflow: ellipsis;
+    background: hsl( var(--brand-color_h), var(--brand-color_s), 20% );
+    padding: 5px;
+
+    button {
+      background: transparent;
+      font-size: 16px;
+      border: 0;
+      color: rgba(#ffffff, 0.75);
+      position: absolute;
+      right: 0;
+      padding-right: 5px;
+
+      i {
+        margin-right: 0;
+      }
+
+      &:active,
+      &:hover,
+      &:focus {
+        color: #ffffff;
+      }
+    }
+  }
+
   &__buttons {
     font-size: 16px;
     white-space: nowrap;
@@ -190,12 +209,6 @@
       }
     }
 
-    &.right {
-      button {
-        padding-right: 0;
-      }
-    }
-
     button {
       background: transparent;
       padding: 2px 10px;