grim/wasdead

clean up a bunch of log messages
draft
2020-01-22, Gary Kramlich
05a6039350e3
Parents d82f4509dbbd
Children 3910e3ab79d3
clean up a bunch of log messages
2 files changed, 22 insertions(+), 5 deletions(-)
  • +11 -1
    database/guild.go
  • +11 -4
    discord/presence.go
    • --- a/database/guild.go Wed Jan 22 00:59:47 2020 -0600
    +++ b/database/guild.go Wed Jan 22 01:12:11 2020 -0600
    @@ -15,10 +15,12 @@
    }
    func LoadGuild(id string) (*Guild, error) {
    + created := false
    +
    data, err := db.Get([]byte("guild-" + id))
    if err != nil {
    - log.Debugf("guild %s not found : %v", id, err)
    log.Infof("guild %s not found, creating new", id)
    + created = true
    }
    guild := &Guild{}
    @@ -32,9 +34,17 @@
    guild.Ignore = []string{}
    }
    + if created {
    + guild.Save()
    + }
    +
    return guild, nil
    }
    +func (g *Guild) CanAnnounce() bool {
    + return g.Channel != ""
    +}
    +
    func (g *Guild) Save() error {
    data, err := json.Marshal(g)
    if err != nil {
    --- a/discord/presence.go Wed Jan 22 00:59:47 2020 -0600
    +++ b/discord/presence.go Wed Jan 22 01:12:11 2020 -0600
    @@ -16,19 +16,28 @@
    return
    }
    + if p.Game.Type != discordgo.GameTypeStreaming {
    + return
    + }
    +
    guild, err := database.LoadGuild(p.GuildID)
    if err != nil {
    log.Errorf("error loading guild: %v", err)
    return
    }
    - log.Infof("server: %s username: %s is now streaming", guild.ID, p.Presence.User.Username)
    + if !guild.CanAnnounce() {
    + log.Infof("guild %s does not have an announcement channel set", guild.ID)
    + return
    + }
    +
    + log.Infof("guild %s username %s is now streaming", guild.ID, p.Presence.User.Username)
    presence, _ := presence.GetPresence(p.Game.URL)
    if lastID, ok := guild.History[presence.UserID]; ok {
    if lastID == presence.StreamID {
    - log.Infof("already sent presence to guild %s: %v", p.GuildID, presence)
    + log.Infof("already sent presence for %q to guild %s", presence.Username, p.GuildID)
    return
    }
    }
    @@ -47,8 +56,6 @@
    }
    func presenceEmbed(presence presence.Presence) *discordgo.MessageEmbed {
    - log.Debugf("embeding presence: %#v\n", presence)
    -
    embed := &discordgo.MessageEmbed{
    Author: &discordgo.MessageEmbedAuthor{
    Name: presence.Username,