Fix reddit crossposts & add show-flairs property

docs/configuration.md

@@ -654,6 +654,7 @@ Example:
 | subreddit | string | yes |  |
 | style | string | no | vertical-list |
 | show-thumbnails | boolean | no | false |
+| show-flairs | boolean | no | false |
 | limit | integer | no | 15 |
 | collapse-after | integer | no | 5 |
 | comments-url-template | string | no | https://www.reddit.com/{POST-PATH} |
@@ -690,6 +691,9 @@ Shows or hides thumbnails next to the post. This only works if the `style` is `v
 >
 > Thumbnails don't work for some subreddits due to Reddit's API not returning the thumbnail URL. No workaround for this yet.
 
+##### `show-flairs`
+Shows post flairs when set to `true`.
+
 ##### `limit`
 The maximum number of posts to show.
 

internal/assets/templates/forum-posts.html

@@ -6,7 +6,11 @@
     <li>
         <div class="flex gap-10 row-reverse-on-mobile thumbnail-parent">
             {{ if $.ShowThumbnails }}
-                {{ if ne .ThumbnailUrl "" }}
+                {{ if .IsCrosspost }}
+                <svg title="Crosspost" class="forum-post-list-thumbnail hide-on-mobile" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-9 -8 40 40" stroke-width="1.5" stroke="var(--color-text-subdue)">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M7.5 21 3 16.5m0 0L7.5 12M3 16.5h13.5m0-13.5L21 7.5m0 0L16.5 12M21 7.5H7.5" />
+                </svg>
+                {{ else if ne .ThumbnailUrl "" }}
                 <img class="forum-post-list-thumbnail thumbnail" src="{{ .ThumbnailUrl }}" alt="" loading="lazy">
                 {{ else if .HasTargetUrl }}
                 <svg class="forum-post-list-thumbnail hide-on-mobile" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-9 -8 40 40" stroke-width="1.5" stroke="var(--color-text-subdue)">

internal/feed/primitives.go

@@ -17,6 +17,7 @@ type ForumPost struct {
 	Engagement      float64
 	TimePosted      time.Time
 	Tags            []string
+	IsCrosspost     bool
 }
 
 type ForumPosts []ForumPost

internal/feed/reddit.go

@@ -25,12 +25,26 @@ type subredditResponseJson struct {
 				Pinned        bool    `json:"pinned"`
 				IsSelf        bool    `json:"is_self"`
 				Thumbnail     string  `json:"thumbnail"`
+				Flair         string  `json:"link_flair_text"`
+				ParentList    []struct {
+					Id        string `json:"id"`
+					Subreddit string `json:"subreddit"`
+					Permalink string `json:"permalink"`
+				} `json:"crosspost_parent_list"`
 			} `json:"data"`
 		} `json:"children"`
 	} `json:"data"`
 }
 
-func FetchSubredditPosts(subreddit, sort, topPeriod, search, commentsUrlTemplate, requestUrlTemplate string) (ForumPosts, error) {
+func templateRedditCommentsUrl(template, subreddit, postId, postPath string) string {
+	template = strings.ReplaceAll(template, "{SUBREDDIT}", subreddit)
+	template = strings.ReplaceAll(template, "{POST-ID}", postId)
+	template = strings.ReplaceAll(template, "{POST-PATH}", strings.TrimLeft(postPath, "/"))
+
+	return template
+}
+
+func FetchSubredditPosts(subreddit, sort, topPeriod, search, commentsUrlTemplate, requestUrlTemplate string, showFlairs bool) (ForumPosts, error) {
 	query := url.Values{}
 	var requestUrl string
 
@@ -85,9 +99,7 @@ func FetchSubredditPosts(subreddit, sort, topPeriod, search, commentsUrlTemplate
 		if commentsUrlTemplate == "" {
 			commentsUrl = "https://www.reddit.com" + post.Permalink
 		} else {
-			commentsUrl = strings.ReplaceAll(commentsUrlTemplate, "{SUBREDDIT}", subreddit)
+			commentsUrl = templateRedditCommentsUrl(commentsUrlTemplate, subreddit, post.Id, post.Permalink)
-			commentsUrl = strings.ReplaceAll(commentsUrl, "{POST-ID}", post.Id)
-			commentsUrl = strings.ReplaceAll(commentsUrl, "{POST-PATH}", strings.TrimLeft(post.Permalink, "/"))
 		}
 
 		forumPost := ForumPost{
@@ -107,6 +119,20 @@ func FetchSubredditPosts(subreddit, sort, topPeriod, search, commentsUrlTemplate
 			forumPost.TargetUrl = post.Url
 		}
 
+		if showFlairs && post.Flair != "" {
+			forumPost.Tags = append(forumPost.Tags, post.Flair)
+		}
+
+		if len(post.ParentList) > 0 {
+			forumPost.IsCrosspost = true
+			forumPost.TargetUrlDomain = "r/" + post.ParentList[0].Subreddit
+			if commentsUrlTemplate == "" {
+				forumPost.TargetUrl = "https://www.reddit.com" + post.ParentList[0].Permalink
+			} else {
+				forumPost.TargetUrl = templateRedditCommentsUrl(commentsUrlTemplate, post.ParentList[0].Subreddit, post.ParentList[0].Id, post.ParentList[0].Permalink)
+			}
+		}
+
 		posts = append(posts, forumPost)
 	}
 

internal/widget/reddit.go

@@ -17,6 +17,7 @@ type Reddit struct {
 	Subreddit           string          `yaml:"subreddit"`
 	Style               string          `yaml:"style"`
 	ShowThumbnails      bool            `yaml:"show-thumbnails"`
+	ShowFlairs          bool            `yaml:"show-flairs"`
 	SortBy              string          `yaml:"sort-by"`
 	TopPeriod           string          `yaml:"top-period"`
 	Search              string          `yaml:"search"`
@@ -87,6 +88,7 @@ func (widget *Reddit) Update(ctx context.Context) {
 		widget.Search,
 		widget.CommentsUrlTemplate,
 		widget.RequestUrlTemplate,
+		widget.ShowFlairs,
 	)
 
 	if !widget.canContinueUpdateAfterHandlingErr(err) {