diff --git a/apps/mobile/src/screens/HomeScreen/ExploreScreen.tsx b/apps/mobile/src/screens/HomeScreen/ExploreScreen.tsx index 0318144084..f62550ff56 100644 --- a/apps/mobile/src/screens/HomeScreen/ExploreScreen.tsx +++ b/apps/mobile/src/screens/HomeScreen/ExploreScreen.tsx @@ -4,11 +4,9 @@ import { View } from 'react-native'; import { graphql, useLazyLoadQuery, useRefetchableFragment } from 'react-relay'; import { GalleryRefreshControl } from '~/components/GalleryRefreshControl'; -import { USERS_PER_PAGE } from '~/components/Trending/constants'; import { LoadingTrendingPage } from '~/components/Trending/LoadingTrendingPage'; import { SuggestedSection } from '~/components/Trending/SuggestedSection'; import { TrendingSection } from '~/components/Trending/TrendingSection'; -import { TwitterSection } from '~/components/Trending/TwitterSection'; import { ExploreScreenFragment$key } from '~/generated/ExploreScreenFragment.graphql'; import { ExploreScreenQuery } from '~/generated/ExploreScreenQuery.graphql'; import { SuggestedSectionQueryFragment$key } from '~/generated/SuggestedSectionQueryFragment.graphql'; @@ -51,20 +49,21 @@ function ExploreScreenInner({ queryRef }: ExploreScreenInnerProps) { } } + # [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again viewer { __typename - ... on Viewer { - socialAccounts @required(action: THROW) { - twitter { - __typename - } - } - } + # ... on Viewer { + # socialAccounts @required(action: THROW) { + # twitter { + # __typename + # } + # } + # } } + # ...TwitterSectionQueryFragment ...TrendingSectionQueryFragment ...SuggestedSectionQueryFragment - ...TwitterSectionQueryFragment } `, queryRef @@ -74,15 +73,17 @@ function ExploreScreenInner({ queryRef }: ExploreScreenInnerProps) { const renderItem = useCallback>( ({ item }) => { - if (item.kind === 'twitter') { - return ( - - ); - } else if (item.kind === 'suggested') { + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + // if (item.kind === 'twitter') { + // return ( + // + // ); + // } + if (item.kind === 'suggested') { return ( { const items: ListItemType[] = []; + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again if (query.viewer?.__typename === 'Viewer') { - if (query.viewer.socialAccounts.twitter?.__typename) { - items.push({ kind: 'twitter', queryRef: query }); - } + // if (query.viewer.socialAccounts.twitter?.__typename) { + // items.push({ kind: 'twitter', queryRef: query }); + // } items.push({ kind: 'suggested', queryRef: query }); } @@ -155,17 +157,36 @@ function ExploreScreenInner({ queryRef }: ExploreScreenInnerProps) { ); } +// [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again +// +// export function ExploreScreen() { +// const query = useLazyLoadQuery( +// graphql` +// query ExploreScreenQuery($twitterListFirst: Int!, $twitterListAfter: String) { +// ...ExploreScreenFragment +// } +// `, +// { +// twitterListFirst: USERS_PER_PAGE, +// twitterListAfter: null, +// } +// ); + +// return ( +// }> +// +// +// ); +// } + export function ExploreScreen() { const query = useLazyLoadQuery( graphql` - query ExploreScreenQuery($twitterListFirst: Int!, $twitterListAfter: String) { + query ExploreScreenQuery { ...ExploreScreenFragment } `, - { - twitterListFirst: USERS_PER_PAGE, - twitterListAfter: null, - } + {} ); return ( diff --git a/apps/web/pages/[username]/index.tsx b/apps/web/pages/[username]/index.tsx index 3dbc47960c..5c2a401e49 100644 --- a/apps/web/pages/[username]/index.tsx +++ b/apps/web/pages/[username]/index.tsx @@ -7,9 +7,7 @@ import styled from 'styled-components'; import breakpoints, { pageGutter } from '~/components/core/breakpoints'; import useVerifyEmailOnPage from '~/components/Email/useVerifyEmailOnPage'; -import useOpenTwitterFollowingModal from '~/components/Twitter/useOpenTwitterFollowingModal'; import useOpenTwitterModal from '~/components/Twitter/useOpenTwitterModal'; -import { USER_PER_PAGE } from '~/constants/twitter'; import { GalleryNavbar } from '~/contexts/globalLayout/GlobalNavbar/GalleryNavbar/GalleryNavbar'; import { useGlobalNavbarHeight } from '~/contexts/globalLayout/GlobalNavbar/useGlobalNavbarHeight'; import { StandardSidebar } from '~/contexts/globalLayout/GlobalSidebar/StandardSidebar'; @@ -29,9 +27,7 @@ const UsernameQueryNode = graphql` $sharedCommunitiesFirst: Int $sharedCommunitiesAfter: String $sharedFollowersFirst: Int - $sharedFollowersAfter: String - $twitterListFirst: Int! - $twitterListAfter: String + $sharedFollowersAfter: String # [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again # $twitterListFirst: Int! # $twitterListAfter: String ) { userByUsername(username: $username) @required(action: THROW) { ... on GalleryUser { @@ -47,7 +43,8 @@ const UsernameQueryNode = graphql` ...useVerifyEmailOnPageQueryFragment ...StandardSidebarFragment ...useOpenTwitterModalFragment - ...useOpenTwitterFollowingModalFragment + # [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + # ...useOpenTwitterFollowingModalFragment } `; @@ -93,7 +90,8 @@ export default function UserGallery({ username, preloadedQuery }: UserGalleryPro useVerifyEmailOnPage(query); useOpenTwitterModal(query); - useOpenTwitterFollowingModal(query); + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + // useOpenTwitterFollowingModal(query); return ( { username: query.username, sharedCommunitiesFirst: COMMUNITIES_PER_PAGE, sharedFollowersFirst: FOLLOWERS_PER_PAGE, - twitterListFirst: USER_PER_PAGE, + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + // twitterListFirst: USER_PER_PAGE, }, { fetchPolicy: 'store-or-network' } ); diff --git a/apps/web/pages/explore.tsx b/apps/web/pages/explore.tsx index 3c1252a2b0..c6603913b3 100644 --- a/apps/web/pages/explore.tsx +++ b/apps/web/pages/explore.tsx @@ -1,32 +1,53 @@ import { graphql, useLazyLoadQuery } from 'react-relay'; -import useOpenTwitterFollowingModal from '~/components/Twitter/useOpenTwitterFollowingModal'; -import { USER_PER_PAGE } from '~/constants/twitter'; import { HomeNavbar } from '~/contexts/globalLayout/GlobalNavbar/HomeNavbar/HomeNavbar'; import { StandardSidebar } from '~/contexts/globalLayout/GlobalSidebar/StandardSidebar'; import { exploreQuery } from '~/generated/exploreQuery.graphql'; import GalleryRoute from '~/scenes/_Router/GalleryRoute'; import ExplorePage from '~/scenes/Home/ExploreHomePage'; +// [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again +// +// export default function Explore() { +// const query = useLazyLoadQuery( +// graphql` +// query exploreQuery($twitterListFirst: Int!, $twitterListAfter: String) { +// ...ExploreHomePageFragment +// ...HomeNavbarFragment +// ...StandardSidebarFragment + +// ...useOpenTwitterFollowingModalFragment +// } +// `, +// { +// twitterListFirst: USER_PER_PAGE, +// twitterListAfter: null, +// } +// ); + +// useOpenTwitterFollowingModal(query); + +// return ( +// } +// sidebar={} +// element={} +// /> +// ); +// } + export default function Explore() { const query = useLazyLoadQuery( graphql` - query exploreQuery($twitterListFirst: Int!, $twitterListAfter: String) { + query exploreQuery { ...ExploreHomePageFragment ...HomeNavbarFragment ...StandardSidebarFragment - - ...useOpenTwitterFollowingModalFragment } `, - { - twitterListFirst: USER_PER_PAGE, - twitterListAfter: null, - } + {} ); - useOpenTwitterFollowingModal(query); - return ( } diff --git a/apps/web/pages/trending.tsx b/apps/web/pages/trending.tsx index bf62d28bc4..1808551c70 100644 --- a/apps/web/pages/trending.tsx +++ b/apps/web/pages/trending.tsx @@ -2,8 +2,6 @@ import { graphql, loadQuery, PreloadedQuery, usePreloadedQuery } from 'react-rel import { ITEMS_PER_PAGE, MAX_PIECES_DISPLAYED_PER_FEED_EVENT } from '~/components/Feed/constants'; import { NOTES_PER_PAGE } from '~/components/Feed/Socialize/CommentsModal/CommentsModal'; -import useOpenTwitterFollowingModal from '~/components/Twitter/useOpenTwitterFollowingModal'; -import { USER_PER_PAGE } from '~/constants/twitter'; import { HomeNavbar } from '~/contexts/globalLayout/GlobalNavbar/HomeNavbar/HomeNavbar'; import { StandardSidebar } from '~/contexts/globalLayout/GlobalSidebar/StandardSidebar'; import { trendingPageQuery } from '~/generated/trendingPageQuery.graphql'; @@ -19,13 +17,12 @@ const trendingPageQueryNode = graphql` $trendingBefore: String $globalLast: Int! $globalBefore: String - $visibleTokensPerFeedEvent: Int! - $twitterListFirst: Int! - $twitterListAfter: String + $visibleTokensPerFeedEvent: Int! # [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again # $twitterListFirst: Int! # $twitterListAfter: String ) { ...TrendingHomePageFragment ...HomeNavbarFragment - ...useOpenTwitterFollowingModalFragment + # [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + # ...useOpenTwitterFollowingModalFragment ...StandardSidebarFragment } `; @@ -37,7 +34,8 @@ type Props = { export default function Trending({ preloadedQuery }: Props) { const query = usePreloadedQuery(trendingPageQueryNode, preloadedQuery); - useOpenTwitterFollowingModal(query); + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + // useOpenTwitterFollowingModal(query); return ( { globalLast: ITEMS_PER_PAGE, trendingLast: ITEMS_PER_PAGE, visibleTokensPerFeedEvent: MAX_PIECES_DISPLAYED_PER_FEED_EVENT, - twitterListFirst: USER_PER_PAGE, + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + // twitterListFirst: USER_PER_PAGE, }, { fetchPolicy: 'store-or-network' } ); diff --git a/apps/web/src/components/Explore/Explore.tsx b/apps/web/src/components/Explore/Explore.tsx index a22860df86..3d8fc5d1f6 100644 --- a/apps/web/src/components/Explore/Explore.tsx +++ b/apps/web/src/components/Explore/Explore.tsx @@ -2,12 +2,10 @@ import { graphql, useFragment } from 'react-relay'; import styled from 'styled-components'; import { ExploreFragment$key } from '~/generated/ExploreFragment.graphql'; -import { ReportingErrorBoundary } from '~/shared/errors/ReportingErrorBoundary'; import { VStack } from '../core/Spacer/Stack'; import SuggestedSection from './SuggestedSection'; import TrendingSection from './TrendingSection'; -import TwitterSection from './TwitterSection'; type Props = { queryRef: ExploreFragment$key; @@ -32,18 +30,19 @@ export default function Explore({ queryRef }: Props) { viewer { __typename - ... on Viewer { - socialAccounts @required(action: THROW) { - twitter { - __typename - } - } - } + # [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + # ... on Viewer { + # socialAccounts @required(action: THROW) { + # twitter { + # __typename + # } + # } + # } } + # ...TwitterSectionQueryFragment ...TrendingSectionQueryFragment ...SuggestedSectionQueryFragment - ...TwitterSectionQueryFragment } `, queryRef @@ -53,15 +52,18 @@ export default function Explore({ queryRef }: Props) { {query.viewer?.__typename === 'Viewer' && ( <> - {query.viewer.socialAccounts?.twitter?.__typename && ( - - - - )} + { + // [GAL-3763] Revive this if / when elon lets us import twitter follower graphs again + // query.viewer.socialAccounts?.twitter?.__typename && ( + // + // + // + // ) + }