mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
Implement Cobra CLI tooling, Viper config tooling (#336)
* start pulling out + replacing urfave and config * replace many many instances of config * move more stuff => viper * properly remove urfave * move some flags to root command * add testrig commands to root * alias config file keys * start adding cli parsing tests * reorder viper init * remove config path alias * fmt * change config file keys to non-nested * we're more or less in business now * tidy up the common func * go fmt * get tests passing again * add note about the cliparsing tests * reorganize * update docs with changes * structure cmd dir better * rename + move some files around * fix dangling comma
This commit is contained in:
@@ -23,6 +23,7 @@ import (
|
||||
"html/template"
|
||||
"net/smtp"
|
||||
|
||||
"github.com/spf13/viper"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/config"
|
||||
)
|
||||
|
||||
@@ -36,18 +37,25 @@ type Sender interface {
|
||||
}
|
||||
|
||||
// NewSender returns a new email Sender interface with the given configuration, or an error if something goes wrong.
|
||||
func NewSender(cfg *config.Config) (Sender, error) {
|
||||
t, err := loadTemplates(cfg.TemplateConfig.BaseDir)
|
||||
func NewSender() (Sender, error) {
|
||||
keys := config.Keys
|
||||
|
||||
templateBaseDir := viper.GetString(keys.WebTemplateBaseDir)
|
||||
t, err := loadTemplates(templateBaseDir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
auth := smtp.PlainAuth("", cfg.SMTPConfig.Username, cfg.SMTPConfig.Password, cfg.SMTPConfig.Host)
|
||||
username := viper.GetString(keys.SMTPUsername)
|
||||
password := viper.GetString(keys.SMTPPassword)
|
||||
host := viper.GetString(keys.SMTPHost)
|
||||
port := viper.GetInt(keys.SMTPPort)
|
||||
from := viper.GetString(keys.SMTPFrom)
|
||||
|
||||
return &sender{
|
||||
hostAddress: fmt.Sprintf("%s:%d", cfg.SMTPConfig.Host, cfg.SMTPConfig.Port),
|
||||
from: cfg.SMTPConfig.From,
|
||||
auth: auth,
|
||||
hostAddress: fmt.Sprintf("%s:%d", host, port),
|
||||
from: from,
|
||||
auth: smtp.PlainAuth("", username, password, host),
|
||||
template: t,
|
||||
}, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user