From 63343ae5033035d44b25ed4448cd498f8e762fbb Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 9 Jun 2018 16:29:36 -0600
Subject: [PATCH] Add basic CW/NSFW support

---
 app/Http/Controllers/StatusController.php     |   6 +-
 public/css/app.css                            | Bin 200971 -> 202777 bytes
 public/mix-manifest.json                      | Bin 250 -> 250 bytes
 resources/assets/sass/_variables.scss         |  14 ++
 resources/assets/sass/app.scss                |   4 +-
 resources/assets/sass/components/switch.scss  | 152 ++++++++++++++++++
 .../views/timeline/partial/new-form.blade.php |  12 +-
 7 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100644 resources/assets/sass/components/switch.scss

diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index 27cf768f..4e5c2e8d 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -33,9 +33,11 @@ class StatusController extends Controller
 
       $this->validate($request, [
         'photo'   => 'required|mimes:jpeg,png,bmp,gif|max:' . config('pixelfed.max_photo_size'),
-        'caption' => 'string|max:' . config('pixelfed.max_caption_length')
+        'caption' => 'string|max:' . config('pixelfed.max_caption_length'),
+        'cw'      => 'nullable|string'
       ]);
 
+      $cw = $request->filled('cw') && $request->cw == 'on' ? true : false;
       $monthHash = hash('sha1', date('Y') . date('m'));
       $userHash = hash('sha1', $user->id . (string) $user->created_at);
       $storagePath = "public/m/{$monthHash}/{$userHash}";
@@ -45,6 +47,8 @@ class StatusController extends Controller
       $status = new Status;
       $status->profile_id = $profile->id;
       $status->caption = $request->caption;
+      $status->is_nsfw = $cw;
+
       $status->save();
 
       $media = new Media;
diff --git a/public/css/app.css b/public/css/app.css
index 656378808792a6c58533bda671cf2adeefcb083e..4fc774d1919e744b4b6828b87f8a69419855ccb5 100644
GIT binary patch
delta 3297
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

