From 25d6e306393c6cfaac059cb88a7f35296bc00e7e Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 17 Sep 2024 18:35:12 -0700 Subject: [PATCH] more PgaeContainer session/subscriptions cleanup --- .../src/components/common/index.tsx | 2 + .../fakeyou.com/src/v2/view/PageContainer.tsx | 95 ++++--------- .../pages/contribute/ContributeIndexPage.tsx | 14 +- .../src/v2/view/pages/lipsync/GenerateTts.tsx | 21 +-- .../src/v2/view/pages/lipsync/Lipsync.tsx | 11 +- .../lipsync/SessionLsInferenceResultsList.tsx | 1 - .../live_portrait/CameraLivePortrait.tsx | 1 - .../view/pages/live_portrait/LivePortrait.tsx | 10 +- .../SessionLpInferenceResultsList.tsx | 2 - .../ModerationUserFeatureFlagsPage.tsx | 134 +++++++++--------- .../ModerationUserList.tsx | 13 +- .../ModerationViewIpBanFc.tsx | 115 ++++++++------- .../TtsEditCategoriesPage.tsx | 19 +-- .../tts_model_delete/TtsModelDeletePage.tsx | 44 +++--- .../tts/tts_model_edit/TtsModelEditPage.tsx | 13 +- .../tts/tts_model_view/TtsModelViewPage.tsx | 2 - .../tts_result_delete/TtsResultDeletePage.tsx | 25 ++-- .../tts/tts_result_edit/TtsResultEditPage.tsx | 21 ++- .../tts/tts_result_view/TtsResultViewPage.tsx | 31 ++-- .../pages/upload/UploadLoraWeightPage.tsx | 12 +- .../pages/upload/UploadNewTtsModelPage.tsx | 14 +- .../view/pages/upload/UploadSdWeightPage.tsx | 13 +- .../view/pages/upload/UploadTtsModelPage.tsx | 14 +- .../view/pages/upload/UploadWorkflowPage.tsx | 11 +- .../w2l_result_delete/W2lResultDeletePage.tsx | 21 ++- .../w2l/w2l_result_edit/W2lResultEditPage.tsx | 21 ++- .../w2l/w2l_result_view/W2lResultViewPage.tsx | 19 ++- .../W2lTemplateApprovePage.tsx | 17 +-- .../W2lTemplateDeletePage.tsx | 27 ++-- .../w2l_template_edit/W2lTemplateEditPage.tsx | 15 +- .../w2l_template_list/W2lTemplateListPage.tsx | 27 ++-- .../v2/view/pages/weight/WeightEditPage.tsx | 9 +- 32 files changed, 318 insertions(+), 476 deletions(-) diff --git a/src/website/packages/fakeyou.com/src/components/common/index.tsx b/src/website/packages/fakeyou.com/src/components/common/index.tsx index b99f3ee08e..a56544f1cc 100644 --- a/src/website/packages/fakeyou.com/src/components/common/index.tsx +++ b/src/website/packages/fakeyou.com/src/components/common/index.tsx @@ -28,6 +28,7 @@ import JobsClearButton from "./JobsClearButton"; import JobQueueTicker from "./JobQueueTicker"; import Label from "./Label"; import LikeButton from "./LikeButton"; +import LoadingSpinner from "./LoadingSpinner"; import LoginBlock from "./LoginBlock"; import MasonryGrid from "./MasonryGrid/MasonryGrid"; import Modal, { ModalUtilities } from "./Modal"; @@ -104,6 +105,7 @@ export { JobQueueTicker, Label, LikeButton, + LoadingSpinner, LoginBlock, MasonryGrid, Modal, diff --git a/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 6ea58a07a2..658199a3cb 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -263,7 +263,7 @@ class PageContainer extends React.Component< - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -562,19 +525,11 @@ class PageContainer extends React.Component< {/* NEW LIVE PORTRAIT PAGE */} - + - + diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/contribute/ContributeIndexPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/contribute/ContributeIndexPage.tsx index 42d7809dec..616ec33864 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/contribute/ContributeIndexPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/contribute/ContributeIndexPage.tsx @@ -1,5 +1,4 @@ import React from "react"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { Link } from "react-router-dom"; import { DiscordLink } from "@storyteller/components/src/elements/DiscordLink"; import { WebUrl } from "../../../../common/WebUrl"; @@ -24,17 +23,15 @@ import { import { faWaveformLines } from "@fortawesome/pro-regular-svg-icons"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; import { Button } from "components/common"; +import { useSession } from "hooks"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function ContributeIndexPage(props: Props) { - const categoryHeading = props.sessionWrapper.canEditCategories() +function ContributeIndexPage() { + const { sessionWrapper } = useSession(); + const categoryHeading = sessionWrapper.canEditCategories() ? t("pages.contributeIndex.headingCreateCategory") : t("pages.contributeIndex.headingSuggestCategory"); - const categoryButton = props.sessionWrapper.canEditCategories() + const categoryButton = sessionWrapper.canEditCategories() ? t("pages.contributeIndex.buttonCreateCategory") : t("pages.contributeIndex.buttonSuggestCategory"); @@ -57,7 +54,6 @@ function ContributeIndexPage(props: Props) { ); return ( -
{/*
diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/GenerateTts.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/GenerateTts.tsx index a765de1aad..2fd5a64351 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/GenerateTts.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/GenerateTts.tsx @@ -24,11 +24,18 @@ import { import { Button, Label, + LoadingSpinner, Panel, TextArea, WeightCoverImage, } from "components/common"; -import { useDebounce, useInferenceJobs, useLocalize, useModal } from "hooks"; +import { + useDebounce, + useInferenceJobs, + useLocalize, + useModal, + useSession, +} from "hooks"; import LipsyncAudioPlayer from "./LipsyncAudioPlayer"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { @@ -37,10 +44,7 @@ import { MediaLinks, } from "@storyteller/components/src/api/media_files"; import { SessionTtsInferenceResultList } from "v2/view/_common/SessionTtsInferenceResultsList"; -import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; -import { useHistory } from "react-router-dom"; -import { useLocation } from "react-router-dom"; -import LoadingSpinner from "components/common/LoadingSpinner"; +import { useHistory, useLocation } from "react-router-dom"; import { GetWeight } from "@storyteller/components/src/api/weights/GetWeight"; import { MediaBrowser } from "components/modals"; import ExploreVoices from "../audio_gen/ExploreVoices"; @@ -49,7 +53,6 @@ interface GenerateTtsProps { weightToken?: string | null; onResultToken?: (token: string | null) => void; onAudioDelete?: () => void; - sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; loadingSelectedAudioResult: boolean; setLoadingSelectedAudioResult: React.Dispatch>; currentAudioUrl: string | null; @@ -60,12 +63,12 @@ export const GenerateTts = memo(function GenerateTts({ weightToken, onResultToken, onAudioDelete, - sessionSubscriptionsWrapper, loadingSelectedAudioResult, setLoadingSelectedAudioResult, currentAudioUrl, setCurrentAudioUrl, }: GenerateTtsProps) { + const { sessionSubscriptions } = useSession(); const { modalState, open, close } = useModal(); const [textBuffer, setTextBuffer] = useState(""); const [maybeTtsError, setMaybeTtsError] = useState< @@ -560,8 +563,8 @@ export const GenerateTts = memo(function GenerateTts({ style={{ height: "100%", maxHeight: - sessionSubscriptionsWrapper.hasActiveProSubscription() || - sessionSubscriptionsWrapper.hasActiveEliteSubscription() + sessionSubscriptions?.hasActiveProSubscription() || + sessionSubscriptions?.hasActiveEliteSubscription() ? "460px" : "520px", overflow: "auto", diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/Lipsync.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/Lipsync.tsx index 7dceae9fb2..e2071583bb 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/Lipsync.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/lipsync/Lipsync.tsx @@ -34,7 +34,6 @@ import { FrontendInferenceJobType, InferenceJob, } from "@storyteller/components/src/jobs/InferenceJob"; -import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; import { AITools } from "components/marketing"; import LoadingSpinner from "components/common/LoadingSpinner"; import { @@ -54,16 +53,12 @@ import { LipsyncTokenMap } from "./LipsyncTokens"; import { faDiscord } from "@fortawesome/free-brands-svg-icons"; import { featuredTtsVoiceTokens } from "../audio_gen/tts/FeaturedTTSVoiceTokens"; -interface LipsyncProps { - sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; -} - // Initial source if no source or matching voice that has a source is provided const PRECOMPUTED_SOURCE_TOKENS: string[] = [ "m_7ap2qssd4y5ew51dkx4awnng2key32", // Wednesday Addams ]; -export default function Lipsync({ sessionSubscriptionsWrapper }: LipsyncProps) { +export default function Lipsync() { useDocumentTitle("Lip Sync AI. Free Video Animation"); const { enqueueInferenceJob } = useInferenceJobs(); const { loggedIn, sessionFetched } = useSession(); @@ -564,7 +559,6 @@ export default function Lipsync({ sessionSubscriptionsWrapper }: LipsyncProps) { weightToken={voiceToken} onResultToken={handleAudioResultToken} onAudioDelete={handleAudioDelete} - sessionSubscriptionsWrapper={sessionSubscriptionsWrapper} loadingSelectedAudioResult={loadingSelectedAudioResult} setLoadingSelectedAudioResult={setLoadingSelectedAudioResult} currentAudioUrl={currentAudioUrl} @@ -665,9 +659,6 @@ export default function Lipsync({ sessionSubscriptionsWrapper }: LipsyncProps) { />
setSourceTokens(prevTokens => diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx index dc4cd37029..de4368060a 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx @@ -39,7 +39,6 @@ import { FrontendInferenceJobType, InferenceJob, } from "@storyteller/components/src/jobs/InferenceJob"; -import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; import { AITools } from "components/marketing"; import LoadingSpinner from "components/common/LoadingSpinner"; import SessionLpInferenceResultsList from "./SessionLpInferenceResultsList"; @@ -57,10 +56,6 @@ import { useHistory } from "react-router-dom"; import { JobState } from "@storyteller/components/src/jobs/JobStates"; import PremiumLock from "components/PremiumLock"; -interface LivePortraitProps { - sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; -} - interface GeneratedVideo { sourceIndex: number; motionIndex: number; @@ -95,9 +90,7 @@ const PRECOMPUTED_DRIVER_TOKENS: string[] = [ "m_ar300kqxy3ez8znq9p40y2qejfhsc2", // Slight Smile ]; -export default function LivePortrait({ - sessionSubscriptionsWrapper, -}: LivePortraitProps) { +export default function LivePortrait() { useDocumentTitle("Live Portrait AI. Free Video Animation"); const { enqueueInferenceJob } = useInferenceJobs(); const { loggedIn, loggedInOrModal, sessionFetched } = useSession(); @@ -1077,7 +1070,6 @@ export default function LivePortrait({
{featureFlagForm} - - - ) + ); } export { ModerationUserFeatureFlagsPage }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_user_list/ModerationUserList.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_user_list/ModerationUserList.tsx index ee5e2b851b..d97263346c 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_user_list/ModerationUserList.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_user_list/ModerationUserList.tsx @@ -1,6 +1,5 @@ import React, { useCallback, useEffect, useState } from "react"; import { Link } from "react-router-dom"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; import { GetUserList, @@ -10,12 +9,10 @@ import { import { formatDistance } from "date-fns"; import { WebUrl } from "../../../../../common/WebUrl"; import { BackLink } from "../../../_common/BackLink"; +import { useSession } from "hooks"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function ModerationUserListFc(props: Props) { +function ModerationUserListFc() { + const { sessionWrapper } = useSession(); const [userList, setUserList] = useState>([]); const getUsers = useCallback(async () => { @@ -34,14 +31,14 @@ function ModerationUserListFc(props: Props) { return
; } - if (!props.sessionWrapper.canBanUsers()) { + if (!sessionWrapper.canBanUsers()) { return

Unauthorized

; } const now = new Date(); let rows: Array = []; - userList.forEach((user) => { + userList.forEach(user => { const createTime = new Date(user.created_at); const relativeCreateTime = formatDistance(createTime, now, { addSuffix: true, diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx index bbbc5f507b..ae6c51a342 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx @@ -1,65 +1,62 @@ -import React, { useEffect, useState } from 'react'; -import { ApiConfig } from '@storyteller/components'; -import { Link, useHistory, useParams } from 'react-router-dom'; -import { SessionWrapper } from '@storyteller/components/src/session/SessionWrapper'; -import { formatDistance } from 'date-fns'; - -interface Props { - sessionWrapper: SessionWrapper, -} +import React, { useEffect, useState } from "react"; +import { ApiConfig } from "@storyteller/components"; +import { Link, useHistory, useParams } from "react-router-dom"; +import { formatDistance } from "date-fns"; +import { useSession } from "hooks"; interface IpBanListResponse { - success: boolean, - ip_address_ban: IpBan, + success: boolean; + ip_address_ban: IpBan; } interface IpBan { - ip_address: string, - maybe_target_user_token: string, - maybe_target_username: string, + ip_address: string; + maybe_target_user_token: string; + maybe_target_username: string; - mod_user_token: string, - mod_username: string, - mod_display_name: string, - mod_notes: string, + mod_user_token: string; + mod_username: string; + mod_display_name: string; + mod_notes: string; - created_at: string, - updated_at: string, + created_at: string; + updated_at: string; } -function ModerationViewIpBanFc(props: Props) { +function ModerationViewIpBanFc() { + const { sessionWrapper } = useSession(); const { ipAddress } = useParams() as { ipAddress: string }; const history = useHistory(); - const [ipBan, setIpBan] = useState(undefined); + const [ipBan, setIpBan] = useState(undefined); useEffect(() => { const api = new ApiConfig(); const endpointUrl = api.getModerationIpBan(ipAddress); fetch(endpointUrl, { - method: 'GET', + method: "GET", headers: { - 'Accept': 'application/json', + Accept: "application/json", }, - credentials: 'include', + credentials: "include", }) - .then(res => res.json()) - .then(res => { - const response : IpBanListResponse = res; - if (!response.success) { - return; - } + .then(res => res.json()) + .then(res => { + const response: IpBanListResponse = res; + if (!response.success) { + return; + } - setIpBan(response.ip_address_ban) - }) - .catch(e => { - //this.props.onSpeakErrorCallback(); - }); + setIpBan(response.ip_address_ban); + }) + .catch(e => { + //this.props.onSpeakErrorCallback(); + }); }, [ipAddress]); // NB: Empty array dependency sets to run ONLY on mount - const handleFormSubmit = (ev: React.FormEvent) : boolean => { + const handleFormSubmit = (ev: React.FormEvent): boolean => { ev.preventDefault(); const api = new ApiConfig(); @@ -67,42 +64,40 @@ function ModerationViewIpBanFc(props: Props) { const request = { delete: true, - } + }; fetch(endpointUrl, { - method: 'POST', + method: "POST", headers: { - 'Accept': 'application/json', - 'Content-Type': 'application/json', + Accept: "application/json", + "Content-Type": "application/json", }, - credentials: 'include', + credentials: "include", body: JSON.stringify(request), }) - .then(res => res.json()) - .then(res => { - if (res.success) { - history.push('/moderation/ip_bans'); - } - }) - .catch(e => {}); + .then(res => res.json()) + .then(res => { + if (res.success) { + history.push("/moderation/ip_bans"); + } + }) + .catch(e => {}); return false; - } + }; - if (!props.sessionWrapper.canBanUsers()) { + if (!sessionWrapper.canBanUsers()) { return

Unauthorized

; } const now = new Date(); - let relativeCreateTime = ''; - let modLink = + let relativeCreateTime = ""; + let modLink = ; if (ipBan !== undefined) { - const modLinkLocation = `/profile/${ipBan.mod_username}` - modLink = ( - {ipBan.mod_username} - ) + const modLinkLocation = `/profile/${ipBan.mod_username}`; + modLink = {ipBan.mod_username}; const createTime = new Date(ipBan.created_at); relativeCreateTime = formatDistance(createTime, now, { addSuffix: true }); @@ -138,10 +133,12 @@ function ModerationViewIpBanFc(props: Props) {
- +
- ) + ); } export { ModerationViewIpBanFc }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_edit_categories/TtsEditCategoriesPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_edit_categories/TtsEditCategoriesPage.tsx index 6e2ff43ecc..60eb7e0a84 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_edit_categories/TtsEditCategoriesPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_edit_categories/TtsEditCategoriesPage.tsx @@ -26,7 +26,6 @@ import { ListTtsCategoriesForModelIsOk, TtsModelCategory, } from "@storyteller/components/src/api/category/ListTtsCategoriesForModel"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { faExclamationCircle, faXmark, @@ -35,11 +34,7 @@ import { useParams, Link } from "react-router-dom"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function TtsEditCategoriesPage(props: Props) { +function TtsEditCategoriesPage() { let { token } = useParams() as { token: string }; PosthogClient.recordPageview(); @@ -55,7 +50,7 @@ function TtsEditCategoriesPage(props: Props) { undefined ); - const getModel = useCallback(async (token) => { + const getModel = useCallback(async token => { const model = await GetTtsModel(token); if (GetTtsModelIsOk(model)) { @@ -79,7 +74,7 @@ function TtsEditCategoriesPage(props: Props) { } }, []); - const listTtsCategoriesForModel = useCallback(async (token) => { + const listTtsCategoriesForModel = useCallback(async token => { const categoryList = await ListTtsCategoriesForModel(token); if (ListTtsCategoriesForModelIsOk(categoryList)) { @@ -150,7 +145,7 @@ function TtsEditCategoriesPage(props: Props) { const modelLink = WebUrl.ttsModelPage(token); const assignedCategoryTokens = new Set( - assignedCategories.map((category) => category.category_token) + assignedCategories.map(category => category.category_token) ); let currentCategoriesList = ( @@ -162,7 +157,7 @@ function TtsEditCategoriesPage(props: Props) { if (assignedCategories.length !== 0) { currentCategoriesList = ( <> - {assignedCategories.map((category) => { + {assignedCategories.map(category => { let notApprovedWarning = null; let modelsNotAllowedWarning = null; let deletedWarning = null; @@ -232,12 +227,12 @@ function TtsEditCategoriesPage(props: Props) { } const addCategoryOptions = allTtsCategories - .filter((category) => { + .filter(category => { const alreadyAdded = assignedCategoryTokens.has(category.category_token); const cannotAdd = !category.can_directly_have_models; return !alreadyAdded && !cannotAdd; }) - .map((category) => { + .map(category => { return ( <> diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_delete/TtsModelDeletePage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_delete/TtsModelDeletePage.tsx index 57b179c5a0..8cdc16a5de 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_delete/TtsModelDeletePage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_delete/TtsModelDeletePage.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; import { WebUrl } from "../../../../../common/WebUrl"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { BackLink } from "../../../_common/BackLink"; +import { useSession } from "hooks"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; @@ -40,22 +40,18 @@ interface TtsModelModeratorFields { user_deleted_at: string | undefined | null; } -interface Props { - sessionWrapper: SessionWrapper; -} - -function TtsModelDeletePage(props: Props) { +function TtsModelDeletePage() { PosthogClient.recordPageview(); const history = useHistory(); - - let { token } = useParams() as { token: string }; + const { token } = useParams() as { token: string }; + const { sessionWrapper } = useSession(); const [ttsModel, setTtsModel] = useState(undefined); const [ttsModelUseCount, setTtsModelUseCount] = useState( undefined ); - const getModel = useCallback((token) => { + const getModel = useCallback(token => { const api = new ApiConfig(); const endpointUrl = api.viewTtsModel(token); @@ -66,8 +62,8 @@ function TtsModelDeletePage(props: Props) { }, credentials: "include", }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { const modelsResponse: TtsModelViewResponsePayload = res; if (!modelsResponse.success) { return; @@ -75,10 +71,10 @@ function TtsModelDeletePage(props: Props) { setTtsModel(modelsResponse.model); }) - .catch((e) => {}); + .catch(e => {}); }, []); - const getModelUseCount = useCallback((token) => { + const getModelUseCount = useCallback(token => { const api = new ApiConfig(); const endpointUrl = api.getTtsModelUseCount(token); @@ -89,8 +85,8 @@ function TtsModelDeletePage(props: Props) { }, credentials: "include", }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { const modelsResponse: TtsModelUseCountResponsePayload = res; if (!modelsResponse.success) { return; @@ -98,7 +94,7 @@ function TtsModelDeletePage(props: Props) { setTtsModelUseCount(modelsResponse.count || 0); }) - .catch((e) => {}); + .catch(e => {}); }, []); useEffect(() => { @@ -118,9 +114,7 @@ function TtsModelDeletePage(props: Props) { const request = { set_delete: !currentlyDeleted, - as_mod: props.sessionWrapper.deleteTtsResultAsMod( - ttsModel?.creator_user_token - ), + as_mod: sessionWrapper.deleteTtsResultAsMod(ttsModel?.creator_user_token), }; fetch(endpointUrl, { @@ -132,17 +126,17 @@ function TtsModelDeletePage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res.success) { - if (props.sessionWrapper.canDeleteOtherUsersTtsResults()) { + if (sessionWrapper.canDeleteOtherUsersTtsResults()) { history.push(modelLink); // Mods can perform further actions } else { history.push("/"); } } }) - .catch((e) => {}); + .catch(e => {}); return false; }; @@ -178,8 +172,8 @@ function TtsModelDeletePage(props: Props) { let moderatorRows = null; if ( - props.sessionWrapper.canDeleteOtherUsersTtsResults() || - props.sessionWrapper.canDeleteOtherUsersTtsModels() + sessionWrapper.canDeleteOtherUsersTtsResults() || + sessionWrapper.canDeleteOtherUsersTtsModels() ) { moderatorRows = ( <> diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_edit/TtsModelEditPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_edit/TtsModelEditPage.tsx index 8b54bbc3ba..230e902e43 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_edit/TtsModelEditPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_edit/TtsModelEditPage.tsx @@ -1,6 +1,5 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, useHistory, Link } from "react-router-dom"; import { WebUrl } from "../../../../../common/WebUrl"; import { VisibleIconFc } from "../../../_icons/VisibleIcon"; @@ -37,6 +36,7 @@ import { import { faFunction } from "@fortawesome/pro-solid-svg-icons"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; +import { useSession } from "hooks"; const DEFAULT_VISIBILITY = "public"; @@ -44,12 +44,9 @@ const DEFAULT_PRETRAINED_VOCODER = "hifigan-superres"; const UNSET_CUSTOM_VOCODER_SENTINEL = ""; // NB: Empty string -interface Props { - sessionWrapper: SessionWrapper; -} - -function TtsModelEditPage(props: Props) { - let { token } = useParams() as { token: string }; +function TtsModelEditPage() { + const { token } = useParams() as { token: string }; + const { sessionWrapper } = useSession(); PosthogClient.recordPageview(); const history = useHistory(); @@ -230,7 +227,7 @@ function TtsModelEditPage(props: Props) { const modelLink = WebUrl.ttsModelPage(token); - const isModerator = props.sessionWrapper.canEditOtherUsersTtsModels(); + const isModerator = sessionWrapper.canEditOtherUsersTtsModels(); const handleFormSubmit = (ev: React.FormEvent) => { ev.preventDefault(); diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_view/TtsModelViewPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_view/TtsModelViewPage.tsx index b83d006793..7077d833e5 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_view/TtsModelViewPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_view/TtsModelViewPage.tsx @@ -46,7 +46,6 @@ import { faLock, } from "@fortawesome/free-solid-svg-icons"; -import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; import { TwitterShareButton, FacebookShareButton, @@ -70,7 +69,6 @@ import { AITools } from "components/marketing"; import { useSession } from "hooks"; interface Props { - sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; textBuffer: string; setTextBuffer: (textBuffer: string) => void; clearTextBuffer: () => void; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_delete/TtsResultDeletePage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_delete/TtsResultDeletePage.tsx index f5b5fccc48..e0f4e8a6d4 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_delete/TtsResultDeletePage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_delete/TtsResultDeletePage.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect } from "react"; import { ApiConfig } from "@storyteller/components"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; import { WebUrl } from "../../../../../common/WebUrl"; +import { useSession } from "hooks"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; @@ -47,12 +47,9 @@ interface TtsInferenceResultModeratorFields { user_deleted_at: string | undefined | null; } -interface Props { - sessionWrapper: SessionWrapper; -} - -function TtsResultDeletePage(props: Props) { +function TtsResultDeletePage() { const history = useHistory(); + const { sessionWrapper } = useSession(); PosthogClient.recordPageview(); let { token }: { token: string } = useParams(); @@ -72,8 +69,8 @@ function TtsResultDeletePage(props: Props) { }, credentials: "include", }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { const modelsResponse: TtsInferenceResultResponsePayload = res; if (!modelsResponse.success) { return; @@ -81,7 +78,7 @@ function TtsResultDeletePage(props: Props) { setTtsInferenceResult(modelsResponse.result); }) - .catch((e) => { + .catch(e => { //this.props.onSpeakErrorCallback(); }); }, [token]); // NB: Empty array dependency sets to run ONLY on mount @@ -102,7 +99,7 @@ function TtsResultDeletePage(props: Props) { const request = { set_delete: !currentlyDeleted, - as_mod: props.sessionWrapper.deleteTtsResultAsMod( + as_mod: sessionWrapper.deleteTtsResultAsMod( ttsInferenceResult?.maybe_creator_user_token ), }; @@ -116,17 +113,17 @@ function TtsResultDeletePage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res.success) { - if (props.sessionWrapper.canDeleteOtherUsersTtsResults()) { + if (sessionWrapper.canDeleteOtherUsersTtsResults()) { history.push(resultLink); // Mods can perform further actions } else { history.push("/"); } } }) - .catch((e) => {}); + .catch(e => {}); return false; }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_edit/TtsResultEditPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_edit/TtsResultEditPage.tsx index c691fd5feb..7ee5aa87e8 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_edit/TtsResultEditPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_edit/TtsResultEditPage.tsx @@ -1,6 +1,5 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { WebUrl } from "../../../../../common/WebUrl"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; @@ -52,11 +51,7 @@ interface TtsInferenceResultModeratorFields { user_deleted_at: string | undefined | null; } -interface Props { - sessionWrapper: SessionWrapper; -} - -function TtsResultEditPage(props: Props) { +function TtsResultEditPage() { let { token }: { token: string } = useParams(); PosthogClient.recordPageview(); @@ -67,7 +62,7 @@ function TtsResultEditPage(props: Props) { >(undefined); const [visibility, setVisibility] = useState(DEFAULT_VISIBILITY); - const getTtsResult = useCallback((token) => { + const getTtsResult = useCallback(token => { const api = new ApiConfig(); const endpointUrl = api.viewTtsInferenceResult(token); @@ -78,8 +73,8 @@ function TtsResultEditPage(props: Props) { }, credentials: "include", }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { const modelsResponse: TtsInferenceResultResponsePayload = res; if (!modelsResponse.success) { return; @@ -90,7 +85,7 @@ function TtsResultEditPage(props: Props) { modelsResponse?.result?.creator_set_visibility || DEFAULT_VISIBILITY ); }) - .catch((e) => {}); + .catch(e => {}); }, []); useEffect(() => { @@ -128,15 +123,15 @@ function TtsResultEditPage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res === undefined || !res.success) { return; // Endpoint error? } history.push(resultLink); }) - .catch((e) => {}); + .catch(e => {}); return false; }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx index 4295709c38..6ee11ca58d 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx @@ -1,5 +1,4 @@ import React, { useState, useEffect, useCallback } from "react"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; import { useParams, Link } from "react-router-dom"; @@ -41,14 +40,12 @@ import { TextExpander } from "../../../_common/TextExpander"; import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocumentTitle"; import { CommentComponent } from "../../../_common/comments/CommentComponent"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; +import { useSession } from "hooks"; import "./TtsResult.scss"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function TtsResultViewPage(props: Props) { - let { token }: { token: string } = useParams(); +function TtsResultViewPage() { + const { token }: { token: string } = useParams(); + const { sessionWrapper } = useSession(); PosthogClient.recordPageview(); const [ttsInferenceResult, setTtsInferenceResult] = useState< @@ -72,13 +69,15 @@ function TtsResultViewPage(props: Props) { const documentTitle = ttsInferenceResult?.tts_model_title === undefined ? undefined - : `Deep Fake ${ttsInferenceResult.tts_model_title - } TTS says ${ttsInferenceResult.raw_inference_text.substring(0, 50)}`; + : `Deep Fake ${ + ttsInferenceResult.tts_model_title + } TTS says ${ttsInferenceResult.raw_inference_text.substring(0, 50)}`; usePrefixedDocumentTitle(documentTitle); const shareLink = `https://fakeyou.com${WebUrl.ttsResultPage(token)}`; - const shareTitle = `I just used FakeYou to generate speech as ${ttsInferenceResult?.tts_model_title || "one of my favorite characters" - }!`; + const shareTitle = `I just used FakeYou to generate speech as ${ + ttsInferenceResult?.tts_model_title || "one of my favorite characters" + }!`; const handleCopyLink = () => { navigator.clipboard.writeText(shareLink); @@ -156,8 +155,8 @@ function TtsResultViewPage(props: Props) { let moderatorRows = null; if ( - props.sessionWrapper.canDeleteOtherUsersTtsResults() || - props.sessionWrapper.canDeleteOtherUsersTtsModels() + sessionWrapper.canDeleteOtherUsersTtsResults() || + sessionWrapper.canDeleteOtherUsersTtsModels() ) { moderatorRows = ( <> @@ -285,7 +284,7 @@ function TtsResultViewPage(props: Props) { : "btn btn-destructive w-100"; let editButton = null; - const canEdit = props.sessionWrapper.canEditTtsResultAsUserOrMod( + const canEdit = sessionWrapper.canEditTtsResultAsUserOrMod( ttsInferenceResult?.maybe_creator_user_token ); @@ -304,7 +303,7 @@ function TtsResultViewPage(props: Props) { } let deleteButton = null; - const canDelete = props.sessionWrapper.deleteTtsResultAsMod( + const canDelete = sessionWrapper.deleteTtsResultAsMod( ttsInferenceResult?.maybe_creator_user_token ); @@ -331,7 +330,7 @@ function TtsResultViewPage(props: Props) { let downloadButton = null; - if (props.sessionWrapper.isLoggedIn()) { + if (sessionWrapper.isLoggedIn()) { downloadButton = ( <> { switch (fail) { default: diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadNewTtsModelPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadNewTtsModelPage.tsx index d78cbae9fa..50d150e6f1 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadNewTtsModelPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadNewTtsModelPage.tsx @@ -1,22 +1,18 @@ import React, { useState } from "react"; import { SessionTtsModelUploadResultList } from "../../_common/SessionTtsModelUploadResultsList"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { useHistory } from "react-router-dom"; import { v4 as uuidv4 } from "uuid"; import { BackLink } from "../../_common/BackLink"; import { Link } from "react-router-dom"; import { WebUrl } from "../../../../common/WebUrl"; -import { useInferenceJobs } from "hooks"; +import { useInferenceJobs, useSession } from "hooks"; import { EnqueueGsvModelDownload } from "@storyteller/components/src/api/model_downloads/EnqueueGsvModelDownload"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function UploadNewTtsModelPage(props: Props) { - let history = useHistory(); +function UploadNewTtsModelPage() { + const history = useHistory(); + const { sessionWrapper } = useSession(); const { enqueueInferenceJob } = useInferenceJobs(); const [downloadUrl, setDownloadUrl] = useState(""); @@ -26,7 +22,7 @@ function UploadNewTtsModelPage(props: Props) { const [downloadUrlInvalidReason] = useState(""); const [titleInvalidReason] = useState(""); - if (!props.sessionWrapper.isLoggedIn()) { + if (!sessionWrapper.isLoggedIn()) { return (
diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadSdWeightPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadSdWeightPage.tsx index 9f8eec0052..c1d8b54184 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadSdWeightPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadSdWeightPage.tsx @@ -15,18 +15,11 @@ import { TempSelect, TempTextArea, } from "components/common"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; -import { useSdUpload } from "hooks"; +import { useSdUpload, useSession } from "hooks"; -interface UploadSdWeightPageProps { - sessionWrapper: SessionWrapper; -} - -export default function UploadSdWeightPage({ - sessionWrapper, -}: UploadSdWeightPageProps) { +export default function UploadSdWeightPage() { usePrefixedDocumentTitle("Edit Voice"); - + const { sessionWrapper } = useSession(); const visibilityOptions = [ { label: "Public", value: "public" }, { label: "Private", value: "private" }, diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx index 4ca92fbab0..804b5e2c3f 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadTtsModelPage.tsx @@ -1,7 +1,6 @@ import React, { useState } from "react"; import { ApiConfig } from "@storyteller/components"; import { SessionTtsModelUploadResultList } from "../../_common/SessionTtsModelUploadResultsList"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { DiscordLink } from "@storyteller/components/src/elements/DiscordLink"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { useHistory } from "react-router-dom"; @@ -9,24 +8,21 @@ import { v4 as uuidv4 } from "uuid"; import { BackLink } from "../../_common/BackLink"; import { Link } from "react-router-dom"; import { WebUrl } from "../../../../common/WebUrl"; -import { useInferenceJobs } from "hooks"; +import { useInferenceJobs, useSession } from "hooks"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; import MentionsSection from "components/common/MentionsSection"; import StorytellerStudioCTA from "components/common/StorytellerStudioCTA"; import { Container } from "components/common"; -interface Props { - sessionWrapper: SessionWrapper; -} - interface TtsModelUploadJobResponsePayload { success: boolean; job_token?: string; } -function UploadTtsModelPage(props: Props) { - let history = useHistory(); +function UploadTtsModelPage() { + const history = useHistory(); + const { sessionWrapper } = useSession(); const { enqueueInferenceJob } = useInferenceJobs(); PosthogClient.recordPageview(); @@ -39,7 +35,7 @@ function UploadTtsModelPage(props: Props) { const [downloadUrlInvalidReason] = useState(""); const [titleInvalidReason] = useState(""); - if (!props.sessionWrapper.isLoggedIn()) { + if (!sessionWrapper.isLoggedIn()) { return (
diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadWorkflowPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadWorkflowPage.tsx index cd05a0b46f..1fe8fee593 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadWorkflowPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/upload/UploadWorkflowPage.tsx @@ -16,17 +16,12 @@ import { } from "components/common"; import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import InferenceJobsList from "components/layout/InferenceJobsList"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import useWorkflowUpload from "hooks/useWorkflowUpload"; +import { useSession } from "hooks"; -interface UploadWorkflowPageProps { - sessionWrapper: SessionWrapper; -} - -export default function UploadWorkflowPage({ - sessionWrapper, -}: UploadWorkflowPageProps) { +export default function UploadWorkflowPage() { usePrefixedDocumentTitle("Edit Voice"); + const { sessionWrapper } = useSession(); const visibilityOptions = [ { label: "Public", value: "public" }, diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_delete/W2lResultDeletePage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_delete/W2lResultDeletePage.tsx index 63e7a2d9cf..8d5f65bfe2 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_delete/W2lResultDeletePage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_delete/W2lResultDeletePage.tsx @@ -1,23 +1,20 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; import { WebUrl } from "../../../../../common/WebUrl"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { GetW2lResult, GetW2lResultIsOk, W2lResult, } from "@storyteller/components/src/api/w2l/GetW2lResult"; +import { useSession } from "hooks"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lResultDeletePage(props: Props) { +function W2lResultDeletePage() { const history = useHistory(); PosthogClient.recordPageview(); + const { sessionWrapper } = useSession(); let { token } = useParams() as { token: string }; @@ -25,7 +22,7 @@ function W2lResultDeletePage(props: Props) { W2lResult | undefined >(undefined); - const getInferenceResult = useCallback(async (token) => { + const getInferenceResult = useCallback(async token => { const templateResponse = await GetW2lResult(token); if (GetW2lResultIsOk(templateResponse)) { setW2lInferenceResult(templateResponse); @@ -47,7 +44,7 @@ function W2lResultDeletePage(props: Props) { const request = { set_delete: !currentlyDeleted, - as_mod: props.sessionWrapper.canDeleteOtherUsersW2lResults(), + as_mod: sessionWrapper.canDeleteOtherUsersW2lResults(), }; fetch(endpointUrl, { @@ -59,17 +56,17 @@ function W2lResultDeletePage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res.success) { - if (props.sessionWrapper.canDeleteOtherUsersW2lResults()) { + if (sessionWrapper.canDeleteOtherUsersW2lResults()) { history.push(templateResultLink); // Mods can perform further actions } else { history.push("/"); } } }) - .catch((e) => {}); + .catch(e => {}); return false; }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_edit/W2lResultEditPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_edit/W2lResultEditPage.tsx index 41df4deb05..a835fffe25 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_edit/W2lResultEditPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_edit/W2lResultEditPage.tsx @@ -1,6 +1,5 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { WebUrl } from "../../../../../common/WebUrl"; import { VisibleIconFc } from "../../../_icons/VisibleIcon"; @@ -52,11 +51,7 @@ interface W2lInferenceResultModeratorFields { user_deleted_at: string | undefined | null; } -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lResultEditPage(props: Props) { +function W2lResultEditPage() { let { token }: { token: string } = useParams(); PosthogClient.recordPageview(); @@ -67,7 +62,7 @@ function W2lResultEditPage(props: Props) { >(undefined); const [visibility, setVisibility] = useState(DEFAULT_VISIBILITY); - const getW2lResult = useCallback((token) => { + const getW2lResult = useCallback(token => { const api = new ApiConfig(); const endpointUrl = api.viewW2lInferenceResult(token); @@ -78,8 +73,8 @@ function W2lResultEditPage(props: Props) { }, credentials: "include", }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { const modelsResponse: W2lInferenceResultResponsePayload = res; if (!modelsResponse.success) { return; @@ -90,7 +85,7 @@ function W2lResultEditPage(props: Props) { modelsResponse?.result?.creator_set_visibility || DEFAULT_VISIBILITY ); }) - .catch((e) => {}); + .catch(e => {}); }, []); useEffect(() => { @@ -128,15 +123,15 @@ function W2lResultEditPage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res === undefined || !res.success) { return; // Endpoint error? } history.push(resultLink); }) - .catch((e) => {}); + .catch(e => {}); return false; }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx index ea4d4bbc6a..3a077ad7b3 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx @@ -1,6 +1,5 @@ import React, { useState, useEffect, useCallback } from "react"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link } from "react-router-dom"; import { ReportDiscordLink } from "../../../_common/DiscordReportLink"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; @@ -21,13 +20,11 @@ import { faDownload, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons"; import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocumentTitle"; import { CommentComponent } from "../../../_common/comments/CommentComponent"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; +import { useSession } from "hooks"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lResultViewPage(props: Props) { +function W2lResultViewPage() { let { token } = useParams() as { token: string }; + const { sessionWrapper } = useSession(); PosthogClient.recordPageview(); @@ -36,7 +33,7 @@ function W2lResultViewPage(props: Props) { >(undefined); const [notFoundState, setNotFoundState] = useState(false); - const getInferenceResult = useCallback(async (token) => { + const getInferenceResult = useCallback(async token => { const templateResponse = await GetW2lResult(token); if (GetW2lResultIsOk(templateResponse)) { setW2lInferenceResult(templateResponse); @@ -99,8 +96,8 @@ function W2lResultViewPage(props: Props) { let moderatorRows = null; if ( - props.sessionWrapper.canDeleteOtherUsersW2lResults() || - props.sessionWrapper.canDeleteOtherUsersW2lTemplates() + sessionWrapper.canDeleteOtherUsersW2lResults() || + sessionWrapper.canDeleteOtherUsersW2lTemplates() ) { moderatorRows = ( <> @@ -226,7 +223,7 @@ function W2lResultViewPage(props: Props) { : "btn btn-destructive w-100"; let editButton = null; - const canEdit = props.sessionWrapper.canEditW2lResultAsUserOrMod( + const canEdit = sessionWrapper.canEditW2lResultAsUserOrMod( w2lInferenceResult?.maybe_creator_user_token ); @@ -245,7 +242,7 @@ function W2lResultViewPage(props: Props) { } let deleteButton = null; - const canDelete = props.sessionWrapper.canDeleteW2lResultAsUserOrMod( + const canDelete = sessionWrapper.canDeleteW2lResultAsUserOrMod( w2lInferenceResult?.maybe_creator_user_token ); diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_approve/W2lTemplateApprovePage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_approve/W2lTemplateApprovePage.tsx index e9c80ce808..a4817766ac 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_approve/W2lTemplateApprovePage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_approve/W2lTemplateApprovePage.tsx @@ -1,7 +1,6 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; import { WebUrl } from "../../../../../common/WebUrl"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { GetW2lTemplate, @@ -15,11 +14,7 @@ import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClie const DEFAULT_APPROVED_STATE = true; -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lTemplateApprovePage(props: Props) { +function W2lTemplateApprovePage() { const history = useHistory(); PosthogClient.recordPageview(); @@ -36,7 +31,7 @@ function W2lTemplateApprovePage(props: Props) { DEFAULT_APPROVED_STATE ); - const getTemplate = useCallback(async (templateToken) => { + const getTemplate = useCallback(async templateToken => { const template = await GetW2lTemplate(templateToken); if (GetW2lTemplateIsOk(template)) { @@ -46,7 +41,7 @@ function W2lTemplateApprovePage(props: Props) { } }, []); - const getTemplateUseCount = useCallback(async (templateToken) => { + const getTemplateUseCount = useCallback(async templateToken => { const count = await GetW2lTemplateUseCount(templateToken); setW2lTemplateUseCount(count || 0); }, []); @@ -84,13 +79,13 @@ function W2lTemplateApprovePage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res.success) { history.push(templateLink); } }) - .catch((e) => {}); + .catch(e => {}); return false; }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_delete/W2lTemplateDeletePage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_delete/W2lTemplateDeletePage.tsx index 6d33cca9a9..3b433850e1 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_delete/W2lTemplateDeletePage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_delete/W2lTemplateDeletePage.tsx @@ -1,7 +1,6 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; import { WebUrl } from "../../../../../common/WebUrl"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, Link, useHistory } from "react-router-dom"; import { GetW2lTemplate, @@ -12,13 +11,11 @@ import { GetW2lTemplateUseCount } from "@storyteller/components/src/api/w2l/GetW import { BackLink } from "../../../_common/BackLink"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; +import { useSession } from "hooks"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lTemplateDeletePage(props: Props) { +function W2lTemplateDeletePage() { const history = useHistory(); + const { sessionWrapper } = useSession(); PosthogClient.recordPageview(); @@ -31,7 +28,7 @@ function W2lTemplateDeletePage(props: Props) { number | undefined >(undefined); - const getTemplate = useCallback(async (templateToken) => { + const getTemplate = useCallback(async templateToken => { const template = await GetW2lTemplate(templateToken); if (GetW2lTemplateIsOk(template)) { @@ -39,7 +36,7 @@ function W2lTemplateDeletePage(props: Props) { } }, []); - const getTemplateUseCount = useCallback(async (templateToken) => { + const getTemplateUseCount = useCallback(async templateToken => { const count = await GetW2lTemplateUseCount(templateToken); setW2lTemplateUseCount(count || 0); }, []); @@ -61,7 +58,7 @@ function W2lTemplateDeletePage(props: Props) { const request = { set_delete: !currentlyDeleted, - as_mod: props.sessionWrapper.deleteTtsResultAsMod( + as_mod: sessionWrapper.deleteTtsResultAsMod( w2lTemplate?.creator_user_token ), }; @@ -75,17 +72,17 @@ function W2lTemplateDeletePage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res.success) { - if (props.sessionWrapper.canDeleteOtherUsersTtsResults()) { + if (sessionWrapper.canDeleteOtherUsersTtsResults()) { history.push(templateLink); // Mods can perform further actions } else { history.push("/"); } } }) - .catch((e) => {}); + .catch(e => {}); return false; }; @@ -125,8 +122,8 @@ function W2lTemplateDeletePage(props: Props) { let moderatorRows = null; if ( - props.sessionWrapper.canDeleteOtherUsersTtsResults() || - props.sessionWrapper.canDeleteOtherUsersW2lTemplates() + sessionWrapper.canDeleteOtherUsersTtsResults() || + sessionWrapper.canDeleteOtherUsersW2lTemplates() ) { moderatorRows = ( <> diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_edit/W2lTemplateEditPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_edit/W2lTemplateEditPage.tsx index 680d253c18..df06c54776 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_edit/W2lTemplateEditPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_edit/W2lTemplateEditPage.tsx @@ -1,6 +1,5 @@ import React, { useState, useEffect, useCallback } from "react"; import { ApiConfig } from "@storyteller/components"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { useParams, useHistory } from "react-router-dom"; import { WebUrl } from "../../../../../common/WebUrl"; import { VisibleIconFc } from "../../../_icons/VisibleIcon"; @@ -16,11 +15,7 @@ import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClie const DEFAULT_VISIBILITY = "public"; -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lTemplateEditPage(props: Props) { +function W2lTemplateEditPage() { let { templateToken }: { templateToken: string } = useParams(); const history = useHistory(); @@ -34,7 +29,7 @@ function W2lTemplateEditPage(props: Props) { const [descriptionMarkdown, setDescriptionMarkdown] = useState(""); const [visibility, setVisibility] = useState(DEFAULT_VISIBILITY); - const getTemplate = useCallback(async (token) => { + const getTemplate = useCallback(async token => { const template = await GetW2lTemplate(token); if (GetW2lTemplateIsOk(template)) { @@ -101,15 +96,15 @@ function W2lTemplateEditPage(props: Props) { credentials: "include", body: JSON.stringify(request), }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { if (res === undefined || !res.success) { return; // Endpoint error? } history.push(templateLink); }) - .catch((e) => {}); + .catch(e => {}); return false; }; diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_list/W2lTemplateListPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_list/W2lTemplateListPage.tsx index 981dd2a4b5..f9e8c77afb 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_list/W2lTemplateListPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_list/W2lTemplateListPage.tsx @@ -1,6 +1,5 @@ import React, { useState, useEffect } from "react"; import { ApiConfig } from "@storyteller/components"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { Link } from "react-router-dom"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; import { distance, duration } from "../../../../../data/animation"; @@ -14,6 +13,7 @@ import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocum import { PageHeader } from "../../../_common/PageHeader"; import { faVideo } from "@fortawesome/pro-solid-svg-icons"; import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient"; +import { useSession } from "hooks"; const Fade = require("react-reveal/Fade"); @@ -40,11 +40,8 @@ interface W2lTemplate { updated_at: string; } -interface Props { - sessionWrapper: SessionWrapper; -} - -function W2lTemplateListPage(props: Props) { +function W2lTemplateListPage() { + const { sessionWrapper } = useSession(); const [w2lTemplates, setW2lTemplates] = useState>([]); const [currentPageIndex, setCurrentPageIndex] = useState(0); @@ -61,8 +58,8 @@ function W2lTemplateListPage(props: Props) { }, credentials: "include", }) - .then((res) => res.json()) - .then((res) => { + .then(res => res.json()) + .then(res => { const templatesResponse: W2lTemplateListResponsePayload = res; if (!templatesResponse.success) { return; @@ -70,7 +67,7 @@ function W2lTemplateListPage(props: Props) { setW2lTemplates(templatesResponse.templates); }) - .catch((e) => { + .catch(e => { //this.props.onSpeakErrorCallback(); }); }, []); // NB: Empty array dependency sets to run ONLY on mount @@ -85,7 +82,7 @@ function W2lTemplateListPage(props: Props) { let templateElements: Array = []; - w2lTemplates.forEach((t) => { + w2lTemplates.forEach(t => { let object = null; if ( @@ -137,7 +134,7 @@ function W2lTemplateListPage(props: Props) { let nextRowSize = 1; - currentPageElements.forEach((el) => { + currentPageElements.forEach(el => { rowOfTemplateElements.push(el); if (rowOfTemplateElements.length === nextRowSize) { @@ -146,7 +143,7 @@ function W2lTemplateListPage(props: Props) { className="col-6 col-sm-4 col-lg-3 d-flex w2l-ani-item" key={rowKey} > - {rowOfTemplateElements.map((el) => el)} + {rowOfTemplateElements.map(el => el)}
); rowOfTemplateElements = []; @@ -165,7 +162,7 @@ function W2lTemplateListPage(props: Props) { if (rowOfTemplateElements.length !== 0) { allRowsOfTemplateElements.push(
- {rowOfTemplateElements.map((el) => el)} + {rowOfTemplateElements.map(el => el)}
); rowOfTemplateElements = []; @@ -173,7 +170,7 @@ function W2lTemplateListPage(props: Props) { let extraDetails =

; - if (props.sessionWrapper.isLoggedIn()) { + if (sessionWrapper.isLoggedIn()) { extraDetails = (

Pick a template, then you can make it lip sync. If you want to use your @@ -234,7 +231,7 @@ function W2lTemplateListPage(props: Props) {

- {allRowsOfTemplateElements.map((el) => el)} + {allRowsOfTemplateElements.map(el => el)}
diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/weight/WeightEditPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/weight/WeightEditPage.tsx index b97bfd6824..4f40d2b789 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/weight/WeightEditPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/weight/WeightEditPage.tsx @@ -18,18 +18,11 @@ import { TempSelect, TempTextArea, } from "components/common"; -import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; import { useSession, useWeightFetch } from "hooks"; import "./WeightEditPage.scss"; -interface WeightEditPageProps { - sessionWrapper: SessionWrapper; -} - -export default function WeightEditPage({ - sessionWrapper, -}: WeightEditPageProps) { +export default function WeightEditPage() { const { user, canEditTtsModel } = useSession(); // const [language, languageSet] = useState("en"); // const [fetched, fetchedSet] = useState(false);