UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1769 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2019-10-07 00:49:47 -06:00 committed by GitHub
commit 6d54f9b42e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/ApiController.php
View file

@ -83,12 +83,15 @@ class ApiController extends BaseApiController
{ {
abort_if(!Auth::check(), 403); abort_if(!Auth::check(), 403);
$this->validate($request, [ $this->validate($request, [
'q' => 'required|string' 'q' => 'required|string|max:100'
]); ]);
$q = filter_var($request->input('q'), FILTER_SANITIZE_STRING); $q = filter_var($request->input('q'), FILTER_SANITIZE_STRING);
$hash = hash('sha256', $q);
$key = 'search:location:id:' . $hash;
$places = Cache::remember($key, now()->addMinutes(15), function() use($q) {
$q = '%' . $q . '%'; $q = '%' . $q . '%';
$places = Place::where('name', 'like', $q) return Place::where('name', 'like', $q)
->take(25) ->take(80)
->get() ->get()
->map(function($r) { ->map(function($r) {
return [ return [
@ -98,6 +101,7 @@ class ApiController extends BaseApiController
'url' => $r->url() 'url' => $r->url()
]; ];
}); });
});
return $places; return $places;
} }

BIN
public/js/activity.js vendored
View file

Binary file not shown.

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

17
resources/assets/js/components/Timeline.vue
View file

@ -564,10 +564,7 @@
if(this.profile.is_admin == true) { if(this.profile.is_admin == true) {
this.modes.mod = true; this.modes.mod = true;
} }
$('.profile-card .loader').addClass('d-none'); //this.expRec();
$('.profile-card .contents').removeClass('d-none');
$('.profile-card .card-footer').removeClass('d-none');
this.expRec();
}).catch(err => { }).catch(err => {
swal( swal(
'Oops, something went wrong', 'Oops, something went wrong',
@ -602,8 +599,8 @@
this.feed.push(...data); this.feed.push(...data);
let ids = data.map(status => status.id); let ids = data.map(status => status.id);
this.ids = ids; this.ids = ids;
this.min_id = Math.max(...ids); this.min_id = Math.max(...ids).toString();
this.max_id = Math.min(...ids); this.max_id = Math.min(...ids).toString();
this.loading = false; this.loading = false;
$('.timeline .pagination').removeClass('d-none'); $('.timeline .pagination').removeClass('d-none');
// if(this.feed.length == 4) { // if(this.feed.length == 4) {
@ -626,6 +623,10 @@
$state.complete(); $state.complete();
return; return;
} }
if(this.page > 40) {
this.loading = false;
$state.complete();
}
let apiUrl = false; let apiUrl = false;
switch(this.scope) { switch(this.scope) {
case 'home': case 'home':
@ -655,8 +656,8 @@
self.ids.push(d.id); self.ids.push(d.id);
} }
}); });
this.min_id = Math.max(...this.ids); this.min_id = Math.max(...this.ids).toString();
this.max_id = Math.min(...this.ids); this.max_id = Math.min(...this.ids).toString();
this.page += 1; this.page += 1;
$state.loaded(); $state.loaded();
this.loading = false; this.loading = false;