delta 1771
zcmaJ?YfM{Z7|!$cX2*a)FF=_L#3IDfwFg>Gxs7R-s990x#LdfGFVtvYjCz?%T;^P2
zOo(xY#5exXfgp^rtz>|o(IrA+G%;~;Ka7iU%`_&u_-nt~WkdaXdJZis<5$1Fm*>4c
z@A-Ic^T=nL=XOjOJZ<4vZ2sX1X3~i#m7YKoZ5u$*=#ewB-XCu1psqNo<}aO@-=z!1
zVxuQ-*+#FWibwxi$^4d%{*Ve71F=X{fSA*dl^SJFSiI>}3X)N3aY;TOeQ1JHee;VZ
zL}7`91|p4;+Z%}Y57s_dD;;{Xi8q?@+dXzg<8}LGujI>97MJ5Tv#D-=xowTkhIcgl
zHL;f3;lce%fgRzYc(gy>92puIinrH$6yZ^K__c%0hvF{}687PNYLCYshz1Hw{Zb@C
zPjsRe5{=EmMm;-GX7;$eYI&DB@wnseQOMhc)0G0F0N57^$LK~Eme&X7e{`eOu1saQ
z3sz++bmV!_%WV2I-UmAw_Mu*6o|$4nfQ&F>Wuv91@o0XO;??wBZeLT@W_KSvYob+A
zq7QQ$l_s#;>A-U$x$Av!QFkxO>Az<X%nz086n|?k{8ej0l+iE4u<68}Q7D9ZdOZ#Y
zcg0asmR(HVc>;r5vTu5_R@A$E3NL7jRab}B96W`_geu$;Z4*^1w%1O>Obz3(^P6M%
zhN&>gNi@>i6R7!U67LzEQcFzOzds3{)9(_hSIIDi3Qb=(g%NXh;G$!6byCnIIfbB>
zigy~Hs{WU!@w4XU>19^xnSzmioyL}ohnWsep<8ov&!A&nHVn_;3iKH=QE(Q$Ca)yB
zymElXXYr8shhLw?cHD(B<UNPO>obPVp2NHAMWtmoEEGJCy&8>=H^7<K;XEeO{yJ3B
z(etRHV+ok3Gl3G#OM!_b@Z!2be(x3gl1w07dglp9&S4yC7mr`SqSmE5=Dd}QJ@{ZA
z&HBu+X=xtmoKp>5SrB7YxhYI5=-2{EXk-x%Z8-)P#4NsF#CJKjd+F>K7|e5%HRA(c
z!pes^_8YR+{PIQE+qEsW(ba^=raT3gvc)@6IH{rJb&In!_Fw}l@mFp_)*G{TiI!Fb
zXTMrO-zIT4#F+|3U+SlSy5Z)J{EIzCok#YOXrrY%66yC95I-zO#igbn^~|ZBW=iW>
zgRadd@j3&$U{uS#v6ET&-$iW3xKU!Cmoo!aBN`NN8n-bEl~~zU>T$4&%xhcDMEM-7
zn$*xw4(1dms#RoNaH29oDzdR^{->2~k~Q8WgX})C1=+W%fD1vTIsi)VW^d?3WBBk>
ZY)LI<y5(8+iCUL0#kMQ@!zuQ4<^NB1C3XM+

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 3598c8dc7b64e783e6a35efdaea512f2ee8a6e67..a0fc846dab985ea32b2c1850d4fa1e5a94d40ab9 100644
GIT binary patch
delta 29
kcmeyx_=|Bug0Oj7idkBkVUlH%p`}5ZaiURb(!}C+0G-PULjV8(

delta 29
kcmeyx_=|Buf^ed#sfC3_nrVuqiE*MyqOpmA`NZOO0Fx65TL1t6

diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss
index f4a958a7..46639fe6 100644
--- a/resources/assets/sass/_variables.scss
+++ b/resources/assets/sass/_variables.scss
@@ -6,3 +6,17 @@ $body-bg: #f5f8fa;
 $font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;
 $font-size-base: 0.9rem;
 $line-height-base: 1.6;
+
+$font-size-lg: ($font-size-base * 1.25);
+$font-size-sm: ($font-size-base * .875);
+$input-height: 2.375rem;
+$input-height-sm: 1.9375rem;
+$input-height-lg: 3rem;
+$input-btn-focus-width: .2rem;
+$custom-control-indicator-bg: #dee2e6;
+$custom-control-indicator-disabled-bg: #e9ecef;
+$custom-control-description-disabled-color: #868e96;
+$white: white;
+$theme-colors: (
+  'primary': #08d
+);
\ No newline at end of file
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index 235957bc..a9369498 100644
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -13,4 +13,6 @@
 
 @import "components/typeahead";
 
-@import "components/notifications";
\ No newline at end of file
+@import "components/notifications";
+
+@import "components/switch";
\ No newline at end of file
diff --git a/resources/assets/sass/components/switch.scss b/resources/assets/sass/components/switch.scss
new file mode 100644
index 00000000..6ddb4724
--- /dev/null
+++ b/resources/assets/sass/components/switch.scss
@@ -0,0 +1,152 @@
+$switch-height: calc(#{$input-height} * .8) !default;
+$switch-height-sm: calc(#{$input-height-sm} * .8) !default;
+$switch-height-lg: calc(#{$input-height-lg} * .8) !default;
+$switch-border-radius: $switch-height !default;
+$switch-bg: $custom-control-indicator-bg !default;
+$switch-checked-bg: map-get($theme-colors, 'danger') !default;
+$switch-disabled-bg: $custom-control-indicator-disabled-bg !default;
+$switch-disabled-color: $custom-control-description-disabled-color !default;
+$switch-thumb-bg: $white !default;
+$switch-thumb-border-radius: 50% !default;
+$switch-thumb-padding: 2px !default;
+$switch-focus-box-shadow: 0 0 0 $input-btn-focus-width rgba(map-get($theme-colors, 'primary'), .25);
+$switch-transition: .2s all !default;
+
+.switch {
+  font-size: $font-size-base;
+  position: relative;
+
+  input {
+    position: absolute;
+    height: 1px;
+    width: 1px;
+    background: none;
+    border: 0;
+    clip: rect(0 0 0 0);
+    clip-path: inset(50%);
+    overflow: hidden;
+    padding: 0;
+
+    + label {
+      position: relative;
+      min-width: calc(#{$switch-height} * 2);
+      border-radius: $switch-border-radius;
+      height: $switch-height;
+      line-height: $switch-height;
+      display: inline-block;
+      cursor: pointer;
+      outline: none;
+      user-select: none;
+      vertical-align: middle;
+      text-indent: calc(calc(#{$switch-height} * 2) + .5rem);
+    }
+
+    + label::before,
+    + label::after {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: calc(#{$switch-height} * 2);
+      bottom: 0;
+      display: block;
+    }
+
+    + label::before {
+      right: 0;
+      background-color: $switch-bg;
+      border-radius: $switch-border-radius;
+      transition: $switch-transition;
+    }
+
+    + label::after {
+      top: $switch-thumb-padding;
+      left: $switch-thumb-padding;
+      width: calc(#{$switch-height} - calc(#{$switch-thumb-padding} * 2));
+      height: calc(#{$switch-height} - calc(#{$switch-thumb-padding} * 2));
+      border-radius: $switch-thumb-border-radius;
+      background-color: $switch-thumb-bg;
+      transition: $switch-transition;
+    }
+
+    &:checked + label::before {
+      background-color: $switch-checked-bg;
+    }
+
+    &:checked + label::after {
+      margin-left: $switch-height;
+    }
+
+    &:focus + label::before {
+      outline: none;
+      box-shadow: $switch-focus-box-shadow;
+    }
+
+    &:disabled + label {
+      color: $switch-disabled-color;
+      cursor: not-allowed;
+    }
+
+    &:disabled + label::before {
+      background-color: $switch-disabled-bg;
+    }
+  }
+
+  // Small variation
+  &.switch-sm {
+    font-size: $font-size-sm;
+
+    input {
+      + label {
+        min-width: calc(#{$switch-height-sm} * 2);
+        height: $switch-height-sm;
+        line-height: $switch-height-sm;
+        text-indent: calc(calc(#{$switch-height-sm} * 2) + .5rem);
+      }
+
+      + label::before {
+        width: calc(#{$switch-height-sm} * 2);
+      }
+
+      + label::after {
+        width: calc(#{$switch-height-sm} - calc(#{$switch-thumb-padding} * 2));
+        height: calc(#{$switch-height-sm} - calc(#{$switch-thumb-padding} * 2));
+      }
+
+      &:checked + label::after {
+        margin-left: $switch-height-sm;
+      }
+    }
+  }
+
+  // Large variation
+  &.switch-lg {
+    font-size: $font-size-lg;
+
+    input {
+      + label {
+        min-width: calc(#{$switch-height-lg} * 2);
+        height: $switch-height-lg;
+        line-height: $switch-height-lg;
+        text-indent: calc(calc(#{$switch-height-lg} * 2) + .5rem);
+      }
+
+      + label::before {
+        width: calc(#{$switch-height-lg} * 2);
+      }
+
+      + label::after {
+        width: calc(#{$switch-height-lg} - calc(#{$switch-thumb-padding} * 2));
+        height: calc(#{$switch-height-lg} - calc(#{$switch-thumb-padding} * 2));
+      }
+
+      &:checked + label::after {
+        margin-left: $switch-height-lg;
+      }
+    }
+  }
+
+  + .switch {
+    margin-left: 1rem;
+  }
+}
diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php
index 104e4de5..304b582e 100644
--- a/resources/views/timeline/partial/new-form.blade.php
+++ b/resources/views/timeline/partial/new-form.blade.php
@@ -12,11 +12,21 @@
           </div>
           <div class="form-group">
             <label class="font-weight-bold text-muted small">Caption</label>
-            <input type="text" class="form-control" name="caption" placeholder="Add a caption here">
+            <input type="text" class="form-control" name="caption" placeholder="Add a caption here" autocomplete="off">
             <small class="form-text text-muted">
               Max length: {{config('pixelfed.max_caption_length')}} characters.
             </small>
           </div>
+          <div class="form-group">
+            <label class="font-weight-bold text-muted small">CW/NSFW</label>
+            <div class="switch switch-sm">
+              <input type="checkbox" class="switch" id="cw-switch" name="cw">
+              <label for="cw-switch" class="small font-weight-bold">(Default off)</label>
+            </div>
+            <small class="form-text text-muted">
+              Please mark all NSFW and controversial content, as per our content policy.
+            </small>
+          </div>  
           <button type="submit" class="btn btn-outline-primary btn-block">Post</button>
         </form>
       </div>