mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-23 05:23:17 +00:00
Merge pull request #2380 from pixelfed/staging
New Discover Layout, add trending hashtags, places and posts
This commit is contained in:
daniel
GitHub
commit
a81f6aa23e
7 changed files with 279 additions and 24 deletions
|
|
@ -14,6 +14,7 @@
|
|||
- Add Media Tags ([711fc020](https://github.com/pixelfed/pixelfed/commit/711fc020))
|
||||
- Add MediaTagService ([524c6d45](https://github.com/pixelfed/pixelfed/commit/524c6d45))
|
||||
- Add MediaBlocklist feature ([ba1f7e7e](https://github.com/pixelfed/pixelfed/commit/ba1f7e7e))
|
||||
- New Discover Layout, add trending hashtags, places and posts ([c251d41b](https://github.com/pixelfed/pixelfed/commit/c251d41b))
|
||||
|
||||
### Updated
|
||||
- Updated PostComponent, fix remote urls ([42716ccc](https://github.com/pixelfed/pixelfed/commit/42716ccc))
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ use Auth, DB, Cache;
|
|||
use Illuminate\Http\Request;
|
||||
use App\Transformer\Api\AccountTransformer;
|
||||
use App\Transformer\Api\AccountWithStatusesTransformer;
|
||||
use App\Transformer\Api\StatusTransformer;
|
||||
use App\Transformer\Api\StatusStatelessTransformer;
|
||||
use League\Fractal;
|
||||
use League\Fractal\Serializer\ArraySerializer;
|
||||
|
|
@ -165,4 +166,74 @@ class DiscoverController extends Controller
|
|||
|
||||
return $res;
|
||||
}
|
||||
|
||||
public function trendingApi(Request $request)
|
||||
{
|
||||
$this->validate($request, [
|
||||
'range' => 'nullable|string|in:daily,monthly,alltime'
|
||||
]);
|
||||
|
||||
$range = $request->filled('range') ?
|
||||
$request->input('range') == 'alltime' ? '-1' :
|
||||
($request->input('range') == 'daily' ? 1 : 31) : 1;
|
||||
|
||||
$key = ':api:discover:trending:v1:range:' . $range;
|
||||
$ttl = now()->addHours(2);
|
||||
$res = Cache::remember($key, $ttl, function() use($range) {
|
||||
if($range == '-1') {
|
||||
$res = Status::orderBy('likes_count','desc')
|
||||
->take(12)
|
||||
->get();
|
||||
} else {
|
||||
$res = Status::orderBy('likes_count','desc')
|
||||
->take(12)
|
||||
->where('created_at', '>', now()->subDays($range))
|
||||
->get();
|
||||
}
|
||||
$resource = new Fractal\Resource\Collection($res, new StatusStatelessTransformer());
|
||||
return $this->fractal->createData($resource)->toArray();
|
||||
});
|
||||
return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
|
||||
}
|
||||
|
||||
public function trendingHashtags(Request $request)
|
||||
{
|
||||
$res = StatusHashtag::select('hashtag_id', \DB::raw('count(*) as total'))
|
||||
->groupBy('hashtag_id')
|
||||
->orderBy('total','desc')
|
||||
->where('created_at', '>', now()->subDays(4))
|
||||
->take(9)
|
||||
->get()
|
||||
->map(function($h) {
|
||||
$hashtag = $h->hashtag;
|
||||
return [
|
||||
'id' => $hashtag->id,
|
||||
'total' => $h->total,
|
||||
'name' => '#'.$hashtag->name,
|
||||
'url' => $hashtag->url('?src=dsh1')
|
||||
];
|
||||
});
|
||||
return $res;
|
||||
}
|
||||
|
||||
public function trendingPlaces(Request $request)
|
||||
{
|
||||
$res = Status::select('place_id',DB::raw('count(place_id) as total'))
|
||||
->whereNotNull('place_id')
|
||||
->where('created_at','>',now()->subDays(14))
|
||||
->groupBy('place_id')
|
||||
->orderBy('total')
|
||||
->limit(4)
|
||||
->get()
|
||||
->map(function($s){
|
||||
$p = $s->place;
|
||||
return [
|
||||
'name' => $p->name,
|
||||
'country' => $p->country,
|
||||
'url' => $p->url()
|
||||
];
|
||||
});
|
||||
|
||||
return $res;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ class InternalApiController extends Controller
|
|||
->with('media')
|
||||
->inRandomOrder()
|
||||
->latest()
|
||||
->take(37)
|
||||
->take(39)
|
||||
->get();
|
||||
|
||||
$res = [
|
||||
|
|
|
|||
BIN
public/js/discover.js
vendored
BIN
public/js/discover.js
vendored
Binary file not shown.
Binary file not shown.
|
|
@ -4,39 +4,111 @@
|
|||
<img src="/img/pixelfed-icon-grey.svg">
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="d-block d-md-none px-0 border-top-0 mx-n3">
|
||||
<input class="form-control rounded-0" placeholder="Search" v-model="searchTerm" v-on:keyup.enter="searchSubmit">
|
||||
<div class="d-block d-md-none border-top-0 pt-3">
|
||||
<input class="form-control rounded-pill shadow-sm" placeholder="Search" v-model="searchTerm" v-on:keyup.enter="searchSubmit">
|
||||
</div>
|
||||
<div>
|
||||
<p class="display-4 font-weight-bold pt-5 text-lighter"><i class="far fa-compass"></i> DISCOVER</p>
|
||||
<div class="pt-3">
|
||||
<p class="d-block d-md-none h1 font-weight-bold text-lighter pt-3" style="opacity: 0.4"><i class="far fa-compass"></i> DISCOVER</p>
|
||||
<p class="d-none d-md-block display-3 font-weight-bold text-lighter pt-3" style="opacity: 0.4"><i class="far fa-compass"></i> DISCOVER</p>
|
||||
</div>
|
||||
<section class="d-none d-md-flex mb-md-2 pt-5 discover-bar" style="width:auto; overflow: auto hidden;" v-if="categories.length > 0">
|
||||
<!--<a v-if="config.ab.loops == true" class="text-decoration-none bg-transparent border border-success rounded d-inline-flex align-items-center justify-content-center mr-3 card-disc" href="/discover/loops">
|
||||
<p class="text-success lead font-weight-bold mb-0">Loops</p>
|
||||
</a>-->
|
||||
<a v-for="(category, index) in categories" :key="index+'_cat_'" class="bg-dark rounded d-inline-flex align-items-end justify-content-center mr-3 box-shadow card-disc text-decoration-none" :href="category.url" :style="'background: linear-gradient(rgba(0, 0, 0, 0.3),rgba(0, 0, 0, 0.3)),url('+category.thumb+');'">
|
||||
<p class="text-white font-weight-bold" style="text-shadow: 3px 3px 16px #272634;">{{category.name}}</p>
|
||||
</a>
|
||||
|
||||
|
||||
<section v-if="hashtags.length" class="mb-4 pb-5 section-explore mt-4 pt-4">
|
||||
<div class="lead">
|
||||
<i class="fas fa-hashtag text-lighter fa-lg mr-3"></i>
|
||||
<a v-for="(tag, index) in hashtags" :href="tag.url" class="badge badge-light rounded-pill border py-2 px-3 mr-2 mb-2 shadow-sm border-danger text-danger">{{tag.name}}</a>
|
||||
</div>
|
||||
<div class="lead mt-4">
|
||||
<i class="fas fa-map-marker-alt text-lighter fa-lg mr-3"></i>
|
||||
<a v-for="(tag, index) in places" :href="tag.url" class="badge badge-light rounded-pill border py-2 px-3 mr-2 mb-2 shadow-sm border-danger text-danger">{{tag.name}}, {{tag.country}}</a>
|
||||
</div>
|
||||
</section>
|
||||
<section class="mb-5 section-explore">
|
||||
|
||||
<section v-if="trending.length" class="mb-5 section-explore">
|
||||
<div class="profile-timeline">
|
||||
<div class="row p-0 mt-5">
|
||||
<div class="col-12 col-md-6">
|
||||
<div class="col-12 mb-3 d-flex justify-content-between align-items-center">
|
||||
<p class="d-block d-md-none h1 font-weight-bold mb-0">Trending</p>
|
||||
<p class="d-none d-md-block display-4 font-weight-bold mb-0">Trending</p>
|
||||
<div>
|
||||
<div class="btn-group">
|
||||
<button @click="trendingRangeToggle('daily')" :class="trendingRange == 'daily' ? 'btn py-1 font-weight-bold px-3 text-uppercase btn-sm btn-danger':'btn py-1 font-weight-bold px-3 text-uppercase btn-sm btn-outline-danger'">Daily</button>
|
||||
<button @click="trendingRangeToggle('monthly')" :class="trendingRange == 'monthly' ? 'btn py-1 font-weight-bold px-3 text-uppercase btn-sm btn-danger':'btn py-1 font-weight-bold px-3 text-uppercase btn-sm btn-outline-danger'">Monthly</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row p-0" style="display: flex;">
|
||||
<div v-for="(post, index) in trending.slice(0, 12)" class="col-4 p-1 p-sm-2 p-md-3 pt-0">
|
||||
<a class="card info-overlay card-md-border-0" :href="post.url">
|
||||
<div class="square">
|
||||
<span v-if="post.pf_type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
<span v-if="post.pf_type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
|
||||
<span v-if="post.pf_type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
|
||||
<div class="square-content" v-bind:style="{ 'background-image': 'url(' + post.media_attachments[0].preview_url + ')' }">
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section v-if="categories.length > 0" class="mb-5 section-explore">
|
||||
<div class="profile-timeline pt-3">
|
||||
<div class="row p-0 mt-5">
|
||||
<div class="col-12 mb-4 d-flex justify-content-between align-items-center">
|
||||
<p class="d-block d-md-none h1 font-weight-bold mb-0">Categories</p>
|
||||
<p class="d-none d-md-block display-4 font-weight-bold mb-0">Categories</p>
|
||||
</div>
|
||||
</div>
|
||||
<section class="d-none d-md-flex mb-md-2 discover-bar" style="width:auto; overflow: auto hidden;">
|
||||
<a v-for="(category, index) in categories" :key="index+'_cat_'" class="bg-dark rounded d-inline-flex align-items-end justify-content-center mr-3 box-shadow card-disc text-decoration-none" :href="category.url" :style="'background: linear-gradient(rgba(0, 0, 0, 0.3),rgba(0, 0, 0, 0.3)),url('+category.thumb+');'">
|
||||
<p class="text-white font-weight-bold" style="text-shadow: 3px 3px 16px #272634;">{{category.name}}</p>
|
||||
</a>
|
||||
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
<section v-if="categories.length > 0" class="py-5 mb-5 section-explore bg-warning rounded">
|
||||
<div class="profile-timeline py-3">
|
||||
<div class="row p-0 my-5">
|
||||
<div class="col-12 mb-3 text-center text-dark">
|
||||
<p class="d-none d-md-block display-3 font-weight-bold">Discover. Categories.</p>
|
||||
<p class="d-block d-md-none h1 font-weight-bold">Discover. Categories.</p>
|
||||
<p class="h4 font-weight-light mb-0">Discover amazing posts, people, places and hashtags.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section 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">
|
||||
<p class="d-block d-md-none h1 font-weight-bold mb-0">Spotlight</p>
|
||||
<p class="d-none d-md-block display-4 font-weight-bold mb-0">Spotlight</p>
|
||||
<div>
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-danger py-1 font-weight-bold px-3 text-uppercase btn-sm">Today</button>
|
||||
<button class="btn btn-outline-danger py-1 font-weight-bold px-3 text-uppercase btn-sm">Yesterday</button>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- <div class="col-12 col-md-6">
|
||||
<div class="mb-4">
|
||||
<a class="card info-overlay card-md-border-0" :href="posts[0].url">
|
||||
<a class="card info-overlay card-md-border-0" :href="posts[10].url">
|
||||
<div class="square">
|
||||
<span v-if="posts[0].type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
<span v-if="posts[0].type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
|
||||
<span v-if="posts[0].type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
|
||||
<div class="square-content" v-bind:style="{ 'background-image': 'url(' + posts[0].thumb + ')' }">
|
||||
<span v-if="posts[10].type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
<span v-if="posts[10].type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
|
||||
<span v-if="posts[10].type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
|
||||
<div class="square-content" v-bind:style="{ 'background-image': 'url(' + posts[10].thumb + ')' }">
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-md-6 row p-0 m-0">
|
||||
<div v-for="(post, index) in posts.slice(1,5)" class="col-6" style="margin-bottom:1.8rem;">
|
||||
<div v-for="(post, index) in posts.slice(11,15)" class="col-6" style="margin-bottom:1.8rem;">
|
||||
<a class="card info-overlay card-md-border-0" :href="post.url">
|
||||
<div class="square">
|
||||
<span v-if="post.type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
|
|
@ -47,10 +119,14 @@
|
|||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="col-12 mb-3 d-flex justify-content-between align-items-center">
|
||||
<p class="d-block d-md-none h1 font-weight-bold mb-0">For You</p>
|
||||
<p class="d-none d-md-block display-4 font-weight-bold mb-0">For You</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row p-0" style="display: flex;">
|
||||
<div v-for="(post, index) in posts.slice(5)" class="col-3 p-1 p-sm-2 p-md-3">
|
||||
<div v-for="(post, index) in posts" class="col-4 p-1 p-sm-2 p-md-3 pt-0">
|
||||
<a class="card info-overlay card-md-border-0" :href="post.url">
|
||||
<div class="square">
|
||||
<span v-if="post.type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
|
|
@ -64,9 +140,61 @@
|
|||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section class="mb-5">
|
||||
<p class="lead text-center">To view more posts, check the <a href="/" class="font-weight-bold">home</a> or <a href="/timeline/public" class="font-weight-bold">local</a> timelines.</p>
|
||||
</section>
|
||||
<!-- <section 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">
|
||||
<p class="display-4 font-weight-bold mb-0">Recommended</p>
|
||||
<!-- <div>
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-dark py-1 font-weight-bold px-3 text-uppercase btn-sm">Today</button>
|
||||
<button class="btn btn-outline-secondary py-1 font-weight-bold px-3 text-uppercase btn-sm">Weekly</button>
|
||||
<button class="btn btn-outline-secondary py-1 font-weight-bold px-3 text-uppercase btn-sm">Monthly</button>
|
||||
</div>
|
||||
</div> - - ->
|
||||
</div>
|
||||
<div class="col-12 col-md-6">
|
||||
<div class="mb-4">
|
||||
<a class="card info-overlay card-md-border-0" :href="posts[20].url">
|
||||
<div class="square">
|
||||
<span v-if="posts[20].type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
<span v-if="posts[20].type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
|
||||
<span v-if="posts[20].type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
|
||||
<div class="square-content" v-bind:style="{ 'background-image': 'url(' + posts[20].thumb + ')' }">
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-md-6 row p-0 m-0">
|
||||
<div v-for="(post, index) in posts.slice(21,25)" class="col-6" style="margin-bottom:1.8rem;">
|
||||
<a class="card info-overlay card-md-border-0" :href="post.url">
|
||||
<div class="square">
|
||||
<span v-if="post.type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
<span v-if="post.type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
|
||||
<span v-if="post.type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
|
||||
<div class="square-content" v-bind:style="{ 'background-image': 'url(' + post.thumb + ')' }">
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row p-0" style="display: flex;">
|
||||
<div v-for="(post, index) in posts.slice(25, 29)" class="col-3 p-1 p-sm-2 p-md-3 pt-0">
|
||||
<a class="card info-overlay card-md-border-0" :href="post.url">
|
||||
<div class="square">
|
||||
<span v-if="post.type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
|
||||
<span v-if="post.type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
|
||||
<span v-if="post.type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
|
||||
<div class="square-content" v-bind:style="{ 'background-image': 'url(' + post.thumb + ')' }">
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section> -->
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -98,15 +226,23 @@
|
|||
loaded: false,
|
||||
config: window.App.config,
|
||||
posts: {},
|
||||
hashtags: {},
|
||||
places: {},
|
||||
trending: {},
|
||||
trendingDaily: {},
|
||||
trendingMonthly: {},
|
||||
categories: {},
|
||||
allCategories: {},
|
||||
searchTerm: '',
|
||||
trendingRange: 'daily'
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.fetchData();
|
||||
this.fetchCategories();
|
||||
this.loadTrending();
|
||||
this.loadTrendingHashtags();
|
||||
this.loadTrendingPlaces();
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
|
@ -130,6 +266,50 @@
|
|||
if(this.searchTerm.length > 1) {
|
||||
window.location.href = '/i/results?q=' + this.searchTerm;
|
||||
}
|
||||
},
|
||||
|
||||
loadTrending() {
|
||||
if(this.trendingRange == 'daily' && this.trendingDaily.length) {
|
||||
this.trending = this.trendingDaily;
|
||||
return;
|
||||
}
|
||||
if(this.trendingRange == 'monthly' && this.trendingMonthly.length) {
|
||||
this.trending = this.trendingMonthly;
|
||||
return;
|
||||
}
|
||||
axios.get('/api/pixelfed/v2/discover/posts/trending', {
|
||||
params: {
|
||||
range: this.trendingRange
|
||||
}
|
||||
})
|
||||
.then(res => {
|
||||
if(this.trendingRange == 'daily') {
|
||||
this.trendingDaily = res.data;
|
||||
}
|
||||
if(this.trendingRange == 'monthly') {
|
||||
this.trendingMonthly = res.data;
|
||||
}
|
||||
this.trending = res.data;
|
||||
});
|
||||
},
|
||||
|
||||
trendingRangeToggle(r) {
|
||||
this.trendingRange = r;
|
||||
this.loadTrending();
|
||||
},
|
||||
|
||||
loadTrendingHashtags() {
|
||||
axios.get('/api/pixelfed/v2/discover/posts/hashtags')
|
||||
.then(res => {
|
||||
this.hashtags = res.data;
|
||||
});
|
||||
},
|
||||
|
||||
loadTrendingPlaces() {
|
||||
axios.get('/api/pixelfed/v2/discover/posts/places')
|
||||
.then(res => {
|
||||
this.places = res.data;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,6 +152,9 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
|||
Route::post('loops/watch', 'DiscoverController@loopWatch');
|
||||
Route::get('discover/tag', 'DiscoverController@getHashtags');
|
||||
Route::post('status/compose', 'InternalApiController@composePost')->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440');
|
||||
Route::get('discover/posts/trending', 'DiscoverController@trendingApi');
|
||||
Route::get('discover/posts/hashtags', 'DiscoverController@trendingHashtags');
|
||||
Route::get('discover/posts/places', 'DiscoverController@trendingPlaces');
|
||||
});
|
||||
});
|
||||
Route::group(['prefix' => 'local'], function () {
|
||||
|
|
|
|||
Loading…
Reference in a new issue