twhelp
/
dcbot-old
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename one variable in Session.SendEmbed, remove comments from embed.go

This commit is contained in:
Dawid Wysokiński 2021-07-17 17:42:38 +02:00
parent b4b3379765
commit 35d9a563fb
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
discord/discord.go
View File

@ -176,7 +176,7 @@ func (s *Session) SendEmbed(channelID string, message *discordgo.MessageEmbed) e
baseNumberOfCharacters += len(message.Footer.Text) baseNumberOfCharacters += len(message.Footer.Text)
} }
var splittedFields [][]*discordgo.MessageEmbedField var splitFields [][]*discordgo.MessageEmbedField
characters := baseNumberOfCharacters characters := baseNumberOfCharacters
fromIndex := 0 fromIndex := 0
fieldsLen := len(fields) fieldsLen := len(fields)
@ -184,14 +184,14 @@ func (s *Session) SendEmbed(channelID string, message *discordgo.MessageEmbed) e
fNameLen := len(field.Name) fNameLen := len(field.Name)
fValLen := len(field.Value) fValLen := len(field.Value)
if characters+fNameLen+fValLen > EmbedSizeLimit || index == fieldsLen-1 { if characters+fNameLen+fValLen > EmbedSizeLimit || index == fieldsLen-1 {
splittedFields = append(splittedFields, fields[fromIndex:index+1]) splitFields = append(splitFields, fields[fromIndex:index+1])
fromIndex = index fromIndex = index
characters = baseNumberOfCharacters characters = baseNumberOfCharacters
} }
characters += fNameLen characters += fNameLen
characters += fValLen characters += fValLen
} }
for _, fields := range splittedFields { for _, fields := range splitFields {
fieldsLen := len(fields) fieldsLen := len(fields)
for i := 0; i < fieldsLen; i += EmbedLimitField { for i := 0; i < fieldsLen; i += EmbedLimitField {
end := i + EmbedLimitField end := i + EmbedLimitField

14
discord/embed.go
View File

@ -6,7 +6,6 @@ import (
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
) )
// Constants for message embed character limits
const ( const (
EmbedColor = 0x00ff00 EmbedColor = 0x00ff00
EmbedLimitTitle = 256 EmbedLimitTitle = 256
@ -29,7 +28,6 @@ func NewEmbed() *Embed {
}} }}
} }
//SetTitle ...
func (e *Embed) SetTitle(name string) *Embed { func (e *Embed) SetTitle(name string) *Embed {
e.Title = name e.Title = name
return e return e
@ -40,7 +38,6 @@ func (e *Embed) SetTimestamp(timestamp string) *Embed {
return e return e
} }
//SetDescription [desc]
func (e *Embed) SetDescription(description string) *Embed { func (e *Embed) SetDescription(description string) *Embed {
if len(description) > EmbedLimitDescription { if len(description) > EmbedLimitDescription {
description = description[:EmbedLimitDescription] description = description[:EmbedLimitDescription]
@ -49,7 +46,6 @@ func (e *Embed) SetDescription(description string) *Embed {
return e return e
} }
//AddField [name] [value]
func (e *Embed) AddField(name, value string) *Embed { func (e *Embed) AddField(name, value string) *Embed {
if len(value) > EmbedLimitFieldValue { if len(value) > EmbedLimitFieldValue {
value = value[:EmbedLimitFieldValue] value = value[:EmbedLimitFieldValue]
@ -71,10 +67,8 @@ func (e *Embed) AddField(name, value string) *Embed {
func (e *Embed) SetFields(fields []*discordgo.MessageEmbedField) *Embed { func (e *Embed) SetFields(fields []*discordgo.MessageEmbedField) *Embed {
e.Fields = fields e.Fields = fields
return e return e
} }
//SetFooter [Text] [iconURL]
func (e *Embed) SetFooter(args ...string) *Embed { func (e *Embed) SetFooter(args ...string) *Embed {
iconURL := "" iconURL := ""
text := "" text := ""
@ -102,7 +96,6 @@ func (e *Embed) SetFooter(args ...string) *Embed {
return e return e
} }
//SetImage ...
func (e *Embed) SetImage(args ...string) *Embed { func (e *Embed) SetImage(args ...string) *Embed {
var URL string var URL string
var proxyURL string var proxyURL string
@ -123,7 +116,6 @@ func (e *Embed) SetImage(args ...string) *Embed {
return e return e
} }
//SetThumbnail ...
func (e *Embed) SetThumbnail(args ...string) *Embed { func (e *Embed) SetThumbnail(args ...string) *Embed {
var URL string var URL string
var proxyURL string var proxyURL string
@ -144,7 +136,6 @@ func (e *Embed) SetThumbnail(args ...string) *Embed {
return e return e
} }
//SetAuthor ...
func (e *Embed) SetAuthor(args ...string) *Embed { func (e *Embed) SetAuthor(args ...string) *Embed {
var ( var (
name string name string
@ -179,19 +170,16 @@ func (e *Embed) SetAuthor(args ...string) *Embed {
return e return e
} }
//SetURL ...
func (e *Embed) SetURL(URL string) *Embed { func (e *Embed) SetURL(URL string) *Embed {
e.URL = URL e.URL = URL
return e return e
} }
//SetColor ...
func (e *Embed) SetColor(clr int) *Embed { func (e *Embed) SetColor(clr int) *Embed {
e.Color = clr e.Color = clr
return e return e
} }
// InlineAllFields sets all fields in the embed to be inline
func (e *Embed) InlineAllFields() *Embed { func (e *Embed) InlineAllFields() *Embed {
for _, v := range e.Fields { for _, v := range e.Fields {
v.Inline = true v.Inline = true
@ -281,7 +269,7 @@ func (msg *MessageEmbed) Append(m string) {
func (msg *MessageEmbed) ToMessageEmbedFields() []*discordgo.MessageEmbedField { func (msg *MessageEmbed) ToMessageEmbedFields() []*discordgo.MessageEmbedField {
msg.mutex.Lock() msg.mutex.Lock()
defer msg.mutex.Unlock() defer msg.mutex.Unlock()
fields := []*discordgo.MessageEmbedField{} var fields []*discordgo.MessageEmbedField
for _, chunk := range msg.chunks { for _, chunk := range msg.chunks {
fields = append(fields, &discordgo.MessageEmbedField{ fields = append(fields, &discordgo.MessageEmbedField{
Name: "-", Name: "-",