cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pagecomment: add useragent and check for no title

This commit is contained in:
Chris Sexton 2022-09-07 10:39:01 -04:00
parent b8a199faba
commit b670ecc647
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/pagecomment/pagecomment.go
View File

@ -53,7 +53,7 @@ func (p *PageComment) handleURLReq(r bot.Request) bool {
if strings.HasPrefix(u, "<") && strings.HasSuffix(u, ">") { if strings.HasPrefix(u, "<") && strings.HasSuffix(u, ">") {
u = u[1 : len(u)-1] u = u[1 : len(u)-1]
} }
msg := p.handleURL(u, fullComment, r.Msg.User.Name) msg := handleURL(u, fullComment, r.Msg.User.Name)
p.b.Send(r.Conn, bot.Delete, r.Msg.Channel, r.Msg.ID) p.b.Send(r.Conn, bot.Delete, r.Msg.Channel, r.Msg.ID)
p.b.Send(r.Conn, bot.Message, r.Msg.Channel, msg) p.b.Send(r.Conn, bot.Message, r.Msg.Channel, msg)
return true return true
@ -68,7 +68,7 @@ func (p *PageComment) handleURLCmd(conn bot.Connector) func(*discordgo.Session,
if err == nil { if err == nil {
who = profile.Name who = profile.Name
} }
msg := p.handleURL(u, cmt, who) msg := handleURL(u, cmt, who)
err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource, Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{ Data: &discordgo.InteractionResponseData{
@ -82,17 +82,28 @@ func (p *PageComment) handleURLCmd(conn bot.Connector) func(*discordgo.Session,
} }
} }
func (p *PageComment) handleURL(u, cmt, who string) string { func handleURL(u, cmt, who string) string {
req, err := http.Get(u) client := http.Client{}
req, err := http.NewRequest(http.MethodGet, u, nil)
if err != nil { if err != nil {
return "Couldn't parse that URL"
}
req.Header.Set("User-Agent", "catbase/1.0")
resp, err := client.Do(req)
if err != nil || resp.StatusCode > 299 {
log.Error().Err(err).Int("status", resp.StatusCode).Msgf("error with request")
return "Couldn't get that URL" return "Couldn't get that URL"
} }
doc, err := goquery.NewDocumentFromReader(req.Body) doc, err := goquery.NewDocumentFromReader(resp.Body)
if err != nil { if err != nil {
return "Couldn't parse that URL" return "Couldn't parse that URL"
} }
wait := make(chan string, 1) wait := make(chan string, 1)
doc.Find("title").First().Each(func(i int, s *goquery.Selection) { sel := doc.Find("title")
if sel.Length() == 0 {
return fmt.Sprintf("> %s: %s\n(<%s>)", who, cmt, u)
}
sel.First().Each(func(i int, s *goquery.Selection) {
wait <- fmt.Sprintf("> %s\n%s: %s\n(<%s>)", s.Text(), who, cmt, u) wait <- fmt.Sprintf("> %s\n%s: %s\n(<%s>)", s.Text(), who, cmt, u)
}) })
return <-wait return <-wait