Replace webhook with discordgo

.env.template

@@ -1,3 +1,3 @@
 SN_AUTH_COOKIE=
-DISCORD_WEBHOOK=
 DISCORD_TOKEN=
+DISCORD_CHANNEL_ID=

discord.go

@@ -1,12 +1,9 @@
 package main
 
 import (
-	"bytes"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
-	"net/http"
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustin/go-humanize"
@@ -15,55 +12,31 @@ import (
 )
 
 var (
-	DiscordWebhook string
+	DiscordToken     string
-	DiscordToken   string
+	DiscordClient    *discordgo.Session
-	DiscordClient  *discordgo.Session
+	DiscordChannelId string
 )
 
-type DiscordEmbedFooter struct {
-	Text    string `json:"text"`
-	IconUrl string `json:"icon_url"`
-}
-
-type DiscordEmbedField struct {
-	Name   string `json:"name"`
-	Value  string `json:"value"`
-	Inline bool   `json:"inline"`
-}
-
-type DiscordEmbed struct {
-	Title     string              `json:"title"`
-	Url       string              `json:"url"`
-	Color     int                 `json:"color"`
-	Footer    DiscordEmbedFooter  `json:"footer"`
-	Timestamp string              `json:"timestamp"`
-	Fields    []DiscordEmbedField `json:"fields"`
-}
-
-type DiscordWebhookPayload struct {
-	Embeds []DiscordEmbed `json:"embeds"`
-}
-
 func init() {
 	err := godotenv.Load()
 	if err != nil {
 		log.Fatal("Error loading .env file")
 	}
-	flag.StringVar(&DiscordWebhook, "DISCORD_WEBHOOK", "", "Webhook to send logs to discord")
 	flag.StringVar(&DiscordToken, "DISCORD_TOKEN", "", "Discord bot token")
+	flag.StringVar(&DiscordChannelId, "DISCORD_CHANNEL_ID", "", "Discord channel id")
 	flag.Parse()
-	if DiscordWebhook == "" {
-		log.Fatal("DISCORD_WEBHOOK not set")
-	}
 	if DiscordToken == "" {
 		log.Fatal("DISCORD_TOKEN not set")
 	}
+	if DiscordChannelId == "" {
+		log.Fatal("DISCORD_CHANNEL_ID not set")
+	}
 	initBot()
 }
 
 func initBot() {
 	var err error
-	DiscordClient, err = discordgo.New(DiscordToken)
+	DiscordClient, err = discordgo.New("Bot " + DiscordToken)
 	if err != nil {
 		log.Fatal("error creating discord session:", err)
 	}
@@ -102,69 +75,57 @@ func onMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
 func SendDupesErrorToDiscord(dupesErr *DupesError) {
 	title := fmt.Sprintf("%d dupe(s) found for %s:", len(dupesErr.Dupes), dupesErr.Url)
 	color := 0xffc107
-	var fields []DiscordEmbedField
+	var fields []*discordgo.MessageEmbedField
 	for _, dupe := range dupesErr.Dupes {
 		fields = append(fields,
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "Title",
 				Value:  dupe.Title,
 				Inline: false,
 			},
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "Id",
 				Value:  StackerNewsItemLink(dupe.Id),
 				Inline: true,
 			},
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "Url",
 				Value:  dupe.Url,
 				Inline: true,
 			},
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "User",
 				Value:  dupe.User.Name,
 				Inline: true,
 			},
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "Created",
 				Value:  humanize.Time(dupe.CreatedAt),
 				Inline: true,
 			},
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "Sats",
 				Value:  fmt.Sprint(dupe.Sats),
 				Inline: true,
 			},
-			DiscordEmbedField{
+			&discordgo.MessageEmbedField{
 				Name:   "Comments",
 				Value:  fmt.Sprint(dupe.NComments),
 				Inline: true,
 			},
 		)
 	}
-	embed := DiscordEmbed{
+	embed := discordgo.MessageEmbed{
 		Title:  title,
 		Color:  color,
 		Fields: fields,
 	}
-	SendEmbedToDiscord(embed)
+	SendEmbedToDiscord(&embed)
 }
 
-func SendEmbedToDiscord(embed DiscordEmbed) {
+func SendEmbedToDiscord(embed *discordgo.MessageEmbed) {
-	bodyJSON, err := json.Marshal(
+	_, err := DiscordClient.ChannelMessageSendEmbed(DiscordChannelId, embed)
-		DiscordWebhookPayload{
-			Embeds: []DiscordEmbed{embed},
-		},
-	)
 	if err != nil {
 		log.Fatal("Error during json.Marshal:", err)
 	}
-	req, err := http.NewRequest("POST", DiscordWebhook, bytes.NewBuffer(bodyJSON))
-	req.Header.Set("Content-Type", "application/json")
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		log.Println("Discord webhook error:", err)
-	}
-	defer resp.Body.Close()
 }

sn.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/bwmarrin/discordgo"
 	"github.com/dustin/go-humanize"
 	"github.com/joho/godotenv"
 	"github.com/namsral/flag"
@@ -236,15 +237,15 @@ func SendStackerNewsEmbedToDiscord(title string, id int) {
 	Timestamp := time.Now().Format(time.RFC3339)
 	url := StackerNewsItemLink(id)
 	color := 0xffc107
-	embed := DiscordEmbed{
+	embed := discordgo.MessageEmbed{
 		Title: title,
-		Url:   url,
+		URL:   url,
 		Color: color,
-		Footer: DiscordEmbedFooter{
+		Footer: &discordgo.MessageEmbedFooter{
 			Text:    "Stacker News",
-			IconUrl: "https://stacker.news/favicon.png",
+			IconURL: "https://stacker.news/favicon.png",
 		},
 		Timestamp: Timestamp,
 	}
-	SendEmbedToDiscord(embed)
+	SendEmbedToDiscord(&embed)
 }