From d0cd22f5b426003167648a9eb2f369f9fee537d7 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 23 Sep 2018 17:08:17 -0600
Subject: [PATCH 1/7] Update StatusController

---
 app/Http/Controllers/StatusController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index a86209c3e..04c42747e 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -85,7 +85,13 @@ class StatusController extends Controller
         }
 
         $this->validate($request, [
-          'photo.*'      => 'required|mimes:jpeg,png,gif|max:'.config('pixelfed.max_photo_size'),
+          'photo.*'      => function() {
+            return [
+                'required',
+                'mimes:' . config('pixelfed.media_types'),
+                'max:' . config('pixelfed.max_photo_size'),
+            ];
+          },
           'caption'      => 'string|max:'.config('pixelfed.max_caption_length'),
           'cw'           => 'nullable|string',
           'filter_class' => 'nullable|string',

From 2982182b3df8dd665c4c127991d50de9eb578a31 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 23 Sep 2018 17:25:33 -0600
Subject: [PATCH 2/7] Update Profile model

---
 app/Profile.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/Profile.php b/app/Profile.php
index 92d1bad3f..b69bf74b9 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -196,6 +196,30 @@ class Profile extends Model
             ->pluck('filterable_id');
     }
 
+    public function blockedIds()
+    {
+        return UserFilter::whereUserId($this->id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('block')
+            ->pluck('filterable_id');
+    }
+
+    public function mutedProfileUrls()
+    {
+        $ids = $this->mutedIds();
+        return $this->whereIn('id', $ids)->get()->map(function($i) {
+            return $i->url();
+        });
+    }
+
+    public function blockedProfileUrls()
+    {
+        $ids = $this->blockedIds();
+        return $this->whereIn('id', $ids)->get()->map(function($i) {
+            return $i->url();
+        });
+    }
+
     public function reports()
     {
         return $this->hasMany(Report::class, 'profile_id');

From c44dcca592badfec5a56925d095c1683db871f31 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 23 Sep 2018 20:17:55 -0600
Subject: [PATCH 3/7] Update 2FA checkpoint view, fixes #470

---
 resources/views/auth/checkpoint.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/auth/checkpoint.blade.php b/resources/views/auth/checkpoint.blade.php
index 24c4ae775..ae415a5b4 100644
--- a/resources/views/auth/checkpoint.blade.php
+++ b/resources/views/auth/checkpoint.blade.php
@@ -16,7 +16,7 @@
                         <div class="form-group row">
 
                             <div class="col-md-12">
-                                <input id="code" type="code" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" placeholder="{{__('Two-Factor Authentication Code')}}" required autocomplete="off">
+                                <input id="code" type="text" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" placeholder="{{__('Two-Factor Authentication Code')}}" required autocomplete="off" autofocus="">
 
                                 @if ($errors->has('code'))
                                     <span class="invalid-feedback">

From e0760ff74af1cb152b176de285840573ed730462 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 26 Sep 2018 22:08:06 -0600
Subject: [PATCH 4/7] Update timeline.js

---
 resources/assets/js/timeline.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/timeline.js b/resources/assets/js/timeline.js
index bae140581..403524064 100644
--- a/resources/assets/js/timeline.js
+++ b/resources/assets/js/timeline.js
@@ -3,7 +3,12 @@ $(document).ready(function() {
   $('.container.timeline-container').removeClass('d-none');
   let elem = document.querySelector('.timeline-feed');
   pixelfed.fetchLikes();
-  
+  $('video').on('play', function() {
+    activated = this;
+    $('video').each(function() {
+      if(this != activated) this.pause();
+    });
+  });
   let infScroll = new InfiniteScroll( elem, {
     path: '.pagination__next',
     append: '.timeline-feed',
@@ -19,6 +24,12 @@ $(document).ready(function() {
         $(this).addClass('d-none');
       }
     });
+    $('video').on('play', function() {
+      activated = this;
+      $('video').each(function() {
+        if(this != activated) this.pause();
+      });
+    });
   });
 
 

From 6d4482882ca9e5ef72586161606a71bf98493034 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 26 Sep 2018 22:18:47 -0600
Subject: [PATCH 5/7] Update searchform.js

---
 resources/assets/js/components/searchform.js | 30 +++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/components/searchform.js b/resources/assets/js/components/searchform.js
index e23843edf..47fd833d4 100644
--- a/resources/assets/js/components/searchform.js
+++ b/resources/assets/js/components/searchform.js
@@ -13,21 +13,21 @@ $(document).ready(function() {
     name: 'search',
     display: 'value',
     source: queryEngine,
-    limit: 20,
+    limit: 40,
     templates: {
       empty: [
-        '<div class="alert alert-danger mb-0">',
-          'unable to find any matches',
+        '<div class="alert alert-info mb-0 font-weight-bold">',
+          'No Results Found',
         '</div>'
       ].join('\n'),
       suggestion: function(data) {
         let type = data.type;
-        let res = null;
+        let res = false;
         switch(type) {
           case 'hashtag':
             res = '<a href="'+data.url+'">' +
             '<div class="media d-flex align-items-center">' +
-            '<div class="mr-3 h4 text-muted">#</div>' +
+            '<div class="mr-3 h4 text-muted"><span class="fas fa-hashtag"></span></div>' +
             '<div class="media-body text-truncate">' +
             '<p class="mt-0 mb-0 font-weight-bold">'+data.value+'</p>' +
             '<p class="text-muted mb-0">'+data.count+' posts</p>' +
@@ -38,7 +38,7 @@ $(document).ready(function() {
           case 'profile':
             res = '<a href="'+data.url+'">' +
             '<div class="media d-flex align-items-center">' +
-            '<div class="mr-3 h4 text-muted"><span class="icon-user"></span></div>' +
+            '<div class="mr-3 h4 text-muted"><span class="far fa-user"></span></div>' +
             '<div class="media-body text-truncate">' +
             '<p class="mt-0 mb-0 font-weight-bold">'+data.name+'</p>' +
             '<p class="text-muted mb-0">'+data.value+'</p>' +
@@ -46,8 +46,24 @@ $(document).ready(function() {
             '</div>' +
             '</a>';
           break;
+          case 'status':
+            res = '<a href="'+data.url+'">' +
+            '<div class="media d-flex align-items-center">' +
+            '<div class="mr-3 h4 text-muted"><img src="'+data.thumb+'" width="32px"></div>' +
+            '<div class="media-body text-truncate">' +
+            '<p class="mt-0 mb-0 font-weight-bold">'+data.name+'</p>' +
+            '<p class="text-muted mb-0">'+data.value+'</p>' +
+            '</div>' +
+            '</div>' +
+            '</a>';
+          break;
+          default:
+            res = false;
+          break;
+        }
+        if(res !== false) {
+          return res;
         }
-        return res;
       }
     }
   });

From 55362f3b5915abbc0c5d97a1c46bafccfa033aee Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 26 Sep 2018 22:22:36 -0600
Subject: [PATCH 6/7] Update compiled assets

---
 public/css/app.css       | Bin 217985 -> 217019 bytes
 public/js/app.js         | Bin 450227 -> 450680 bytes
 public/js/timeline.js    | Bin 1557 -> 1773 bytes
 public/mix-manifest.json | Bin 250 -> 251 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/css/app.css b/public/css/app.css
index 4114dad8e6c2f4562e816bce712aa797dbae7978..5e128d91597a54f1a51800105dd4c33a4082d9c7 100644
GIT binary patch
delta 1078
zcmah|U2IfE6waBuKmA|m&(c~pZdZt~bS`(dOQClok|?0^V@XIbDHw0}&hB2kKbyOA
z3+V=<FGS-5#?~HVjL`6)Q9?@gVG<}=n)ql;)I<dmpijg^ebGcsRJhx2<u~zVW^%rB
zzVDowZ{GT}{nF|7xihmcRGpo@)&dp$^&~{4@<gHf#kse4<8%k<tRDRRj|hJEImE?S
z0Nx0QzGi5Wrqua?fxP2dH0Rjdbxc~eDn(`#id;>}BSTxaxXjAppB(nBeIU&&tfUPs
zWnArqmoV52UAx9C&*VnQWJd<e%w#z(-(NUZHYR<9v*TQInf3s-!l-%N5kGaqk5VXI
z*N@|sUPxfC2T^=80L{4VS?IyqdI+{>l)=>S*1_SCL3v~&E_9GJc<KU#@$2&t!uOtr
zz)U{`#eqJ^HRGK*2;!NiAc?OgU^V_b2VwC~0!rk6R92D4Qn!jb>*0EX_SR<DUKa?V
z&$vm9D)2&^AkRSY75rfuVl9<PYS=nEu4Zsy+8^V}`w$YP58!qP!=3PLTjR?AyURle
z5%^~H<6i=wTm`Mz`U!N4*FOeNBAJX>JPm(KB%KyF&caj#N2~s<2ZXQm+Vk)P9;v}5
z3<=n~1azq?wVX-nYIcE9Ui7T-3hu4Jo+Y%cj+XBW?-#rZSxFQHd?lg3DtP^(-@wgF
zP{qYH(BGA=TfoxXf?-pW<+&=Sr%s6|b{v8haef}&CCg<>4Fcl(8tgoZi6mKzGfA=q
zw<pPqy%WsMo6a${Xy`h#vyR72!)B@?zD$xG1mB?~gEv2d=WrJ#>ms_LnNES`n9Z5X
zbX@RA6n}|H;aE;Ha~o2MGEt1vc*<{UW43N=KT%C2@G>O{j7Omf&z*#(nLd)jmw$u9
zVz*4n!3__ws^iQzE?Y6>J!bLQ5cz9yVBB$a=2E57I2<!{UR0F<!zwv0*KCfLd!&Bx
zVUIK)j>sj~$r~o4+JxpCA9wUgJu!ditTTSp{~|PRa5d-nffF+4)MB=W%Fm>GG}|C|
pHQn&asuEY?^75Zp-tMU_73w~Dnen)+nat&l&K~XQU`(RJcL7z1c~t-a

delta 1473
zcmb7ET}V@580P(sx~ZGGX44#+rkh*soaWT!PgqFQMFn0)*2SF1wK_XTwzCLDG3p{B
ze?qsnA2KD#8?k86*Dqw<7FiHPQ6LdrMFw33Lf^L32`cmM`+48zd7tO~-tXyc{rM^V
z{fS9%#U>{|<>;DZMYS~r6-Bl8Vz(2v=J$op`ch6~k?Bi^Mjw6C#Y+C@3eYnRMVMa$
z<)aICH8?yCS@>lNOmrjz>N0F`u=bF@M?7gyK(q(KlIri4*uM9a==Yscn_NQeo_c()
zgChD$3)vhv&@%?5c$0@5e3lD(>>mRw4)b8j5IR(OWs4(MVLM(Kg96+gh3wTKWh-aV
zC{!jcm*Mj8MFfgd5)4r&!?_4(6K5=;VfAHoVrvlma(7teeL*GM&8y-$6<_CqlT{pv
zz*l@H!BLDxSUEo<V6=urN%X4ml9STcwgH!@HCf37Y`YGoqIFD*M_V_6Y)u7SuM>_{
zvO<9toYjG`bfc;riI7%46xb+gsl_!yBkOTc4D<<IN-)5C6<G}`5-<4@z5a@l1cz~8
z3@X!=#-4;FRoc3KvB1Pj&~5@bnUD&fo^z5fZRd6|?ddpI%S@vsdicoUOes|0TqzWy
zR7tehXaI|;!QR}V1UtnbAM|wk!=Wa@#S##VP)r96;LXNwmbiX9<l>?kG`QUiTe3Pt
z)&&uLHui9b%%G==85+nM1SJ(Nm(x*S>u@(Zg!Q?MI9CQ5dY}wGuMieun{AnkGA>n@
z9N+oluoGw9toq&#kM~S`mgG*}AMp4@=7=oPPj%owMh6DrXBLiJgF?Cxg)o=tX3Cne
z<^wU({u}U}gIX$%!)QMB-h&n{vrF-YLzs7jtHyoR?EBb%gey<3CKlO5{+(eT$=e4|
zKyN;P_na{i-m8RF$uB2)oAI|51YC}uYJUho@5CU7AU=j$X{1p56S#PqxjI!vcHq37
zG@#o;4BG!JPJCHK_R=m3X(Tw>L$;vvAaSC}Myj;&kq~9ofinUz;dnKv#|t(F^5!z=
dP+ou&wAD^Rne>-He#}#|fs1MA&^C^D{{xHE{0RU6

diff --git a/public/js/app.js b/public/js/app.js
index 65c2a63a619900f07550b67fa4b5fc621e8bd81e..bb7e610774338d1910ba130e55c053964d394a9b 100644
GIT binary patch
delta 9237
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

delta 9195
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
XIWiok(gL2b-3J^w_JUU&|L*sHqV_O^

diff --git a/public/js/timeline.js b/public/js/timeline.js
index 14cc9d76a62f7ecca471045add4b205f20299023..f135d889a7962f025e9a09995e1ae3c4f20274c2 100644
GIT binary patch
delta 731
zcmcIi!D<yT6y>$AVnKi46>(lDC4mrYDK7fR&W+tXp-XWw&fKw)X)<K)JZ;nA?G(Bz
z!5<O)4gWw~i}(-T8JxcH1Kfn0o0F4!PR{2CzaK8=MPoBG&T<f8mHGsAXct2>vD}DY
z3XZSLYvBPKZ<DT8@S$=Z>qU3P>8_=NIWf1(y)~U?X<2eNfTWX~+6vl~dVaX+wN_nd
zkXB_HY0dTUJO_!A2C&L?rMSLczIg{3svHVq;iY#Kc)aXkA#=7cZySI6b2c-rXo<;=
znEtAZk0z%Hy}?nklo6-I4(UcniSg6q@ECiFO0y?ST5eUXk3`GE(aAs4SrK5+scrl<
znN2X>+xoiR=WJzia7-vNmsMqY$>iNt5mIt}l_KOC&rK~ya7eRrK0<cqbA5+DIOrOx
zN}C$EAfZB9c%Qr=_0}MqW!{nb@!M9tO>V~L+h5jW_WwOhKhQqUUDjNH#ZG<PopOd7
zhx<g$pK7fsb3jq(Q-tws`i#uGnSOta8dYIR1ivu?MHm7YKkgh8^2g5Ju7}!O0evLx
M)P4Fh(Y9jo2k8O*;{X5v

delta 440
zcmY*VK}rKL6lJU(MDzj`aXKzcFvL=diw?Pfo4OZ;cFag*{3&TFN*dhhx&-ebf_MvW
z-~mLugMW&nb@O<6d3pc8d~H5%4BEvMa;r2DN!|6(Bp{s6YB8}yQ>O|7C;F5cX{QE~
zigS50*2Ye<>WLDSB%JE&`C#h~Z}VYU5>=a+Vt?FHJd~o{`P01RS3)w&a{-9wq8?8q
z1BMG&t}9Asv%%<6=4g?H0(oroSQ>k~u(@1Ap)RIo{?Te_Pdz5VQqoVmupJ#G7(jrf
z!xS?aR8GC*WDp*rP7f9lW04-D%o58dqDwt--TuGrEOoN(DQx(RS`mbJ<t6Mj?i<)9
zJT;!f+iHgDdNV=XZyq9!n(sRxfETK?(vaUspsxPqa2EH_8RA{U*O;&2LezVjeFJ{0
Bn4ACr

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 17f77a6987bda19718bb13b2c4aeb233fa46e67d..6aae34969c77a22c654fa5f0124156bc80d8a8a2 100644
GIT binary patch
delta 79
zcmV~$u@QhE3;@8Rwbc!5>?9!&7{Ec2U>0x@8OG(b@&659xYs2rh$r&gn+YN?yA9r!
g<T)!;U=@ncTPX<R+Gk@^O%|mPo!EhT9nTS_AFVYO)Bpeg

delta 77
zcmWN@K^1@?3;@ta25I2Mn_~mU0uTg-D_{``V>!L(KmFG|?pl3j=$Il6?JNnXH^Ir9
e7Z62j1tfwt#!#5&xi3-w1_RTP?Z`r;^R6FRI~FDY


From 958b5b402f2cbb463a681b40cf5cbbc591f53bea Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 26 Sep 2018 23:00:45 -0600
Subject: [PATCH 7/7] Update SearchController

---
 app/Http/Controllers/SearchController.php | 95 ++++++++++++++++-------
 1 file changed, 69 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 2244004c1..247120162 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -2,43 +2,86 @@
 
 namespace App\Http\Controllers;
 
+use Auth;
 use App\Hashtag;
 use App\Profile;
+use App\Status;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
 class SearchController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function searchAPI(Request $request, $tag)
     {
-        $res = Cache::remember('api:search:tag:'.$tag, 1440, function () use ($tag) {
-            $res = Hashtag::where('slug', 'like', '%'.$tag.'%')->get();
-            $tags = $res->map(function ($item, $key) {
-                return [
-            'count'  => $item->posts()->count(),
-            'url'    => $item->url(),
-            'type'   => 'hashtag',
-            'value'  => $item->name,
-            'tokens' => explode('-', $item->name),
-            'name'   => null,
-          ];
-            });
-            $res = Profile::where('username', 'like', '%'.$tag.'%')->get();
-            $profiles = $res->map(function ($item, $key) {
-                return [
-            'count'  => 0,
-            'url'    => $item->url(),
-            'type'   => 'profile',
-            'value'  => $item->username,
-            'tokens' => [$item->username],
-            'name'   => $item->name,
-          ];
-            });
-            $tags = $tags->push($profiles[0]);
+        if(mb_strlen($tag) < 3) {
+            return;
+        }
+        $hash = hash('sha256', $tag);
+        $tokens = Cache::remember('api:search:tag:'.$hash, 60, function () use ($tag) {
+            $tokens = collect([]);
+            $hashtags = Hashtag::select('id', 'name', 'slug')->where('slug', 'like', '%'.$tag.'%')->limit(20)->get();
+            if($hashtags->count() > 0) {
+                $tags = $hashtags->map(function ($item, $key) {
+                    return [
+                        'count'  => $item->posts()->count(),
+                        'url'    => $item->url(),
+                        'type'   => 'hashtag',
+                        'value'  => $item->name,
+                        'tokens' => explode('-', $item->name),
+                        'name'   => null,
+                    ];
+                });
+                $tokens->push($tags);
+            }
+            $users = Profile::select('username', 'name', 'id')->where('username', 'like', '%'.$tag.'%')->limit(20)->get();
 
-            return $tags;
+            if($users->count() > 0) {
+                $profiles = $users->map(function ($item, $key) {
+                    return [
+                        'count'  => 0,
+                        'url'    => $item->url(),
+                        'type'   => 'profile',
+                        'value'  => $item->username,
+                        'tokens' => [$item->username],
+                        'name'   => $item->name,
+                    ];
+                });
+                $tokens->push($profiles);
+            }
+
+            return $tokens;
         });
+        $posts = Status::select('id', 'profile_id', 'caption', 'created_at')
+                    ->whereHas('media')
+                    ->whereNull('in_reply_to_id')
+                    ->whereNull('reblog_of_id')
+                    ->whereProfileId(Auth::user()->profile->id)
+                    ->where('caption', 'like', '%'.$tag.'%')
+                    ->orderBy('created_at', 'desc')
+                    ->get();
 
-        return response()->json($res);
+        if($posts->count() > 0) {
+            $posts = $posts->map(function($item, $key) {
+                return [
+                    'count'  => 0,
+                    'url'    => $item->url(),
+                    'type'   => 'status',
+                    'value'  => 'Posted '.$item->created_at->diffForHumans(),
+                    'tokens' => [$item->caption],
+                    'name'   => $item->caption,
+                    'thumb'  => $item->thumb(),
+                ];
+            });
+            $tokens = $tokens->push($posts);
+        }
+        if($tokens->count() > 0) {
+            $tokens = $tokens[0];
+        }
+        return response()->json($tokens);
     }
 }