From 5a7e416700b932edf889079f202b18bda70b14f5 Mon Sep 17 00:00:00 2001 From: Untone Date: Tue, 19 Mar 2024 14:54:40 +0300 Subject: [PATCH 1/6] linted --- src/graphql/client/chat.ts | 2 +- src/graphql/client/core.ts | 2 +- src/utils/config.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/graphql/client/chat.ts b/src/graphql/client/chat.ts index df801c02..c00fd705 100644 --- a/src/graphql/client/chat.ts +++ b/src/graphql/client/chat.ts @@ -1,3 +1,4 @@ +import { chatApiUrl } from '../../utils/config' // inbox import { createGraphQLClient } from '../createGraphQLClient' import createChat from '../mutation/chat/chat-create' @@ -21,7 +22,6 @@ import { QueryLoad_ChatsArgs, QueryLoad_Messages_ByArgs, } from '../schema/chat.gen' -import { chatApiUrl } from '../../utils/config' export const inboxClient = { private: null, diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts index bb68d943..e7d8708e 100644 --- a/src/graphql/client/core.ts +++ b/src/graphql/client/core.ts @@ -16,6 +16,7 @@ import type { Topic, } from '../schema/core.gen' +import { coreApiUrl } from '../../utils/config' import { createGraphQLClient } from '../createGraphQLClient' import createArticle from '../mutation/core/article-create' import deleteShout from '../mutation/core/article-delete' @@ -46,7 +47,6 @@ import reactionsLoadBy from '../query/core/reactions-load-by' import topicBySlug from '../query/core/topic-by-slug' import topicsAll from '../query/core/topics-all' import topicsRandomQuery from '../query/core/topics-random' -import { coreApiUrl } from "../../utils/config" const publicGraphQLClient = createGraphQLClient(coreApiUrl) diff --git a/src/utils/config.ts b/src/utils/config.ts index 9585180d..cfc2f7fa 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -16,4 +16,4 @@ const defaultChatUrl = 'https://chat.discours.io' export const chatApiUrl = import.meta.env.PUBLIC_CHAT_API || defaultChatUrl const defaultAuthUrl = 'https://auth.discours.io' -export const authApiUrl = import.meta.env.PUBLIC_AUTH_API || defaultAuthUrl \ No newline at end of file +export const authApiUrl = import.meta.env.PUBLIC_AUTH_API || defaultAuthUrl From 97b1ec4386432f21e8426ac75e505a1f62b9bafe Mon Sep 17 00:00:00 2001 From: ilya-bkv Date: Wed, 20 Mar 2024 14:59:07 +0300 Subject: [PATCH 2/6] Audio player fix (play by track click) --- src/components/Article/AudioPlayer/PlayerPlaylist.tsx | 1 + src/components/Views/Expo/Expo.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx index ff0661c9..81e69d58 100644 --- a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx +++ b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx @@ -39,6 +39,7 @@ export const PlayerPlaylist = (props: Props) => { } const play = (index: number) => { + props.onPlayMedia(index) const mi = props.media[index] gtag('event', 'select_item', { item_list_id: props.articleSlug, diff --git a/src/components/Views/Expo/Expo.tsx b/src/components/Views/Expo/Expo.tsx index e4541922..eddd12a4 100644 --- a/src/components/Views/Expo/Expo.tsx +++ b/src/components/Views/Expo/Expo.tsx @@ -24,8 +24,8 @@ type Props = { layout: LayoutType } -export const PRERENDERED_ARTICLES_COUNT = 36 -const LOAD_MORE_PAGE_SIZE = 12 +export const PRERENDERED_ARTICLES_COUNT = 37 +const LOAD_MORE_PAGE_SIZE = 11 export const Expo = (props: Props) => { const [isLoaded, setIsLoaded] = createSignal(Boolean(props.shouts)) From d4ce74b49117c9671eb3ad28b3824b531ab6a498 Mon Sep 17 00:00:00 2001 From: ilya-bkv Date: Thu, 21 Mar 2024 11:42:28 +0300 Subject: [PATCH 3/6] Hide modal after route to profile from another profile --- src/components/Views/Author/Author.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index ad9f5f66..4041aa2a 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -26,6 +26,7 @@ import { Loading } from '../../_shared/Loading' import { byCreated } from '../../../utils/sortby' import stylesArticle from '../../Article/Article.module.scss' import styles from './Author.module.scss' +import { hideModal, MODALS } from "../../../stores/ui"; type Props = { shouts: Shout[] @@ -40,13 +41,14 @@ export const AuthorView = (props: Props) => { const { loadSubscriptions } = useFollowing() const { sortedArticles } = useArticlesStore({ shouts: props.shouts }) const { authorEntities } = useAuthorsStore({ authors: [props.author] }) - const { page: getPage } = useRouter() + const { page: getPage, searchParams } = useRouter() const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false) const [isBioExpanded, setIsBioExpanded] = createSignal(false) const [followers, setFollowers] = createSignal([]) const [following, setFollowing] = createSignal>([]) const [showExpandBioControl, setShowExpandBioControl] = createSignal(false) const [commented, setCommented] = createSignal() + const modal = MODALS[searchParams().m] // current author const [author, setAuthor] = createSignal() @@ -92,7 +94,13 @@ export const AuthorView = (props: Props) => { } } - onMount(() => fetchData(props.authorSlug)) + onMount(() => { + fetchData(props.authorSlug) + + if (!modal) { + hideModal() + } + }); const loadMore = async () => { saveScrollPosition() From 0c078a7bc12e3cdb97d4c35a4f1366139da70630 Mon Sep 17 00:00:00 2001 From: Untone Date: Fri, 22 Mar 2024 08:25:01 +0300 Subject: [PATCH 4/6] get-image-url-hotfix --- src/components/Views/Author/Author.tsx | 4 ++-- src/utils/getImageUrl.ts | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index 4041aa2a..a21cebcc 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -23,10 +23,10 @@ import { Row2 } from '../../Feed/Row2' import { Row3 } from '../../Feed/Row3' import { Loading } from '../../_shared/Loading' +import { MODALS, hideModal } from '../../../stores/ui' import { byCreated } from '../../../utils/sortby' import stylesArticle from '../../Article/Article.module.scss' import styles from './Author.module.scss' -import { hideModal, MODALS } from "../../../stores/ui"; type Props = { shouts: Shout[] @@ -100,7 +100,7 @@ export const AuthorView = (props: Props) => { if (!modal) { hideModal() } - }); + }) const loadMore = async () => { saveScrollPosition() diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts index 7d88cd51..f35561d2 100644 --- a/src/utils/getImageUrl.ts +++ b/src/utils/getImageUrl.ts @@ -15,12 +15,18 @@ export const getImageUrl = ( src: string, options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}, ) => { - const filename = src?.split('/').pop() - const isAudio = src.toLowerCase().split('.').pop() in ['wav', 'mp3', 'ogg', 'aif', 'flac'] - const base = isAudio ? cdnUrl : `${thumborUrl}/unsafe/` - const sizeUrlPart = isAudio ? '' : getSizeUrlPart(options) + if (src.includes('discours.io')) { + const filename = src.toLowerCase().split('/').pop() + const ext = filename.split('.').pop() + const isAudio = ext in ['wav', 'mp3', 'ogg', 'aif', 'flac'] + const base = isAudio ? cdnUrl : `${thumborUrl}/unsafe/` + const suffix = isAudio || options.noSizeUrlPart ? '' : getSizeUrlPart(options) + const subfolder = isAudio ? 'audio' : 'image' - return `${base}${sizeUrlPart}production/${isAudio ? 'audio' : 'image'}/${filename}` + return `${base}${suffix}production/${subfolder}/${filename}` + } + + return src } export const getOpenGraphImageUrl = ( From db830308e9da25a91521300f44afb19dbf234d42 Mon Sep 17 00:00:00 2001 From: Untone Date: Fri, 22 Mar 2024 08:28:11 +0300 Subject: [PATCH 5/6] fix --- src/utils/getImageUrl.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts index f35561d2..efdb324b 100644 --- a/src/utils/getImageUrl.ts +++ b/src/utils/getImageUrl.ts @@ -15,7 +15,9 @@ export const getImageUrl = ( src: string, options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}, ) => { - if (src.includes('discours.io')) { + if (!src.includes('discours.io') || src.includes('http')) { + return src + } const filename = src.toLowerCase().split('/').pop() const ext = filename.split('.').pop() const isAudio = ext in ['wav', 'mp3', 'ogg', 'aif', 'flac'] @@ -24,9 +26,6 @@ export const getImageUrl = ( const subfolder = isAudio ? 'audio' : 'image' return `${base}${suffix}production/${subfolder}/${filename}` - } - - return src } export const getOpenGraphImageUrl = ( From e3c00cc6cd746c493a4bc739f9bfe93e5a77cbbf Mon Sep 17 00:00:00 2001 From: Untone Date: Fri, 22 Mar 2024 08:29:37 +0300 Subject: [PATCH 6/6] and --- src/utils/getImageUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts index efdb324b..7b8b56dc 100644 --- a/src/utils/getImageUrl.ts +++ b/src/utils/getImageUrl.ts @@ -15,7 +15,7 @@ export const getImageUrl = ( src: string, options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}, ) => { - if (!src.includes('discours.io') || src.includes('http')) { + if (!src.includes('discours.io') && src.includes('http')) { return src } const filename = src.toLowerCase().split('/').pop()