diff --git a/.dockerignore b/.dockerignore index 15f3f7e..f279409 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,3 @@ -/go/inliner /Dockerfile /vendor /.git -/test* diff --git a/.gitignore b/.gitignore index 5c5cbaf..ea4fca0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -/bin/inliner -/go/inliner /vendor /.php-cs-fixer.cache /test* diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..54f9ea4 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,4 @@ +# Contributors + +- [deblan](https://gitnet.fr/deblan) +- smainz diff --git a/DOCS.md b/DOCS.md index dcb48d3..fc61b3c 100644 --- a/DOCS.md +++ b/DOCS.md @@ -11,19 +11,18 @@ url: https://gitnet.fr/deblan/woodpecker-email ## Settings - | Settings Name | Required | Type | Description | Documentation | - | --------------- | -------- | ------------------ | ------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | - | dsn | yes | `string` | Mail transport configuration | [Documentation](https://symfony.com/doc/current/mailer.html#tls-peer-verification) | - | from.address | yes | `string` | Email address of the sender | | - | from.name | no | `string` | Name of the sender | | - | recipients | no | `string` or `list` | List of recipients to send this mail to (besides the commit author) | YAML list or comma separated list | - | recipients_only | no | `boolean` | Exclude the committer (default: `false`) | | - | content.subject | no | `string` | Define the email subject template | | - | content.body | no | `string` | Define the email body template | | - | attachments | no | `string` or `list` | List of files to attach | YAML list or comma separated list | - | debug | no | `boolean` | Debug mode (email are sent!, default: `false`) | | - | level | no | `string` | Define the level of the mail (default: `info`, values: `info`, `success`, `warning`, `failure`) | | - | inline | no | `bool` | Inline CSS (default: `false`) | | + | Settings Name | Required | Type | Description | Documentation | + | --------------- | -------- | ------------------ | ------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | + | dsn | yes | `string` | Mail transport configuration | [Documentation](https://symfony.com/doc/current/mailer.html#tls-peer-verification) | + | from.address | yes | `string` | Email address of the sender | | + | from.name | no | `string` | Name of the sender | | + | recipients | no | `string` or `list` | List of recipients to send this mail to (besides the commit author) | YAML list or comma separated list | + | recipients_only | no | `boolean` | Exclude the committer (default: `false`) | | + | content.subject | no | `string` | Define the email subject template | | + | content.body | no | `string` | Define the email body template | | + | attachments | no | `string` or `list` | List of files to attach | YAML list or comma separated list | + | debug | no | `boolean` | Debug mode (email are sent!, default: `false`) | | + | level | no | `string` | Define the level of the mail (default: `info`, values: `info`, `success`, `warning`, `failure`) | | ### Examples diff --git a/Dockerfile b/Dockerfile index 242346d..d57df44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,8 @@ -FROM golang:1.24 as builder - -WORKDIR /app - -COPY ./go /app - -RUN go mod download && CGO_ENABLED=0 go build -v -o inliner - FROM deblan/php:8.3 WORKDIR /opt/app COPY . . -COPY --from=builder /app/inliner go/ RUN composer install diff --git a/bin/console b/bin/console index 9c9e2c0..ae6914e 100755 --- a/bin/console +++ b/bin/console @@ -89,11 +89,9 @@ $config = EnvVarLoader::buildArray([ 'content' => 'PLUGIN_CONTENT', 'level' => 'PLUGIN_LEVEL', 'is_debug' => 'PLUGIN_DEBUG', - 'is_inline' => 'PLUGIN_INLINE', ], [ 'PLUGIN_RECIPIENTS_ONLY' => false, 'PLUGIN_DEBUG' => false, - 'PLUGIN_INLINE' => false, ]); function writeln(...$values) diff --git a/composer.json b/composer.json index ab55008..636f15f 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "symfony/mailer": "^7.0", "twig/twig": "^3.8", "symfony/google-mailer": "^7.1", - "symfony/process": "^7.2" + "twig/extra-bundle": "^3.20", + "twig/cssinliner-extra": "^3.20" } } diff --git a/go/go.mod b/go/go.mod deleted file mode 100644 index 4d1f0af..0000000 --- a/go/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module gitnet.fr/deblan/woodpecker-email - -go 1.23.0 - -require ( - github.com/PuerkitoBio/goquery v1.10.2 // indirect - github.com/andybalholm/cascadia v1.3.3 // indirect - github.com/aymerick/douceur v0.2.0 // indirect - github.com/gorilla/css v1.0.1 // indirect - golang.org/x/net v0.35.0 // indirect -) diff --git a/go/go.sum b/go/go.sum deleted file mode 100644 index c61d7b4..0000000 --- a/go/go.sum +++ /dev/null @@ -1,75 +0,0 @@ -github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8= -github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU= -github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= -github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= -github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= -github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= -github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= -golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/go/main.go b/go/main.go deleted file mode 100644 index 1f70b39..0000000 --- a/go/main.go +++ /dev/null @@ -1,63 +0,0 @@ -package main - -import ( - "flag" - "fmt" - "io/ioutil" - "os" - - "github.com/aymerick/douceur/inliner" -) - -const ( - // Version is package version - Version = "0.2.0" -) - -var ( - flagVersion bool -) - -func init() { - flag.BoolVar(&flagVersion, "version", false, "Display version") -} - -func main() { - flag.Parse() - - if flagVersion { - fmt.Println(Version) - os.Exit(0) - } - - args := flag.Args() - - if len(args) == 0 { - fmt.Println("No file") - os.Exit(1) - } - - inlineCSS(args[0]) -} - -func inlineCSS(filePath string) { - input := readFile(filePath) - - output, err := inliner.Inline(string(input)) - if err != nil { - fmt.Println("Inlining error: ", err) - os.Exit(1) - } - - fmt.Println(output) -} - -func readFile(filePath string) []byte { - file, err := ioutil.ReadFile(filePath) - if err != nil { - fmt.Println("Failed to open file: ", filePath, err) - os.Exit(1) - } - - return file -} diff --git a/src/Factory/EmailFactory.php b/src/Factory/EmailFactory.php index ae73ffa..6e199e8 100644 --- a/src/Factory/EmailFactory.php +++ b/src/Factory/EmailFactory.php @@ -9,8 +9,6 @@ use Symfony\Component\Mime\Email; use Symfony\Component\Mime\Part\DataPart; use Symfony\Component\Mime\Part\File; use Twig\Environment; -use Symfony\Component\Process\Process; -use Symfony\Component\Process\Exception\ProcessFailedException; class EmailFactory { @@ -72,41 +70,12 @@ class EmailFactory $email->addBcc($this->build['commit']['author_email']); } - $email->html($this->buildHtml( - $content['body'] ?? null, - $level - ));; + $email->html($this->twig->render('build_status.html.twig', [ + 'build' => $this->build, + 'level' => $level, + 'body' => $content['body'] ?? null, + ])); return $email; } - - protected function buildHtml(?string $body, string $level): string - { - $value = $this->twig->render('build_status.html.twig', [ - 'build' => $this->build, - 'level' => $level, - 'body' => $body, - ]); - - if ($this->config['is_inline']) { - $value = $this->doInline($value); - } - - return $value; - } - - protected function doInline(string $value): string - { - $file = '/tmp/mail.html'; - file_put_contents($file, $value); - - $process = new Process(['./bin/inliner', $file]); - $process->run(); - - if (!$process->isSuccessful()) { - throw new ProcessFailedException($process); - } - - return $process->getOutput(); - } } diff --git a/src/Factory/TwigFactory.php b/src/Factory/TwigFactory.php index 7d176b2..74b487b 100644 --- a/src/Factory/TwigFactory.php +++ b/src/Factory/TwigFactory.php @@ -5,6 +5,7 @@ namespace Plugin\Factory; use Twig\Environment; use Twig\Extension\DebugExtension; use Twig\Extension\StringLoaderExtension; +use Twig\Extra\CssInliner\CssInlinerExtension; use Twig\Loader\FilesystemLoader; class TwigFactory @@ -16,6 +17,7 @@ class TwigFactory $twig = new Environment($loader); $twig->addExtension(new StringLoaderExtension()); $twig->addExtension(new DebugExtension()); + $twig->addExtension(new CssInlinerExtension()); return $twig; } diff --git a/templates/_base.html.twig b/templates/_base.html.twig index fb803c5..52d799c 100644 --- a/templates/_base.html.twig +++ b/templates/_base.html.twig @@ -1,4 +1,5 @@ +{% apply inline_css %} @@ -207,3 +208,4 @@ {% endblock %} +{% endapply %}