From e2feb1341b954efe1037b7b0da37319b86bbf994 Mon Sep 17 00:00:00 2001 From: Prim69 <13991048+Prim69@users.noreply.github.com> Date: Sat, 21 Aug 2021 15:20:12 -0400 Subject: [PATCH] naming stuff --- .gitignore | 3 ++- {Commands => commands}/BotCommands.go | 6 +++--- {Commands => commands}/FunCommands.go | 0 {Commands => commands}/GeneralCommands.go | 0 {Commands => commands}/MusicCommands.go | 0 {Commands => commands}/ServerCommands.go | 0 {Commands => commands}/SnipeCommand.go | 0 {Commands => commands}/UserCommands.go | 0 {Commands => commands}/UtilityCommands.go | 0 {Commands => commands}/commands.go | 0 go.mod | 4 ++-- {SpeedyCmds => lib/SpeedyCmds}/Handler.go | 0 {SpeedyCmds => lib/SpeedyCmds}/command/Command.go | 0 .../SpeedyCmds}/command/commandGroup/group.go | 0 .../SpeedyCmds}/command/commandMap/CommandMap.go | 0 {SpeedyCmds => lib/SpeedyCmds}/command/ctx/Ctx.go | 0 {SpeedyCmds => lib/SpeedyCmds}/go.mod | 0 {SpeedyCmds => lib/SpeedyCmds}/go.sum | 0 {SpeedyCmds => lib/SpeedyCmds}/utils/Maps.go | 0 {SpeedyCmds => lib/SpeedyCmds}/utils/Strings.go | 0 main.go | 6 +++--- {Utils => utils}/Config.go | 2 +- {Utils => utils}/Constants.go | 5 +++-- 23 files changed, 14 insertions(+), 12 deletions(-) rename {Commands => commands}/BotCommands.go (88%) rename {Commands => commands}/FunCommands.go (100%) rename {Commands => commands}/GeneralCommands.go (100%) rename {Commands => commands}/MusicCommands.go (100%) rename {Commands => commands}/ServerCommands.go (100%) rename {Commands => commands}/SnipeCommand.go (100%) rename {Commands => commands}/UserCommands.go (100%) rename {Commands => commands}/UtilityCommands.go (100%) rename {Commands => commands}/commands.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/Handler.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/command/Command.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/command/commandGroup/group.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/command/commandMap/CommandMap.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/command/ctx/Ctx.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/go.mod (100%) rename {SpeedyCmds => lib/SpeedyCmds}/go.sum (100%) rename {SpeedyCmds => lib/SpeedyCmds}/utils/Maps.go (100%) rename {SpeedyCmds => lib/SpeedyCmds}/utils/Strings.go (100%) rename {Utils => utils}/Config.go (96%) rename {Utils => utils}/Constants.go (52%) diff --git a/.gitignore b/.gitignore index ea7141a..b5f538b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -token.tok \ No newline at end of file +token.tok +.idea \ No newline at end of file diff --git a/Commands/BotCommands.go b/commands/BotCommands.go similarity index 88% rename from Commands/BotCommands.go rename to commands/BotCommands.go index 2fb5c7e..8e5f7e0 100644 --- a/Commands/BotCommands.go +++ b/commands/BotCommands.go @@ -1,9 +1,9 @@ package commands import ( - "FBI/Utils" "github.com/Jviguy/SpeedyCmds/command/ctx" "github.com/bwmarrin/discordgo" + "github.com/prim69/fbi-bot/utils" "math" "strconv" "time" @@ -61,7 +61,7 @@ func StatsCommand(ctx ctx.Ctx, session *discordgo.Session) error { _, _ = SendEmbed(ctx, session, discordgo.MessageEmbed{ Color: 0xF0BBCE, Author: &discordgo.MessageEmbedAuthor{ - URL: Utils.DiscordLink, + URL: utils.DiscordLink, Name: "Bot Information", IconURL: "https://media.discordapp.net/attachments/814542881594671155/858957822918524978/unknown.png?width=458&height=473", }, @@ -76,7 +76,7 @@ func StatsCommand(ctx ctx.Ctx, session *discordgo.Session) error { }, { Name: "About", - Value: session.State.User.Username + " is coded by **" + Utils.Author + "** in the Go programming language.", + Value: session.State.User.Username + " is coded by **" + utils.Author + "** in the Go programming language.\n" + "This bot is open source, the source code can be found at " + utils.GithubLink, }, }, }) diff --git a/Commands/FunCommands.go b/commands/FunCommands.go similarity index 100% rename from Commands/FunCommands.go rename to commands/FunCommands.go diff --git a/Commands/GeneralCommands.go b/commands/GeneralCommands.go similarity index 100% rename from Commands/GeneralCommands.go rename to commands/GeneralCommands.go diff --git a/Commands/MusicCommands.go b/commands/MusicCommands.go similarity index 100% rename from Commands/MusicCommands.go rename to commands/MusicCommands.go diff --git a/Commands/ServerCommands.go b/commands/ServerCommands.go similarity index 100% rename from Commands/ServerCommands.go rename to commands/ServerCommands.go diff --git a/Commands/SnipeCommand.go b/commands/SnipeCommand.go similarity index 100% rename from Commands/SnipeCommand.go rename to commands/SnipeCommand.go diff --git a/Commands/UserCommands.go b/commands/UserCommands.go similarity index 100% rename from Commands/UserCommands.go rename to commands/UserCommands.go diff --git a/Commands/UtilityCommands.go b/commands/UtilityCommands.go similarity index 100% rename from Commands/UtilityCommands.go rename to commands/UtilityCommands.go diff --git a/Commands/commands.go b/commands/commands.go similarity index 100% rename from Commands/commands.go rename to commands/commands.go diff --git a/go.mod b/go.mod index 8eece88..d4b7149 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module FBI +module github.com/prim69/fbi-bot go 1.16 @@ -7,4 +7,4 @@ require ( github.com/bwmarrin/discordgo v0.23.2 // indirect ) -replace github.com/Jviguy/SpeedyCmds => ./SpeedyCmds \ No newline at end of file +replace github.com/Jviguy/SpeedyCmds => ./lib/SpeedyCmds \ No newline at end of file diff --git a/SpeedyCmds/Handler.go b/lib/SpeedyCmds/Handler.go similarity index 100% rename from SpeedyCmds/Handler.go rename to lib/SpeedyCmds/Handler.go diff --git a/SpeedyCmds/command/Command.go b/lib/SpeedyCmds/command/Command.go similarity index 100% rename from SpeedyCmds/command/Command.go rename to lib/SpeedyCmds/command/Command.go diff --git a/SpeedyCmds/command/commandGroup/group.go b/lib/SpeedyCmds/command/commandGroup/group.go similarity index 100% rename from SpeedyCmds/command/commandGroup/group.go rename to lib/SpeedyCmds/command/commandGroup/group.go diff --git a/SpeedyCmds/command/commandMap/CommandMap.go b/lib/SpeedyCmds/command/commandMap/CommandMap.go similarity index 100% rename from SpeedyCmds/command/commandMap/CommandMap.go rename to lib/SpeedyCmds/command/commandMap/CommandMap.go diff --git a/SpeedyCmds/command/ctx/Ctx.go b/lib/SpeedyCmds/command/ctx/Ctx.go similarity index 100% rename from SpeedyCmds/command/ctx/Ctx.go rename to lib/SpeedyCmds/command/ctx/Ctx.go diff --git a/SpeedyCmds/go.mod b/lib/SpeedyCmds/go.mod similarity index 100% rename from SpeedyCmds/go.mod rename to lib/SpeedyCmds/go.mod diff --git a/SpeedyCmds/go.sum b/lib/SpeedyCmds/go.sum similarity index 100% rename from SpeedyCmds/go.sum rename to lib/SpeedyCmds/go.sum diff --git a/SpeedyCmds/utils/Maps.go b/lib/SpeedyCmds/utils/Maps.go similarity index 100% rename from SpeedyCmds/utils/Maps.go rename to lib/SpeedyCmds/utils/Maps.go diff --git a/SpeedyCmds/utils/Strings.go b/lib/SpeedyCmds/utils/Strings.go similarity index 100% rename from SpeedyCmds/utils/Strings.go rename to lib/SpeedyCmds/utils/Strings.go diff --git a/main.go b/main.go index 4be67b9..7ffb279 100644 --- a/main.go +++ b/main.go @@ -1,14 +1,14 @@ package main import ( - "FBI/Utils" - "FBI/commands" "fmt" "github.com/bwmarrin/discordgo" + "github.com/prim69/fbi-bot/commands" + "github.com/prim69/fbi-bot/utils" ) func main(){ - dg, err := discordgo.New("Bot " + Utils.ReadToken()) + dg, err := discordgo.New("Bot " + utils.ReadToken()) if err != nil { panic(err) diff --git a/Utils/Config.go b/utils/Config.go similarity index 96% rename from Utils/Config.go rename to utils/Config.go index 6eb89f2..46b83ab 100644 --- a/Utils/Config.go +++ b/utils/Config.go @@ -1,4 +1,4 @@ -package Utils +package utils import ( "bufio" diff --git a/Utils/Constants.go b/utils/Constants.go similarity index 52% rename from Utils/Constants.go rename to utils/Constants.go index 9665c8b..11e1250 100644 --- a/Utils/Constants.go +++ b/utils/Constants.go @@ -1,6 +1,7 @@ -package Utils +package utils const ( DiscordLink = "https://discord.gg/sexmc" + GithubLink = "https://github.com/Prim69/FBI-Bot" Author = "prim#0419" -) +) \ No newline at end of file