From 2ab2c9a9744d09da327ee83afd0d862e9210c78a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 25 Nov 2020 17:59:13 -0700
Subject: [PATCH 1/6] Update DiscoverController, fix trending api

---
 app/Http/Controllers/DiscoverController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php
index 113239cf1..c8b57c2a0 100644
--- a/app/Http/Controllers/DiscoverController.php
+++ b/app/Http/Controllers/DiscoverController.php
@@ -177,16 +177,20 @@ class DiscoverController extends Controller
         $request->input('range') == 'alltime' ? '-1' : 
         ($request->input('range') == 'daily' ? 1 : 31) : 1;
 
-      $key = ':api:discover:trending:v1:range:' . $range;
+      $key = ':api:discover:trending:v2:range:' . $range;
       $ttl = now()->addHours(2);
       $res = Cache::remember($key, $ttl, function() use($range) {
         if($range == '-1') {
           $res = Status::whereVisibility('public')
+          ->whereType('photo')
+          ->whereIsNsfw(false)
           ->orderBy('likes_count','desc')
           ->take(12)
           ->get();
         } else {
           $res = Status::whereVisibility('public')
+          ->whereType('photo')
+          ->whereIsNsfw(false)
           ->orderBy('likes_count','desc')
           ->take(12)
           ->where('created_at', '>', now()->subDays($range))

From 0d3575fea4f27f9a189e11fce8919a6a05374229 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 25 Nov 2020 18:00:49 -0700
Subject: [PATCH 2/6] Update vue components

---
 resources/assets/js/components/DiscoverComponent.vue | 6 +++---
 resources/assets/js/components/Timeline.vue          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/components/DiscoverComponent.vue b/resources/assets/js/components/DiscoverComponent.vue
index 34bbe3224..51bab70ab 100644
--- a/resources/assets/js/components/DiscoverComponent.vue
+++ b/resources/assets/js/components/DiscoverComponent.vue
@@ -81,7 +81,7 @@
 					</div>
 				</div>
 			</section>
-			<section class="pt-5 mb-5 section-explore">
+			<section v-if="posts.length" class="pt-5 mb-5 section-explore">
 				<div class="profile-timeline pt-3">
 					<div class="row p-0 mt-5">
 						<!-- <div class="col-12 mb-3 d-flex justify-content-between align-items-center">
@@ -284,10 +284,10 @@
 				})
 				.then(res => {
 					if(this.trendingRange == 'daily') {
-						this.trendingDaily = res.data;
+						this.trendingDaily = res.data.filter(t => t.sensitive == false);
 					}
 					if(this.trendingRange == 'monthly') {
-						this.trendingMonthly = res.data;
+						this.trendingMonthly = res.data.filter(t => t.sensitive == false);
 					}
 					this.trending = res.data;
 				});
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index f33de86b0..7b6e219b2 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -16,8 +16,8 @@
 					</span>
 				</p>
 				<p class="mb-0 d-none d-md-block">
-					<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
-						<i class="fas fa-camera fa-lg pt-1"></i>
+					<a class="btn btn-block btn-primary btn-sm font-weight-bold" href="/i/compose" data-toggle="modal" data-target="#composeModal">
+					 New Post
 					</a>
 				</p>
 			</div>
@@ -379,8 +379,8 @@
 							</span>
 						</p>
 						<p class="mb-0 d-none d-md-block">
-							<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
-								<i class="fas fa-camera fa-lg pt-1"></i>
+							<a class="btn btn-block btn-primary btn-sm font-weight-bold" href="/i/compose" data-toggle="modal" data-target="#composeModal">
+								New Post
 							</a>
 						</p>
 					</div>

From d6f81700a385df4f66b7b235e6bad880fea048d8 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 25 Nov 2020 18:36:22 -0700
Subject: [PATCH 3/6] Update dark mode

---
 resources/assets/sass/appdark.scss | 95 ++++++++++++++++++++++++++---
 resources/assets/sass/dark.scss    | 97 +++++++++++++++---------------
 2 files changed, 135 insertions(+), 57 deletions(-)

diff --git a/resources/assets/sass/appdark.scss b/resources/assets/sass/appdark.scss
index d88a375e5..f6f60287c 100644
--- a/resources/assets/sass/appdark.scss
+++ b/resources/assets/sass/appdark.scss
@@ -19,18 +19,66 @@
     background: #ADAFAE !important;
 }
 
