Merge branch 'Podcastindex-org:master' into enhancement#233__reply-to…

…-comments
podStation · May 4, 2023 · bc65ff6 · bc65ff6
2 parents 7f59726 + b7d2b76
commit bc65ff6
Show file tree

Hide file tree

Showing 40 changed files with 478 additions and 129 deletions.
diff --git a/server/assets/audicylogo.png b/server/assets/audicylogo.png
diff --git a/server/assets/spreaker.png b/server/assets/spreaker.png
diff --git a/server/data/apps-schema.json b/server/data/apps-schema.json
@@ -40,7 +40,8 @@
               "blockchain",
               "podcaster wallet",
               "open source",
-              "other"
+              "other",
+              "chat bot"
             ]
           }
         },
@@ -75,7 +76,8 @@
               "Sailfish OS",
               "Umbrel",
               "Citadel",
-              "Hive"
+              "Hive",
+              "Discord"
             ]
           }
         },

diff --git a/server/data/apps.json b/server/data/apps.json
@@ -1,4 +1,27 @@
 [
+  {
+    "appName": "Audicy",
+    "appType": [
+      "podcast player",
+      "other",
+      "chat bot"
+    ],
+    "appUrl": "https://audicy.xyz",
+    "appIconUrl": "audicylogo.png",
+    "platforms": [
+      "Discord"
+    ],
+    "supportedElements": [
+      {
+        "elementName": "Search",
+        "elementURL": "https://audicy.xyz"
+      },
+      {
+        "elementName": "Episode",
+        "elementURL": "https://audicy.xyz"
+      }
+    ]
+  },
   {
     "appName": "chaptertool",
     "appType": [
@@ -1132,6 +1155,22 @@
       {
         "elementName": "Txt",
         "elementURL": "https://blubrry.com/support/media-hosting-documentation/blubrry-dashboard-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "Season",
+        "elementURL": "https://blubrry.com/support/media-hosting-documentation/blubrry-dashboard-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "Episode",
+        "elementURL": "https://blubrry.com/support/media-hosting-documentation/blubrry-dashboard-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "Trailer",
+        "elementUrl": "https://blubrry.com/support/media-hosting-documentation/blubrry-dashboard-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "License",
+        "elementURL": "https://blubrry.com/support/media-hosting-documentation/blubrry-dashboard-podcasting-2-0-features/"
       }
     ]
   },
@@ -1192,6 +1231,22 @@
       {
         "elementName": "Txt",
         "elementURL": "https://blubrry.com/support/powerpress-documentation/powerpress-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "Season",
+        "elementURL": "https://blubrry.com/support/powerpress-documentation/powerpress-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "Episode",
+        "elementURL": "https://blubrry.com/support/powerpress-documentation/powerpress-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "Trailer",
+        "elementURL": "https://blubrry.com/support/powerpress-documentation/powerpress-podcasting-2-0-features/"
+      },
+      {
+        "elementName": "License",
+        "elementURL": "https://blubrry.com/support/powerpress-documentation/powerpress-podcasting-2-0-features/"
       }
     ]
   },
@@ -2064,6 +2119,10 @@
       {
         "elementName": "Txt",
         "elementURL": "https://rssblue.com/help/podcast-metadata#txt-records"
+      },
+      {
+        "elementName": "Podping",
+        "elementURL": "https://rssblue.com/blog/podping-is-live"
       }
     ]
   },
@@ -2316,5 +2375,27 @@
         "elementURL": "https://conshax.com"
       }
     ]
+  },
+  {
+    "appName": "Spreaker from iHeart",
+    "appType": [
+      "hosting",
+      "podcast player"
+    ],
+    "appUrl": "https://www.spreaker.com",
+    "appIconUrl": "spreaker.png",
+    "platforms": [
+      "Android",
+      "iOS",
+      "MacOS",
+      "Web",
+      "Windows"
+    ],
+    "supportedElements": [
+      {
+        "elementName": "Transcript",
+        "elementURL": "https://help.spreaker.com/en/articles/6886489-podcast-transcript"
+      }
+    ]
   }
 ]
