fix: 🐛 spoiler tags and event boost cards display

Sekai-World · Oct 29, 2023 · 9dc2377 · 9dc2377
1 parent 296329c
commit 9dc2377
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/card/AgendaView.tsx b/src/pages/card/AgendaView.tsx
@@ -91,7 +91,7 @@ const AgendaView: React.FC<{ data?: ICardInfo }> = ({ data }) => {
           <Grid item xs={6} md={7}>
             <Grid container direction="column" spacing={1}>
               <Grid item>
-                <SpoilerTag releaseTime={new Date(data.releaseAt)} />
+                <SpoilerTag releaseTime={new Date(data.releaseAt ?? data.archivePublishedAt)} />
               </Grid>
               <Grid item>
                 <ContentTrans

diff --git a/src/pages/card/ComfyView.tsx b/src/pages/card/ComfyView.tsx
@@ -99,7 +99,7 @@ const ComfyView: React.FC<{ data?: ICardInfo }> = ({ data }) => {
             <Grid container direction="column" rowSpacing={0.5}>
               <Grid item>
                 <Grid container justifyContent="center">
-                  <SpoilerTag releaseTime={new Date(data.releaseAt)} />
+                  <SpoilerTag releaseTime={new Date(data.releaseAt ?? data.archivePublishedAt)} />
                 </Grid>
               </Grid>
               <Grid item>

diff --git a/src/pages/card/GridView.tsx b/src/pages/card/GridView.tsx
@@ -55,7 +55,7 @@ const GridView: React.FC<{ data?: ICardInfo }> = ({ data }) => {
               top: "1%",
               left: "1%",
             }}
-            releaseTime={new Date(data.releaseAt)}
+            releaseTime={new Date(data.releaseAt ?? data.archivePublishedAt)}
           />
         </CardMedia>
         <CardContent style={{ paddingBottom: "16px" }}>

diff --git a/src/pages/event/EventDetail.tsx b/src/pages/event/EventDetail.tsx
@@ -163,7 +163,7 @@ const EventDetail: React.FC<{}> = observer(() => {
         Number(eventId) >= 36 ? (Number(eventId) >= 54 ? 2 : 1) : 0;
       setBoostCards(() => {
         let result = cards
-          .filter((elem) => elem.releaseAt <= ev!.aggregateAt)
+          .filter((elem) => (elem.releaseAt ?? elem.archivePublishedAt) <= ev!.aggregateAt)
           .map((card) => {
             let eventCard = ec.find(
               (it) => it.cardId === card.id && it.bonusRate !== undefined

diff --git a/src/pages/storyreader/StoryReader.tsx b/src/pages/storyreader/StoryReader.tsx
@@ -669,7 +669,7 @@ const StoryReader: React.FC<{}> = observer(() => {
               const filteredCards = cards.filter(
                 (card) =>
                   card.characterId === Number(charaId) &&
-                  (isShowSpoiler || card.releaseAt <= new Date().getTime())
+                  (isShowSpoiler || (card.releaseAt ?? card.archivePublishedAt) <= new Date().getTime())
               );
               if (filteredCards.length) {
                 return (