Skip to content

Commit

Permalink
1.0
Browse files Browse the repository at this point in the history
kelszo committed Nov 10, 2019
1 parent 6405751 commit c892c62
Showing 3 changed files with 38 additions and 9 deletions.
9 changes: 6 additions & 3 deletions commands/digitalungdom/status.go
Original file line number Diff line number Diff line change
@@ -63,13 +63,16 @@ var Status = pkg.Command{
boardStatus += fmt.Sprintf("**%v**: %v\n", name, status)
}
cur.Close(context.TODO())
if err := cur.Err(); err != nil {
return err
}

serverStatus := "**digitalungdom.se**: online\n"
serverStatus += "**dub**: online"

var memberStatus string
digitalungdomCount, err := ctx.Server.Database.Collection("users").CountDocuments(context.TODO(), bson.M{})
if err := cur.Err(); err != nil {
if err != nil {
return err
}

@@ -86,8 +89,8 @@ var Status = pkg.Command{
AddField("__**MEDLEMMAR**__", memberStatus).
MessageEmbed

ctx.ReplyEmbed(embed)
_, err = ctx.ReplyEmbed(embed)

return nil
return err
},
}
30 changes: 24 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ func messageHandler(discord *discordgo.Session, message *discordgo.MessageCreate
return
}

memberAdd := &discordgo.GuildMemberAdd{member}
memberAdd := &discordgo.GuildMemberAdd{Member: member}

guildMemberAddHandler(discord, memberAdd)
return
@@ -185,27 +185,32 @@ func messageHandler(discord *discordgo.Session, message *discordgo.MessageCreate

err = command.Execute(ctx)
if err != nil {
log.Print(fmt.Sprintf("Error exectuing: %v ", message.Content), err)
log.Print(fmt.Sprintf("Error executing: %v ", message.Content), err)
}
}

func guildMemberAddHandler(discord *discordgo.Session, member *discordgo.GuildMemberAdd) {
gifbuff, err := pkg.NameToGif(member.User.Username, member.User.AvatarURL("128"))
if err != nil {
log.Print("Error creating user gif:", err)
return
}
reader := bytes.NewReader((*gifbuff).Bytes())

_, err = discord.ChannelFileSendWithMessage(server.Channels.General.ID,
fmt.Sprintf("Välkommen till Digital Ungdoms Discord server <@%v>!", member.User.ID),
"welcome.gif",
reader)
if err != nil {
fmt.Print(err)
log.Print("Error sending welcome message:", err)
return
}

var privateDM *discordgo.Channel

privateDM, err = discord.UserChannelCreate(member.User.ID)
if err != nil {
log.Print("Error welcoming user")
log.Print("Error creating private channel:", err)
return
}

@@ -220,6 +225,10 @@ func guildMemberAddHandler(discord *discordgo.Session, member *discordgo.GuildMe
member.User.Username)

_, err = discord.ChannelMessageSend(privateDM.ID, content)
if err != nil {
log.Print("Error sending private welcome message:", err)
return
}
}

func addReactionHandler(discord *discordgo.Session, message *discordgo.MessageReactionAdd) {
@@ -238,7 +247,12 @@ func addReactionHandler(discord *discordgo.Session, message *discordgo.MessageRe
return
}

server.ReactionListener.React(message.MessageReaction)
err = server.ReactionListener.React(message.MessageReaction)

if err != nil {
log.Print("Error reacting to message:", err)
return
}
}

func removeReactionHandler(discord *discordgo.Session, message *discordgo.MessageReactionRemove) {
@@ -258,7 +272,11 @@ func removeReactionHandler(discord *discordgo.Session, message *discordgo.Messag
return
}

server.ReactionListener.React(message.MessageReaction)
err = server.ReactionListener.React(message.MessageReaction)
if err != nil {
log.Print("Error reacting to message:", err)
return
}
}

func registerCommands(commandHandler *pkg.CommandHandler) {
8 changes: 8 additions & 0 deletions pkg/reactionator.go
Original file line number Diff line number Diff line change
@@ -74,6 +74,10 @@ func (reactionListener *ReactionListener) React(message *discordgo.MessageReacti
err = errors.New("Invalid default message type")
}

if err != nil {
return err
}

err = reactionListener.discord.MessageReactionRemove(message.ChannelID, message.MessageID, message.Emoji.Name, message.UserID)

return err
@@ -141,6 +145,10 @@ func (reactionator *reactionator) Initiate() error {
return errors.New("Invalid default message type")
}

if err != nil {
return err
}

for _, value := range reactionator.reactionOrder {
reactionator.discord.MessageReactionAdd(reactionator.channelID, msg.ID, value)
}

0 comments on commit c892c62

Please sign in to comment.