Browse Source

Move email templates in assets directory

Chocobozzz 1 month ago
parent
commit
be19d9be34
31 changed files with 2 additions and 4 deletions
  1. 0 1
      scripts/build/server.sh
  2. 0 1
      scripts/dev/server.sh
  3. 0 0
      server/core/assets/email-templates/abuse-new-message/html.pug
  4. 0 0
      server/core/assets/email-templates/abuse-state-change/html.pug
  5. 0 0
      server/core/assets/email-templates/account-abuse-new/html.pug
  6. 0 0
      server/core/assets/email-templates/common/base.pug
  7. 0 0
      server/core/assets/email-templates/common/greetings.pug
  8. 0 0
      server/core/assets/email-templates/common/html.pug
  9. 0 0
      server/core/assets/email-templates/common/mixins.pug
  10. 0 0
      server/core/assets/email-templates/contact-form/html.pug
  11. 0 0
      server/core/assets/email-templates/follower-on-channel/html.pug
  12. 0 0
      server/core/assets/email-templates/password-create/html.pug
  13. 0 0
      server/core/assets/email-templates/password-reset/html.pug
  14. 0 0
      server/core/assets/email-templates/peertube-version-new/html.pug
  15. 0 0
      server/core/assets/email-templates/plugin-version-new/html.pug
  16. 0 0
      server/core/assets/email-templates/user-export-completed/html.pug
  17. 0 0
      server/core/assets/email-templates/user-export-errored/html.pug
  18. 0 0
      server/core/assets/email-templates/user-import-completed/html.pug
  19. 0 0
      server/core/assets/email-templates/user-import-errored/html.pug
  20. 0 0
      server/core/assets/email-templates/user-registered/html.pug
  21. 0 0
      server/core/assets/email-templates/user-registration-request-accepted/html.pug
  22. 0 0
      server/core/assets/email-templates/user-registration-request-rejected/html.pug
  23. 0 0
      server/core/assets/email-templates/user-registration-request/html.pug
  24. 0 0
      server/core/assets/email-templates/verify-email/html.pug
  25. 0 0
      server/core/assets/email-templates/video-abuse-new/html.pug
  26. 0 0
      server/core/assets/email-templates/video-auto-blacklist-new/html.pug
  27. 0 0
      server/core/assets/email-templates/video-comment-abuse-new/html.pug
  28. 0 0
      server/core/assets/email-templates/video-comment-mention/html.pug
  29. 0 0
      server/core/assets/email-templates/video-comment-new/html.pug
  30. 1 1
      server/core/lib/emailer.ts
  31. 1 1
      support/doc/development/server.md

+ 0 - 1
scripts/build/server.sh

@@ -8,5 +8,4 @@ npm run tsc --  -b --verbose server/tsconfig.json
 npm run resolve-tspaths:server
 
 cp -r "./server/core/static" "./server/core/assets" ./dist/core
-cp -r "./server/core/lib/emails" "./dist/core/lib"
 cp "./server/scripts/upgrade.sh" "./dist/scripts"

+ 0 - 1
scripts/dev/server.sh

@@ -20,6 +20,5 @@ npm run tsc -- -b -v --incremental server/tsconfig.json
 npm run resolve-tspaths:server
 
 cp -r ./server/core/static ./server/core/assets ./dist/core
-cp -r "./server/core/lib/emails" "./dist/core/lib"
 
 ./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=dev node dist/server"' server/tsconfig.json

+ 0 - 0
server/core/lib/emails/abuse-new-message/html.pug → server/core/assets/email-templates/abuse-new-message/html.pug


+ 0 - 0
server/core/lib/emails/abuse-state-change/html.pug → server/core/assets/email-templates/abuse-state-change/html.pug


+ 0 - 0
server/core/lib/emails/account-abuse-new/html.pug → server/core/assets/email-templates/account-abuse-new/html.pug


+ 0 - 0
server/core/lib/emails/common/base.pug → server/core/assets/email-templates/common/base.pug


+ 0 - 0
server/core/lib/emails/common/greetings.pug → server/core/assets/email-templates/common/greetings.pug


