Alex/flox
1
0
Fork 0
mirror of https://github.com/devfake/flox.git synced 2024-11-15 06:32:34 +01:00
Code Issues Releases Wiki Activity

region query for upcoming movies (#69)

Browse Source
This commit is contained in:
Viktor Geringer 2017-04-11 14:42:36 +02:00 committed by GitHub
parent 342683adeb
commit d398126664
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/app/Services/TMDB.php
View File

@ -97,14 +97,19 @@
} }
/** /**
* Search TMDb for upcoming movies. * Search TMDb for upcoming movies in our region.
* *
* @return array * @return array
*/ */
public function upcoming() public function upcoming()
{ {
$cache = Cache::remember('upcoming', $this->untilEndOfDay(), function() { $cache = Cache::remember('upcoming', $this->untilEndOfDay(), function() {
$response = $this->requestTmdb($this->base . '/3/movie/upcoming'); // There is no 'EN' region in TMDb.
$region = strtolower($this->translation) == 'en' ? 'us' : $this->translation;
$response = $this->requestTmdb($this->base . '/3/movie/upcoming', [
'region' => $region,
]);
return collect($this->createItems($response, 'movie')); return collect($this->createItems($response, 'movie'));
}); });

12
client/app/components/Content/Subpage.vue
View File

@ -121,6 +121,10 @@
}, },
posterImage() { posterImage() {
if( ! this.item.poster) {
return this.noImage;
}
if(this.item.rating != null) { if(this.item.rating != null) {
return config.posterSubpage + this.item.poster; return config.posterSubpage + this.item.poster;
} }
@ -128,14 +132,14 @@
return config.posterSubpageTMDB + this.item.poster; return config.posterSubpageTMDB + this.item.poster;
}, },
noImage() {
return config.url + '/assets/img/no-image-subpage.png';
},
released() { released() {
const released = new Date(this.item.released * 1000); const released = new Date(this.item.released * 1000);
return released.getFullYear(); return released.getFullYear();
},
noImage() {
return config.url + '/assets/img/no-image-subpage.png';
} }
}, },