Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sendmail command #13079

Merged
merged 25 commits into from
Oct 24, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
016b35b
Add SendSync method
zhiburt Oct 8, 2020
538d0db
Add sendmail command
zhiburt Oct 8, 2020
8ecbcc7
add checks that if either title or content is empty then error out
zhiburt Oct 9, 2020
5c0524a
Add a confirmation step
zhiburt Oct 9, 2020
2abad3e
Add --force option to bypass confirm step
zhiburt Oct 9, 2020
9c98e13
Move implementation of runSendMail to a different file
zhiburt Oct 9, 2020
a750b18
Add copyrighting comment
zhiburt Oct 9, 2020
3cb7d18
Make content optional
zhiburt Oct 12, 2020
d3723b5
Fix import style
zhiburt Oct 12, 2020
087129c
Merge branch 'master' of https://github.com/go-gitea/gitea into sendm…
zhiburt Oct 15, 2020
2ed24b5
Use batch when getting all users
zhiburt Oct 15, 2020
6f4b38d
Merge branch 'sendmail_command' of github.com:zhiburt/gitea into send…
zhiburt Oct 15, 2020
59a1bee
Send emails one by one instead of as one chunck
zhiburt Oct 16, 2020
f5a108d
Send messages concurantly
zhiburt Oct 16, 2020
5b5f8c5
Use SendAsync+Flush instead of SendSync
zhiburt Oct 19, 2020
042c259
Add timeout parameter to sendemail command
zhiburt Oct 19, 2020
a25d8be
Fix spelling mistake
zhiburt Oct 19, 2020
b350eea
Update cmd/admin.go
zhiburt Oct 23, 2020
3d5b393
Connect to a running Gitea instance
zhiburt Oct 23, 2020
cee82ff
Merge branch 'sendmail_command' of github.com:zhiburt/gitea into send…
zhiburt Oct 23, 2020
6968eb9
Fix mispelling
zhiburt Oct 23, 2020
af3cff6
Add copyright comment
zhiburt Oct 23, 2020
b959bf1
Merge branch 'master' into sendmail_command
lunny Oct 24, 2020
1b9f0ee
Merge branch 'master' into sendmail_command
techknowlogick Oct 24, 2020
490fa03
Merge branch 'master' into sendmail_command
techknowlogick Oct 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions cmd/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
pwd "code.gitea.io/gitea/modules/password"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/mailer"

"github.com/urfave/cli"
)
Expand All @@ -35,6 +36,7 @@ var (
subcmdRepoSyncReleases,
subcmdRegenerate,
subcmdAuth,
subcmdSendMail,
},
}

Expand Down Expand Up @@ -253,6 +255,24 @@ var (
Action: runAddOauth,
Flags: oauthCLIFlags,
}

subcmdSendMail = cli.Command{
Name: "sendmail",
Usage: "Send a message to all users",
Action: runSendMail,
Flags: []cli.Flag{
cli.StringFlag{
Name: "title",
Usage: `a title of a message`,
Value: "",
},
cli.StringFlag{
Name: "content",
Usage: "a content of a message",
Value: "",
},
},
}
)

func runChangePassword(c *cli.Context) error {
Expand Down Expand Up @@ -606,3 +626,43 @@ func runDeleteAuth(c *cli.Context) error {

return models.DeleteSource(source)
}

func runSendMail(c *cli.Context) error {
if !c.IsSet("title") {
return errors.New("--title flag is missing")
}

if !c.IsSet("content") {
return errors.New("--content flag is missing")
}

subject := c.String("title")
body := c.String("content")

if err := initDB(); err != nil {
return err
}

users, _, err := models.SearchUsers(&models.SearchUserOptions{
zhiburt marked this conversation as resolved.
Show resolved Hide resolved
Type: models.UserTypeIndividual,
OrderBy: models.SearchOrderByAlphabetically,
ListOptions: models.ListOptions{},
})
if err != nil {
return errors.New("Cann't find users")
}

var emails []string
for _, user := range users {
emails = append(emails, user.Email)
}

mailer.NewContext()
msg := mailer.NewMessage(emails, subject, body)
err = mailer.SendSync(msg)
if err != nil {
return err
}

return nil
}
6 changes: 6 additions & 0 deletions services/mailer/mailer.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,12 @@ func NewContext() {
go graceful.GetManager().RunWithShutdownFns(mailQueue.Run)
}

// SendSync uses default sender to send a message with blocking
func SendSync(msg *Message) error {
gomailMsg := msg.ToMessage()
return gomail.Send(Sender, gomailMsg)
}

// SendAsync send mail asynchronously
func SendAsync(msg *Message) {
go func() {
Expand Down