Huge refactoring ._.

configuration/configuration.go

@@ -17,7 +17,7 @@ type Configuration struct {
 	InsecureTLS          bool     `yaml:"insecure_tls"`
 	CommandCharacter     string   `yaml:"command_character"`
 	Middlewares          []string `yaml:"middlewares"`
-	Plugins              []string `yaml:"plugins"`
+	Commands             []string `yaml:"commands"`
 	Admins               []string `yaml:"admins"`
 	GoogleAPIKey         string   `yaml:"google_api_key"`
 	YandexTrnslKey       string   `yaml:"yandex_trnsl_key"`
@@ -42,7 +42,7 @@ func Load() {
 	if err != nil {
 		log.Fatalf("Error parsing YAML :  %v", err)
 	}
-	sort.Strings(Config.Plugins)
+	sort.Strings(Config.Commands)
 	sort.Strings(Config.Middlewares)
 }
 

main.go

@@ -69,7 +69,7 @@ func main() {
 				splitted := strings.Fields(m[1:])
 				command := splitted[0]
 				args := splitted[1:]
-				if p, ok := plugins.Plugins[command]; ok {
+				if p, ok := plugins.Commands[command]; ok {
 					p.Get(ib, from, to, args)
 				}
 			}

plugins/afk/plugin.go → plugins/afk/command.go

@@ -11,30 +11,30 @@ import (
 )
 
 const (
-	pluginCommand = "afk"
+	command = "afk"
 )
 
-// Plugin is the plugin struct. It will be exposed as packagename.Plugin to keep the API stable and friendly.
-type Plugin struct {
+// Command is the plugin struct. It will be exposed as packagename.Plugin to keep the API stable and friendly.
+type Command struct {
 	Started bool
 }
 
 func init() {
-	plugins.Plugins[pluginCommand] = new(Plugin)
+	plugins.Commands[command] = new(Command)
 }
 
 // Help must send some help about what the command actually does and how to call it if there are any optional arguments.
-func (p *Plugin) Help(ib *irc.Connection, from string) {
-	if !p.Started {
+func (c *Command) Help(ib *irc.Connection, from string) {
+	if !c.Started {
 		return
 	}
 	ib.Privmsg(from, "Tell the world you're afk, for a reason. Or not.")
 	ib.Privmsg(from, "Example : !afk reason.")
 }
 
 // Get is the actual call to your plugin.
-func (p *Plugin) Get(ib *irc.Connection, from string, to string, args []string) {
-	if !p.Started {
+func (c *Command) Get(ib *irc.Connection, from string, to string, args []string) {
+	if !c.Started {
 		return
 	}
 	reason := ""
@@ -50,20 +50,20 @@ func (p *Plugin) Get(ib *irc.Connection, from string, to string, args []string)
 }
 
 // Start starts the plugin and returns any occured error, nil otherwise
-func (p *Plugin) Start() error {
-	if utils.StringInSlice(pluginCommand, configuration.Config.Plugins) {
-		p.Started = true
+func (c *Command) Start() error {
+	if utils.StringInSlice(command, configuration.Config.Commands) {
+		c.Started = true
 	}
 	return nil
 }
 
 // Stop stops the plugin and returns any occured error, nil otherwise
-func (p *Plugin) Stop() error {
-	p.Started = false
+func (c *Command) Stop() error {
+	c.Started = false
 	return nil
 }
 
 // IsStarted returns the state of the plugin
-func (p *Plugin) IsStarted() bool {
-	return p.Started
+func (c *Command) IsStarted() bool {
+	return c.Started
 }

plugins/anon/plugin.go → plugins/anon/command.go

@@ -10,30 +10,30 @@ import (
 )
 
 const (
-	pluginCommand = "anon"
+	command = "anon"
 )
 
-// Plugin is the anon plugin. Exposed as anon.Plugin.
-type Plugin struct {
+// Command is the anon plugin. Exposed as anon.Command.
+type Command struct {
 	Started bool
 }
 
 func init() {
-	plugins.Plugins[pluginCommand] = new(Plugin)
+	plugins.Commands[command] = new(Command)
 }
 
 // Help provides some help on the usage of the plugin.
-func (p *Plugin) Help(ib *irc.Connection, from string) {
-	if !p.Started {
+func (c *Command) Help(ib *irc.Connection, from string) {
+	if !c.Started {
 		return
 	}
 	ib.Privmsg(from, "Allows to send anonymous messages on the channel where the bot is connected.")
 	ib.Privmsgf(from, "Example : /msg %s !anon Hello everyone.", configuration.Config.BotName)
 }
 
 // Get actually sends the data to the channel.
-func (p *Plugin) Get(ib *irc.Connection, from string, to string, args []string) {
-	if !p.Started {
+func (c *Command) Get(ib *irc.Connection, from string, to string, args []string) {
+	if !c.Started {
 		return
 	}
 	if len(args) > 0 {
@@ -42,20 +42,20 @@ func (p *Plugin) Get(ib *irc.Connection, from string, to string, args []string)
 }
 
 // Start starts the plugin and returns any occured error, nil otherwise
-func (p *Plugin) Start() error {
-	if utils.StringInSlice(pluginCommand, configuration.Config.Plugins) {
-		p.Started = true
+func (c *Command) Start() error {
+	if utils.StringInSlice(command, configuration.Config.Commands) {
+		c.Started = true
 	}
 	return nil
 }
 
 // Stop stops the plugin and returns any occured error, nil otherwise
-func (p *Plugin) Stop() error {
-	p.Started = false
+func (c *Command) Stop() error {
+	c.Started = false
 	return nil
 }
 
 // IsStarted returns the state of the plugin
-func (p *Plugin) IsStarted() bool {
-	return p.Started
+func (c *Command) IsStarted() bool {
+	return c.Started
 }

plugins/choice/plugin.go → plugins/choice/command.go

@@ -10,29 +10,29 @@ import (
 )
 
 const (
-	pluginCommand = "choice"
+	command = "choice"
 )
 
 func init() {
-	plugins.Plugins[pluginCommand] = new(Plugin)
+	plugins.Commands[command] = new(Command)
 }
 
-// Plugin is the plugin struct. It will be exposed as packagename.Plugin to keep the API stable and friendly.
-type Plugin struct {
+// Command is the plugin struct. It will be exposed as packagename.Command to keep the API stable and friendly.
+type Command struct {
 	Started bool
 }
 
 // Help must send some help about what the command actually does and how to call it if there are any optional arguments.
-func (p *Plugin) Help(ib *irc.Connection, from string) {
-	if !p.Started {
+func (c *Command) Help(ib *irc.Connection, from string) {
+	if !c.Started {
 		return
 	}
 	ib.Privmsg(from, "Makes a choice for you. Example : !choice rhum whisky vodka beer")
 }
 
 // Get is the actual call to your plugin.
-func (p *Plugin) Get(ib *irc.Connection, from string, to string, args []string) {
-	if !p.Started {
+func (c *Command) Get(ib *irc.Connection, from string, to string, args []string) {
+	if !c.Started {
 		return
 	}
 	if to == configuration.Config.BotName {
@@ -49,20 +49,20 @@ func (p *Plugin) Get(ib *irc.Connection, from string, to string, args []string)
 }
 
 // Start starts the plugin and returns any occured error, nil otherwise
-func (p *Plugin) Start() error {
-	if utils.StringInSlice(pluginCommand, configuration.Config.Plugins) {
-		p.Started = true
+func (c *Command) Start() error {
+	if utils.StringInSlice(command, configuration.Config.Commands) {
+		c.Started = true
 	}
 	return nil
 }
 
 // Stop stops the plugin and returns any occured error, nil otherwise
-func (p *Plugin) Stop() error {
-	p.Started = false
+func (c *Command) Stop() error {
+	c.Started = false
 	return nil
 }
 
 // IsStarted returns the state of the plugin
-func (p *Plugin) IsStarted() bool {
-	return p.Started
+func (c *Command) IsStarted() bool {
+	return c.Started
 }