Merge pull request #18 from PonyvilleFM/Xe/feat/aura-implicitly-posts-to-twitter

cmd/aura: implicitly post to twitter, use server nickname in tweets

Author: Xe

cmd/aura/aura.go

@@ -166,17 +166,27 @@ func (a *aura) setup(s *discordgo.Session, m *discordgo.Message, parv []string)
 }
 
 func (a *aura) djon(s *discordgo.Session, m *discordgo.Message, parv []string) error {
-	fname, err := genFname(m.Author)
+	ch, err := s.Channel(m.ChannelID)
 	if err != nil {
 		return err
 	}
 
-	ch, err := s.Channel(m.ChannelID)
+	gid := ch.GuildID
+	creator := m.Author.Username
+
+	member, err := s.GuildMember(gid, m.Author.ID)
 	if err != nil {
 		return err
 	}
 
-	gid := ch.GuildID
+	if member.Nick != "" {
+		creator = member.Nick
+	}
+
+	fname, err := genFname(creator)
+	if err != nil {
+		return err
+	}
 
 	_, ok := a.guildRecordings[gid]
 	if ok {
@@ -193,7 +203,7 @@ func (a *aura) djon(s *discordgo.Session, m *discordgo.Message, parv []string) e
 
 	a.guildRecordings[gid] = &rec{
 		Recording: rr,
-		creator:   m.Author.Username,
+		creator:   creator,
 	}
 
 	go func() {
@@ -216,7 +226,7 @@ func (a *aura) djon(s *discordgo.Session, m *discordgo.Message, parv []string) e
 
 	invurl := "http://discord.gg/" + inv.Code
 
-	err = announce("Live DJ on-air: " + m.Author.Username + "\nJoin our chat here: " + invurl)
+	err = announce("Live DJ on-air: " + creator + "\nJoin our chat here: " + invurl)
 	if err != nil {
 		log.Println(err)
 		return nil

cmd/aura/nonpvfm.go

@@ -1,5 +1,3 @@
-// +build pvfm
-
 package main
 
 import (
@@ -8,13 +6,12 @@ import (
 	"time"
 
 	"github.com/PonyvilleFM/aura/pvfm/pvl"
-	"github.com/bwmarrin/discordgo"
 	"github.com/dghubble/go-twitter/twitter"
 	"github.com/dghubble/oauth1"
 )
 
-func genFname(u *discordgo.User) (string, error) {
-	return fmt.Sprintf("%s - %s.mp3", u.Username, time.Now().Format(time.RFC822)), nil
+func genFname(username string) (string, error) {
+	return fmt.Sprintf("%s - %s.mp3", username, time.Now().Format(time.RFC822)), nil
 }
 
 var (