Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d345044b3a | ||
|
|
b3aff0828c | ||
|
|
3d4518f961 | ||
|
|
37e8fa52af | ||
|
|
a370c76ba4 | ||
|
|
2fe9de279d | ||
|
|
33776b1129 | ||
|
|
733cd87896 | ||
|
|
ebf20670df |
@@ -83,7 +83,9 @@ func main() {
|
||||
dg.AddHandler(guild_management.OnMessageUpdate)
|
||||
dg.AddHandler(guild_management.OnMessageDelete)
|
||||
dg.AddHandler(user_management.OnGuildMemberAddLogging)
|
||||
dg.AddHandler(user_management.OnGuildMemberAdd)
|
||||
dg.AddHandler(user_management.OnGuildMemberRemoveLogging)
|
||||
dg.AddHandler(user_management.OnGuildMemberRemove)
|
||||
|
||||
err = dg.Open()
|
||||
if err != nil {
|
||||
|
||||
@@ -32,7 +32,7 @@ func ParseDateString(inTime time.Time) string {
|
||||
} else {
|
||||
dateString = "Now"
|
||||
}
|
||||
stamp := inTime.Format("2006-01-02 15:04:05")
|
||||
stamp := inTime.Format("2006-01-02 15:04:05.000")
|
||||
return fmt.Sprintf("%v\n%v", dateString, stamp)
|
||||
}
|
||||
|
||||
|
||||
@@ -29,6 +29,9 @@ func OnMessageUpdate(session *discordgo.Session, m *discordgo.MessageUpdate) {
|
||||
log.Println(err)
|
||||
return
|
||||
}
|
||||
if m.Content == "" {
|
||||
return
|
||||
}
|
||||
embed := &discordgo.MessageEmbed{
|
||||
Title: fmt.Sprintf("Message Edited: %v", msg.ID),
|
||||
Description: fmt.Sprintf("**Before:** %v\n**After:** %v\nIn Channel: %v", msg.Content, m.Content, channel.Mention()),
|
||||
|
||||
@@ -27,6 +27,7 @@ func AddCommandHandlers(h *disgoman.CommandManager) {
|
||||
_ = h.AddCommand(utils.GitCommand)
|
||||
_ = h.AddCommand(utils.InviteCommand)
|
||||
_ = h.AddCommand(utils.PingCommand)
|
||||
_ = h.AddCommand(utils.SnowflakeCommand)
|
||||
_ = h.AddCommand(tasks.AddReminderCommand)
|
||||
_ = h.AddCommand(tags.AddTagCommand)
|
||||
_ = h.AddCommand(tags.TagCommand)
|
||||
|
||||
@@ -325,7 +325,7 @@ func makeAutoRoleCommandFunc(ctx disgoman.Context, args []string) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
_, _ = ctx.Send(fmt.Sprintf("%s will be added to all new memebers.", r.Name))
|
||||
}
|
||||
|
||||
var RemoveAutoRoleCommand = &disgoman.Command{
|
||||
@@ -385,5 +385,5 @@ func removeAutoRoleCommandFunc(ctx disgoman.Context, args []string) {
|
||||
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())
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return nil
|
||||
}
|
||||
var tasks []Task
|
||||
for res.Next() {
|
||||
|
||||
@@ -45,6 +45,7 @@ func OnGuildMemberAdd(s *discordgo.Session, member *discordgo.GuildMemberAdd) {
|
||||
if err != nil {
|
||||
log.Println("Error getting Auto Join Roles: ", err)
|
||||
}
|
||||
log.Println(roles)
|
||||
for _, r := range roles {
|
||||
role, err := s.State.Role(member.GuildID, r.ID)
|
||||
if err != nil {
|
||||
|
||||
@@ -218,3 +218,32 @@ func userCommandFunc(ctx disgoman.Context, args []string) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var SnowflakeCommand = &disgoman.Command{
|
||||
Name: "s",
|
||||
Aliases: nil,
|
||||
Description: "Return the parts of a snowflake",
|
||||
OwnerOnly: false,
|
||||
Hidden: false,
|
||||
RequiredPermissions: 0,
|
||||
SanitizeEveryone: true,
|
||||
Invoke: snowflakeCommandFunc,
|
||||
}
|
||||
|
||||
func snowflakeCommandFunc(ctx disgoman.Context, args []string) {
|
||||
int64ID, err := strconv.ParseInt(args[0], 10, 64)
|
||||
if err != nil {
|
||||
ctx.CommandManager.ErrorChannel <- disgoman.CommandError{
|
||||
Context: ctx,
|
||||
Message: "Not a valid ID",
|
||||
Error: err,
|
||||
}
|
||||
return
|
||||
}
|
||||
s := discord_utils.ParseSnowflake(int64ID)
|
||||
embed := &discordgo.MessageEmbed{
|
||||
Title: args[0],
|
||||
Description: fmt.Sprintf("Created: %s\nWorker: %d\nProcess: %d\nCounter: %d", discord_utils.ParseDateString(s.CreationTime), s.WorkerID, s.ProcessID, s.Increment),
|
||||
}
|
||||
_, _ = ctx.Session.ChannelMessageSendEmbed(ctx.Channel.ID, embed)
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ func (s *RoleService) Role(id string) (*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`
|
||||
_, err := s.DB.Exec(queryString, r.ID, r.IsModerator, r.IsAdmin, r.SelfAssignable, r.AutoRole, r.Guild)
|
||||
if err != nil {
|
||||
@@ -63,7 +63,7 @@ func (s *RoleService) RemoveAutoRole(r *goff.Role) error {
|
||||
|
||||
func (s *RoleService) GetAutoRoles(gID string) ([]*goff.Role, error) {
|
||||
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)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user