bring back old link type with title

Author: topi314

redditbot/database.go

@@ -15,14 +15,29 @@ var (
 	ErrSubscriptionNotFound = errors.New("subscription not found")
 )
 
-type FormatType string
-
 const (
-	FormatTypeEmbed FormatType = "embed"
-	FormatTypeText  FormatType = "text"
-	FormatTypeLink  FormatType = "link"
+	FormatTypeEmbed         FormatType = "embed"
+	FormatTypeText          FormatType = "text"
+	FormatTypeLink          FormatType = "link"
+	FormatTypeLinkWithTitle FormatType = "link_with_title"
 )
 
+type FormatType string
+
+func (f FormatType) String() string {
+	switch f {
+	case FormatTypeEmbed:
+		return "Embed"
+	case FormatTypeText:
+		return "Text"
+	case FormatTypeLink:
+		return "Link"
+	case FormatTypeLinkWithTitle:
+		return "Link with Title"
+	}
+	return "Unknown"
+}
+
 type Subscription struct {
 	Subreddit    string       `db:"subreddit"`
 	Type         string       `db:"type"`

redditbot/discord.go

@@ -34,17 +34,21 @@ var typeChoices = []discord.ApplicationCommandOptionChoiceString{
 
 var formatTypeChoices = []discord.ApplicationCommandOptionChoiceString{
 	{
-		Name:  strings.Title(string(FormatTypeEmbed)),
+		Name:  FormatTypeEmbed.String(),
 		Value: string(FormatTypeEmbed),
 	},
 	{
-		Name:  strings.Title(string(FormatTypeText)),
+		Name:  FormatTypeText.String(),
 		Value: string(FormatTypeText),
 	},
 	{
-		Name:  strings.Title(string(FormatTypeLink)),
+		Name:  FormatTypeLink.String(),
 		Value: string(FormatTypeLink),
 	},
+	{
+		Name:  FormatTypeLinkWithTitle.String(),
+		Value: string(FormatTypeLinkWithTitle),
+	},
 }
 
 var Commands = []discord.ApplicationCommandCreate{
@@ -400,7 +404,7 @@ func (b *Bot) OnSubredditList(data discord.SlashCommandInteractionData, event *e
 		if !sub.LinkButton {
 			linkButton = "disabled"
 		}
-		content += fmt.Sprintf("- %s - type: `%s` - format: `%s` - role: %s - proxy: %s - link-button: `%s`\n", formatSubreddit(sub.Subreddit, true), strings.Title(sub.Type), strings.Title(string(sub.FormatType)), role, proxy, linkButton)
+		content += fmt.Sprintf("- %s - type: `%s` - format: `%s` - role: %s - proxy: %s - link-button: `%s`\n", formatSubreddit(sub.Subreddit, true), strings.Title(sub.Type), sub.FormatType.String(), role, proxy, linkButton)
 	}
 
 	_ = event.CreateMessage(discord.MessageCreate{

redditbot/subscriptions.go

@@ -170,6 +170,11 @@ func (b *Bot) checkSubscription(sub Subscription) {
 }
 
 func (b *Bot) sendPost(sub Subscription, post RedditPost) bool {
+	proxy := defaultRedditProxy
+	if sub.RedditProxy != "" {
+		proxy = sub.RedditProxy
+	}
+
 	var webhookMessageCreate discord.WebhookMessageCreate
 	switch sub.FormatType {
 	case FormatTypeEmbed:
@@ -198,21 +203,17 @@ func (b *Bot) sendPost(sub Subscription, post RedditPost) bool {
 			Embeds: []discord.Embed{embed},
 		}
 	case FormatTypeText:
-		proxy := defaultRedditProxy
-		if sub.RedditProxy != "" {
-			proxy = sub.RedditProxy
-		}
 		webhookMessageCreate = discord.WebhookMessageCreate{
 			Content: fmt.Sprintf("## [%s](%s%s)\n%s", post.Title, proxy, post.Permalink, cutString(quoteString(html.UnescapeString(post.Selftext)), 4000)),
 		}
 	case FormatTypeLink:
-		proxy := defaultRedditProxy
-		if sub.RedditProxy != "" {
-			proxy = sub.RedditProxy
-		}
 		webhookMessageCreate = discord.WebhookMessageCreate{
 			Content: fmt.Sprintf("New [post](%s%s) in [`%s`](<%s>)", proxy, post.Permalink, post.SubredditNamePrefixed, "https://reddit.com/"+post.SubredditNamePrefixed),
 		}
+	case FormatTypeLinkWithTitle:
+		webhookMessageCreate = discord.WebhookMessageCreate{
+			Content: fmt.Sprintf("[%s](%s%s)", post.Title, proxy, post.Permalink),
+		}
 	}
 
 	if sub.RoleID != 0 {
@@ -243,7 +244,7 @@ func (b *Bot) sendPost(sub Subscription, post RedditPost) bool {
 			},
 		}
 	}
-	
+
 	postsSent.With(prometheus.Labels{
 		"subreddit":  sub.Subreddit,
 		"type":       sub.Type,