Skip to content

Commit

Permalink
Merge pull request #1212 from podverse/develop
Browse files Browse the repository at this point in the history
Release v4.15.0
  • Loading branch information
mitchdowney authored Nov 22, 2023
2 parents 628985d + 211e9a5 commit b6aa434
Show file tree
Hide file tree
Showing 7 changed files with 256 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
docker stop podverse_web_prod
docker rm podverse_web_prod
docker image rm podverse/podverse_web:latest
docker-compose -f /opt/podverse-ops/docker-compose/prod/srv/docker-compose.yml up -d podverse_web
docker compose -f /opt/podverse-ops/docker-compose/prod/srv/docker-compose.yml up -d podverse_web
- name: send deploy finished message to Matrix Alerts room
uses: s3krit/matrix-message-action@v0.0.3
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "podverse-web",
"version": "4.14.0",
"version": "4.15.0",
"description": "Web app for the Podverse podcast clip sharing ecosystem",
"repository": {
"type": "git",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@fortawesome/react-fontawesome": "0.1.16",
"@podverse/react-dropdown-select": "4.8.4-beta.2",
"@podverse/react-show-more-text": "1.5.1-beta.2",
"axios": "0.24.0",
"axios": "1.6.0",
"classnames": "2.3.1",
"debounce": "1.2.1",
"linkify-html": "3.0.4",
Expand Down Expand Up @@ -95,7 +95,7 @@
"jest": "27.4.7",
"lint-staged": "12.1.2",
"npm-run-all": "4.1.5",
"postcss": "8.4.5",
"postcss": "8.4.31",
"postcss-scss": "4.0.2",
"prettier": "2.5.0",
"stylelint": "^15.10.1",
Expand Down
57 changes: 57 additions & 0 deletions pages/album/[albumId].tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
This page exists because iOS React Native does not handle a URL with
# symbols without converting them to %23, which is invalid for the Matrix space link.
*/

import { GetServerSideProps } from 'next'
import { useTranslation } from 'next-i18next'
import { Page } from '~/lib/utility/page'
import { PV } from '~/resources'
import { Meta } from '~/components'

type ServerProps = Page

export default function AlbumRedirect(props: ServerProps) {
/* Initialize */

const { t } = useTranslation()

/* Meta Tags */

const meta = {
currentUrl: `${PV.Config.WEB_BASE_URL}${PV.RoutePaths.web.album}`,
description: t('pages-about_Description'),
title: t('pages-about_Title')
}

return (
<>
<Meta
description={meta.description}
ogDescription={meta.description}
ogTitle={meta.title}
ogType='website'
ogUrl={meta.currentUrl}
robotsNoIndex={false}
title={meta.title}
twitterDescription={meta.description}
twitterTitle={meta.title}
/>
<p>redirecting...</p>
</>
)
}

/* Server-Side Logic */

export const getServerSideProps: GetServerSideProps = async (ctx) => {
const { params } = ctx
const { albumId } = params

return {
redirect: {
destination: `${PV.Config.WEB_BASE_URL}${PV.RoutePaths.web.podcast}/${albumId}`,
permanent: false
}
}
}
57 changes: 57 additions & 0 deletions pages/track/[trackId].tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
This page exists because iOS React Native does not handle a URL with
# symbols without converting them to %23, which is invalid for the Matrix space link.
*/

import { GetServerSideProps } from 'next'
import { useTranslation } from 'next-i18next'
import { Page } from '~/lib/utility/page'
import { PV } from '~/resources'
import { Meta } from '~/components'

type ServerProps = Page

export default function TrackRedirect(props: ServerProps) {
/* Initialize */

const { t } = useTranslation()

/* Meta Tags */

const meta = {
currentUrl: `${PV.Config.WEB_BASE_URL}${PV.RoutePaths.web.track}`,
description: t('pages-about_Description'),
title: t('pages-about_Title')
}

return (
<>
<Meta
description={meta.description}
ogDescription={meta.description}
ogTitle={meta.title}
ogType='website'
ogUrl={meta.currentUrl}
robotsNoIndex={false}
title={meta.title}
twitterDescription={meta.description}
twitterTitle={meta.title}
/>
<p>redirecting...</p>
</>
)
}

/* Server-Side Logic */

export const getServerSideProps: GetServerSideProps = async (ctx) => {
const { params } = ctx
const { trackId } = params

return {
redirect: {
destination: `${PV.Config.WEB_BASE_URL}${PV.RoutePaths.web.episode}/${trackId}`,
permanent: false
}
}
}
18 changes: 16 additions & 2 deletions public/locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"Verifying your email address": "Vérification de l'adresse e-mail…",
"YourMembershipHasExpired": "Veuillez renouveler votre abonnement à Podverse Premium pour utiliser toutes les fonctionnalités.",
"No episode notes available": "Aucune note d'épisode disponible",
"open source": "Libre",
"open source": "Open Source",
"Are you sure you want to remove all of your history items": "Effacer tout l'historique ?",
"ARIA - Toggle UI theme change": "Modifier le thème de l'interface",
"Bug Report": "Signaler un problème",
Expand Down Expand Up @@ -425,5 +425,19 @@
"Join our Matrix space": "Rejoignez notre espace Matrix",
"Download my data": "Télécharger mes données",
"Download my data explanation": "Téléchargez une copie complète de vos données à partir de notre base de données.",
"Chat Room": "Salle de chat"
"Chat Room": "Salle de chat",
"Donate with Patreon": "Faire un don via Patreon",
"Donate with PayPal": "Faire un don via PayPal",
"Delete my account": "Supprimer mon compte",
"Donate with Github": "Faire un don via GitHub",
"Bitcoin wallet address": "Adresse du portefeuille Bitcoin",
"category - truecrime": "Crime",
"Contribute page": "Page de contribution",
"category - leisure": "Loisirs",
"Embed player overrides error info": "Afin d'utiliser le lecteur Web intégré de Podverse avec des configurations personnalisées, nous devons d'abord ajouter une liste d'« URL de média approuvés » pour ce podcast. Nous avons besoin de cette liste pour empêcher les gens d'utiliser notre lecteur intégré pour pirater ou déformer les podcasts. Veuillez nous contacter et nous activerons cette fonctionnalité pour vous !",
"Account Claim Token": "Jeton de réclamation de compte",
"Embed player overrides error email body": "Veuillez nous fournir un lien vers le flux RSS de votre podcast afin que nous puissions activer la fonction de configuration du lecteur intégré pour vous.",
"Embed player overrides error email subject": "Aide à la définition d'URL de média approuvées pour la fonction de configuration du lecteur intégré",
"Embed custom CSS intro instructions": "Écrasez le style du lecteur intégré de Podverse à l'aide d'un script sur votre site web.",
"Embed custom CSS instructions": "Utilisez JavaScript pour écraser le style du lecteur intégré. Copiez le script ci-dessous, modifiez-le si vous le souhaitez, puis collez-le dans (le bas de) votre site Web."
}
2 changes: 2 additions & 0 deletions src/resources/RoutePaths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export const RoutePaths = {
playlists: `/playlists`,
podcast: `/podcast`,
podcasts: `/podcasts`,
album: '/album',
profile: `/profile`,
profiles: `/profiles`,
queue: '/queue',
Expand All @@ -87,6 +88,7 @@ export const RoutePaths = {
settings_membership: `/settings#membership`,
settings: `/settings`,
terms: `/terms`,
track: '/track',
tutorials: `/tutorials`,
unspam: `http://www.unspam.com/noemailcollection/`,
v4v_wallet: `/v4v-wallet`,
Expand Down
Loading

0 comments on commit b6aa434

Please sign in to comment.