Hotfix/featured (#391)

add: Shout.featured_at
remove: Shout.visibility

src/components/Article/FullArticle.tsx

@@ -80,7 +80,7 @@ export const FullArticle = (props: Props) => {
     actions: { requireAuthentication },
   } = useSession()
 
-  const formattedDate = createMemo(() => formatDate(new Date(props.article.created_at * 1000)))
+  const formattedDate = createMemo(() => formatDate(new Date(props.article.published_at * 1000)))
 
   const mainTopic = createMemo(() => {
     const main_topic_slug = props.article.topics.length > 0 ? props.article.main_topic : null

src/components/Feed/ArticleCard/ArticleCard.tsx

@@ -94,11 +94,9 @@ export const ArticleCard = (props: ArticleCardProps) => {
   const mainTopicTitle =
     mainTopicSlug && lang() === 'en' ? mainTopicSlug.replace(/-/, ' ') : mainTopic?.title || ''
 
-  const formattedDate = createMemo<string>(() => {
+  const formattedDate = createMemo<string>(() =>
-    let r = ''
+    props.article.published_at ? formatDate(new Date(props.article.published_at * 1000)) : '',
-    if (props.article.created_at) r = formatDate(new Date(props.article.created_at * 1000))
+  )
-    return r
-  })
 
   const { title, subtitle } = getTitleAndSubtitle(props.article)
 

src/components/Nav/SearchModal/SearchModal.tsx

@@ -29,13 +29,7 @@ const getSearchCoincidences = ({ str, intersection }: { str: string; intersectio
 const prepareSearchResults = (list: Shout[], searchValue: string) =>
   list.sort(byScore()).map((article, index) => ({
     ...article,
-    body: article.body,
-    cover: article.cover,
-    created_at: article.created_at,
     id: index,
-    slug: article.slug,
-    authors: article.authors,
-    topics: article.topics,
     title: article.title
       ? getSearchCoincidences({
           str: article.title,

src/components/Views/Edit.tsx

@@ -5,7 +5,7 @@ import { createStore } from 'solid-js/store'
 
 import { ShoutForm, useEditorContext } from '../../context/editor'
 import { useLocalize } from '../../context/localize'
-import { ShoutVisibility, type Shout, type Topic } from '../../graphql/schema/core.gen'
+import { type Shout, type Topic } from '../../graphql/schema/core.gen'
 import { LayoutType, MediaItem } from '../../pages/types'
 import { useRouter } from '../../stores/router'
 import { clone } from '../../utils/clone'
@@ -182,10 +182,10 @@ export const EditView = (props: Props) => {
       const hasChanges = !deepEqual(form, prevForm)
       if (hasChanges) {
         setSaving(true)
-        if (props.shout?.visibility === ShoutVisibility.Authors) {
+        if (props.shout?.published_at) {
-          await saveDraft(form)
-        } else {
           saveDraftToLocalStorage(form)
+        } else {
+          await saveDraft(form)
         }
         setPrevForm(clone(form))
         setTimeout(() => {

src/components/Views/Expo/Expo.tsx

@@ -45,7 +45,7 @@ export const Expo = (props: Props) => {
   })
 
   const getLoadShoutsFilters = (additionalFilters: LoadShoutsFilters = {}): LoadShoutsFilters => {
-    const filters = { published: true, ...additionalFilters }
+    const filters = { featured: true, ...additionalFilters }
 
     if (!filters.layouts) filters.layouts = []
     if (props.layout) {

src/components/Views/Feed/Feed.tsx

@@ -1,5 +1,3 @@
-import type { Author, LoadShoutsOptions, Reaction, Shout } from '../../../graphql/schema/core.gen'
-
 import { getPagePath } from '@nanostores/router'
 import { Meta } from '@solidjs/meta'
 import { clsx } from 'clsx'
@@ -9,6 +7,12 @@ import { useLocalize } from '../../../context/localize'
 import { useReactions } from '../../../context/reactions'
 import { useSession } from '../../../context/session'
 import { apiClient } from '../../../graphql/client/core'
+import {
+  type Author,
+  type LoadShoutsOptions,
+  type Reaction,
+  type Shout,
+} from '../../../graphql/schema/core.gen'
 import { router, useRouter } from '../../../stores/router'
 import { showModal } from '../../../stores/ui'
 import { useArticlesStore, resetSortedArticles } from '../../../stores/zine/articles'
@@ -35,7 +39,7 @@ export const FEED_PAGE_SIZE = 20
 const UNRATED_ARTICLES_COUNT = 5
 
 type FeedPeriod = 'week' | 'month' | 'year'
-type VisibilityMode = 'all' | 'community' | 'public'
+type VisibilityMode = 'all' | 'community' | 'featured'
 
 type PeriodItem = {
   value: FeedPeriod
@@ -96,7 +100,7 @@ export const FeedView = (props: Props) => {
   const { t } = useLocalize()
 
   const monthPeriod: PeriodItem = { value: 'month', title: t('This month') }
-  const visibilityAll = { value: 'public', title: t('All') }
+  const visibilityAll = { value: 'featured', title: t('All') }
 
   const periods: PeriodItem[] = [
     { value: 'week', title: t('This week') },
@@ -106,7 +110,7 @@ export const FeedView = (props: Props) => {
 
   const visibilities: VisibilityItem[] = [
     { value: 'community', title: t('All') },
-    { value: 'public', title: t('Published') },
+    { value: 'featured', title: t('Published') },
   ]
 
   const { page, searchParams, changeSearchParams } = useRouter<FeedSearchParams>()
@@ -190,7 +194,10 @@ export const FeedView = (props: Props) => {
     if (visibilityMode === 'all') {
       options.filters = { ...options.filters }
     } else if (visibilityMode) {
-      options.filters = { ...options.filters, published: visibilityMode === 'public' }
+      options.filters = {
+        ...options.filters,
+        featured: visibilityMode === 'featured',
+      }
     }
 
     if (searchParams().by && searchParams().by !== 'publish_date') {

src/components/Views/Home.tsx

@@ -60,7 +60,7 @@ export const HomeView = (props: Props) => {
     loadTopMonthArticles()
     if (sortedArticles().length < PRERENDERED_ARTICLES_COUNT + CLIENT_LOAD_ARTICLES_COUNT) {
       const { hasMore } = await loadShouts({
-        filters: { published: true },
+        filters: { featured: true },
         limit: CLIENT_LOAD_ARTICLES_COUNT,
         offset: sortedArticles().length,
       })
@@ -80,7 +80,7 @@ export const HomeView = (props: Props) => {
     saveScrollPosition()
 
     const { hasMore } = await loadShouts({
-      filters: { published: true },
+      filters: { featured: true },
       limit: LOAD_MORE_PAGE_SIZE,
       offset: sortedArticles().length,
     })

src/context/editor.tsx

@@ -6,7 +6,7 @@ import { Accessor, createContext, createSignal, useContext } from 'solid-js'
 import { createStore, SetStoreFunction } from 'solid-js/store'
 
 import { apiClient } from '../graphql/client/core'
-import { ShoutVisibility, Topic, TopicInput } from '../graphql/schema/core.gen'
+import { Topic, TopicInput } from '../graphql/schema/core.gen'
 import { router, useRouter } from '../stores/router'
 import { slugify } from '../utils/slugify'
 
@@ -158,10 +158,10 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
       const shout = await updateShout(formToSave, { publish: false })
       removeDraftFromLocalStorage(formToSave.shoutId)
 
-      if (shout.visibility === ShoutVisibility.Authors) {
+      if (shout.published_at) {
-        openPage(router, 'drafts')
-      } else {
         openPage(router, 'article', { slug: shout.slug })
+      } else {
+        openPage(router, 'drafts')
       }
     } catch (error) {
       console.error('[saveShout]', error)

src/context/following.tsx

@@ -1,4 +1,4 @@
-import { createEffect, createSignal, createContext, Accessor, useContext, JSX, onMount } from 'solid-js'
+import { createEffect, createSignal, createContext, Accessor, useContext, JSX } from 'solid-js'
 import { createStore } from 'solid-js/store'
 
 import { apiClient } from '../graphql/client/core'

src/graphql/query/core/article-load.ts

@@ -7,7 +7,6 @@ export default gql`
       title
       lead
       description
-      visibility
       subtitle
       slug
       layout
@@ -45,6 +44,7 @@ export default gql`
       created_at
       updated_at
       published_at
+      featured_at
       stat {
         viewed
 

src/graphql/query/core/articles-load-by.ts

@@ -34,6 +34,7 @@ export default gql`
       }
       created_at
       published_at
+      featured_at
       stat {
         viewed
 

src/graphql/query/core/articles-load-drafts.ts

@@ -32,6 +32,7 @@ export default gql`
       }
       created_at
       published_at
+      featured_at
       stat {
         viewed
 

src/graphql/query/core/articles-load-feed.ts

@@ -26,6 +26,7 @@ export default gql`
       }
       created_at
       published_at
+      featured_at
       stat {
         viewed
 

src/graphql/query/core/articles-load-followed.ts

@@ -29,6 +29,7 @@ export default gql`
       }
       created_at
       published_at
+      featured_at
       stat {
         viewed
 

src/graphql/query/core/articles-load-random-top.ts

@@ -34,6 +34,7 @@ export default gql`
       }
       created_at
       published_at
+      featured_at
       stat {
         viewed
 

src/graphql/query/core/articles-load-random-topic.ts

@@ -50,6 +50,7 @@ export default gql`
         }
         created_at
         published_at
+        featured_at
         stat {
           viewed
 

src/graphql/query/core/articles-load-unrated.ts

@@ -35,6 +35,7 @@ export default gql`
       }
       created_at
       published_at
+      featured_at
       stat {
         viewed
 

src/pages/author.page.server.ts

@@ -16,7 +16,7 @@ export const onBeforeRender = async (pageContext: PageContext) => {
   }
 
   const authorShouts = await apiClient.getShouts({
-    filters: { author: slug, published: false },
+    filters: { author: slug, featured: false },
     limit: PRERENDERED_ARTICLES_COUNT,
   })
   const pageProps: PageProps = { author, authorShouts, seo: { title: author.name } }

src/pages/author.page.tsx

@@ -21,7 +21,7 @@ export const AuthorPage = (props: PageProps) => {
   const preload = () => {
     return Promise.all([
       loadShouts({
-        filters: { author: slug(), published: false },
+        filters: { author: slug(), featured: false },
         limit: PRERENDERED_ARTICLES_COUNT,
       }),
       loadAuthor({ slug: slug() }),

src/pages/feed.page.tsx

@@ -13,7 +13,7 @@ const handleFeedLoadShouts = (options: LoadShoutsOptions) => {
   return loadShouts({
     ...options,
     filters: {
-      published: false,
+      featured: false,
       ...options.filters,
     },
   })

src/pages/index.page.server.ts

@@ -6,7 +6,7 @@ import { apiClient } from '../graphql/client/core'
 
 export const onBeforeRender = async (_pageContext: PageContext) => {
   const homeShouts = await apiClient.getShouts({
-    filters: { published: true },
+    filters: { featured: true },
     limit: PRERENDERED_ARTICLES_COUNT,
   })
 

src/pages/index.page.tsx

@@ -20,7 +20,7 @@ export const HomePage = (props: PageProps) => {
     }
 
     await Promise.all([
-      loadShouts({ filters: { published: true }, limit: PRERENDERED_ARTICLES_COUNT }),
+      loadShouts({ filters: { featured: true }, limit: PRERENDERED_ARTICLES_COUNT }),
       loadRandomTopics({ amount: RANDOM_TOPICS_COUNT }),
     ])
 

src/pages/topic.page.server.ts

@@ -16,7 +16,7 @@ export const onBeforeRender = async (pageContext: PageContext) => {
   }
 
   const topicShouts = await apiClient.getShouts({
-    filters: { topic: topic.slug, published: true },
+    filters: { topic: topic.slug, featured: true },
     limit: PRERENDERED_ARTICLES_COUNT,
   })
 

src/pages/topic.page.tsx

@@ -21,7 +21,7 @@ export const TopicPage = (props: PageProps) => {
   const preload = () =>
     Promise.all([
       loadShouts({
-        filters: { topic: slug(), published: true },
+        filters: { topic: slug(), featured: true },
         limit: PRERENDERED_ARTICLES_COUNT,
         offset: 0,
       }),

src/stores/zine/articles.ts

@@ -131,7 +131,7 @@ export const loadShouts = async (
 ): Promise<{ hasMore: boolean; newShouts: Shout[] }> => {
   options.limit += 1
   const newShouts = await apiClient.getShouts(options)
-  const hasMore = newShouts ?? newShouts.length === options.limit + 1
+  const hasMore = newShouts?.length === options.limit + 1
 
   if (hasMore) {
     newShouts.splice(-1)
@@ -148,7 +148,7 @@ export const loadMyFeed = async (
 ): Promise<{ hasMore: boolean; newShouts: Shout[] }> => {
   options.limit += 1
   const newShouts = await apiClient.getMyFeed(options)
-  const hasMore = newShouts ?? newShouts.length === options.limit + 1
+  const hasMore = newShouts?.length === options.limit + 1
 
   if (hasMore) {
     newShouts.splice(-1)
@@ -165,7 +165,7 @@ export const loadShoutsSearch = async (
 ): Promise<{ hasMore: boolean; newShouts: Shout[] }> => {
   options.limit += 1
   const newShouts = await apiClient.getShoutsSearch(options)
-  const hasMore = newShouts ?? newShouts.length === options.limit + 1
+  const hasMore = newShouts?.length === options.limit + 1
 
   if (hasMore) {
     newShouts.splice(-1)
@@ -193,7 +193,7 @@ export const loadTopMonthArticles = async (): Promise<void> => {
   const after = Math.floor(daysago / 1000)
   const options: LoadShoutsOptions = {
     filters: {
-      published: true,
+      featured: true,
       after,
     },
     order_by: 'likes_stat',
@@ -208,7 +208,7 @@ const TOP_ARTICLES_COUNT = 10
 
 export const loadTopArticles = async (): Promise<void> => {
   const options: LoadShoutsOptions = {
-    filters: { published: true },
+    filters: { featured: true },
     order_by: 'likes_stat',
     limit: TOP_ARTICLES_COUNT,
   }

src/stores/zine/layouts.ts

@@ -29,7 +29,7 @@ export const resetSortedLayoutShouts = () => {
 export const loadLayoutShoutsBy = async (options: LoadShoutsOptions): Promise<{ hasMore: boolean }> => {
   options.limit += 1
   const newLayoutShouts = await apiClient.getShouts(options)
-  const hasMore = newLayoutShouts.length === options.limit + 1
+  const hasMore = newLayoutShouts?.length === options.limit + 1
 
   if (hasMore) {
     newLayoutShouts.splice(-1)

src/utils/sortby.ts

@@ -6,6 +6,10 @@ export const byCreated = (a: Shout | Reaction, b: Shout | Reaction) => {
   return a?.created_at - b?.created_at
 }
 
+export const byPublished = (a: Shout, b: Shout) => {
+  return a.published_at - b.published_at
+}
+
 export const byLength = (
   a: (Shout | Reaction | Topic | Author)[],
   b: (Shout | Reaction | Topic | Author)[],