Merge branch 'develop'

master
sct 1 year ago
commit 45ce57687a

@ -94,9 +94,9 @@ jobs:
run: | run: |
failures=(neutral, skipped, timed_out, action_required) failures=(neutral, skipped, timed_out, action_required)
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
echo ::set-output name=status::failure echo "status=failure" >> $GITHUB_OUTPUT
else else
echo ::set-output name=status::$WORKFLOW_CONCLUSION echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
fi fi
- name: Post Status to Discord - name: Post Status to Discord
uses: sarisia/actions-status-discord@v1 uses: sarisia/actions-status-discord@v1

@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Get the version - name: Get the version
id: get_version id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx - name: Set up Docker Buildx

@ -69,9 +69,9 @@ jobs:
run: | run: |
git fetch --prune --tags git fetch --prune --tags
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
echo ::set-output name=RELEASE::stable echo "RELEASE=stable" >> $GITHUB_OUTPUT
else else
echo ::set-output name=RELEASE::edge echo "RELEASE=edge" >> $GITHUB_OUTPUT
fi fi
- name: Set Up QEMU - name: Set Up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
@ -93,8 +93,9 @@ jobs:
snap: ${{ steps.build.outputs.snap }} snap: ${{ steps.build.outputs.snap }}
- name: Publish Snap Package - name: Publish Snap Package
uses: snapcore/action-publish@v1 uses: snapcore/action-publish@v1
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
with: with:
store_login: ${{ secrets.SNAP_LOGIN }}
snap: ${{ steps.build.outputs.snap }} snap: ${{ steps.build.outputs.snap }}
release: ${{ steps.prepare.outputs.RELEASE }} release: ${{ steps.prepare.outputs.RELEASE }}
@ -111,9 +112,9 @@ jobs:
run: | run: |
failures=(neutral, skipped, timed_out, action_required) failures=(neutral, skipped, timed_out, action_required)
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
echo ::set-output name=status::failure echo "status=failure" >> $GITHUB_OUTPUT
else else
echo ::set-output name=status::$WORKFLOW_CONCLUSION echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
fi fi
- name: Post Status to Discord - name: Post Status to Discord
uses: sarisia/actions-status-discord@v1 uses: sarisia/actions-status-discord@v1

@ -35,9 +35,9 @@ jobs:
run: | run: |
git fetch --prune --unshallow --tags git fetch --prune --unshallow --tags
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
echo ::set-output name=RELEASE::stable echo "RELEASE=stable" >> $GITHUB_OUTPUT
else else
echo ::set-output name=RELEASE::edge echo "RELEASE=edge" >> $GITHUB_OUTPUT
fi fi
- name: Set Up QEMU - name: Set Up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
@ -57,8 +57,9 @@ jobs:
snap: ${{ steps.build.outputs.snap }} snap: ${{ steps.build.outputs.snap }}
- name: Publish Snap Package - name: Publish Snap Package
uses: snapcore/action-publish@v1 uses: snapcore/action-publish@v1
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
with: with:
store_login: ${{ secrets.SNAP_LOGIN }}
snap: ${{ steps.build.outputs.snap }} snap: ${{ steps.build.outputs.snap }}
release: ${{ steps.prepare.outputs.RELEASE }} release: ${{ steps.prepare.outputs.RELEASE }}
@ -75,9 +76,9 @@ jobs:
run: | run: |
failures=(neutral, skipped, timed_out, action_required) failures=(neutral, skipped, timed_out, action_required)
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
echo ::set-output name=status::failure echo "status=failure" >> $GITHUB_OUTPUT
else else
echo ::set-output name=status::$WORKFLOW_CONCLUSION echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
fi fi
- name: Post Status to Discord - name: Post Status to Discord
uses: sarisia/actions-status-discord@v1 uses: sarisia/actions-status-discord@v1

@ -4418,7 +4418,7 @@ paths:
- in: query - in: query
name: genre name: genre
schema: schema:
type: number type: string
example: 18 example: 18
- in: query - in: query
name: network name: network

@ -85,7 +85,7 @@ interface DiscoverTvOptions {
voteAverageLte?: string; voteAverageLte?: string;
includeEmptyReleaseDate?: boolean; includeEmptyReleaseDate?: boolean;
originalLanguage?: string; originalLanguage?: string;
genre?: number; genre?: string;
network?: number; network?: number;
keywords?: string; keywords?: string;
sortBy?: SortOptions; sortBy?: SortOptions;

@ -356,7 +356,7 @@ discoverRoutes.get('/tv', async (req, res, next) => {
page: Number(query.page), page: Number(query.page),
sortBy: query.sortBy as SortOptions, sortBy: query.sortBy as SortOptions,
language: req.locale ?? query.language, language: req.locale ?? query.language,
genre: query.genre ? Number(query.genre) : undefined, genre: query.genre,
network: query.network ? Number(query.network) : undefined, network: query.network ? Number(query.network) : undefined,
firstAirDateLte: query.firstAirDateLte firstAirDateLte: query.firstAirDateLte
? new Date(query.firstAirDateLte).toISOString().split('T')[0] ? new Date(query.firstAirDateLte).toISOString().split('T')[0]
@ -491,7 +491,7 @@ discoverRoutes.get<{ genreId: string }>(
const data = await tmdb.getDiscoverTv({ const data = await tmdb.getDiscoverTv({
page: Number(req.query.page), page: Number(req.query.page),
language: req.locale ?? (req.query.language as string), language: req.locale ?? (req.query.language as string),
genre: Number(req.params.genreId), genre: req.params.genreId,
}); });
const media = await Media.getRelatedMedia( const media = await Media.getRelatedMedia(
@ -770,7 +770,9 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
await Promise.all( await Promise.all(
genres.map(async (genre) => { genres.map(async (genre) => {
const genreData = await tmdb.getDiscoverTv({ genre: genre.id }); const genreData = await tmdb.getDiscoverTv({
genre: genre.id.toString(),
});
mappedGenres.push({ mappedGenres.push({
id: genre.id, id: genre.id,

@ -91,10 +91,10 @@ const DiscoverTv = () => {
<option value={SortOptions.PopularityAsc}> <option value={SortOptions.PopularityAsc}>
{intl.formatMessage(messages.sortPopularityAsc)} {intl.formatMessage(messages.sortPopularityAsc)}
</option> </option>
<option value={SortOptions.ReleaseDateDesc}> <option value={SortOptions.FirstAirDateDesc}>
{intl.formatMessage(messages.sortFirstAirDateDesc)} {intl.formatMessage(messages.sortFirstAirDateDesc)}
</option> </option>
<option value={SortOptions.ReleaseDateAsc}> <option value={SortOptions.FirstAirDateAsc}>
{intl.formatMessage(messages.sortFirstAirDateAsc)} {intl.formatMessage(messages.sortFirstAirDateAsc)}
</option> </option>
<option value={SortOptions.TmdbRatingDesc}> <option value={SortOptions.TmdbRatingDesc}>

Loading…
Cancel
Save