feat(rss): add image_alt + fix 'embed' object case

Author: ZRunner

src/components/GuildDashboard/SpecialCategoryComponents/RssFeeds/FeedEmbedSettings.tsx

@@ -41,13 +41,13 @@ export default function FeedEmbedSettings({ feed, editFeed }: FeedEmbedSettingsP
 }
 
 function ShowDateInFooterToggle({ feed, editFeed }: FeedEmbedSettingsProps) {
-  const currentValue = feed.embed.showDateInFooter ?? true;
+  const currentValue = feed.embed.show_date_in_footer ?? true;
   function onChange() {
     editFeed({
       ...feed,
       embed: {
         ...feed.embed,
-        showDateInFooter: !currentValue,
+        "show_date_in_footer": !currentValue,
       },
     });
   }
@@ -61,13 +61,13 @@ function ShowDateInFooterToggle({ feed, editFeed }: FeedEmbedSettingsProps) {
 }
 
 function EnableLinkInTitleToggle({ feed, editFeed }: FeedEmbedSettingsProps) {
-  const currentValue = feed.embed.enableLinkInTitle ?? false;
+  const currentValue = feed.embed.enable_link_in_title ?? false;
   function onChange() {
     editFeed({
       ...feed,
       embed: {
         ...feed.embed,
-        enableLinkInTitle: !currentValue,
+        "enable_link_in_title": !currentValue,
       },
     });
   }
@@ -82,7 +82,7 @@ function EnableLinkInTitleToggle({ feed, editFeed }: FeedEmbedSettingsProps) {
 
 function ImageLocationSelector({ feed, editFeed }: FeedEmbedSettingsProps) {
   const possibleValues = ["thumbnail", "banner", "none"] as const;
-  const currentValue = feed.embed.imageLocation ?? possibleValues[0];
+  const currentValue = feed.embed.image_location ?? possibleValues[0];
 
   function valueIsValid(value: string): value is typeof possibleValues[number] {
     return possibleValues.includes(value as never);
@@ -94,7 +94,7 @@ function ImageLocationSelector({ feed, editFeed }: FeedEmbedSettingsProps) {
         ...feed,
         embed: {
           ...feed.embed,
-          imageLocation: value,
+          "image_location": value,
         },
       });
     }
@@ -146,14 +146,14 @@ function EmbedAuthorTextEditor({ feed, editFeed }: FeedEmbedSettingsProps) {
       ...feed,
       embed: {
         ...feed.embed,
-        authorText: value || undefined,
+        "author_text": value || undefined,
       },
     });
   }
 
   return (
     <TextField
-      value={feed.embed.authorText ?? ""}
+      value={feed.embed.author_text ?? ""}
       onChange={(e) => onChange(e.target.value)}
       variant="standard"
       style={{ marginTop: 0 }}
@@ -170,14 +170,14 @@ function EmbedFooterTextEditor({ feed, editFeed }: FeedEmbedSettingsProps) {
       ...feed,
       embed: {
         ...feed.embed,
-        footerText: value || undefined,
+        "footer_text": value || undefined,
       },
     });
   }
 
   return (
     <TextField
-      value={feed.embed.footerText ?? ""}
+      value={feed.embed.footer_text ?? ""}
       onChange={(e) => onChange(e.target.value)}
       variant="standard"
       style={{ marginTop: 0 }}

src/components/GuildDashboard/SpecialCategoryComponents/RssFeeds/FeedPreview.tsx

@@ -65,17 +65,17 @@ function useBuildDiscordMessageFromFeed({ feed, feedData }: { feed: RssFeed; fee
     color: feed.embed.color || 0x979C9F,
   };
 
-  if (feed.embed.authorText) {
+  if (feed.embed.author_text) {
     embed.author = {
-      name: formatStringPythonLike(feed.embed.authorText, variables, 256),
+      name: formatStringPythonLike(feed.embed.author_text, variables, 256),
     };
   }
-  if (feed.embed.footerText) {
+  if (feed.embed.footer_text) {
     embed.footer = {
-      text: formatStringPythonLike(feed.embed.footerText, variables, 2048),
+      text: formatStringPythonLike(feed.embed.footer_text, variables, 2048),
     };
   }
-  if (feed.embed.showDateInFooter !== false) {
+  if (feed.embed.show_date_in_footer !== false) {
     const parsedDate = parseDate(feedData.pubDate);
     if (parsedDate !== null) {
       embed.timestamp = parsedDate.getTime();
@@ -87,13 +87,13 @@ function useBuildDiscordMessageFromFeed({ feed, feedData }: { feed: RssFeed; fee
     embed.title = feedData.title.substring(0, 256);
   }
   if (feedData.image) {
-    if (feed.embed.imageLocation === undefined || feed.embed.imageLocation === "thumbnail") {
+    if (feed.embed.image_location === undefined || feed.embed.image_location === "thumbnail") {
       embed.thumbnail = feedData.image;
-    } else if (feed.embed.imageLocation === "banner") {
+    } else if (feed.embed.image_location === "banner") {
       embed.image = feedData.image;
     }
   }
-  if (feed.embed.enableLinkInTitle) {
+  if (feed.embed.enable_link_in_title) {
     embed.url = feedData.url;
   }
 
@@ -110,6 +110,7 @@ function useVariablesDict(feed: RssFeed, feedData: RssFeedParsedEntry): Record<s
     "logo": "📰",
     "full_text": feedData.postText || "",
     "description": feedData.postDescription || "",
+    "image_alt": feedData.imageAlt || "",
   };
   const parsedDate = parseDate(feedData.pubDate);
   if (parsedDate !== null) {

src/repository/types/api.d.ts

@@ -66,13 +66,13 @@ export interface RssFeed {
   roles: string[];
   useEmbed: boolean;
   embed: {
-    authorText?: string;
+    author_text?: string;
     title?: string;
-    footerText?: string;
+    footer_text?: string;
     color?: number;
-    showDateInFooter?: boolean;
-    enableLinkInTitle?: boolean;
-    imageLocation?: "thumbnail" | "banner" | "none";
+    show_date_in_footer?: boolean;
+    enable_link_in_title?: boolean;
+    image_location?: "thumbnail" | "banner" | "none";
   };
   silentMention: boolean;
   recentErrors: number;
@@ -81,39 +81,25 @@ export interface RssFeed {
 }
 
 
-interface __RssFeedPUT_Common {
+interface RssFeedPUTData {
+  id: string;
   channelId: string;
   structure: string;
   roles: string[];
   useEmbed: boolean;
   embed: {
-    authorText?: string;
+    author_text?: string;
     title?: string;
-    footerText?: string;
+    footer_text?: string;
     color?: number;
-    showDateInFooter?: boolean;
-    enableLinkInTitle?: boolean;
-    imageLocation?: "thumbnail" | "banner" | "none";
+    show_date_in_footer?: boolean;
+    enable_link_in_title?: boolean;
+    image_location?: "thumbnail" | "banner" | "none";
   };
   silentMention: boolean;
   enabled: boolean;
 }
 
-export interface RssFeedPUTData extends __RssFeedPUT_Common {
-  id: string;
-}
-
-interface RssFeedsPATCHData {
-  add?: (__RssFeedPUT_Common & {
-    link: string;
-    type: Exclude<VALID_RSS_FEED_TYPES, "tw">;
-  })[];
-  edit?: (__RssFeedPUT_Common & {
-    id: string;
-  })[];
-  remove?: string[];
-}
-
 export interface RssFeedParsedEntry {
   url: string;
   title: string;
@@ -122,6 +108,7 @@ export interface RssFeedParsedEntry {
   author: string | null;
   channel: string | null;
   image: string | null;
+  imageAlt: string | null;
   postText: string | null;
   postDescription: string | null;
 }