Skip to content

Commit 05a1a53

Browse files
committed
cmd/aura: implicitly post to twitter, use server nickname in tweets
1 parent c23b47c commit 05a1a53

File tree

3 files changed

+17
-28
lines changed

3 files changed

+17
-28
lines changed

cmd/aura/aura.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,27 @@ func (a *aura) setup(s *discordgo.Session, m *discordgo.Message, parv []string)
162162
}
163163

164164
func (a *aura) djon(s *discordgo.Session, m *discordgo.Message, parv []string) error {
165-
fname, err := genFname(m.Author)
165+
ch, err := s.Channel(m.ChannelID)
166166
if err != nil {
167167
return err
168168
}
169169

170-
ch, err := s.Channel(m.ChannelID)
170+
gid := ch.GuildID
171+
creator := m.Author.Username
172+
173+
member, err := s.GuildMember(gid, m.Author.ID)
171174
if err != nil {
172175
return err
173176
}
174177

175-
gid := ch.GuildID
178+
if member.Nick != "" {
179+
creator = member.Nick
180+
}
181+
182+
fname, err := genFname(creator)
183+
if err != nil {
184+
return err
185+
}
176186

177187
_, ok := a.guildRecordings[gid]
178188
if ok {
@@ -189,7 +199,7 @@ func (a *aura) djon(s *discordgo.Session, m *discordgo.Message, parv []string) e
189199

190200
a.guildRecordings[gid] = &rec{
191201
Recording: rr,
192-
creator: m.Author.Username,
202+
creator: creator,
193203
}
194204

195205
go func() {
@@ -212,7 +222,7 @@ func (a *aura) djon(s *discordgo.Session, m *discordgo.Message, parv []string) e
212222

213223
invurl := "http://discord.gg/" + inv.Code
214224

215-
err = announce("Live DJ on-air: " + m.Author.Username + "\nJoin our chat here: " + invurl)
225+
err = announce("Live DJ on-air: " + creator + "\nJoin our chat here: " + invurl)
216226
if err != nil {
217227
log.Println(err)
218228
return nil

cmd/aura/nonpvfm.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmd/aura/pvfm.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// +build pvfm
2-
31
package main
42

53
import (
@@ -8,13 +6,12 @@ import (
86
"time"
97

108
"github.com/PonyvilleFM/aura/pvfm/pvl"
11-
"github.com/bwmarrin/discordgo"
129
"github.com/dghubble/go-twitter/twitter"
1310
"github.com/dghubble/oauth1"
1411
)
1512

16-
func genFname(u *discordgo.User) (string, error) {
17-
return fmt.Sprintf("%s - %s.mp3", u.Username, time.Now().Format(time.RFC822)), nil
13+
func genFname(username string) (string, error) {
14+
return fmt.Sprintf("%s - %s.mp3", username, time.Now().Format(time.RFC822)), nil
1815
}
1916

2017
var (

0 commit comments

Comments
 (0)