diff --git a/server/index.js b/server/index.js
@@ -88,7 +88,13 @@ app.use('/api/recent/episodes', async (req, res) => {
 })
 
 app.use('/api/podcasts/bytag', async (req, res) => {
-    const response = await api.podcastsByTag()
+    let max = req.query.max
+    let start_at = req.query.start_at
+    const response = await api.custom('podcasts/bytag', {
+        'podcast-value': '',
+        'max': max,
+        'start_at': start_at,
+    })
     res.send(response)
 })
 

diff --git a/ui/images/dark_mode.svg b/ui/images/dark_mode.svg
diff --git a/ui/images/light_mode.svg b/ui/images/light_mode.svg
diff --git a/ui/images/transcript.svg b/ui/images/transcript.svg
diff --git a/ui/src/components/Button/styles.scss b/ui/src/components/Button/styles.scss
@@ -1,9 +1,9 @@
 :root {
+    --button-background: #F0F0F0;
     --button-hover-color: #f2f2f2;
-}
 
-@media (prefers-color-scheme: dark) {
-    :root {
+    &[data-theme="dark"] {
+        --button-background: #1a1a1a;
         --button-hover-color: #302d2d;
     }
 }
@@ -14,6 +14,7 @@
     font-family: var(--font-family-exp);
     font-size: 16px;
     color: var(--fg-main);
+    background-color: var(--button-background);
     padding: 8px 20px;
     text-align: center;
     white-space: nowrap;

diff --git a/ui/src/components/EpisodeItem/index.tsx b/ui/src/components/EpisodeItem/index.tsx
@@ -143,7 +143,7 @@ export default class EpisodeItem extends React.PureComponent<IProps> {
 
                             {episodeEnclosure ?
                                 <a
-                                    className="episode-enclosure"
+                                    className="episode-link"
                                     href={episodeEnclosure}
                                     title="Download"
                                     target="_blank"

diff --git a/ui/src/components/EpisodeItem/styles.scss b/ui/src/components/EpisodeItem/styles.scss
@@ -2,10 +2,8 @@
     --bg-color: #ffffff;
     --border-color: #d6d6d6;
     --cover-art-border-color: lighten(#d6d6d6, 0.2);
-}
 
-@media (prefers-color-scheme: dark) {
-    :root {
+    &[data-theme="dark"] {
         --bg-color: #180e0e;
         --border-color: #505050;
         --cover-art-border-color: var(--border-color);
@@ -36,8 +34,9 @@
     justify-content: center;
     padding: 15px 15px 15px 15px;
     img {
-        height: 140px;
+        max-height: 140px;
         width: 140px;
+        //object-fit: contain;
         border-radius: 10px;
         border: 1px solid var(--cover-art-border-color);
     }
@@ -71,15 +70,13 @@
 .episode-links {
     display: inline-flex;
     flex-direction: row;
+    gap: 5px;
 }
 
 .episode-link img, .episode-play-pause-mobile {
     width: 30px;
     height: 30px;
 }
-.episode-enclosure {
-    margin-left: 10px;
-}
 .episode-play-pause-mobile {
     display: none;
     margin-left: 20px;

diff --git a/ui/src/components/EpisodeList/index.tsx b/ui/src/components/EpisodeList/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import EpisodeItem from '../EpisodeItem'
 import InfiniteList from '../InfiniteList'
-import { fixURL } from '../../utils'
+import { fixURL, getImage } from '../../utils'
 
 const he = require('he')
 
@@ -51,8 +51,6 @@ export default class EpisodeList extends React.PureComponent<IProps> {
         let {
             id,
             title,
-            image,
-            feedImage,
             link,
             enclosureUrl,
             transcriptUrl,
@@ -64,7 +62,7 @@ export default class EpisodeList extends React.PureComponent<IProps> {
         } = item
         let {podcast} = this.props
         // try to use episode image, fall back to feed images
-        image = image || feedImage || podcast.image || podcast.artwork
+        const image = getImage(item) || getImage(podcast)
         enclosureUrl = fixURL(enclosureUrl)
         description = he.decode(description)
 

diff --git a/ui/src/components/KPI/styles.scss b/ui/src/components/KPI/styles.scss
@@ -1,9 +1,7 @@
 :root {
     --kpi-title-color: #494949;
-}
 
-@media (prefers-color-scheme: dark) {
-    :root {
+    &[data-theme="dark"] {
         --kpi-title-color: #cdcdcd;
     }
 }

diff --git a/ui/src/components/Player/index.tsx b/ui/src/components/Player/index.tsx
@@ -4,7 +4,7 @@ import sha256 from 'crypto-js/sha256'
 import { AUDIO_PRELOAD_ATTRIBUTE } from 'react-h5-audio-player/src/constants'
 import { v4 as uuidv4 } from 'uuid'
 import { Link } from 'react-router-dom'
-import { getISODate, getPrettyDate } from '../../utils'
+import { getImage, getISODate, getPrettyDate } from '../../utils'
 
 import 'react-h5-audio-player/src/styles.scss'
 import './styles.scss'
@@ -111,7 +111,7 @@ export default class Player extends React.Component<IProps> {
     setMediaSessionMetadata() {
         let navigator: any = window.navigator
         let episode = this.props.episode
-        let image: string = episode.image || episode.feedImage
+        let image: string = getImage(episode)
         if (episode && 'mediaSession' in window.navigator) {
             // @ts-ignore
             navigator.mediaSession.metadata = new MediaMetadata({

diff --git a/ui/src/components/Player/styles.scss b/ui/src/components/Player/styles.scss
@@ -37,7 +37,7 @@
         text-overflow: ellipsis;
         margin-bottom: 5px;
 
-        > a {
+        a {
             font-size: 16px;
             font-family: var(--font-family);
             color: var(--fg-main);
@@ -77,18 +77,21 @@
             }
         }
     } 
-    @media (prefers-color-scheme: dark) {
-        .rhap_container {
-            background-color: var(--bg-main);
-        }
-        .rhap_time {
-            color: var(--fg-main);
-        }
+}
+:root[data-theme="dark"] {
+    .rhap_container {
+        background-color: var(--bg-main);
+    }
+    .rhap_time {
+        color: var(--fg-main);
     }
 }
 
 @media only screen and (max-width: 520px) {
     .player-show-title p {
         max-width: 350px;
     }
+    .player-podcast-name {
+        max-width: 350px;
+    }
 }
diff --git a/ui/src/components/PodcastHeader/index.tsx b/ui/src/components/PodcastHeader/index.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import Button from "../Button";
 
 import Value from '../Value'
 import NoImage from '../../../images/no-cover-art.png'
@@ -151,7 +152,7 @@ export default class PodcastHeader extends React.PureComponent<IProps, PodState>
                                 : ""
                             }
                             {feedURL ?
-                                <button onClick={this.copyClicked}>{ this.state.copyMessage }</button>
+                                <Button small={true} onClick={this.copyClicked}>{ this.state.copyMessage }</Button>
                                 : ""
                             }
                         </div>

diff --git a/ui/src/components/PodcastHeader/styles.scss b/ui/src/components/PodcastHeader/styles.scss
@@ -2,10 +2,8 @@
     --category-bg-color: #f3f3f3;
     --category-border-color: #cecece;
     --cover-art-border-color: lighten(#d6d6d6, 0.2);
-}
 
-@media (prefers-color-scheme: dark) {
-    :root {
+    &[data-theme="dark"] {
         --category-bg-color: #302d2d;
         --category-border-color: #505050;
         --cover-art-border-color: var(--border-color);
@@ -26,6 +24,7 @@
     img {
         height: 300px;
         width: 300px;
+        object-fit: contain;
         border-radius: 10px;
         border: 1px solid var(--cover-art-border-color);
     }