+ 0 - 0
server/core/lib/emails/common/html.pug → server/core/assets/email-templates/common/html.pug


+ 0 - 0
server/core/lib/emails/common/mixins.pug → server/core/assets/email-templates/common/mixins.pug


+ 0 - 0
server/core/lib/emails/contact-form/html.pug → server/core/assets/email-templates/contact-form/html.pug


+ 0 - 0
server/core/lib/emails/follower-on-channel/html.pug → server/core/assets/email-templates/follower-on-channel/html.pug


+ 0 - 0
server/core/lib/emails/password-create/html.pug → server/core/assets/email-templates/password-create/html.pug


+ 0 - 0
server/core/lib/emails/password-reset/html.pug → server/core/assets/email-templates/password-reset/html.pug


+ 0 - 0
server/core/lib/emails/peertube-version-new/html.pug → server/core/assets/email-templates/peertube-version-new/html.pug


+ 0 - 0
server/core/lib/emails/plugin-version-new/html.pug → server/core/assets/email-templates/plugin-version-new/html.pug


+ 0 - 0
server/core/lib/emails/user-export-completed/html.pug → server/core/assets/email-templates/user-export-completed/html.pug


+ 0 - 0
server/core/lib/emails/user-export-errored/html.pug → server/core/assets/email-templates/user-export-errored/html.pug


+ 0 - 0
server/core/lib/emails/user-import-completed/html.pug → server/core/assets/email-templates/user-import-completed/html.pug


+ 0 - 0
server/core/lib/emails/user-import-errored/html.pug → server/core/assets/email-templates/user-import-errored/html.pug


+ 0 - 0
server/core/lib/emails/user-registered/html.pug → server/core/assets/email-templates/user-registered/html.pug


+ 0 - 0
server/core/lib/emails/user-registration-request-accepted/html.pug → server/core/assets/email-templates/user-registration-request-accepted/html.pug


+ 0 - 0
server/core/lib/emails/user-registration-request-rejected/html.pug → server/core/assets/email-templates/user-registration-request-rejected/html.pug


+ 0 - 0
server/core/lib/emails/user-registration-request/html.pug → server/core/assets/email-templates/user-registration-request/html.pug


+ 0 - 0
server/core/lib/emails/verify-email/html.pug → server/core/assets/email-templates/verify-email/html.pug


+ 0 - 0
server/core/lib/emails/video-abuse-new/html.pug → server/core/assets/email-templates/video-abuse-new/html.pug


+ 0 - 0
server/core/lib/emails/video-auto-blacklist-new/html.pug → server/core/assets/email-templates/video-auto-blacklist-new/html.pug


+ 0 - 0
server/core/lib/emails/video-comment-abuse-new/html.pug → server/core/assets/email-templates/video-comment-abuse-new/html.pug


+ 0 - 0
server/core/lib/emails/video-comment-mention/html.pug → server/core/assets/email-templates/video-comment-mention/html.pug


+ 0 - 0
server/core/lib/emails/video-comment-new/html.pug → server/core/assets/email-templates/video-comment-new/html.pug


+ 1 - 1
server/core/lib/emailer.ts

@@ -264,7 +264,7 @@ class Emailer {
       },
       transport: this.transporter,
       views: {
-        root: join(root(), 'dist', 'core', 'lib', 'emails')
+        root: join(root(), 'dist', 'core', 'assets', 'email-templates')
       },
       subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX
     })

+ 1 - 1
support/doc/development/server.md

@@ -61,7 +61,7 @@ Some of these may be optional (for example your new endpoint may not need to sen
    - Create the notification logic in `server/core/lib/notifier/shared`:
      + Email subject has a common prefix (defined by the admin in PeerTube configuration)
    - Add your notification to `server/core/lib/notifier/notifier.ts`
-   - Create the email template in `server/core/lib/emails`:
+   - Create the email template in `server/core/assets/email-templates`:
      + A text version is automatically generated from the HTML
      + The template usually extends `../common/grettings` that already says "Hi" and "Cheers". You just have to write the title and the content blocks that will be inserted in the appropriate places in the HTML template
    - If you need to associate a new table with `userNotification`: