diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-07-19 09:47:55 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-07-19 10:47:55 +0200 |
| commit | 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 (patch) | |
| tree | 17036ad9db68c3080e1e91279c8bce9f9ea6e5c3 /internal/email | |
| parent | [bugfix] Markdown format fixes (#718) (diff) | |
| download | gotosocial-098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3.tar.xz | |
[chore] use our own logging implementation (#716)
* first commit
Signed-off-by: kim <grufwub@gmail.com>
* replace logging with our own log library
Signed-off-by: kim <grufwub@gmail.com>
* fix imports
Signed-off-by: kim <grufwub@gmail.com>
* fix log imports
Signed-off-by: kim <grufwub@gmail.com>
* add license text
Signed-off-by: kim <grufwub@gmail.com>
* fix package import cycle between config and log package
Signed-off-by: kim <grufwub@gmail.com>
* fix empty kv.Fields{} being passed to WithFields()
Signed-off-by: kim <grufwub@gmail.com>
* fix uses of log.WithFields() with whitespace issues and empty slices
Signed-off-by: kim <grufwub@gmail.com>
* *linter related grumbling*
Signed-off-by: kim <grufwub@gmail.com>
* gofmt the codebase! also fix more log.WithFields() formatting issues
Signed-off-by: kim <grufwub@gmail.com>
* update testrig code to match new changes
Signed-off-by: kim <grufwub@gmail.com>
* fix error wrapping in non fmt.Errorf function
Signed-off-by: kim <grufwub@gmail.com>
* add benchmarking of log.Caller() vs non-cached
Signed-off-by: kim <grufwub@gmail.com>
* fix syslog tests, add standard build tags to test runner to ensure consistency
Signed-off-by: kim <grufwub@gmail.com>
* make syslog tests more robust
Signed-off-by: kim <grufwub@gmail.com>
* fix caller depth arithmatic (is that how you spell it?)
Signed-off-by: kim <grufwub@gmail.com>
* update to use unkeyed fields in kv.Field{} instances
Signed-off-by: kim <grufwub@gmail.com>
* update go-kv library
Signed-off-by: kim <grufwub@gmail.com>
* update libraries list
Signed-off-by: kim <grufwub@gmail.com>
* fuck you linter get nerfed
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/email')
| -rw-r--r-- | internal/email/confirm.go | 4 | ||||
| -rw-r--r-- | internal/email/noopsender.go | 6 | ||||
| -rw-r--r-- | internal/email/util.go | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/internal/email/confirm.go b/internal/email/confirm.go index b49004056..7cc32f330 100644 --- a/internal/email/confirm.go +++ b/internal/email/confirm.go @@ -22,8 +22,8 @@ import ( "bytes" "net/smtp" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/log" ) const ( @@ -42,7 +42,7 @@ func (s *sender) SendConfirmEmail(toAddress string, data ConfirmData) error { if err != nil { return err } - logrus.WithField("func", "SendConfirmEmail").Trace(s.hostAddress + "\n" + config.GetSMTPUsername() + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n") + log.Trace(s.hostAddress + "\n" + config.GetSMTPUsername() + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n") return smtp.SendMail(s.hostAddress, s.auth, s.from, []string{toAddress}, msg) } diff --git a/internal/email/noopsender.go b/internal/email/noopsender.go index 9aab1ca41..4f4aa2014 100644 --- a/internal/email/noopsender.go +++ b/internal/email/noopsender.go @@ -22,8 +22,8 @@ import ( "bytes" "text/template" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/log" ) // NewNoopSender returns a no-op email sender that will just execute the given sendCallback @@ -61,7 +61,7 @@ func (s *noopSender) SendConfirmEmail(toAddress string, data ConfirmData) error return err } - logrus.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg) + log.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg) if s.sendCallback != nil { s.sendCallback(toAddress, string(msg)) @@ -81,7 +81,7 @@ func (s *noopSender) SendResetEmail(toAddress string, data ResetData) error { return err } - logrus.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg) + log.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg) if s.sendCallback != nil { s.sendCallback(toAddress, string(msg)) diff --git a/internal/email/util.go b/internal/email/util.go index c543db755..80534d6ae 100644 --- a/internal/email/util.go +++ b/internal/email/util.go @@ -45,7 +45,6 @@ func loadTemplates(templateBaseDir string) (*template.Template, error) { // https://pkg.go.dev/net/smtp#SendMail // and it did seem to work. func assembleMessage(mailSubject string, mailBody string, mailTo string, mailFrom string) ([]byte, error) { - if strings.Contains(mailSubject, "\r") || strings.Contains(mailSubject, "\n") { return nil, errors.New("email subject must not contain newline characters") } |