+.border-top {
+	border-top: 1px solid #282828 !important;
+}
+
+.border-bottom {
+	border-bottom: 1px solid #282828 !important;
+}
+
 .btn-outline-light {
 	border-color: #E2E8F0 !important;
 	color: #E2E8F0 !important;
 }
 
+.modal-content,
+.card,
+.dropdown-menu,
 .bg-white,
+.list-group-item,
+.autocomplete-result-list,
 .postPresenterContainer,
 .postComponent .card-body.flex-grow-0.py-1,
 .postComponent .reactions,
 .postComponent .status-comments,
 .navbar-laravel {
-	background: #2D3748 !important;
+	background: #000 !important;
+}
+
+.autocomplete-result-list {
+	z-index: 99999;
+}
+
+.pill-to {
+	background: #282828 !important;
+}
+
+.dropdown-item:hover, 
+.tt-suggestion:hover, 
+.dropdown-item:focus, 
+.tt-suggestion:focus,
+.chat-msg:hover,
+.result-card .media:hover {
+	background: #181818 !important;
+}
+
+.notification-card .contents {
+	scrollbar-color: dark;
+}
+
+body, html {
+	scrollbar-color: dark;
+}
+
+.modal-content,
+.form-control,
+.img-thumbnail {
+	border: 1px solid #282828 !important;
+}
+
+.navbar.border-bottom {
+	border-color: #282828 !important; 
 }
 
 .postComponent .border-left {
@@ -44,7 +92,7 @@
 input,
 textarea {
 	color: #E2E8F0 !important;
-	background: #4A5568 !important;
+	background: #000 !important;
 }
 
 .far, .fas,
@@ -55,15 +103,42 @@ textarea {
 	color: #ADAFAE !important;
 }
 
-.form-control.search-form-input {
-	color: #E2E8F0 !important;
-	background: #4A5568 !important;
-}
-
 .btn-outline-primary {
 	border-color: #4A5568 !important;
 }
 
+.postComponent .status-comments {
+	border-top: 1px solid #282828 !important;
+	border-bottom: 1px solid #282828 !important;
+}
+
+.messages-page .card-header {
+	border-bottom: 1px solid #282828;
+}
+
+hr {
+	border-color: #282828 !important;
+}
+
+::-webkit-scrollbar {
+  width: 15px;
+}
+
+::-webkit-scrollbar-track {
+  background: #202020;
+  border-left: 1px solid #2c2c2c;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #3e3e3e;
+  border: solid 3px #202020;
+  border-radius: 7px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: white;
+}
+
 @import "components/filters";
 
 @import "components/typeahead";
@@ -74,6 +149,8 @@ textarea {
 
 @import "moment";
 
+@import '~animate.css/animate.min.css';
+
 .border {
-    border: 1px solid #4A5568 !important;
-}
+	border-color: #282828 !important;
+}
\ No newline at end of file
diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss
index 044ad6fe1..fd2d9173a 100644
--- a/resources/assets/sass/dark.scss
+++ b/resources/assets/sass/dark.scss
@@ -1,4 +1,4 @@
-// Cyborg 4.2.1
+// Cyborg 4.5.3
 // Bootswatch
 
 //
@@ -9,24 +9,24 @@ $white:    #fff !default;
 $gray-100: #f8f9fa !default;
 $gray-200: #e9ecef !default;
 $gray-300: #dee2e6 !default;
-$gray-400: #ADAFAE !default;
+$gray-400: #adafae !default;
 $gray-500: #888 !default;
 $gray-600: #555 !default;
-$gray-700: #2D3748 !default;
+$gray-700: #282828 !default;
 $gray-800: #222 !default;
 $gray-900: #212529 !default;
 $black:    #000 !default;
 
-$blue:    #2A9FD6 !default;
+$blue:    #2a9fd6 !default;
 $indigo:  #6610f2 !default;
 $purple:  #6f42c1 !default;
 $pink:    #e83e8c !default;
-$red:     #CC0000 !default;
+$red:     #c00 !default;
 $orange:  #fd7e14 !default;
-$yellow:  #FF8800 !default;
-$green:   #77B300 !default;
+$yellow:  #f80 !default;
+$green:   #77b300 !default;
 $teal:    #20c997 !default;
-$cyan:    #9933CC !default;
+$cyan:    #93c !default;
 
 $primary:       $blue !default;
 $secondary:     $gray-600 !default;
@@ -42,27 +42,28 @@ $yiq-contrasted-threshold:  175 !default;
 
 // Body
 
-$body-bg:       #1A202C !default;
-$body-color:    $gray-500 !default;
+$body-bg:       #060606 !default;
+$body-color:    $gray-400 !default;
 
 // Fonts
 
 $font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;
 $font-size-base: 0.9rem;
+$font-weight-lighter: 300;
+$line-height-base: 1.6;
 
-
-$headings-color:         $white !default;
+$font-size-lg: ($font-size-base * 1.25);
+$font-size-sm: ($font-size-base * .875);
+$headings-color:          $white !default;
 
 // Tables
 
-$table-accent-bg:               rgba($white,.05) !default;
-$table-hover-bg:                rgba($white,.075) !default;
-
+$table-color:                   $white !default;
+$table-accent-bg:               rgba($white, .05) !default;
+$table-hover-bg:                rgba($white, .075) !default;
 $table-border-color:            $gray-700 !default;
-
-$table-dark-bg:               $gray-500 !default;
-$table-dark-border-color:     darken($gray-500, 7.5%) !default;
-$table-dark-color:            $body-bg !default;
+$table-dark-bg:                 $gray-500 !default;
+$table-dark-border-color:       darken($gray-500, 7.5%) !default;
 
 // Buttons
 
@@ -70,13 +71,11 @@ $input-btn-padding-x:       1rem !default;
 
 // Forms
 
-$input-disabled-bg:              $gray-400 !default;
-
-$input-border-color:             transparent !default;
-
+$input-disabled-bg:                 $gray-400 !default;
+$input-border-color:                $white !default;
 $input-group-addon-color:           $white !default;
 $input-group-addon-bg:              $gray-700 !default;
-
+$input-group-addon-border-color:    transparent !default;
 $custom-file-color:                 $white !default;
 $custom-file-border-color:          $gray-700 !default;
 
@@ -84,7 +83,6 @@ $custom-file-border-color:          $gray-700 !default;
 
 $dropdown-bg:                    $gray-700 !default;
 $dropdown-divider-bg:            $gray-800 !default;
-
 $dropdown-link-color:            $white !default;
 $dropdown-link-hover-color:      $white !default;
 $dropdown-link-hover-bg:         $primary !default;
@@ -106,62 +104,65 @@ $navbar-dark-hover-color:           $white !default;
 $pagination-color:                     $white !default;
 $pagination-bg:                        $gray-700 !default;
 $pagination-border-color:              transparent !default;
-
 $pagination-hover-color:               $white !default;
 $pagination-hover-bg:                  $primary !default;
 $pagination-hover-border-color:        $pagination-border-color !default;
-
 $pagination-disabled-bg:               $pagination-bg !default;
 $pagination-disabled-border-color:     $pagination-border-color !default;
 
 
 // Jumbotron
 
-$jumbotron-bg:                   $gray-700 !default;
+$jumbotron-bg:                      $gray-700 !default;
 
 // Cards
 
-$card-bg:                  $gray-700 !default;
+$card-bg:                           $gray-700 !default;
 
 // Tooltips
 
-$tooltip-bg:                  $gray-700 !default;
-$tooltip-opacity:             1 !default;
+$tooltip-bg:                        $gray-700 !default;
+$tooltip-opacity:                   1 !default;
 
 // Popovers
 
-$popover-bg:                          $gray-700 !default;
+$popover-bg:                        $gray-700 !default;
+
+// Toasts
+
+$toast-color:                       $white !default;
+$toast-background-color:            $gray-800 !default;
+$toast-border-color:                $gray-700 !default;
+$toast-header-color:                $body-color !default;
+$toast-header-background-color:     $toast-background-color !default;
+$toast-header-border-color:         $toast-border-color !default;
 
 // Modals
 
-$modal-content-bg:               $gray-800 !default;
-
-$modal-header-border-color:   $gray-700 !default;
+$modal-content-bg:                  $gray-800 !default;
+$modal-header-border-color:         $gray-700 !default;
 
 // Progress bars
 
-$progress-bg:                   $gray-700 !default;
+$progress-bg:                       $gray-700 !default;
 
 // List group
 
-$list-group-bg:                  $gray-800 !default;
-$list-group-border-color:        $gray-700 !default;
-
-$list-group-hover-bg:                 $primary !default;
-
-$list-group-disabled-bg:         $gray-700 !default;
-
-$list-group-action-active-bg:         $primary !default;
+$list-group-bg:                     $gray-800 !default;
+$list-group-border-color:           $gray-700 !default;
+$list-group-hover-bg:               $primary !default;
+$list-group-disabled-bg:            $gray-700 !default;
+$list-group-action-active-bg:       $primary !default;
 
 // Breadcrumbs
 
-$breadcrumb-bg:                 $gray-700 !default;
+$breadcrumb-bg:                     $gray-700 !default;
 
 // Close
 
-$close-color:                 $white !default;
-$close-text-shadow:           none !default;
+$close-color:                       $white !default;
+$close-text-shadow:                 none !default;
 
 // Code
 
-$pre-color:                         inherit !default;
\ No newline at end of file
+$pre-color:                         inherit !default;

From eb4f43674b54bc66a0c3837217e32673c3101569 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 25 Nov 2020 18:38:55 -0700
Subject: [PATCH 4/6] Update blank layout

---
 resources/views/layouts/blank.blade.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resources/views/layouts/blank.blade.php b/resources/views/layouts/blank.blade.php
index 2d38e319d..dd4d33714 100644
--- a/resources/views/layouts/blank.blade.php
+++ b/resources/views/layouts/blank.blade.php
@@ -23,7 +23,14 @@
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="canonical" href="{{request()->url()}}">
+        @if(request()->cookie('dark-mode')) 
+    
+    <link href="{{ mix('css/appdark.css') }}" rel="stylesheet" data-stylesheet="dark">
+    @else
+    
     <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
+    @endif
+    
     @stack('styles')
 
     <script type="text/javascript">window._sharedData = {curUser: {}, version: 0}; window.App = {config: {!!App\Util\Site\Config::json()!!}};</script>

From e75c3349c2fe6d23331aeb6a2bc7df6c609e5988 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 25 Nov 2020 18:39:41 -0700
Subject: [PATCH 5/6] Update compiled assets

---
 public/css/appdark.css   | Bin 311735 -> 384079 bytes
 public/js/discover.js    | Bin 15969 -> 16077 bytes
 public/js/timeline.js    | Bin 131147 -> 131136 bytes
 public/mix-manifest.json | Bin 2001 -> 2001 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/css/appdark.css b/public/css/appdark.css
index ac1c54a2c2a365803ef54e809e74a39e5922d900..3075806e629d3e21b592e5f61a1b19eb30b6a011 100644
GIT binary patch
delta 51966
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

delta 1846
zcma)6ZA?>V6wd8Ax0O+#v_e6LZ7C|CCA8&^uVGZOOk?!V%#3Whl+qT)N9(0#0%H<f
zvZ;a0T)X3(6AW{U8U<1JR<miAZ2s9qFpDla65YoSV=^@OOGJ0M_m)92ll^<&bDs0O
z&-r?<$E|FSrRzL*Z3&ABx~AJkq0%323X2uava&KVnZT)c`#i-SKPxxE{WR@DV~2T*
zWHRg78ar6ZVFtTpD{R6#Z)pjg*a~aa)5KO-sh(^#(5j#DmUYtE8nCj#8ZdDv2UgN}
z2y$sW0Lkp(TX6KH#2W{Kut5#J8-zle8eA0h)iwoObw07NLldg%BN?7auZG~UK{cqn
z?9F;;0BNw$Acb9-^jjlTq|K)2Q8=YBZx&TG!AcsM1UsdsV3KskGfY*@a8Z5#Ni!_r
z6WFB`PQg{Is|7aeW{sIN5rH2lUj#GzaR+SV=GBooT49Rk1UkDNm(T}6)YG$zuz=RL
z!857TW286Qp@&;b_uAn*Dc6-nxAuZHt5gUy+gI3&yrqH|XfCk(eNF!SqEdnGb-<(&
zrr!^C8E+<2Cm2D-v7Ao$l~b9zXtW3NU(Ax)3wHL)ZYVTp!dT8nu!vKLt3QSVTs1j*
zWLecT*aHswa4%H-KW#P|-v<UN+y|rot&(Jw4l3#e18dw57r1#Zt$(3nCMymlE3?+|
z89bo7Kg-2#sYMS*CqIW(io>xDGZ-9!prBmCV^E^DaPTx%vfsx*bjaC`T#?(*Itk0v
z{!#x5EMYe$;fz7&6{vd(E~mMbqF06^K7T{Bt%6M5V3mgKHi|r#a~qikqjcY!LeI{D
zo}GLO+W_Q<3rToa&$*@T&Md|m@O_+}yTi%&dg}bSV-v}!=VoW_>c6wZCQ|TaPSMTM
z(r`DY(HPk=6W&YQQs`4NmTMWvYiOkhW^9qOtFho_ErO>@7F?z>{b|8mF0osY3@n$d
zt5c<SORaNkTjrdL*>nazHLB&C&c)m6>5db>%~p1yvNkN%1w@y&hRQOrp**|_I<H%L
zWXR;bUbjbJJ^5JWR5grjz~R(6lG%|OtkSk<rVBZ2>TTSZFgWsXF{^(Et5p$fun~_N
z=0-<a@fxbK*6c#R=8|Wih;rI6og$y$0(!U$Q)h-jN}paxrZ0e>@rjAQ=usEu(Zx1=
zo-p`!V-~yFj!D@R%#=C)4uJ{EgaR5mjTJg~0V_F(uW<x%$e8DIQapxcdb$CPP%IR%
zu^7gaRBfX%v{BbFw9u74?BxWusUMTI{%$*lXFxU?kK<*X3Qs?Qc4>9Do<05=vo)A(
zTdp2SagWyW%y$wknr+u949+PGJvoJ!<Vlc8|DZ#s(V|vg-T@sXiZqN%*_|Q0#c2la
z94=$y!+2t@LFyM5(NE{`Fkk8|_6BL}8_Z+97x0GmZXLsb<~ke0MS6Fgr^F+}V)A||
z3EScrnJGSt#c^Mp)^+m>4NVQ9`e;BT-wr;D*>>>PK|wr@@_(TwCK7}knrh>%s_@Kq
ze&bTQ-p8+BP#bc+SKkl~P`ID(v2@h>{EZ<oytAdQ!m0k|<Qw1@)4BnEkG{kw2(OgU
z$N+y+I>n`!TLV7PU+)Tr#b#GSOJrxXgP!;CR=PaEr|=4xzVG9+Y3NISIXm<fe^j7#
UZM-pE<#9ALN5W#%*Angg2Qv9iV*mgE

diff --git a/public/js/discover.js b/public/js/discover.js
index ea55d10171bc46df72139362c4cc4a5362fc113e..6cd6bbc255b3287c297f0fd6d72740188b036568 100644
GIT binary patch
delta 287
zcmaD@bGCLu$HZeAoA)!#V`cHm^Uj#qr_Nty;+m<XX`QE+r%|k_m$*5aV=B9@URq{O
zNotXXMp|iJa!F=>o<@mgbx~?bX;Genfvs(cUU6z(ab`(oS!%7O=Hw6j=A`M^tS(T-
z2zJ5dg@X6^*-G>Z@{3C*^NJ{Mo~anY%w|=h7oV!J`Gd+TcJ{<X%M^n|v&jo}<XA#1
z9aAQL_JxbNGdjZA{fyJ#Y#pY_%!#fclM^|FH#h2D5n$B;`EqiBt{8`Ho`w?0n8^=y
SI(TYzqN9y<3}RzrHLU@F0b#2E

delta 179
zcmX?G`><w02dk2iNsi^@em42Z1#F!B5y`;@N}ASrdU+bfntF*7+q76s+|qNDCMRh7
zvKyx*o0?e~Pu`;K2xtG%o(5;n)S0|-!#vi_U2K!tCwuXkZ(he&#>fIPf3t?bJ^slH
z<)t?pD1<X_?o(dL4%cO;Eyn_~cCw+a7>8}1h7!oa$(D8<o3(V`2=LVEL`NIz7{tcL
HYFYyTO0hUv

diff --git a/public/js/timeline.js b/public/js/timeline.js
index 7736f8d5bf073d7ece664277f5500d04541ab190..a4412c1d561523203f9498bd4482f4b228665b26 100644
GIT binary patch
delta 436
zcmX@zz;U2~V?!k$i(^Gl&}7FqmXp6o$#EE`nIsyTCK*hYlAej+?3Q*za5!c35gZ4Z
z6$s7;nP>zjShfhkIV)?6;0VbbL~w4)wIVnf^5+m7JB1zu=aPaqi<4Qt$>fc!>YJDF
ziSTTeQ*3Zz2`w!xoF1&iXfpW%hxT*>aYl~GzH|9Di>I6~nw+qnbGm#tBkSZf_g!>L
zGBS(x;>$FYV)9~2U{Jv?wOk<}zqkZhP)Rd(@_`%fo3~wm$c|zL3&@P=iIW+{xe)p$
zZ(JcFQX8wIXsDA{nv<iW1Pj3F^OYH8H-|hZ;R8Do<ZjW(GJiiMP3t_pJdI*ay~J9b
tNOxmDaM1e-i%gb$pUnbNG5vrtqZBw+rr%R$?AqM={-EA=U3o^ihX5=klWhP1

delta 416
zcmX@mz;U{PV?!n1=KCV{Jj`AeiIWw?EhcZ}ljkroHa0UhGB=)lhi@i=Q_Js$;GE{y
z=Z7haRj7{1iz%6Y@Cc*mWI2HzgsM#f(VTEq(;2@oici)Rj6%rw3)&($R|F3tICF(s
z5gaYyb8yZi5hU}ch<I<7Rcv%($#c$5o9>~+XfpW%hxYXO^B6fM`_AQ?{QDN?W`&ev
zMeGVm`9&$IMU#8)2TfMGB_ouWn_85pkd~;Mlde!uqHCyBJGt&=%;x>q&#|Mc)y7n-
z84HB9u{w%|I(elzIXX%(KW^4}Fp-ZX(%sk(9G0f<8#X6=IHbptW8z;ty>S+!ID4Lk
mk~b)*<z9D!9X)v?t2#eOT1nG7PcKiSSW_=?yMjEU!b1Qi)`VyP

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 433dd5e0e5257d9426bf2d468a5a045440376593..13f510e20827f3614b98e162500ef59bf6b19be0 100644
GIT binary patch
delta 84
zcmcb}f02K~Tt*Q~OViY33-go|lf<+%6C<<a6vO1r8yQzHiKL_$m?xPTnx~lpp^3Sn
miJ_Uv=3EvZW(iC4G)tr8<Rn9jGz+t2Q}dLx#1tj2S}p)uKN!3K

delta 84
zcmcb}f02K~Tt<;pGXsmnM8gzI(^SJ`i_{cj12coo8yQzHiI}BWSfm+Q0zpzrikYcl
mYO=BE=3EvZW(mV&Gc!vQW5cv$!!#rFw8Z2@Qwt@oS}p)UJs2GT


From bafd6079e3a71482835a959f14f4802877ef66f7 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 25 Nov 2020 18:43:04 -0700
Subject: [PATCH 6/6] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3037ab3e..1156ad4b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,8 @@
 - Updated RegisterController, make the minimum user password length configurable. ([09479c02](https://github.com/pixelfed/pixelfed/commit/09479c02))
 - Updated AuthServiceProvider, added support for configurable OAuth tokens and refresh tokens lifetime. ([7cfae612](https://github.com/pixelfed/pixelfed/commit/7cfae612))
 - Updated EmailService, make case insensitive. ([1b41d664](https://github.com/pixelfed/pixelfed/commit/1b41d664))
+- Updated DiscoverController, fix trending api. ([2ab2c9a](https://github.com/pixelfed/pixelfed/commit/2ab2c9a))
+- Updated Dark Mode layout. ([d6f8170](https://github.com/pixelfed/pixelfed/commit/d6f8170))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added