Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37e8fa52af | ||
|
|
a370c76ba4 | ||
|
|
2fe9de279d | ||
|
|
33776b1129 | ||
|
|
733cd87896 | ||
|
|
ebf20670df | ||
|
|
14c5705473 |
@@ -83,7 +83,9 @@ func main() {
|
|||||||
dg.AddHandler(guild_management.OnMessageUpdate)
|
dg.AddHandler(guild_management.OnMessageUpdate)
|
||||||
dg.AddHandler(guild_management.OnMessageDelete)
|
dg.AddHandler(guild_management.OnMessageDelete)
|
||||||
dg.AddHandler(user_management.OnGuildMemberAddLogging)
|
dg.AddHandler(user_management.OnGuildMemberAddLogging)
|
||||||
|
dg.AddHandler(user_management.OnGuildMemberAdd)
|
||||||
dg.AddHandler(user_management.OnGuildMemberRemoveLogging)
|
dg.AddHandler(user_management.OnGuildMemberRemoveLogging)
|
||||||
|
dg.AddHandler(user_management.OnGuildMemberRemove)
|
||||||
|
|
||||||
err = dg.Open()
|
err = dg.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ func AddCommandHandlers(h *disgoman.CommandManager) {
|
|||||||
_ = h.AddCommand(roles.RemoveSelfAssignableCommand)
|
_ = h.AddCommand(roles.RemoveSelfAssignableCommand)
|
||||||
_ = h.AddCommand(roles.SelfAssignRoleCommand)
|
_ = h.AddCommand(roles.SelfAssignRoleCommand)
|
||||||
_ = h.AddCommand(roles.UnAssignRoleCommand)
|
_ = h.AddCommand(roles.UnAssignRoleCommand)
|
||||||
|
_ = h.AddCommand(roles.MakeAutoRoleCommand)
|
||||||
|
_ = h.AddCommand(roles.RemoveAutoRoleCommand)
|
||||||
_ = h.AddCommand(p_interpreter.PCommand)
|
_ = h.AddCommand(p_interpreter.PCommand)
|
||||||
_ = h.AddCommand(fun.InterleaveCommand)
|
_ = h.AddCommand(fun.InterleaveCommand)
|
||||||
_ = h.AddCommand(fun.DeinterleaveCommand)
|
_ = h.AddCommand(fun.DeinterleaveCommand)
|
||||||
|
|||||||
@@ -325,7 +325,7 @@ func makeAutoRoleCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_, _ = ctx.Send(fmt.Sprintf("%s will be added to all new memebers.", r.Name))
|
||||||
}
|
}
|
||||||
|
|
||||||
var RemoveAutoRoleCommand = &disgoman.Command{
|
var RemoveAutoRoleCommand = &disgoman.Command{
|
||||||
@@ -385,5 +385,5 @@ func removeAutoRoleCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_, _ = ctx.Send(fmt.Sprintf("%s will no longer be added to all new memebers.", r.Name))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ func getTasksToRun() []Task {
|
|||||||
res, err := postgres.DB.Query(query, time.Now())
|
res, err := postgres.DB.Query(query, time.Now())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
var tasks []Task
|
var tasks []Task
|
||||||
for res.Next() {
|
for res.Next() {
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ func OnGuildMemberAdd(s *discordgo.Session, member *discordgo.GuildMemberAdd) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("Error getting Auto Join Roles: ", err)
|
log.Println("Error getting Auto Join Roles: ", err)
|
||||||
}
|
}
|
||||||
|
log.Println(roles)
|
||||||
for _, r := range roles {
|
for _, r := range roles {
|
||||||
role, err := s.State.Role(member.GuildID, r.ID)
|
role, err := s.State.Role(member.GuildID, r.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ func (s *RoleService) Role(id string) (*goff.Role, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *RoleService) AddRole(r *goff.Role) (*goff.Role, error) {
|
func (s *RoleService) AddRole(r *goff.Role) (*goff.Role, error) {
|
||||||
queryString := `INSERT INTO roles (id, moderator, admin, self_assignable, auto_role, guild)
|
queryString := `INSERT INTO roles (id, moderator, admin, self_assignable, auto_role, guild_id)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT DO NOTHING`
|
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT DO NOTHING`
|
||||||
_, err := s.DB.Exec(queryString, r.ID, r.IsModerator, r.IsAdmin, r.SelfAssignable, r.AutoRole, r.Guild)
|
_, err := s.DB.Exec(queryString, r.ID, r.IsModerator, r.IsAdmin, r.SelfAssignable, r.AutoRole, r.Guild)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -63,7 +63,7 @@ func (s *RoleService) RemoveAutoRole(r *goff.Role) error {
|
|||||||
|
|
||||||
func (s *RoleService) GetAutoRoles(gID string) ([]*goff.Role, error) {
|
func (s *RoleService) GetAutoRoles(gID string) ([]*goff.Role, error) {
|
||||||
var roles []*goff.Role
|
var roles []*goff.Role
|
||||||
queryString := `SELECT id FROM roles WHERE guild_id = $1`
|
queryString := `SELECT id FROM roles WHERE guild_id = $1 AND auto_role = true`
|
||||||
rows, err := s.DB.Query(queryString, gID)
|
rows, err := s.DB.Query(queryString, gID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
Reference in New Issue
Block a user