diff --git a/web/public/favicon.svg b/web/public/favicon.svg index 8de15422..afda3d35 100644 --- a/web/public/favicon.svg +++ b/web/public/favicon.svg @@ -131,6 +131,6 @@ id="tspan1728" x="16.979799" y="286.34747" - style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.264584px">dizqueTV + style="fill:#e6e6e6;fill-opacity:1;stroke-width:0.264584px">Tunarr diff --git a/web/public/dizquetv.png b/web/public/tunarr.png similarity index 100% rename from web/public/dizquetv.png rename to web/public/tunarr.png diff --git a/web/src/App.tsx b/web/src/App.tsx index 36c048d9..b06cadfc 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -34,9 +34,9 @@ import { Outlet, Link as RouterLink } from 'react-router-dom'; import './App.css'; import ServerEvents from './components/ServerEvents.tsx'; import VersionFooter from './components/VersionFooter.tsx'; +import { useVersion } from './hooks/useVersion.ts'; import useStore from './store/index.ts'; import { setDarkModeState } from './store/themeEditor/actions.ts'; -import { useVersion } from './hooks/useVersion.ts'; interface NavItem { name: string; @@ -156,7 +156,7 @@ export function Root() { > { if (!prevChannel && channel) { const url = isEmpty(channel.icon.path) - ? `/dizquetv.png` + ? `/tunarr.png` : channel.icon.path; setChannelIcon(url); setChannelIconPreview(url); diff --git a/web/src/generated/client.ts b/web/src/generated/client.ts index aad35fcc..0a6488cf 100644 --- a/web/src/generated/client.ts +++ b/web/src/generated/client.ts @@ -25,7 +25,7 @@ const createChannelV2_Body = z.object({ position: z.string(), }), guideMinimumDurationSeconds: z.number().optional().default(300), - groupTitle: z.string().optional().default('dizqueTV'), + groupTitle: z.string().optional().default('Tunarr'), disableFillerOverlay: z.boolean().optional(), offline: z .object({ diff --git a/web/src/helpers/plexLogin.ts b/web/src/helpers/plexLogin.ts index ecefbe72..7b812bbb 100644 --- a/web/src/helpers/plexLogin.ts +++ b/web/src/helpers/plexLogin.ts @@ -1,13 +1,16 @@ import { compact, partition } from 'lodash-es'; +import { apiClient } from '../external/api.ts'; import { AsyncInterval } from './AsyncInterval.ts'; import { sequentialPromises } from './util.ts'; -import { apiClient } from '../external/api.ts'; + +// From Plex: The Client Identifier identifies the specific instance of your app. A random string or UUID is sufficient here. There are no hard requirements for Client Identifier length or format, but once one is generated the client should store and re-use this identifier for subsequent requests. +const ClientIdentifier = 'p86cy1w47clco3ro8t92nfy1'; const PlexLoginHeaders = { Accept: 'application/json', - 'X-Plex-Product': 'dizqueTV', + 'X-Plex-Product': 'Tunarr', 'X-Plex-Version': 'Plex OAuth', - 'X-Plex-Client-Identifier': 'rg14zekk3pa5zp4safjwaa8z', + 'X-Plex-Client-Identifier': ClientIdentifier, 'X-Plex-Model': 'Plex OAuth', }; @@ -83,7 +86,7 @@ export const plexLoginFlow = async () => { }; const authWindow = window.open( - `https://app.plex.tv/auth/#!?clientID=rg14zekk3pa5zp4safjwaa8z&context[device][version]=Plex OAuth&context[device][model]=Plex OAuth&code=${initialResponseBody.code}&context[device][product]=Plex Web`, + `https://app.plex.tv/auth/#!?clientID=${ClientIdentifier}&context[device][version]=Plex OAuth&context[device][model]=Plex OAuth&code=${initialResponseBody.code}&context[device][product]=Plex Web`, '_blank', `height=${plexWindowSizes.height}, width=${plexWindowSizes.width}, top=${plexWindowPosition.height}, left=${plexWindowPosition.width}`, ); diff --git a/web/src/pages/channels/ChannelsPage.tsx b/web/src/pages/channels/ChannelsPage.tsx index 677cc8b4..25734f44 100644 --- a/web/src/pages/channels/ChannelsPage.tsx +++ b/web/src/pages/channels/ChannelsPage.tsx @@ -125,7 +125,7 @@ export default function ChannelsPage() { diff --git a/web/src/pages/guide/GuidePage.tsx b/web/src/pages/guide/GuidePage.tsx index c6b51dc2..e56175bc 100644 --- a/web/src/pages/guide/GuidePage.tsx +++ b/web/src/pages/guide/GuidePage.tsx @@ -31,10 +31,10 @@ import { isEmpty, round } from 'lodash-es'; import { Fragment, useCallback, useEffect, useState } from 'react'; import { useInterval } from 'usehooks-ts'; import PaddedPaper from '../../components/base/PaddedPaper.tsx'; +import { formatProgramDuration } from '../../helpers/util.ts'; import { prefetchAllTvGuides, useAllTvGuides } from '../../hooks/useTvGuide.ts'; import useStore from '../../store/index.ts'; import { setGuideDurationState } from '../../store/themeEditor/actions.ts'; -import { formatProgramDuration } from '../../helpers/util.ts'; dayjs.extend(duration); dayjs.extend(isBetween); @@ -656,7 +656,7 @@ export default function GuidePage() { style={{ maxHeight: '40px' }} src={ isEmpty(channel.icon?.path) - ? '/dizquetv.png' + ? '/tunarr.png' : channel.icon?.path } /> diff --git a/web/src/pages/settings/XmlTvSettingsPage.tsx b/web/src/pages/settings/XmlTvSettingsPage.tsx index f7115fd1..c7783fd5 100644 --- a/web/src/pages/settings/XmlTvSettingsPage.tsx +++ b/web/src/pages/settings/XmlTvSettingsPage.tsx @@ -1,4 +1,3 @@ -import React, { useEffect } from 'react'; import { Alert, Button, @@ -10,10 +9,11 @@ import { Stack, TextField, } from '@mui/material'; -import { useXmlTvSettings } from '../../hooks/settingsHooks.ts'; -import { hasOnlyDigits } from '../../helpers/util.ts'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import { XmlTvSettings, defaultXmlTvSettings } from '@tunarr/types'; +import React, { useEffect } from 'react'; +import { hasOnlyDigits } from '../../helpers/util.ts'; +import { useXmlTvSettings } from '../../hooks/settingsHooks.ts'; export default function XmlTvSettingsPage() { const { data, isPending, error } = useXmlTvSettings(); @@ -182,10 +182,10 @@ export default function XmlTvSettingsPage() { /> If enabled the pictures used for Movie and TV Show posters will be - cached in dizqueTV's .dizqueTV folder and will be delivered by - dizqueTV's server instead of requiring calls to Plex. Note that using - fixed xmltv location in Plex (as opposed to url) will not work - correctly in this case. + cached in Tunarr's .tunarr folder and will be delivered by Tunarr's + server instead of requiring calls to Plex. Note that using fixed xmltv + location in Plex (as opposed to url) will not work correctly in this + case. diff --git a/web/src/pages/welcome/WelcomePage.tsx b/web/src/pages/welcome/WelcomePage.tsx index e364048d..e00e768f 100644 --- a/web/src/pages/welcome/WelcomePage.tsx +++ b/web/src/pages/welcome/WelcomePage.tsx @@ -83,7 +83,7 @@ export default function WelcomePage() { margin: '0 auto', textAlign: 'center', }} - src="/dizquetv.png" + src="/tunarr.png" /> Welcome to Tunarr!