Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4895294969 | ||
|
|
9d0d1ddd56 |
@@ -113,8 +113,8 @@ func (s guildService) GetOrCreateGuild(id string) (geeksbot.Guild, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s guildService) CreateOrUpdateRole(r geeksbot.Role) (geeksbot.Role, error) {
|
func (s guildService) CreateOrUpdateRole(r geeksbot.Role) (geeksbot.Role, error) {
|
||||||
role, err := s.Role(r.ID)
|
role, err := s.CreateRole(r)
|
||||||
if err.Error() == `pq: duplicate key value violates unique constraint "roles_pkey"` {
|
if err != nil && err.Error() == `pq: duplicate key value violates unique constraint "roles_pkey"` {
|
||||||
role, err = s.UpdateRole(r)
|
role, err = s.UpdateRole(r)
|
||||||
}
|
}
|
||||||
return role, err
|
return role, err
|
||||||
|
|||||||
@@ -37,6 +37,9 @@ func addModeratorRoleCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
if _, ok := added[id]; ok {
|
if _, ok := added[id]; ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
|
||||||
|
_, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id))
|
||||||
|
}
|
||||||
_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
|
_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
|
||||||
ID: id,
|
ID: id,
|
||||||
RoleType: "moderator",
|
RoleType: "moderator",
|
||||||
@@ -83,6 +86,9 @@ func addAdminRoleCommandFunc(ctx disgoman.Context, args []string) {
|
|||||||
if _, ok := added[id]; ok {
|
if _, ok := added[id]; ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
|
||||||
|
_, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id))
|
||||||
|
}
|
||||||
_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
|
_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
|
||||||
ID: id,
|
ID: id,
|
||||||
RoleType: "admin",
|
RoleType: "admin",
|
||||||
|
|||||||
Reference in New Issue
Block a user