refactor(webapp): vue 2.7.16 (#9160)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -126,80 +126,3 @@ updates:
     day: "saturday"
     timezone: "Europe/Berlin"
     time: "03:00"
-
-# frontend
-# - package-ecosystem: npm
-#   open-pull-requests-limit: 99
-#   directory: "/frontend"
-#   rebase-strategy: "disabled"
-#   schedule:
-#     interval: weekly
-#     day: "saturday"
-#     timezone: "Europe/Berlin"
-#     time: "03:00"
-#   groups:
-#     eslint:
-#       applies-to: version-updates
-#       patterns:
-#         - "eslint*"
-#         - "@eslint*"
-#     pinia:
-#       applies-to: version-updates
-#       patterns:
-#         - "pinia*"
-#     react:
-#       applies-to: version-updates
-#       patterns:
-#         - "react*"
-#     remark:
-#       applies-to: version-updates
-#       patterns:
-#         - "remark*"
-#     storybook:
-#       applies-to: version-updates
-#       patterns:
-#         - "storybook"
-#         - "@storybook*"
-#     stylelint:
-#       applies-to: version-updates
-#       patterns:
-#         - "stylelint*"
-#     typescript:
-#       applies-to: version-updates
-#       patterns:
-#         - "ts*"
-#         - "@types*"
-#         - "typescript"
-#     vite:
-#       applies-to: version-updates
-#       patterns:
-#         - "vite"
-#         - "vite-plugin*"
-#         - "@vitejs/plugin-vue"
-#     vitest:
-#       applies-to: version-updates
-#       patterns:
-#         - "vitest"
-#         - "@vitest*"
-#     vue:
-#       applies-to: version-updates
-#       patterns:
-#         - "*vue?(/)*"
-#       exclude-patterns:
-#         - "vuetify"
-#         - "*vuepress*"
-#         - "vue-tsc"
-#     vuepress:
-#       applies-to: version-updates
-#       patterns:
-#         - "vuepress"
-#         - "@vuepress*"
-# - package-ecosystem: docker
-#   open-pull-requests-limit: 99
-#   directory: "/frontend"
-#   rebase-strategy: "disabled"
-#   schedule:
-#     interval: weekly
-#     day: "saturday"
-#     timezone: "Europe/Berlin"
-#     time: "03:00"

.github/file-filters.yml

@@ -12,6 +12,7 @@ docker: &docker
 webapp: &webapp
   - '.github/workflows/test-webapp.yml'
   - 'webapp/**/*'
+  - 'styleguide/**/*'
   - 'package.json'
 
 docs-check: &docs-check
@@ -30,24 +31,4 @@ vuepress: &vuepress
 
 documentation: &documentation
   - *vuepress
-  - *markdown
+  - *markdown
-
-# frontend
-frontend-test-lint-code: &frontend-test-lint-code
-  - 'frontend/**/*'
-
-frontend-test-unit-code: &frontend-test-unit-code
-  - 'frontend/**/*'
-
-frontend-test-build-code: &frontend-test-build-code
-  - 'frontend/**/*'
-
-frontend-test-build-docker: &frontend-test-build-docker
-  - 'frontend/**/*'
-
-frontend-test-build-docs: &frontend-test-build-docs
-  - 'frontend/**/*.md'
-  - 'frontend/.vuepress/*'
-
-frontend-test-build-storybook: &frontend-test-build-storybook
-  - 'frontend/**/*'

.github/workflows/check-documentation.yml

@@ -11,7 +11,7 @@ jobs:
       documentation: ${{ steps.changes.outputs.documentation }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Check for markdown file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -28,13 +28,13 @@ jobs:
     if: needs.files-changed.outputs.markdown == 'true'
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
       
       - name: Remove uncheckable documentation files
         run: rm -rf ./CHANGELOG.md # workaround until https://github.com/gaurav-nelson/github-action-markdown-link-check/pull/183 has been done
 
       - name: Check Markdown Links
-        uses: gaurav-nelson/github-action-markdown-link-check@1b916f2cf6c36510a6059943104e3c42ce6c16bc # 1.0.15
+        uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31 # 1.0.15
         with:
           use-quiet-mode: 'yes'
           use-verbose-mode: 'no'
@@ -51,10 +51,10 @@ jobs:
     if: needs.files-changed.outputs.documentation == 'true'
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Setup Node 20
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.0.3
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
         with:
           node-version: '20'
 

.github/workflows/cleanup-cache-at-pr-closing.yml

@@ -22,7 +22,7 @@ jobs:
     continue-on-error: true
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Cleanup
         run: |

.github/workflows/deploy-documentation.yml

@@ -13,7 +13,7 @@ jobs:
       documentation: ${{ steps.changes.outputs.documentation }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Check for file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -27,10 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Setup Node 20
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.0.3
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
         with:
           node-version: 20
 

.github/workflows/docker-push.yml

@@ -24,27 +24,27 @@ jobs:
             file: backend/Dockerfile
             target: production
           - name: webapp-base
-            context: webapp
+            context: .
             file: webapp/Dockerfile
             target: base
           - name: webapp-build
-            context: webapp
+            context: .
             file: webapp/Dockerfile
             target: build
           - name: webapp
-            context: webapp
+            context: .
             file: webapp/Dockerfile
             target: production
           - name: maintenance-base
-            context: webapp
+            context: .
             file: webapp/Dockerfile.maintenance
             target: base
           - name: maintenance-build
-            context: webapp
+            context: .
             file: webapp/Dockerfile.maintenance
             target: build
           - name: maintenance
-            context: webapp
+            context: .
             file: webapp/Dockerfile.maintenance
             target: production
     runs-on: ubuntu-latest
@@ -59,16 +59,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
       - name: Log in to the Container registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |

.github/workflows/frontend.test.build.code.yml

@@ -1,37 +0,0 @@
-name: "frontend:test:build test code"
-
-on: push
-
-jobs:
-  # only (but most important) job from this workflow required for pull requests
-  # check results serve as run conditions for all other jobs here
-  files-changed:
-    name: Detect File Changes - frontend-test-build-code
-    runs-on: ubuntu-latest
-    outputs:
-      changes: ${{ steps.changes.outputs.frontend-test-build-code }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  build:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Build - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Build
-        run: npm install && npm run build
-        working-directory: ${{env.WORKING_DIRECTORY}}

.github/workflows/frontend.test.build.docker.yml

@@ -1,52 +0,0 @@
-name: "frontend:test:build test docker"
-
-on: push
-
-jobs:
-  # only (but most important) job from this workflow required for pull requests
-  # check results serve as run conditions for all other jobs here
-  files-changed:
-    name: Detect File Changes - frontend-test-build-docker
-    runs-on: ubuntu-latest
-    outputs:
-      changes: ${{ steps.changes.outputs.frontend-test-build-docker }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  build-production:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Build Docker Production - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Build Docker Production
-        run: docker compose -f docker-compose.yml build
-        working-directory: ${{env.WORKING_DIRECTORY}}
-
-  build-development:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Build Docker Development - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Build Docker Development
-        run: docker compose build
-        working-directory: ${{env.WORKING_DIRECTORY}}

.github/workflows/frontend.test.build.docs.yml

@@ -1,37 +0,0 @@
-name: "frontend:test:build test docs"
-
-on: push
-
-jobs:
-  # only (but most important) job from this workflow required for pull requests
-  # check results serve as run conditions for all other jobs here
-  files-changed:
-    name: Detect File Changes - frontend-test-build-docs
-    runs-on: ubuntu-latest
-    outputs:
-      changes: ${{ steps.changes.outputs.frontend-test-build-docs }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  build:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Build Docs - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Build Docs
-        run: npm install && npm run docs:build
-        working-directory: ${{env.WORKING_DIRECTORY}}

.github/workflows/frontend.test.build.storybook.yml

@@ -1,37 +0,0 @@
-name: "frontend:test:build test storybook"
-
-on: push
-
-jobs:
-  # only (but most important) job from this workflow required for pull requests
-  # check results serve as run conditions for all other jobs here
-  files-changed:
-    name: Detect File Changes - frontend-test-build-storybook
-    runs-on: ubuntu-latest
-    outputs:
-      changes: ${{ steps.changes.outputs.frontend-test-build-storybook }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  storybook:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Build Storybook - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Build Storybook
-        run: npm install && npm run storybook:build
-        working-directory: ${{env.WORKING_DIRECTORY}}

.github/workflows/frontend.test.lint.code.yml

@@ -1,37 +0,0 @@
-name: "frontend:test:lint code with defined linters"
-
-on: push
-
-jobs:
-  # only (but most important) job from this workflow required for pull requests
-  # check results serve as run conditions for all other jobs here 
-  files-changed:
-    name: Detect File Changes - frontend-test-lint-code
-    runs-on: ubuntu-latest
-    outputs:
-      changes: ${{ steps.changes.outputs.frontend-test-lint-code }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  lint:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Lint - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Lint
-        run: npm install && npm run test:lint
-        working-directory: ${{env.WORKING_DIRECTORY}}

.github/workflows/frontend.test.unit.code.yml

@@ -1,37 +0,0 @@
-name: "frontend:test:unit test code with defined suites"
-
-on: push
-
-jobs:
-  # only (but most important) job from this workflow required for pull requests
-  # check results serve as run conditions for all other jobs here 
-  files-changed:
-    name: Detect File Changes - frontend-test-unit-code
-    runs-on: ubuntu-latest
-    outputs:
-      changes: ${{ steps.changes.outputs.frontend-test-unit-code }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  unit:
-    if: needs.files-changed.outputs.changes == 'true'
-    name: Unit - Frontend
-    needs: files-changed
-    runs-on: ubuntu-latest
-    env:
-      WORKING_DIRECTORY: ./frontend
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
-
-      - name: Frontend | Unit
-        run: npm install && npm run test:unit
-        working-directory: ${{env.WORKING_DIRECTORY}}

.github/workflows/publish.yml

@@ -14,9 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
         with:
           fetch-depth: 0 # Fetch full History for changelog
+      - name: Setup Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
+        with:
+          node-version-file: '.nvmrc'
       - name: Setup env
         run: |
           echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
@@ -54,9 +58,13 @@ jobs:
     needs: [github_tag]
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
         with:
           fetch-depth: 0 # Fetch full History for changelog
+      - name: Setup Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
+        with:
+          node-version-file: '.nvmrc'
       - name: Setup env
         run: |
           echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
@@ -64,7 +72,7 @@ jobs:
           echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
       - run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       #- name: Repository Dispatch
-      #  uses: peter-evans/repository-dispatch@25237563b45ca02acc9f277837f7e17abc0a48a9 # v3.0.0
+      #  uses: peter-evans/repository-dispatch@cf70392543065ca62813db6712a06df1c4f4ae9f # v3.0.0
       #  with:
       #    token: ${{ github.token }}
       #    event-type: trigger-ocelot-build-success
@@ -72,7 +80,7 @@ jobs:
       #    client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
 
       - name: Repository Dispatch stage.ocelot.social
-        uses: peter-evans/repository-dispatch@25237563b45ca02acc9f277837f7e17abc0a48a9 # v3.0.0
+        uses: peter-evans/repository-dispatch@cf70392543065ca62813db6712a06df1c4f4ae9f # v3.0.0
         with:
           token: ${{ secrets.OCELOT_PUBLISH_EVENT_PAT }} # this token is required to access the other repository
           event-type: trigger-ocelot-build-success
@@ -80,7 +88,7 @@ jobs:
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "GITHUB_RUN_NUMBER": "${{ env.GITHUB_RUN_NUMBER }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
       
       - name: Repository Dispatch stage.yunite.me
-        uses: peter-evans/repository-dispatch@25237563b45ca02acc9f277837f7e17abc0a48a9 # v3.0.0
+        uses: peter-evans/repository-dispatch@cf70392543065ca62813db6712a06df1c4f4ae9f # v3.0.0
         with:
           token: ${{ secrets.OCELOT_PUBLISH_EVENT_PAT }} # this token is required to access the other repository
           event-type: trigger-ocelot-build-success

.github/workflows/test-backend.yml

@@ -11,7 +11,7 @@ jobs:
       backend: ${{ steps.changes.outputs.backend }}
       docker: ${{ steps.changes.outputs.docker }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Check for backend file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Neo4J | Build 'community' image
         run: |
@@ -37,7 +37,7 @@ jobs:
       
       - name: Cache docker images
         id: cache-neo4j
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/neo4j.tar
           key: ${{ github.run_id }}-backend-neo4j-cache
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: backend | Build 'test' image
         run: |
@@ -58,7 +58,7 @@ jobs:
       
       - name: Cache docker images
         id: cache-backend
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/backend.tar
           key: ${{ github.run_id }}-backend-cache
@@ -70,7 +70,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
+
+      - name: Setup Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
+        with:
+          node-version-file: 'backend/.nvmrc'
 
       - name: backend | Lint
         run: cd backend && yarn && yarn run lint
@@ -84,17 +89,17 @@ jobs:
       checks: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Restore Neo4J cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/neo4j.tar
           key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/backend.tar
           key: ${{ github.run_id }}-backend-cache
@@ -108,7 +113,6 @@ jobs:
       - name: backend | copy env files
         run: |
           cp webapp/.env.template webapp/.env
-          cp frontend/.env.dist frontend/.env
           cp backend/.env.template backend/.env
 
       - name: backend | docker compose

.github/workflows/test-e2e.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.2.2
 
       - name: Copy backend env file
         run: |
@@ -31,7 +31,7 @@ jobs:
           docker compose -f docker-compose.yml -f docker-compose.test.yml down
       
       - name: Cache docker images
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: |
             /tmp/backend.tar
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.2.2
 
       - name: Copy backend env file
         run: |
@@ -59,7 +59,7 @@ jobs:
           docker save "ghcr.io/ocelot-social-community/ocelot-social/webapp:test" > /tmp/webapp.tar
       
       - name: Cache docker image        
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/webapp.tar
           key: ${{ github.run_id }}-e2e-webapp-cache
@@ -68,13 +68,16 @@ jobs:
     name: Fullstack | prepare cypress
     runs-on: ubuntu-latest
     steps:
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.2.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@08f58d1471bff7f3a07d167b4ad7df25d5fcfcb6 # v4.4.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.4.0
         with:
-          node-version-file: 'backend/.tool-versions'
+          node-version-file: 'backend/.nvmrc'
           cache: 'yarn'
 
       - name: Copy env files
@@ -84,7 +87,8 @@ jobs:
 
       - name: Install cypress requirements
         run: |
-          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          sudo wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          sudo chmod +x /opt/cucumber-json-formatter
           cd backend
           yarn install
           yarn build
@@ -93,7 +97,7 @@ jobs:
       
       - name: Cache docker image
         
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: |
             /opt/cucumber-json-formatter
@@ -113,17 +117,20 @@ jobs:
         # run copies of the current job in parallel
         job: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.2.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@08f58d1471bff7f3a07d167b4ad7df25d5fcfcb6 # v4.4.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.4.0
         with:
-          node-version-file: 'backend/.tool-versions'
+          node-version-file: 'backend/.nvmrc'
           cache: 'yarn'
 
       - name: Restore cypress cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: |
             /opt/cucumber-json-formatter
@@ -133,7 +140,7 @@ jobs:
           restore-keys: ${{ github.run_id }}-e2e-cypress
 
       - name: Restore backend environment cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: |
             /tmp/backend.tar
@@ -144,7 +151,7 @@ jobs:
           key: ${{ github.run_id }}-e2e-backend-environment-cache
 
       - name: Restore webapp cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/webapp.tar
           key: ${{ github.run_id }}-e2e-webapp-cache
@@ -175,7 +182,7 @@ jobs:
       - name: Full stack tests | if tests failed, upload report
         id: e2e-report
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
@@ -187,7 +194,7 @@ jobs:
     continue-on-error: true
     steps:
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.2.2
       
       - name: Full stack tests | cleanup cache
         run: |

.github/workflows/test-webapp.yml

@@ -11,7 +11,7 @@ jobs:
       docker: ${{ steps.changes.outputs.docker }}
       webapp: ${{ steps.changes.outputs.webapp }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Check for frontend file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -28,7 +28,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
+
+      - name: Setup Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
+        with:
+          node-version-file: 'webapp/.nvmrc'
 
       - name: Check translation files
         run: |
@@ -42,15 +47,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Webapp | Build 'test' image
         run: |
-          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker build --target test -f webapp/Dockerfile -t "ocelotsocialnetwork/webapp:test" .
           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
       - name: Cache docker image
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/webapp.tar
           key: ${{ github.run_id }}-webapp-cache
@@ -62,7 +67,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
+
+      - name: Setup Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4.0.3
+        with:
+          node-version-file: 'webapp/.nvmrc'
 
       - name: webapp | Lint
         run: cd webapp && yarn && yarn run lint
@@ -76,10 +86,10 @@ jobs:
       checks: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4.1.7
 
       - name: Restore webapp cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4.0.2
         with:
           path: /tmp/webapp.tar
           key: ${{ github.run_id }}-webapp-cache
@@ -90,7 +100,6 @@ jobs:
       - name: Copy env files
         run: |
           cp webapp/.env.template webapp/.env
-          cp frontend/.env.dist frontend/.env
           cp backend/.env.template backend/.env
 
       - name: backend | docker compose

.github/workflows/test.lint_pr.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
-      - uses: amannn/action-semantic-pull-request@335288255954904a41ddda8947c8f2c844b8bfeb # v5.5.3
+      - uses: amannn/action-semantic-pull-request@069817c298f23fab00a8f29a2e556a5eac0f6390 # v5.5.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -30,9 +30,9 @@ jobs:
           scopes: |
             backend
             webapp
-            frontend
             maintenance
             database
+            e2e
             docu
             docker
             release

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "styleguide"]
-	path = styleguide
-	url = https://github.com/Human-Connection/Nitro-Styleguide.git
 [submodule "deployment/configurations/stage.ocelot.social"]
 	path = deployment/configurations/stage.ocelot.social
 	url = git@github.com:Ocelot-Social-Community/stage.ocelot.social.git

.nvmrc

@@ -1 +1 @@
-v24.2.0
+v25.3.0

.tool-versions

@@ -1 +0,0 @@
-nodejs 20.12.1

backend/.env.template

@@ -1,4 +1,4 @@
-DEBUG=true
+DEBUG=neo4j-graphql-js
 
 NEO4J_URI=bolt://localhost:7687
 NEO4J_USERNAME=neo4j
@@ -19,7 +19,7 @@ SMTP_PASSWORD=
 SMTP_SECURE="false" # true for 465, false for other ports
 SMTP_DKIM_DOMAINNAME=
 SMTP_DKIM_KEYSELECTOR=
-SMTP_DKIM_PRIVATKEY=
+SMTP_DKIM_PRIVATEKEY=
 # E-Mail settings for our 'docker compose up mailserver'
 # SMTP_HOST=localhost
 # SMTP_PORT=1025
@@ -33,8 +33,6 @@ JWT_SECRET="b/&&7b78BF&fv/Vd"
 JWT_EXPIRES="2y"
 MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
 
-PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78"
-
 SENTRY_DSN_BACKEND=
 COMMIT=
 PUBLIC_REGISTRATION=false
@@ -45,7 +43,9 @@ AWS_SECRET_ACCESS_KEY=12341234
 AWS_ENDPOINT=http://localhost:9000
 AWS_REGION=local
 AWS_BUCKET=ocelot
-S3_PUBLIC_GATEWAY=http://localhost:8000
+IMAGOR_PUBLIC_URL=http://localhost:8000
+IMAGOR_SECRET=mysecret
 
 CATEGORIES_ACTIVE=false
 MAX_PINNED_POSTS=1
+MAX_GROUP_PINNED_POSTS=1

backend/.env.test_e2e

@@ -19,14 +19,12 @@ SMTP_PASSWORD=
 SMTP_SECURE="false" # true for 465, false for other ports
 SMTP_DKIM_DOMAINNAME=
 SMTP_DKIM_KEYSELECTOR=
-SMTP_DKIM_PRIVATKEY=
+SMTP_DKIM_PRIVATEKEY=
 
 JWT_SECRET="b/&&7b78BF&fv/Vd"
 JWT_EXPIRES="2y"
 MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
 
-PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78"
-
 SENTRY_DSN_BACKEND=
 COMMIT=
 PUBLIC_REGISTRATION=false
@@ -37,7 +35,9 @@ AWS_SECRET_ACCESS_KEY=12341234
 AWS_ENDPOINT=http://localhost:9000
 AWS_REGION=local
 AWS_BUCKET=ocelot
-S3_PUBLIC_GATEWAY=http://localhost:8000
+IMAGOR_PUBLIC_URL=http://localhost:8000
+IMAGOR_SECRET=mysecret
 
 CATEGORIES_ACTIVE=false
 MAX_PINNED_POSTS=1
+MAX_GROUP_PINNED_POSTS=1

backend/.eslintrc.cjs

@@ -14,7 +14,6 @@ module.exports = {
     'plugin:import/recommended',
     'plugin:import/typescript',
     'plugin:promise/recommended',
-    'plugin:security/recommended-legacy',
     'plugin:@eslint-community/eslint-comments/recommended',
     'prettier',
   ],
@@ -175,6 +174,10 @@ module.exports = {
     '@eslint-community/eslint-comments/require-description': 'off',
   },
   overrides: [
+    {
+      files: ['*.js', '*.cjs', '*.ts', '*.tsx'],
+      extends: ['plugin:security/recommended-legacy'],
+    },
     // only for ts files
     {
       files: ['*.ts', '*.tsx'],
@@ -228,5 +231,33 @@ module.exports = {
       files: ['*.json', '*.json5', '*.jsonc'],
       parser: 'jsonc-eslint-parser',
     },
+    {
+      files: ['*.graphql', '*.gql'],
+      parser: '@graphql-eslint/eslint-plugin',
+      plugins: ['@graphql-eslint'],
+      extends: ['plugin:@graphql-eslint/schema-recommended'],
+      rules: {
+        '@graphql-eslint/description-style': ['error', { style: 'inline' }],
+        '@graphql-eslint/require-description': 'off',
+        '@graphql-eslint/naming-convention': 'off',
+        '@graphql-eslint/strict-id-in-types': 'off',
+        '@graphql-eslint/no-typename-prefix': 'off',
+        // incompatible: `depends on a GraphQL validation rule "XXX" but it's not available in the "graphql" version you are using. Skipping…`
+        '@graphql-eslint/known-directives': 'off',
+        '@graphql-eslint/known-argument-names': 'off',
+        '@graphql-eslint/known-type-names': 'off',
+        '@graphql-eslint/lone-schema-definition': 'off',
+        '@graphql-eslint/provided-required-arguments': 'off',
+        '@graphql-eslint/unique-directive-names': 'off',
+        '@graphql-eslint/unique-directive-names-per-location': 'off',
+        '@graphql-eslint/unique-field-definition-names': 'off',
+        '@graphql-eslint/unique-operation-types': 'off',
+        '@graphql-eslint/unique-type-names': 'off',
+      },
+      parserOptions: {
+        schema: './src/graphql/types/**/*.gql',
+        assumeValid: true,
+      },
+    },
   ],
 }

backend/.nvmrc

@@ -1 +1 @@
-v24.2.0
+v25.3.0

backend/.tool-versions

@@ -1 +0,0 @@
-nodejs 24.2.0

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.3.0-alpine AS base
+FROM node:25.5.0-alpine AS base
 LABEL org.label-schema.name="ocelot.social:backend"
 LABEL org.label-schema.description="Backend of the Social Network Software ocelot.social"
 LABEL org.label-schema.usage="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/README.md"

backend/README.md

@@ -19,18 +19,16 @@ Wait a little until your backend is up and running at [http://localhost:4000/](h
 ## Installation without Docker
 
 For the local installation you need a recent version of
-[Node](https://nodejs.org/en/) (>= `v16.19.0`). We are using
+[Node](https://nodejs.org/en/). We are using
-`v24.2.0` and therefore we recommend to use the same version
+`v25.3.0` and therefore we recommend to use the same version. You can use the
-([see](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4082)
-some known problems with more recent node versions). You can use the
 [node version manager](https://github.com/nvm-sh/nvm) `nvm` to switch
 between different local Node versions:
 
 ```sh
-# install Node
+# install Node using '.nvmrc' file
 $ cd backend
-$ nvm install v24.2.0
+$ nvm install
-$ nvm use v24.2.0
+$ nvm use
 ```
 
 Install node dependencies with [yarn](https://yarnpkg.com/en/):

backend/jest.config.cjs

@@ -18,7 +18,7 @@ module.exports = {
   ],
   coverageThreshold: {
     global: {
-      lines: 90,
+      lines: 92,
     },
   },
   testMatch: ['**/src/**/?(*.)+(spec|test).ts?(x)'],

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "3.11.0",
+  "version": "3.13.1",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
@@ -12,7 +12,7 @@
     "build": "tsc && tsc-alias && ./scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node --require tsconfig-paths/register src/index.ts -e js,ts,gql",
     "dev:debug": "nodemon --exec node --inspect=0.0.0.0:9229 build/src/index.js -e js,ts,gql",
-    "lint": "eslint --max-warnings=0 --report-unused-disable-directives --ext .js,.ts,.cjs,.json,.json5,.jsonc .",
+    "lint": "eslint --max-warnings=0 --report-unused-disable-directives --ext .js,.ts,.cjs,.json,.json5,.jsonc,.graphql,.gql .",
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=--max-old-space-size=8192 jest --runInBand --coverage --forceExit --detectOpenHandles",
     "db:reset": "ts-node --require tsconfig-paths/register src/db/reset.ts",
     "db:reset:withmigrations": "ts-node --require tsconfig-paths/register src/db/reset-with-migrations.ts",
@@ -23,26 +23,29 @@
     "db:data:categories": "ts-node --require tsconfig-paths/register src/db/categories.ts",
     "db:migrate": "migrate --compiler 'ts:./src/db/compiler.ts' --migrations-dir ./src/db/migrations --store ./src/db/migrate/store.ts",
     "db:migrate:create": "migrate --compiler 'ts:./src/db/compiler.ts' --migrations-dir ./src/db/migrations --template-file ./src/db/migrate/template.ts --date-format 'yyyymmddHHmmss' create",
+    "db:func:disable:notifications": "ts-node --require tsconfig-paths/register src/db/disable-notifications.ts",
     "prod:migrate": "migrate --migrations-dir ./build/src/db/migrations --store ./build/src/db/migrate/store.js",
     "prod:db:data:branding": "node build/src/db/data-branding.js",
-    "prod:db:data:categories": "node build/src/db/categories.js"
+    "prod:db:data:categories": "node build/src/db/categories.js",
+    "prod:db:data:admin": "node build/src/db/admin.js",
+    "prod:db:func:disable:notifications": "node build/src/db/disable-notifications.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.842.0",
+    "@aws-sdk/client-s3": "^3.980.0",
-    "@aws-sdk/lib-storage": "^3.842.0",
+    "@aws-sdk/lib-storage": "^3.980.0",
-    "@sentry/node": "^5.15.4",
+    "@sentry/node": "^5.30.0",
     "@types/mime-types": "^3.0.1",
     "apollo-server": "~2.14.2",
     "apollo-server-express": "^2.14.2",
-    "bcryptjs": "~3.0.2",
+    "bcryptjs": "~3.0.3",
     "body-parser": "^1.20.3",
-    "cheerio": "~1.1.0",
+    "cheerio": "~1.2.0",
-    "cross-env": "~7.0.3",
+    "cross-env": "~10.1.0",
     "dotenv": "~17.0.1",
     "email-templates": "^12.0.3",
-    "express": "^5.1.0",
+    "express": "^4.22.1",
     "graphql": "^14.6.0",
-    "graphql-middleware": "~4.0.2",
+    "graphql-middleware": "~6.1.35",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-redis-subscriptions": "^2.7.0",
     "graphql-shield": "~7.2.2",
@@ -50,79 +53,80 @@
     "graphql-tag": "~2.10.3",
     "graphql-upload": "^13.0.0",
     "helmet": "~8.1.0",
-    "ioredis": "^5.6.1",
+    "ioredis": "^5.9.2",
     "jsonwebtoken": "~8.5.1",
     "languagedetect": "^2.0.0",
-    "linkify-html": "^4.3.1",
+    "linkify-html": "^4.3.2",
-    "linkifyjs": "^4.3.1",
+    "linkifyjs": "^4.3.2",
-    "lodash": "~4.17.21",
+    "lodash": "~4.17.23",
     "merge-graphql-schemas": "^1.7.8",
-    "metascraper": "^5.49.1",
+    "metascraper": "^5.49.19",
-    "metascraper-author": "^5.49.1",
+    "metascraper-author": "^5.49.19",
-    "metascraper-date": "^5.49.1",
+    "metascraper-date": "^5.49.19",
-    "metascraper-description": "^5.49.1",
+    "metascraper-description": "^5.49.19",
-    "metascraper-image": "^5.49.1",
+    "metascraper-image": "^5.49.19",
-    "metascraper-lang": "^5.49.1",
+    "metascraper-lang": "^5.49.19",
     "metascraper-lang-detector": "^4.10.2",
-    "metascraper-logo": "^5.49.1",
+    "metascraper-logo": "^5.49.19",
-    "metascraper-publisher": "^5.49.1",
+    "metascraper-publisher": "^5.49.19",
     "metascraper-soundcloud": "^5.34.4",
-    "metascraper-title": "^5.49.1",
+    "metascraper-title": "^5.49.19",
-    "metascraper-url": "^5.49.1",
+    "metascraper-url": "^5.49.19",
-    "metascraper-video": "^5.49.1",
+    "metascraper-video": "^5.49.19",
-    "metascraper-youtube": "^5.49.1",
+    "metascraper-youtube": "^5.49.20",
     "migrate": "^2.1.0",
-    "mime-types": "^3.0.1",
+    "mime-types": "^3.0.2",
-    "minimatch": "^10.0.3",
+    "minimatch": "^10.1.1",
     "mustache": "^4.2.0",
     "neo4j-driver": "^4.4.11",
-    "neo4j-graphql-js": "^2.11.5",
+    "neo4j-graphql-js": "2.11.5",
     "neode": "^0.4.9",
     "node-fetch": "^2.7.0",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.12",
     "nodemailer-html-to-text": "^3.2.0",
-    "preview-email": "^3.1.0",
+    "preview-email": "^3.1.1",
     "pug": "^3.0.3",
     "sanitize-html": "~2.17.0",
-    "slug": "~9.1.0",
+    "slugify": "^1.6.6",
     "trunc-html": "~1.1.2",
-    "tslog": "^4.9.3",
+    "tslog": "^4.10.2",
     "uuid": "~9.0.1",
-    "validator": "^13.15.15",
+    "validator": "^13.15.26",
     "xregexp": "^5.1.2"
   },
   "devDependencies": {
-    "@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.6.0",
-    "@faker-js/faker": "9.8.0",
+    "@faker-js/faker": "9.9.0",
+    "@graphql-eslint/eslint-plugin": "^3.20.1",
     "@types/email-templates": "^10.0.4",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/jsonwebtoken": "~8.5.1",
-    "@types/lodash": "^4.17.19",
+    "@types/lodash": "^4.17.23",
-    "@types/node": "^24.0.10",
+    "@types/node": "^25.1.0",
-    "@types/request": "^2.48.12",
+    "@types/request": "^2.48.13",
     "@types/slug": "^5.0.9",
     "@types/uuid": "~9.0.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "apollo-server-testing": "~2.11.0",
     "eslint": "^8.57.1",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-config-standard": "^17.1.0",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^29.0.1",
+    "eslint-plugin-jest": "^29.12.1",
-    "eslint-plugin-jsonc": "^2.20.1",
+    "eslint-plugin-jsonc": "^2.21.0",
-    "eslint-plugin-n": "^17.20.0",
+    "eslint-plugin-n": "^17.23.2",
     "eslint-plugin-no-catch-all": "^1.1.0",
-    "eslint-plugin-prettier": "^5.5.1",
+    "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-security": "^3.0.1",
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
-    "nodemon": "~3.1.10",
+    "nodemon": "~3.1.11",
-    "prettier": "^3.6.2",
+    "prettier": "^3.8.1",
     "require-json5": "^1.3.0",
     "rosie": "^2.1.1",
-    "ts-jest": "^29.4.0",
+    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.16",
     "tsconfig-paths": "^4.2.0",
@@ -133,7 +137,9 @@
     "**/graphql-upload": "^11.0.0",
     "**/strip-ansi": "6.0.1",
     "**/string-width": "4.2.0",
-    "**/wrap-ansi": "7.0.0"
+    "**/wrap-ansi": "7.0.0",
+    "**/jwa": "^2.0.1",
+    "**/@types/express": "4.17.25"
   },
   "engines": {
     "node": ">=20.12.1"

backend/src/config/index.ts

@@ -30,29 +30,9 @@ const environment = {
     : [],
   SEND_MAIL: env.NODE_ENV !== 'test',
   LOG_LEVEL: 'DEBUG',
+  PROXY_S3: env.PROXY_S3,
 }
 
-const required = {
-  MAPBOX_TOKEN: env.MAPBOX_TOKEN,
-  JWT_SECRET: env.JWT_SECRET,
-  PRIVATE_KEY_PASSPHRASE: env.PRIVATE_KEY_PASSPHRASE,
-}
-
-// https://stackoverflow.com/a/53050575
-type NoUndefinedField<T> = { [P in keyof T]-?: NoUndefinedField<NonNullable<T[P]>> }
-
-function assertRequiredConfig(
-  conf: typeof required,
-): asserts conf is NoUndefinedField<typeof required> {
-  Object.entries(conf).forEach(([key, value]) => {
-    if (!value) {
-      throw new Error(`ERROR: "${key}" env variable is missing.`)
-    }
-  })
-}
-
-assertRequiredConfig(required)
-
 const server = {
   CLIENT_URI: env.CLIENT_URI ?? 'http://localhost:3000',
   GRAPHQL_URI: env.GRAPHQL_URI ?? 'http://localhost:4000',
@@ -68,7 +48,7 @@ const SMTP_PASSWORD = env.SMTP_PASSWORD
 const SMTP_DKIM_DOMAINNAME = env.SMTP_DKIM_DOMAINNAME
 const SMTP_DKIM_KEYSELECTOR = env.SMTP_DKIM_KEYSELECTOR
 // PEM format = https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/PEM-file-format.html
-const SMTP_DKIM_PRIVATKEY = env.SMTP_DKIM_PRIVATKEY?.replace(/\\n/g, '\n') // replace all "\n" in .env string by real line break
+const SMTP_DKIM_PRIVATEKEY = env.SMTP_DKIM_PRIVATEKEY?.replace(/\\n/g, '\n') // replace all "\n" in .env string by real line break
 const SMTP_MAX_CONNECTIONS = (env.SMTP_MAX_CONNECTIONS && parseInt(env.SMTP_MAX_CONNECTIONS)) || 5
 const SMTP_MAX_MESSAGES = (env.SMTP_MAX_MESSAGES && parseInt(env.SMTP_MAX_MESSAGES)) || 100
 
@@ -87,11 +67,11 @@ if (SMTP_USERNAME && SMTP_PASSWORD) {
     pass: SMTP_PASSWORD,
   }
 }
-if (SMTP_DKIM_DOMAINNAME && SMTP_DKIM_KEYSELECTOR && SMTP_DKIM_PRIVATKEY) {
+if (SMTP_DKIM_DOMAINNAME && SMTP_DKIM_KEYSELECTOR && SMTP_DKIM_PRIVATEKEY) {
   nodemailerTransportOptions.dkim = {
     domainName: SMTP_DKIM_DOMAINNAME,
     keySelector: SMTP_DKIM_KEYSELECTOR,
-    privateKey: SMTP_DKIM_PRIVATKEY,
+    privateKey: SMTP_DKIM_PRIVATEKEY,
   }
 }
 
@@ -112,36 +92,38 @@ const redis = {
   REDIS_PASSWORD: env.REDIS_PASSWORD,
 }
 
-const s3 = {
+const required = {
+  EMAIL_DEFAULT_SENDER: env.EMAIL_DEFAULT_SENDER,
+
   AWS_ACCESS_KEY_ID: env.AWS_ACCESS_KEY_ID,
   AWS_SECRET_ACCESS_KEY: env.AWS_SECRET_ACCESS_KEY,
   AWS_ENDPOINT: env.AWS_ENDPOINT,
   AWS_REGION: env.AWS_REGION,
   AWS_BUCKET: env.AWS_BUCKET,
-  S3_PUBLIC_GATEWAY: env.S3_PUBLIC_GATEWAY,
+
+  IMAGOR_PUBLIC_URL: env.IMAGOR_PUBLIC_URL,
+  IMAGOR_SECRET: env.IMAGOR_SECRET,
+
+  MAPBOX_TOKEN: env.MAPBOX_TOKEN,
+  JWT_SECRET: env.JWT_SECRET,
 }
 
-export interface S3Configured {
+// https://stackoverflow.com/a/53050575
-  AWS_ACCESS_KEY_ID: string
+type NoUndefinedField<T> = { [P in keyof T]-?: NoUndefinedField<NonNullable<T[P]>> }
-  AWS_SECRET_ACCESS_KEY: string
+
-  AWS_ENDPOINT: string
+function assertRequiredConfig(
-  AWS_REGION: string
+  conf: typeof required,
-  AWS_BUCKET: string
+): asserts conf is NoUndefinedField<typeof required> {
-  S3_PUBLIC_GATEWAY: string | undefined
+  Object.entries(conf).forEach(([key, value]) => {
+    if (!value) {
+      throw new Error(`ERROR: "${key}" env variable is missing.`)
+    }
+  })
 }
 
-export const isS3configured = (config: typeof s3): config is S3Configured => {
+assertRequiredConfig(required)
-  return !!(
-    config.AWS_ACCESS_KEY_ID &&
-    config.AWS_SECRET_ACCESS_KEY &&
-    config.AWS_ENDPOINT &&
-    config.AWS_REGION &&
-    config.AWS_BUCKET
-  )
-}
 
 const options = {
-  EMAIL_DEFAULT_SENDER: env.EMAIL_DEFAULT_SENDER,
   SUPPORT_EMAIL: env.SUPPORT_EMAIL,
   SUPPORT_URL: emails.SUPPORT_LINK,
   APPLICATION_NAME: metadata.APPLICATION_NAME,
@@ -156,6 +138,9 @@ const options = {
   MAX_PINNED_POSTS: Number.isNaN(Number(process.env.MAX_PINNED_POSTS))
     ? 1
     : Number(process.env.MAX_PINNED_POSTS),
+  MAX_GROUP_PINNED_POSTS: Number.isNaN(Number(process.env.MAX_GROUP_PINNED_POSTS))
+    ? 1
+    : Number(process.env.MAX_GROUP_PINNED_POSTS),
 }
 
 const language = {
@@ -169,12 +154,21 @@ const CONFIG = {
   ...neo4j,
   ...sentry,
   ...redis,
-  ...s3,
   ...options,
   ...language,
 }
 
 export type Config = typeof CONFIG
+export type S3Config = Pick<
+  Config,
+  | 'AWS_ACCESS_KEY_ID'
+  | 'AWS_SECRET_ACCESS_KEY'
+  | 'AWS_ENDPOINT'
+  | 'AWS_REGION'
+  | 'AWS_BUCKET'
+  | 'IMAGOR_SECRET'
+  | 'IMAGOR_PUBLIC_URL'
+>
 export default CONFIG
 
 export { nodemailerTransportOptions }

backend/src/db/disable-notifications.ts

@@ -0,0 +1,61 @@
+import databaseContext from '@context/database'
+
+const run = async () => {
+  const args = process.argv.slice(2)
+
+  if (args.length !== 1) {
+    // eslint-disable-next-line no-console
+    console.error('Usage: yarn run db:func:disable-notifications <email>')
+    // eslint-disable-next-line n/no-process-exit
+    process.exit(1)
+  }
+
+  const email = args[0]
+
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  if (!emailRegex.test(email)) {
+    // eslint-disable-next-line no-console
+    console.error('Error: Invalid email address format')
+    // eslint-disable-next-line n/no-process-exit
+    process.exit(1)
+  }
+
+  const { write } = databaseContext()
+
+  const result = (
+    await write({
+      query: `
+    MATCH (:EmailAddress {email: $email})-[:BELONGS_TO]->(user:User)
+      SET user.emailNotificationsFollowingUsers = false
+      SET user.emailNotificationsPostInGroup = false
+      SET user.emailNotificationsCommentOnObservedPost = false
+      SET user.emailNotificationsMention = false
+      SET user.emailNotificationsChatMessage = false
+      SET user.emailNotificationsGroupMemberJoined = false
+      SET user.emailNotificationsGroupMemberLeft = false
+      SET user.emailNotificationsGroupMemberRemoved = false
+      SET user.emailNotificationsGroupMemberRoleChanged = false
+    RETURN toString(count(user)) as count
+    `,
+      variables: {
+        email,
+      },
+    })
+  ).records[0].get('count') as string
+
+  if (result !== '1') {
+    // eslint-disable-next-line no-console
+    console.error(`User with email address ${email} not found`)
+    // eslint-disable-next-line n/no-process-exit
+    process.exit(1)
+  }
+
+  // eslint-disable-next-line no-console
+  console.log(`Notifications for User with email address ${email} disabled`)
+  // eslint-disable-next-line n/no-process-exit
+  process.exit(0)
+}
+
+void (async function () {
+  await run()
+})()

backend/src/db/factories.ts

@@ -7,7 +7,7 @@
 import { faker } from '@faker-js/faker'
 import { hashSync } from 'bcryptjs'
 import { Factory } from 'rosie'
-import slugify from 'slug'
+import slugify from 'slugify'
 import { v4 as uuid } from 'uuid'
 
 import { generateInviteCode } from '@graphql/resolvers/inviteCodes'

backend/src/db/migrations/20250502230521-migrate-to-s3.ts

@@ -37,42 +37,38 @@ export async function up(_next) {
     urls = urls.filter((url) => url.startsWith('/uploads'))
     // eslint-disable-next-line no-console
     console.log('URLS uploaded:')
-    await Promise.all(
+    for await (const url of urls) {
-      urls
+      const { pathname } = new URL(url, 'http://example.org')
-        .map((url) => async () => {
+      // TODO: find a better way to do this - this is quite a hack
-          const { pathname } = new URL(url, 'http://example.org')
+      const fileLocation =
-          // TODO: find a better way to do this - this is quite a hack
+        CONFIG.NODE_ENV === 'production'
-          const fileLocation =
+          ? path.join(__dirname, `../../../../public/${pathname}`) // we're in the /build folder
-            CONFIG.NODE_ENV === 'production'
+          : path.join(__dirname, `../../../public/${pathname}`)
-              ? path.join(__dirname, `../../../../public/${pathname}`) // we're in the /build folder
+      const s3Location = `original${pathname}`
-              : path.join(__dirname, `../../../public/${pathname}`)
+      const mimeType = lookup(fileLocation)
-          const s3Location = `original${pathname}`
+      // eslint-disable-next-line security/detect-non-literal-fs-filename
-          const mimeType = lookup(fileLocation)
+      const fileHandle = await open(fileLocation)
-          // eslint-disable-next-line security/detect-non-literal-fs-filename
+      const params = {
-          const fileHandle = await open(fileLocation)
+        Bucket: AWS_BUCKET,
-          const params = {
+        Key: s3Location,
-            Bucket: AWS_BUCKET,
+        ACL: ObjectCannedACL.public_read,
-            Key: s3Location,
+        ContentType: mimeType || 'image/jpeg',
-            ACL: ObjectCannedACL.public_read,
+        Body: fileHandle.createReadStream(),
-            ContentType: mimeType || 'image/jpeg',
+      }
-            Body: fileHandle.createReadStream(),
+      const command = new Upload({ client: s3, params })
-          }
-          const command = new Upload({ client: s3, params })
 
-          const data = await command.done()
+      const data = await command.done()
-          const { Location: spacesUrl } = data
+      const { Location: spacesUrl } = data
 
-          const updatedRecord = await transaction.run(
+      const updatedRecord = await transaction.run(
-            'MATCH (image:Image {url: $url}) SET image.url = $spacesUrl RETURN image.url as url',
+        'MATCH (image:Image {url: $url}) SET image.url = $spacesUrl RETURN image.url as url',
-            { url, spacesUrl },
+        { url, spacesUrl },
-          )
+      )
-          const [updatedUrl] = updatedRecord.records.map((record) => record.get('url') as string)
+      const [updatedUrl] = updatedRecord.records.map((record) => record.get('url') as string)
-          // eslint-disable-next-line no-console
+      // eslint-disable-next-line no-console
-          console.log(updatedUrl)
+      console.log(updatedUrl)
-          return updatedUrl
+      // return updatedUrl
-        })
+    }
-        .map((p) => p()),
-    )
     await transaction.commit()
   } catch (error) {
     // eslint-disable-next-line no-console

backend/src/db/migrations/20250804140837-delted-user-follows.ts

@@ -0,0 +1,51 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+
+import { getDriver } from '@db/neo4j'
+
+export const description = 'Delete follow relation for deleted users'
+
+export async function up(_next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Implement your migration here.
+    await transaction.run(`
+      MATCH (:User {deleted: true})-[follow:FOLLOWS]-(:User)
+      DELETE follow;
+    `)
+    await transaction.commit()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    await session.close()
+  }
+}
+
+export async function down(_next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // cannot be rolled back
+    // Implement your migration here.
+    // await transaction.run(``)
+    // await transaction.commit()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    await session.close()
+  }
+}

backend/src/db/models/Post.ts

@@ -18,7 +18,7 @@ export default {
   },
   title: { type: 'string', disallow: [null], min: 3 },
   slug: { type: 'string', allow: [null], unique: 'true' },
-  content: { type: 'string', disallow: [null], min: 3 },
+  content: { type: 'string', disallow: [null], required: true, min: 3 },
   contentExcerpt: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
@@ -58,6 +58,7 @@ export default {
     },
   },
   pinned: { type: 'boolean', default: null, valid: [null, true] },
+  groupPinned: { type: 'boolean', default: null, valid: [null, true] },
   postType: { type: 'string', default: 'Article', valid: ['Article', 'Event'] },
   observes: {
     type: 'relationship',

backend/src/db/models/index.ts

@@ -1,36 +1,49 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable n/no-missing-require */
-/* eslint-disable n/global-require */
 // NOTE: We cannot use `fs` here to clean up the code. Cypress breaks on any npm
 // module that is not browser-compatible. Node's `fs` module is server-side only
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+//
-declare let Cypress: any | undefined
+// We use static imports instead of dynamic require() to ensure compatibility
+// with both Node.js and Webpack (used by Cypress cucumber preprocessor).
+
+import Badge from './Badge'
+import Category from './Category'
+import Comment from './Comment'
+import Donations from './Donations'
+import EmailAddress from './EmailAddress'
+import File from './File'
+import Group from './Group'
+import Image from './Image'
+import InviteCode from './InviteCode'
+import Location from './Location'
+import Migration from './Migration'
+import Post from './Post'
+import Report from './Report'
+import SocialMedia from './SocialMedia'
+import Tag from './Tag'
+import UnverifiedEmailAddress from './UnverifiedEmailAddress'
+import User from './User'
+
+import type Neode from 'neode'
+
+// Type assertion needed because TypeScript infers literal types from the model
+// objects (e.g., type: 'string' as literal), but Neode expects the broader
+// SchemaObject type with PropertyTypes union. The Neode type definitions are
+// incomplete/incorrect, so we use double assertion to bypass the check.
 export default {
-  File: typeof Cypress !== 'undefined' ? require('./File') : require('./File').default,
+  Badge,
-  Image: typeof Cypress !== 'undefined' ? require('./Image') : require('./Image').default,
+  Category,
-  Badge: typeof Cypress !== 'undefined' ? require('./Badge') : require('./Badge').default,
+  Comment,
-  User: typeof Cypress !== 'undefined' ? require('./User') : require('./User').default,
+  Donations,
-  Group: typeof Cypress !== 'undefined' ? require('./Group') : require('./Group').default,
+  EmailAddress,
-  EmailAddress:
+  File,
-    typeof Cypress !== 'undefined' ? require('./EmailAddress') : require('./EmailAddress').default,
+  Group,
-  UnverifiedEmailAddress:
+  Image,
-    typeof Cypress !== 'undefined'
+  InviteCode,
-      ? require('./UnverifiedEmailAddress')
+  Location,
-      : require('./UnverifiedEmailAddress').default,
+  Migration,
-  SocialMedia:
+  Post,
-    typeof Cypress !== 'undefined' ? require('./SocialMedia') : require('./SocialMedia').default,
+  Report,
-  Post: typeof Cypress !== 'undefined' ? require('./Post') : require('./Post').default,
+  SocialMedia,
-  Comment: typeof Cypress !== 'undefined' ? require('./Comment') : require('./Comment').default,
+  Tag,
-  Category: typeof Cypress !== 'undefined' ? require('./Category') : require('./Category').default,
+  UnverifiedEmailAddress,
-  Tag: typeof Cypress !== 'undefined' ? require('./Tag') : require('./Tag').default,
+  User,
-  Location: typeof Cypress !== 'undefined' ? require('./Location') : require('./Location').default,
+} as unknown as Record<string, Neode.SchemaObject>
-  Donations:
-    typeof Cypress !== 'undefined' ? require('./Donations') : require('./Donations').default,
-  Report: typeof Cypress !== 'undefined' ? require('./Report') : require('./Report').default,
-  Migration:
-    typeof Cypress !== 'undefined' ? require('./Migration') : require('./Migration').default,
-  InviteCode:
-    typeof Cypress !== 'undefined' ? require('./InviteCode') : require('./InviteCode').default,
-}

backend/src/db/seed.ts

@@ -8,13 +8,13 @@ import sample from 'lodash/sample'
 
 import CONFIG from '@config/index'
 import { categories } from '@constants/categories'
-import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { ChangeGroupMemberRole } from '@graphql/queries/ChangeGroupMemberRole'
-import { createCommentMutation } from '@graphql/queries/createCommentMutation'
+import { CreateComment } from '@graphql/queries/CreateComment'
-import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { CreateGroup } from '@graphql/queries/CreateGroup'
 import { CreateMessage } from '@graphql/queries/CreateMessage'
-import { createPostMutation } from '@graphql/queries/createPostMutation'
+import { CreatePost } from '@graphql/queries/CreatePost'
-import { createRoomMutation } from '@graphql/queries/createRoomMutation'
+import { CreateRoom } from '@graphql/queries/CreateRoom'
-import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
+import { JoinGroup } from '@graphql/queries/JoinGroup'
 import { createApolloTestSetup } from '@root/test/helpers'
 
 import Factory from './factories'
@@ -341,7 +341,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     console.log('seed', 'groups')
     authenticatedUser = await peterLustig.toJson()
     await mutate({
-      mutation: createGroupMutation(),
+      mutation: CreateGroup,
       variables: {
         id: 'g0',
         name: 'Investigative Journalism',
@@ -354,21 +354,21 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g0',
         userId: 'u2',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g0',
         userId: 'u4',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g0',
         userId: 'u6',
@@ -376,7 +376,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     })
 
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g0',
         userId: 'u2',
@@ -385,7 +385,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     })
 
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g0',
         userId: 'u4',
@@ -396,7 +396,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     // eslint-disable-next-line no-console
     console.log('seed', 'group posts')
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p0-g0',
         groupId: 'g0',
@@ -408,7 +408,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     authenticatedUser = await bobDerBaumeister.toJson()
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p1-g0',
         groupId: 'g0',
@@ -420,7 +420,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     authenticatedUser = await jennyRostock.toJson()
     await mutate({
-      mutation: createGroupMutation(),
+      mutation: CreateGroup,
       variables: {
         id: 'g1',
         name: 'School For Citizens',
@@ -433,35 +433,35 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g1',
         userId: 'u1',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g1',
         userId: 'u2',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g1',
         userId: 'u5',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g1',
         userId: 'u6',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g1',
         userId: 'u7',
@@ -469,7 +469,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     })
 
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g1',
         userId: 'u1',
@@ -477,7 +477,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g1',
         userId: 'u5',
@@ -485,7 +485,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g1',
         userId: 'u6',
@@ -493,7 +493,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p0-g1',
         groupId: 'g1',
@@ -504,7 +504,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     })
     authenticatedUser = await peterLustig.toJson()
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p1-g1',
         groupId: 'g1',
@@ -516,7 +516,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     authenticatedUser = await bobDerBaumeister.toJson()
     await mutate({
-      mutation: createGroupMutation(),
+      mutation: CreateGroup,
       variables: {
         id: 'g2',
         name: 'Yoga Practice',
@@ -528,35 +528,35 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g2',
         userId: 'u3',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g2',
         userId: 'u4',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g2',
         userId: 'u5',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g2',
         userId: 'u6',
       },
     })
     await mutate({
-      mutation: joinGroupMutation(),
+      mutation: JoinGroup,
       variables: {
         groupId: 'g2',
         userId: 'u7',
@@ -564,7 +564,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     })
 
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g2',
         userId: 'u3',
@@ -572,7 +572,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g2',
         userId: 'u4',
@@ -580,7 +580,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g2',
         userId: 'u5',
@@ -588,7 +588,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: changeGroupMemberRoleMutation(),
+      mutation: ChangeGroupMemberRole,
       variables: {
         groupId: 'g2',
         userId: 'u6',
@@ -598,7 +598,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     authenticatedUser = await louie.toJson()
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p0-g2',
         groupId: 'g2',
@@ -614,7 +614,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     const now = new Date()
 
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'e0',
         title: 'Illegaler Kindergeburtstag',
@@ -629,7 +629,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'e1',
         title: 'Wir Schützen den Stuttgarter Schlossgarten',
@@ -644,7 +644,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'e2',
         title: 'IT 4 Change Treffen',
@@ -848,7 +848,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       'The new physics of <a class="hashtag" data-hashtag-id="QuantenFlussTheorie" href="/?hashtag=QuantenFlussTheorie">#QuantenFlussTheorie</a> can explain <a class="hashtag" data-hashtag-id="QuantumGravity" href="/?hashtag=QuantumGravity">#QuantumGravity</a>! <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> got that already. ;-)'
 
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p2',
         title: `Nature Philosophy Yoga`,
@@ -857,7 +857,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p7',
         title: 'This is post #7',
@@ -866,7 +866,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p8',
         title: `Quantum Flow Theory explains Quantum Gravity`,
@@ -875,7 +875,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createPostMutation(),
+      mutation: CreatePost,
       variables: {
         id: 'p12',
         title: 'This is post #12',
@@ -899,7 +899,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     const mentionInComment2 =
       'Did <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> tell you?'
     await mutate({
-      mutation: createCommentMutation,
+      mutation: CreateComment,
       variables: {
         id: 'c4',
         postId: 'p2',
@@ -907,7 +907,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createCommentMutation,
+      mutation: CreateComment,
       variables: {
         id: 'c4-1',
         postId: 'p2',
@@ -915,7 +915,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       },
     })
     await mutate({
-      mutation: createCommentMutation,
+      mutation: CreateComment,
       variables: {
         postId: 'p14',
         content: faker.lorem.paragraph(),
@@ -1223,7 +1223,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       authenticatedUser = userObj
 
       await mutate({
-        mutation: joinGroupMutation(),
+        mutation: JoinGroup,
         variables: {
           groupId: 'g2',
           userId: userObj.id,
@@ -1530,7 +1530,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     console.log('seed', 'chat')
     authenticatedUser = await huey.toJson()
     const { data: roomHueyPeter } = await mutate({
-      mutation: createRoomMutation(),
+      mutation: CreateRoom,
       variables: {
         userId: (await peterLustig.toJson()).id,
       },
@@ -1557,7 +1557,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     authenticatedUser = await huey.toJson()
     const { data: roomHueyJenny } = await mutate({
-      mutation: createRoomMutation(),
+      mutation: CreateRoom,
       variables: {
         userId: (await jennyRostock.toJson()).id,
       },
@@ -1584,7 +1584,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     for (const user of additionalUsers.slice(0, 99)) {
       authenticatedUser = await jennyRostock.toJson()
       const { data: room } = await mutate({
-        mutation: createRoomMutation(),
+        mutation: CreateRoom,
         variables: {
           userId: (await user.toJson()).id,
         },

backend/src/emails/__snapshots__/sendChatMessageMail.spec.ts.snap

@@ -1,9 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`sendChatMessageMail English chat_message template 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -13,9 +16,10 @@ exports[`sendChatMessageMail English chat_message template 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -23,9 +27,10 @@ exports[`sendChatMessageMail English chat_message template 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -36,11 +41,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -51,10 +62,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -62,10 +72,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -74,7 +80,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -94,13 +100,13 @@ footer {
         <p>you have received a new chat message from <a class="user" href="http://webapp:3000/profile/chatSender/chatsender">chatSender</a>.
         </p><a class="button" href="http://webapp:3000/chat">Show Chat</a>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p><br>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p><br>
-          <p>PS: If you don't want to receive e-mails anymore, change your <a class="settings" href="http://webapp:3000/settings/notifications">notification settings</a>!</p>
+          <p class="no-margin-top-bottom">PS: If you don't want to receive e-mails anymore, change your <a class="settings" href="http://webapp:3000/settings/notifications">notification settings</a>!</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -129,14 +135,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "chatReceiver",
+  },
 }
 `;
 
 exports[`sendChatMessageMail German chat_message template 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -146,9 +158,10 @@ exports[`sendChatMessageMail German chat_message template 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -156,9 +169,10 @@ exports[`sendChatMessageMail German chat_message template 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -169,11 +183,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -184,10 +204,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -195,10 +214,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -207,7 +222,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -227,13 +242,13 @@ footer {
         <p>du hast eine neue Chat-Nachricht von <a class="user" href="http://webapp:3000/profile/chatSender/chatsender">chatSender</a> erhalten.
         </p><a class="button" href="http://webapp:3000/chat">Chat anzeigen</a>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p><br>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p><br>
-          <p>PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine <a class="settings" href="http://webapp:3000/settings/notifications">Benachrichtigungseinstellungen</a>!</p>
+          <p class="no-margin-top-bottom">PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine <a class="settings" href="http://webapp:3000/settings/notifications">Benachrichtigungseinstellungen</a>!</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -262,6 +277,9 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "chatReceiver",
+  },
 }
 `;

backend/src/emails/__snapshots__/sendEmailVerification.spec.ts.snap

@@ -1,9 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`sendEmailVerification English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -13,9 +16,10 @@ exports[`sendEmailVerification English renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -23,9 +27,10 @@ exports[`sendEmailVerification English renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -36,11 +41,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -51,10 +62,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -62,10 +72,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -74,7 +80,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -95,12 +101,12 @@ footer {
         <p>If you don't want to change your e-mail address feel free to ignore this message. </p>
         <p>If the above button doesn't work, you can also copy the following code into your browser window: <span>123456</span></p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -132,14 +138,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "User",
+  },
 }
 `;
 
 exports[`sendEmailVerification German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -149,9 +161,10 @@ exports[`sendEmailVerification German renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -159,9 +172,10 @@ exports[`sendEmailVerification German renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -172,11 +186,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -187,10 +207,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -198,10 +217,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -210,7 +225,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -231,12 +246,12 @@ footer {
         <p>Falls du deine E-Mail Adresse doch nicht ändern möchtest, kannst du diese Nachricht einfach ignorieren. </p>
         <p>Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in dein Browserfenster kopieren: <span>123456</span></p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -268,6 +283,9 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "User",
+  },
 }
 `;

backend/src/emails/__snapshots__/sendRegistrationMail.spec.ts.snap

@@ -1,9 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`sendRegistrationMail with invite code English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -13,9 +16,10 @@ exports[`sendRegistrationMail with invite code English renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -23,9 +27,10 @@ exports[`sendRegistrationMail with invite code English renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -36,11 +41,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -51,10 +62,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -62,10 +72,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -74,7 +80,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -91,19 +97,19 @@ footer {
       <h2>Welcome to ocelot.social!</h2>
       <div class="wrapper">
         <div class="content"></div>
-        <p>Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:</p><a class="button" href="http://webapp:3000/registration?email=user%40example.org&amp;nonce=123456&amp;inviteCode=welcome&amp;method=invite-code">Confirm your e-mail address</a>
+        <p>Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:</p><a class="button" href="http://webapp:3000/registration?email=moderator%40example.org&amp;nonce=123456&amp;inviteCode=welcome&amp;method=invite-code">Confirm your e-mail address</a>
         <p>If the above button doesn't work, you can also copy the following code into your browser window: <span>123456</span></p>
         <p>However, this only works if you have registered through our website.</p>
         <p>If you didn't sign up for <a>ocelot.social</a> we recommend you to check it out! It's a social network from people for people who want to connect and change the world together.
         </p>
         <p>PS: If you ignore this e-mail we will not create an account for you. ;)</p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -119,7 +125,7 @@ just one tiny step missing before we can start shaping the world together …
 Please confirm your e-mail address by clicking the button below:
 
 Confirm your e-mail address
-[http://webapp:3000/registration?email=user%40example.org&nonce=123456&inviteCode=welcome&method=invite-code]
+[http://webapp:3000/registration?email=moderator%40example.org&nonce=123456&inviteCode=welcome&method=invite-code]
 
 If the above button doesn't work, you can also copy the following code into your
 browser window: 123456
@@ -141,14 +147,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "moderator@example.org",
+    "name": "Bob &"?@\\ Baumeister",
+  },
 }
 `;
 
 exports[`sendRegistrationMail with invite code German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -158,9 +170,10 @@ exports[`sendRegistrationMail with invite code German renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -168,9 +181,10 @@ exports[`sendRegistrationMail with invite code German renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -181,11 +195,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -196,10 +216,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -207,10 +226,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -219,7 +234,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -236,19 +251,19 @@ footer {
       <h2>Willkommen bei ocelot.social!</h2>
       <div class="wrapper">
         <div class="content"></div>
-        <p>Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige deine E-Mail Adresse:</p><a class="button" href="http://webapp:3000/registration?email=user%40example.org&amp;nonce=123456&amp;inviteCode=welcome&amp;method=invite-code">Bestätige deine E-Mail Adresse</a>
+        <p>Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige deine E-Mail Adresse:</p><a class="button" href="http://webapp:3000/registration?email=moderator%40example.org&amp;nonce=123456&amp;inviteCode=welcome&amp;method=invite-code">Bestätige deine E-Mail Adresse</a>
         <p>Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in dein Browserfenster kopieren: <span>123456</span></p>
         <p>Das funktioniert allerdings nur, wenn du dich über unsere Website registriert hast.</p>
         <p>Falls du dich nicht selbst bei <a>ocelot.social</a> angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.
         </p>
         <p>PS: Wenn du keinen Account bei uns möchtest, kannst du diese E-Mail einfach ignorieren. ;)</p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -264,7 +279,7 @@ fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können
 … Bitte bestätige deine E-Mail Adresse:
 
 Bestätige deine E-Mail Adresse
-[http://webapp:3000/registration?email=user%40example.org&nonce=123456&inviteCode=welcome&method=invite-code]
+[http://webapp:3000/registration?email=moderator%40example.org&nonce=123456&inviteCode=welcome&method=invite-code]
 
 Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in
 dein Browserfenster kopieren: 123456
@@ -287,14 +302,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "moderator@example.org",
+    "name": "Bob &"?@\\ Baumeister",
+  },
 }
 `;
 
 exports[`sendRegistrationMail without invite code English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -304,9 +325,10 @@ exports[`sendRegistrationMail without invite code English renders correctly 1`]
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -314,9 +336,10 @@ exports[`sendRegistrationMail without invite code English renders correctly 1`]
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -327,11 +350,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -342,10 +371,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -353,10 +381,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -365,7 +389,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -382,19 +406,19 @@ footer {
       <h2>Welcome to ocelot.social!</h2>
       <div class="wrapper">
         <div class="content"></div>
-        <p>Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:</p><a class="button" href="http://webapp:3000/registration?email=user%40example.org&amp;nonce=123456&amp;method=invite-mail">Confirm your e-mail address</a>
+        <p>Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:</p><a class="button" href="http://webapp:3000/registration?email=moderator%40example.org&amp;nonce=123456&amp;method=invite-mail">Confirm your e-mail address</a>
         <p>If the above button doesn't work, you can also copy the following code into your browser window: <span>123456</span></p>
         <p>However, this only works if you have registered through our website.</p>
         <p>If you didn't sign up for <a>ocelot.social</a> we recommend you to check it out! It's a social network from people for people who want to connect and change the world together.
         </p>
         <p>PS: If you ignore this e-mail we will not create an account for you. ;)</p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -410,7 +434,7 @@ just one tiny step missing before we can start shaping the world together …
 Please confirm your e-mail address by clicking the button below:
 
 Confirm your e-mail address
-[http://webapp:3000/registration?email=user%40example.org&nonce=123456&method=invite-mail]
+[http://webapp:3000/registration?email=moderator%40example.org&nonce=123456&method=invite-mail]
 
 If the above button doesn't work, you can also copy the following code into your
 browser window: 123456
@@ -432,14 +456,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "moderator@example.org",
+    "name": "Bob &"?@\\ Baumeister",
+  },
 }
 `;
 
 exports[`sendRegistrationMail without invite code German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -449,9 +479,10 @@ exports[`sendRegistrationMail without invite code German renders correctly 1`] =
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -459,9 +490,10 @@ exports[`sendRegistrationMail without invite code German renders correctly 1`] =
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -472,11 +504,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -487,10 +525,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -498,10 +535,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -510,7 +543,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -527,19 +560,19 @@ footer {
       <h2>Willkommen bei ocelot.social!</h2>
       <div class="wrapper">
         <div class="content"></div>
-        <p>Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige deine E-Mail Adresse:</p><a class="button" href="http://webapp:3000/registration?email=user%40example.org&amp;nonce=123456&amp;method=invite-mail">Bestätige deine E-Mail Adresse</a>
+        <p>Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige deine E-Mail Adresse:</p><a class="button" href="http://webapp:3000/registration?email=moderator%40example.org&amp;nonce=123456&amp;method=invite-mail">Bestätige deine E-Mail Adresse</a>
         <p>Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in dein Browserfenster kopieren: <span>123456</span></p>
         <p>Das funktioniert allerdings nur, wenn du dich über unsere Website registriert hast.</p>
         <p>Falls du dich nicht selbst bei <a>ocelot.social</a> angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.
         </p>
         <p>PS: Wenn du keinen Account bei uns möchtest, kannst du diese E-Mail einfach ignorieren. ;)</p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -555,7 +588,7 @@ fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können
 … Bitte bestätige deine E-Mail Adresse:
 
 Bestätige deine E-Mail Adresse
-[http://webapp:3000/registration?email=user%40example.org&nonce=123456&method=invite-mail]
+[http://webapp:3000/registration?email=moderator%40example.org&nonce=123456&method=invite-mail]
 
 Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in
 dein Browserfenster kopieren: 123456
@@ -578,6 +611,9 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "moderator@example.org",
+    "name": "Bob &"?@\\ Baumeister",
+  },
 }
 `;

backend/src/emails/__snapshots__/sendResetPasswordMail.spec.ts.snap

@@ -1,9 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`sendResetPasswordMail English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -13,9 +16,10 @@ exports[`sendResetPasswordMail English renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -23,9 +27,10 @@ exports[`sendResetPasswordMail English renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -36,11 +41,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -51,10 +62,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -62,10 +72,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -74,7 +80,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -95,12 +101,12 @@ footer {
         <p>If you didn't request a new password feel free to ignore this e-mail.</p>
         <p>If the above button doesn't work you can also copy the following code into your browser window: <span>123456</span></p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -131,14 +137,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "Jenny Rostock",
+  },
 }
 `;
 
 exports[`sendResetPasswordMail German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -148,9 +160,10 @@ exports[`sendResetPasswordMail German renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -158,9 +171,10 @@ exports[`sendResetPasswordMail German renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -171,11 +185,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -186,10 +206,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -197,10 +216,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -209,7 +224,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -230,12 +245,12 @@ footer {
         <p>Falls du kein neues Passwort angefordert hast, kannst du diese E-Mail einfach ignorieren.</p>
         <p>Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in dein Browserfenster kopieren: <span>123456</span></p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -267,6 +282,9 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "Jenny Rostock",
+  },
 }
 `;

backend/src/emails/__snapshots__/sendWrongEmail.spec.ts.snap

@@ -1,9 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`sendWrongEmail English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -13,9 +16,10 @@ exports[`sendWrongEmail English renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -23,9 +27,10 @@ exports[`sendWrongEmail English renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -36,11 +41,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -51,10 +62,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -62,10 +72,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -74,7 +80,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -95,12 +101,12 @@ footer {
         <p>If you don't have an account at <a>ocelot.social</a> yet or if you didn't want to reset your password, please ignore this e-mail.
         </p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -129,14 +135,20 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "moderator@example.org",
+    "name": "Bob &"?@\\ Baumeister",
+  },
 }
 `;
 
 exports[`sendWrongEmail German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -146,9 +158,10 @@ exports[`sendWrongEmail German renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -156,9 +169,10 @@ exports[`sendWrongEmail German renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -169,11 +183,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -184,10 +204,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -195,10 +214,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -207,7 +222,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -228,12 +243,12 @@ footer {
         <p>Wenn du noch keinen Account bei <a>ocelot.social</a> hast oder dein Password gar nicht ändern willst, kannst du diese E-Mail einfach ignorieren!
         </p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:devops@ocelot.social">devops@ocelot.social</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -262,6 +277,9 @@ devops@ocelot.social [devops@ocelot.social]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "moderator@example.org",
+    "name": "Bob &"?@\\ Baumeister",
+  },
 }
 `;

backend/src/emails/__snapshots__/supportLine.spec.ts.snap

@@ -1,9 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`sendResetPasswordMail with support English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -13,9 +16,10 @@ exports[`sendResetPasswordMail with support English renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -23,9 +27,10 @@ exports[`sendResetPasswordMail with support English renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -36,11 +41,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -51,10 +62,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -62,10 +72,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -74,7 +80,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -95,12 +101,12 @@ footer {
         <p>If you didn't request a new password feel free to ignore this e-mail.</p>
         <p>If the above button doesn't work you can also copy the following code into your browser window: <span>123456</span></p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>If you have questions or problems, feel free to contact our support: <a href="mailto:support@example.org">support@example.org</a></p>
+        <p class="no-margin-top-bottom">If you have questions or problems, feel free to contact our support: <a href="mailto:support@example.org">support@example.org</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -131,14 +137,20 @@ support@example.org [support@example.org]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "Jenny Rostock",
+  },
 }
 `;
 
 exports[`sendResetPasswordMail with support German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -148,9 +160,10 @@ exports[`sendResetPasswordMail with support German renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -158,9 +171,10 @@ exports[`sendResetPasswordMail with support German renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -171,11 +185,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -186,10 +206,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -197,10 +216,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -209,7 +224,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -230,12 +245,12 @@ footer {
         <p>Falls du kein neues Passwort angefordert hast, kannst du diese E-Mail einfach ignorieren.</p>
         <p>Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in dein Browserfenster kopieren: <span>123456</span></p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <div class="support">
-        <p>Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:support@example.org">support@example.org</a></p>
+        <p class="no-margin-top-bottom">Wenn du Fragen oder Probleme hast, kannst du dich gerne an den Support wenden: <a href="mailto:support@example.org">support@example.org</a></p>
       </div>
       <footer>
         <div class="footer"></div><a href="https://ocelot.social">ocelot.social Community</a>
@@ -267,14 +282,20 @@ support@example.org [support@example.org]
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "Jenny Rostock",
+  },
 }
 `;
 
 exports[`sendResetPasswordMail without support English renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -284,9 +305,10 @@ exports[`sendResetPasswordMail without support English renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -294,9 +316,10 @@ exports[`sendResetPasswordMail without support English renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -307,11 +330,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -322,10 +351,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -333,10 +361,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -345,7 +369,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -366,8 +390,8 @@ footer {
         <p>If you didn't request a new password feel free to ignore this e-mail.</p>
         <p>If the above button doesn't work you can also copy the following code into your browser window: <span>123456</span></p>
         <div class="text-block">
-          <p>See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">See you soon on <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– The ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– The ocelot.social Team</p>
         </div>
       </div>
       <footer>
@@ -396,14 +420,20 @@ See you soon on ocelot.social [https://ocelot.social]!
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "Jenny Rostock",
+  },
 }
 `;
 
 exports[`sendResetPasswordMail without support German renders correctly 1`] = `
 {
   "attachments": [],
-  "from": "ocelot.social <devops@ocelot.social>",
+  "from": {
+    "address": "devops@ocelot.social",
+    "name": "ocelot.social",
+  },
   "html": "<!DOCTYPE html>
 <html lang="de">
   <head>
@@ -413,9 +443,10 @@ exports[`sendResetPasswordMail without support German renders correctly 1`] = `
     <style>body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -423,9 +454,10 @@ exports[`sendResetPasswordMail without support German renders correctly 1`] = `
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -436,11 +468,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -451,10 +489,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -462,10 +499,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -474,7 +507,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;
@@ -495,8 +528,8 @@ footer {
         <p>Falls du kein neues Passwort angefordert hast, kannst du diese E-Mail einfach ignorieren.</p>
         <p>Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in dein Browserfenster kopieren: <span>123456</span></p>
         <div class="text-block">
-          <p>Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
+          <p class="no-margin-top-bottom">Bis bald bei <a class="organization" href="https://ocelot.social">ocelot.social</a>!</p>
-          <p>– Dein ocelot.social Team</p>
+          <p class="no-margin-top-bottom">– Dein ocelot.social Team</p>
         </div>
       </div>
       <footer>
@@ -526,6 +559,9 @@ Bis bald bei ocelot.social [https://ocelot.social]!
 
 
 ocelot.social Community [https://ocelot.social]",
-  "to": "user@example.org",
+  "to": {
+    "address": "user@example.org",
+    "name": "Jenny Rostock",
+  },
 }
 `;

backend/src/emails/sendEmail.ts

@@ -2,7 +2,6 @@
 
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import path from 'node:path'
 
 import Email from 'email-templates'
@@ -29,7 +28,7 @@ export const defaultParams = {
   renderSettingsUrl: true,
 }
 
-const from = `${CONFIG.APPLICATION_NAME} <${CONFIG.EMAIL_DEFAULT_SENDER}>`
+const from = { name: CONFIG.APPLICATION_NAME, address: CONFIG.EMAIL_DEFAULT_SENDER }
 
 const transport = createTransport(nodemailerTransportOptions)
 
@@ -74,8 +73,8 @@ interface OriginalMessage {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const sendNotificationMail = async (notification: any): Promise<OriginalMessage> => {
   const locale = notification?.to?.locale
-  const to = notification?.email
   const name = notification?.to?.name
+  const to = { name, address: notification?.email }
   const template = notification?.reason
 
   try {
@@ -94,8 +93,8 @@ export const sendNotificationMail = async (notification: any): Promise<OriginalM
             : notification?.from?.title,
         postUrl: new URL(
           notification?.from?.__typename === 'Comment'
-            ? `/post/${notification?.from?.post?.id}/${notification?.from?.post?.slug}`
+            ? `/post/${encodeURIComponent(notification?.from?.post?.id)}/${encodeURIComponent(notification?.from?.post?.slug)}`
-            : `/post/${notification?.from?.id}/${notification?.from?.slug}`,
+            : `/post/${encodeURIComponent(notification?.from?.id)}/${encodeURIComponent(notification?.from?.slug)}`,
           CONFIG.CLIENT_URI,
         ),
         postAuthorName:
@@ -106,7 +105,7 @@ export const sendNotificationMail = async (notification: any): Promise<OriginalM
           notification?.from?.__typename === 'Comment'
             ? undefined
             : new URL(
-                `user/${notification?.from?.author?.id}/${notification?.from?.author?.slug}`,
+                `profile/${encodeURIComponent(notification?.from?.author?.id)}/${encodeURIComponent(notification?.from?.author?.slug)}`,
                 CONFIG.CLIENT_URI,
               ),
         commenterName:
@@ -116,14 +115,14 @@ export const sendNotificationMail = async (notification: any): Promise<OriginalM
         commenterUrl:
           notification?.from?.__typename === 'Comment'
             ? new URL(
-                `/profile/${notification?.from?.author?.id}/${notification?.from?.author?.slug}`,
+                `/profile/${encodeURIComponent(notification?.from?.author?.id)}/${encodeURIComponent(notification?.from?.author?.slug)}`,
                 CONFIG.CLIENT_URI,
               )
             : undefined,
         commentUrl:
           notification?.from?.__typename === 'Comment'
             ? new URL(
-                `/post/${notification?.from?.post?.id}/${notification?.from?.post?.slug}#commentId-${notification?.from?.id}`,
+                `/post/${encodeURIComponent(notification?.from?.post?.id)}/${encodeURIComponent(notification?.from?.post?.slug)}#commentId-${encodeURIComponent(notification?.from?.id)}`,
                 CONFIG.CLIENT_URI,
               )
             : undefined,
@@ -132,7 +131,7 @@ export const sendNotificationMail = async (notification: any): Promise<OriginalM
         groupUrl:
           notification?.from?.__typename === 'Group'
             ? new URL(
-                `/groups/${notification?.from?.id}/${notification?.from?.slug}`,
+                `/groups/${encodeURIComponent(notification?.from?.id)}/${encodeURIComponent(notification?.from?.slug)}`,
                 CONFIG.CLIENT_URI,
               )
             : undefined,
@@ -143,7 +142,7 @@ export const sendNotificationMail = async (notification: any): Promise<OriginalM
         groupRelatedUserUrl:
           notification?.from?.__typename === 'Group'
             ? new URL(
-                `/profile/${notification?.relatedUser?.id}/${notification?.relatedUser?.slug}`,
+                `/profile/${encodeURIComponent(notification?.relatedUser?.id)}/${encodeURIComponent(notification?.relatedUser?.slug)}`,
                 CONFIG.CLIENT_URI,
               )
             : undefined,
@@ -165,7 +164,7 @@ export const sendChatMessageMail = async (
   data: ChatMessageEmailInput,
 ): Promise<OriginalMessage> => {
   const { senderUser, recipientUser } = data
-  const to = data.email
+  const to = { name: recipientUser.name, address: data.email }
   try {
     const { originalMessage } = await email.send({
       template: path.join(__dirname, 'templates', 'chat_message'),
@@ -177,7 +176,10 @@ export const sendChatMessageMail = async (
         locale: recipientUser.locale,
         name: recipientUser.name,
         chattingUser: senderUser.name,
-        chattingUserUrl: new URL(`/profile/${senderUser.id}/${senderUser.slug}`, CONFIG.CLIENT_URI),
+        chattingUserUrl: new URL(
+          `/profile/${encodeURIComponent(senderUser.id)}/${encodeURIComponent(senderUser.slug)}`,
+          CONFIG.CLIENT_URI,
+        ),
         chatUrl: new URL('/chat', CONFIG.CLIENT_URI),
       },
     })
@@ -188,6 +190,7 @@ export const sendChatMessageMail = async (
 }
 
 interface VerifyMailInput {
+  name: string
   email: string
   nonce: string
   locale: string
@@ -200,10 +203,10 @@ interface RegistrationMailInput extends VerifyMailInput {
 export const sendRegistrationMail = async (
   data: RegistrationMailInput,
 ): Promise<OriginalMessage> => {
-  const { nonce, locale, inviteCode } = data
+  const { name, nonce, locale, inviteCode } = data
-  const to = data.email
+  const to = { name, address: data.email }
   const actionUrl = new URL('/registration', CONFIG.CLIENT_URI)
-  actionUrl.searchParams.set('email', to)
+  actionUrl.searchParams.set('email', to.address)
   actionUrl.searchParams.set('nonce', nonce)
   if (inviteCode) {
     actionUrl.searchParams.set('inviteCode', inviteCode)
@@ -240,9 +243,9 @@ export const sendEmailVerification = async (
   data: EmailVerificationInput,
 ): Promise<OriginalMessage> => {
   const { nonce, locale, name } = data
-  const to = data.email
+  const to = { name, address: data.email }
   const actionUrl = new URL('/settings/my-email-address/verify', CONFIG.CLIENT_URI)
-  actionUrl.searchParams.set('email', to)
+  actionUrl.searchParams.set('email', to.address)
   actionUrl.searchParams.set('nonce', nonce)
 
   try {
@@ -270,9 +273,9 @@ export const sendResetPasswordMail = async (
   data: EmailVerificationInput,
 ): Promise<OriginalMessage> => {
   const { nonce, locale, name } = data
-  const to = data.email
+  const to = { name, address: data.email }
   const actionUrl = new URL('/password-reset/change-password', CONFIG.CLIENT_URI)
-  actionUrl.searchParams.set('email', to)
+  actionUrl.searchParams.set('email', to.address)
   actionUrl.searchParams.set('nonce', nonce)
   try {
     const { originalMessage } = await email.send({
@@ -296,11 +299,12 @@ export const sendResetPasswordMail = async (
 }
 
 export const sendWrongEmail = async (data: {
+  name: string
   locale: string
   email: string
 }): Promise<OriginalMessage> => {
-  const { locale } = data
+  const { locale, name } = data
-  const to = data.email
+  const to = { name, address: data.email }
   const actionUrl = new URL('/password-reset/request', CONFIG.CLIENT_URI)
   try {
     const { originalMessage } = await email.send({

backend/src/emails/sendRegistrationMail.spec.ts

@@ -7,12 +7,14 @@ import { sendRegistrationMail } from './sendEmail'
 
 describe('sendRegistrationMail', () => {
   const data: {
+    name: string
     email: string
     nonce: string
     locale: string
     inviteCode?: string
   } = {
-    email: 'user@example.org',
+    name: 'Bob &"?@\\ Baumeister',
+    email: 'moderator@example.org',
     nonce: '123456',
     locale: 'en',
     inviteCode: 'welcome',

backend/src/emails/sendWrongEmail.spec.ts

@@ -7,10 +7,12 @@ import { sendWrongEmail } from './sendEmail'
 
 describe('sendWrongEmail', () => {
   const data: {
+    name: string
     email: string
     locale: string
   } = {
-    email: 'user@example.org',
+    name: 'Bob &"?@\\ Baumeister',
+    email: 'moderator@example.org',
     locale: 'en',
   }
 

backend/src/emails/templates/changed_group_member_role/html.pug

@@ -3,5 +3,5 @@ extend ../layout.pug
 block content
   .content
   - var groupUrl = groupUrl
-  p= t('changedGroupMemberRole', { groupName })
+  p!= t('changedGroupMemberRole', { groupName })
-  a.button(href=groupUrl)= t('buttons.viewGroup')
+  a.button(href=groupUrl)!= t('buttons.viewGroup')

backend/src/emails/templates/changed_group_member_role/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.changedGroupMemberRole')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.changedGroupMemberRole')}`

backend/src/emails/templates/chat_message/html.pug

@@ -2,7 +2,7 @@ extend ../layout.pug
 
 block content
   .content
-  p= t('chatMessageStart')
+  p!= t('chatMessageStart')
-    a.user(href=chattingUserUrl)= chattingUser
+    a.user(href=chattingUserUrl)!= chattingUser
-    = t('chatMessageEnd')
+    != t('chatMessageEnd')
-  a.button(href=chatUrl)= t('buttons.viewChat')
+  a.button(href=chatUrl)!= t('buttons.viewChat')

backend/src/emails/templates/chat_message/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.chatMessage')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.chatMessage')}`

backend/src/emails/templates/commented_on_post/html.pug

@@ -3,6 +3,6 @@ extend ../layout.pug
 block content
   .content
   p
-    a.user(href=commenterUrl)= commenterName
+    a.user(href=commenterUrl)!= commenterName
-    = t('commentedOnPost', { postTitle})
+    != t('commentedOnPost', { postTitle})
-  a.button(href=commentUrl)= t('buttons.viewComment')
+  a.button(href=commentUrl)!= t('buttons.viewComment')

backend/src/emails/templates/commented_on_post/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.commentedOnPost')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.commentedOnPost')}`

backend/src/emails/templates/emailVerification/html.pug

@@ -2,9 +2,9 @@ extend ../layout.pug
 
 block content
   .content
-  p= t('emailVerification.introduction')
+  p!= t('emailVerification.introduction')
-  a.button(href=actionUrl)= t('buttons.verifyEmail')
+  a.button(href=actionUrl)!= t('buttons.verifyEmail')
-  p= t('emailVerification.doNotChange')
+  p!= t('emailVerification.doNotChange')
 
-  p= t('emailVerification.codeHint')
+  p!= t('emailVerification.codeHint')
-    span= nonce
+    span!= nonce

backend/src/emails/templates/emailVerification/subject.pug

@@ -1 +1 @@
-= `${t('subjects.newEmail')} ${APPLICATION_NAME}`
+!= `${t('subjects.newEmail')} ${APPLICATION_NAME}`

backend/src/emails/templates/followed_user_posted/html.pug

@@ -3,6 +3,6 @@ extend ../layout.pug
 block content
   .content
   p
-    a.user(href=postAuthorUrl)= postAuthorName
+    a.user(href=postAuthorUrl)!= postAuthorName
-    = t('followedUserPosted', { postTitle })
+    != t('followedUserPosted', { postTitle })
-  a.button(href=postUrl)= t('buttons.viewPost')
+  a.button(href=postUrl)!= t('buttons.viewPost')

backend/src/emails/templates/followed_user_posted/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.followedUserPosted')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.followedUserPosted')}`

backend/src/emails/templates/includes/footer.pug

@@ -2,4 +2,4 @@ footer
   .footer
   - var organizationUrl = ORGANIZATION_URL
   - var organizationName = ORGANIZATION_NAME
-    a(href=organizationUrl)= organizationName
+    a(href=organizationUrl)!= organizationName

backend/src/emails/templates/includes/greeting.pug

@@ -4,14 +4,14 @@
   - var team = APPLICATION_NAME
   - var settingsUrl = settingsUrl
   - var renderSettingsUrl = renderSettingsUrl
-  p= t('general.seeYou')
+  p.no-margin-top-bottom!= t('general.seeYou')
-    a.organization(href=organizationUrl)= team
+    a.organization(href=organizationUrl)!= team
     | !
-  p= t('general.yourTeam', { team })
+  p.no-margin-top-bottom!= t('general.yourTeam', { team })
 
   if renderSettingsUrl
     br
-    p= t('general.settingsHint')
+    p.no-margin-top-bottom!= t('general.settingsHint')
-      a.settings(href=settingsUrl)= t('general.settingsName')
+      a.settings(href=settingsUrl)!= t('general.settingsName')
       | !
   

backend/src/emails/templates/includes/salutation.pug

@@ -1 +1 @@
-h2= `${t('general.greeting')} ${name},`
+h2!= `${t('general.greeting')} ${name},`

backend/src/emails/templates/includes/support.pug

@@ -1,2 +1,2 @@
-p= t('support')
+p.no-margin-top-bottom!= t('support')
-  a(href='mailto:' + supportEmail)= supportEmail
+  a(href='mailto:' + supportEmail)!= supportEmail

backend/src/emails/templates/includes/webflow.css

@@ -1,9 +1,10 @@
 body{
   display: block;
   font-family: Lato, sans-serif;
-  font-size: 17px;
+  font-size: 16px;
   text-align: left;
   text-align: -webkit-left;
+  line-height: 24px;
   justify-content: center;
   padding: 15px;
   margin: 0px;
@@ -11,9 +12,10 @@ body{
 
 h2 {
   margin-top: 25px;
-  font-size: 25px;
+  margin-bottom: 30px;
+  font-size: 24px;
   font-weight: normal;
-  line-height: 22px;
+  line-height: 24px;
   color: #333333;
 }
 
@@ -24,11 +26,17 @@ h2 {
 }
 
 .head-logo {
-  width: 60%;
+  width: 30%;
   height: auto;
   display: block;
   margin-left: auto;
   margin-right: auto;
+  margin-bottom: 50px;
+}
+
+p.no-margin-top-bottom {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 a {
@@ -39,10 +47,9 @@ a.button {
   background: #17b53e;
   font-family: Lato, sans-serif;
   font-size: 16px;
-  line-height: 15px;
   text-decoration: none;
   text-align:center;
-  padding: 13px 17px;
+  padding: 9px 18px;
   color: #ffffff;
   display: table;
   margin-left: auto;
@@ -50,10 +57,6 @@ a.button {
   border-radius: 4px;
 }
 
-span {
-  color: #17b53e;
-}
-
 .text-block {
   margin-top: 20px;
   color: #000000;
@@ -62,7 +65,7 @@ span {
 footer {
   padding: 20px;
   font-family: Lato, sans-serif;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 15px;
   text-align: center;
   color: #888888;

backend/src/emails/templates/includes/welcome.pug

@@ -1 +1 @@
-h2= `${t('general.welcome')} ${APPLICATION_NAME}!`
+h2!= `${t('general.welcome')} ${APPLICATION_NAME}!`

backend/src/emails/templates/mentioned_in_comment/html.pug

@@ -3,6 +3,6 @@ extend ../layout.pug
 block content
   .content
   p
-    a.user(href=commenterUrl)= commenterName
+    a.user(href=commenterUrl)!= commenterName
-    = t('mentionedInComment', { postTitle})
+    != t('mentionedInComment', { postTitle})
-  a.button(href=commentUrl)= t('buttons.viewComment')
+  a.button(href=commentUrl)!= t('buttons.viewComment')

backend/src/emails/templates/mentioned_in_comment/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.mentionedInComment')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.mentionedInComment')}`

backend/src/emails/templates/mentioned_in_post/html.pug

@@ -3,6 +3,6 @@ extend ../layout.pug
 block content
   .content
   p
-    a.user(href=postAuthorUrl)= postAuthorName
+    a.user(href=postAuthorUrl)!= postAuthorName
-    = t('mentionedInPost', { postTitle })
+    != t('mentionedInPost', { postTitle })
-  a.button(href=postUrl)= t('buttons.viewPost')
+  a.button(href=postUrl)!= t('buttons.viewPost')

backend/src/emails/templates/mentioned_in_post/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.mentionedInPost')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.mentionedInPost')}`

backend/src/emails/templates/post_in_group/html.pug

@@ -3,5 +3,5 @@ extend ../layout.pug
 block content
   .content
   - var postUrl = postUrl
-  p= t('postInGroup', { postTitle})
+  p!= t('postInGroup', { postTitle})
-  a.button(href=postUrl)= t('buttons.viewPost')
+  a.button(href=postUrl)!= t('buttons.viewPost')

backend/src/emails/templates/post_in_group/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.postInGroup')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.postInGroup')}`

backend/src/emails/templates/registration/html.pug

@@ -2,14 +2,14 @@ extend ../layout.pug
 
 block content
   .content
-  p= t('registration.introduction')
+  p!= t('registration.introduction')
-  a.button(href=actionUrl)= t('buttons.confirmEmail')
+  a.button(href=actionUrl)!= t('buttons.confirmEmail')
-  p= t('registration.codeHint')
+  p!= t('registration.codeHint')
-    span= nonce
+    span!= nonce
-  p= t('registration.codeHintException')
+  p!= t('registration.codeHintException')
 
-  p= t('registration.notYouStart') 
+  p!= t('registration.notYouStart') 
-    a(href=ORGANIZATION_LINK)= APPLICATION_NAME
+    a(href=ORGANIZATION_LINK)!= APPLICATION_NAME
-    = t('registration.notYouEnd')
+    != t('registration.notYouEnd')
 
-  p= t('registration.ps')
+  p!= t('registration.ps')

backend/src/emails/templates/registration/subject.pug

@@ -1 +1 @@
-= `${t('general.welcome')} ${APPLICATION_NAME}`
+!= `${t('general.welcome')} ${APPLICATION_NAME}`

backend/src/emails/templates/removed_user_from_group/html.pug

@@ -2,4 +2,4 @@ extend ../layout.pug
 
 block content
   .content
-  p= t('removedUserFromGroup', { groupName })
+  p!= t('removedUserFromGroup', { groupName })

backend/src/emails/templates/removed_user_from_group/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.removedUserFromGroup')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.removedUserFromGroup')}`

backend/src/emails/templates/resetPassword/html.pug

@@ -2,8 +2,8 @@ extend ../layout.pug
 
 block content
   .content
-  p= t('resetPassword.introduction')
+  p!= t('resetPassword.introduction')
-  a.button(href=actionUrl)= t('buttons.confirmEmail')
+  a.button(href=actionUrl)!= t('buttons.confirmEmail')
-  p= t('resetPassword.ignore')
+  p!= t('resetPassword.ignore')
-  p= t('resetPassword.codeHint')
+  p!= t('resetPassword.codeHint')
-    span= nonce
+    span!= nonce

backend/src/emails/templates/resetPassword/subject.pug

@@ -1 +1 @@
-= `${t('subjects.resetPassword')} ${APPLICATION_NAME}`
+!= `${t('subjects.resetPassword')} ${APPLICATION_NAME}`

backend/src/emails/templates/user_joined_group/html.pug

@@ -3,6 +3,6 @@ extend ../layout.pug
 block content
   .content
   p
-    a.user(href=groupRelatedUserUrl)= groupRelatedUserName  
+    a.user(href=groupRelatedUserUrl)!= groupRelatedUserName  
-    = t('userJoinedGroup', { groupName })
+    != t('userJoinedGroup', { groupName })
-  a.button(href=groupUrl)= t('buttons.viewGroup')
+  a.button(href=groupUrl)!= t('buttons.viewGroup')

backend/src/emails/templates/user_joined_group/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.userJoinedGroup')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.userJoinedGroup')}`

backend/src/emails/templates/user_left_group/html.pug

@@ -3,6 +3,6 @@ extend ../layout.pug
 block content
   .content
   p
-    a.user(href=groupRelatedUserUrl)= groupRelatedUserName    
+    a.user(href=groupRelatedUserUrl)!= groupRelatedUserName    
-    = t('userLeftGroup', { groupName })
+    != t('userLeftGroup', { groupName })
-  a.button(href=groupUrl)= t('buttons.viewGroup')
+  a.button(href=groupUrl)!= t('buttons.viewGroup')

backend/src/emails/templates/user_left_group/subject.pug

@@ -1 +1 @@
-= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.userLeftGroup')}`
+!= `${APPLICATION_NAME}  – ${t('notification')}: ${t('subjects.userLeftGroup')}`

backend/src/emails/templates/wrongEmail/html.pug

@@ -2,9 +2,9 @@ extend ../layout.pug
 
 block content
   .content
-  p= t('wrongEmail.introduction')
+  p!= t('wrongEmail.introduction')
-  a.button(href=actionUrl)= t('buttons.tryAgain')
+  a.button(href=actionUrl)!= t('buttons.tryAgain')
 
-  p= t('wrongEmail.ignoreStart') 
+  p!= t('wrongEmail.ignoreStart') 
-    a(href=ORGANIZATION_LINK)= APPLICATION_NAME
+    a(href=ORGANIZATION_LINK)!= APPLICATION_NAME
-    = t('wrongEmail.ignoreEnd')
+    != t('wrongEmail.ignoreEnd')

backend/src/emails/templates/wrongEmail/subject.pug

@@ -1 +1 @@
-= `${t('subjects.wrongEmail')} ${APPLICATION_NAME}`
+!= `${t('subjects.wrongEmail')} ${APPLICATION_NAME}`

backend/src/graphql/queries/AddEmailAddress.ts

@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const AddEmailAddress = gql`
+  mutation ($email: String!) {
+    AddEmailAddress(email: $email) {
+      email
+      verifiedAt
+      createdAt
+    }
+  }
+`

backend/src/graphql/queries/AddPostEmotions.ts

@@ -0,0 +1,15 @@
+import gql from 'graphql-tag'
+
+export const AddPostEmotions = gql`
+  mutation ($to: _PostInput!, $data: _EMOTEDInput!) {
+    AddPostEmotions(to: $to, data: $data) {
+      from {
+        id
+      }
+      to {
+        id
+      }
+      emotion
+    }
+  }
+`

backend/src/graphql/queries/Category.ts

@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const Category = gql`
+  query {
+    Category {
+      id
+      slug
+      name
+      icon
+    }
+  }
+`

backend/src/graphql/queries/ChangeGroupMemberRole.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const ChangeGroupMemberRole = gql`
+  mutation ($groupId: ID!, $userId: ID!, $roleInGroup: GroupMemberRole!) {
+    ChangeGroupMemberRole(groupId: $groupId, userId: $userId, roleInGroup: $roleInGroup) {
+      user {
+        id
+        name
+        slug
+      }
+      membership {
+        role
+      }
+    }
+  }
+`

backend/src/graphql/queries/CreateComment.ts

@@ -1,9 +1,15 @@
 import gql from 'graphql-tag'
 
-export const createCommentMutation = gql`
+export const CreateComment = gql`
   mutation ($id: ID, $postId: ID!, $content: String!) {
     CreateComment(id: $id, postId: $postId, content: $content) {
       id
+      content
+      author {
+        name
+      }
+      isPostObservedByMe
+      postObservingUsersCount
     }
   }
 `

backend/src/graphql/queries/CreateGroup.ts

@@ -0,0 +1,53 @@
+import gql from 'graphql-tag'
+
+export const CreateGroup = gql`
+  mutation (
+    $id: ID
+    $name: String!
+    $slug: String
+    $about: String
+    $description: String!
+    $groupType: GroupType!
+    $actionRadius: GroupActionRadius!
+    $categoryIds: [ID]
+    $locationName: String # empty string '' sets it to null
+  ) {
+    CreateGroup(
+      id: $id
+      name: $name
+      slug: $slug
+      about: $about
+      description: $description
+      groupType: $groupType
+      actionRadius: $actionRadius
+      categoryIds: $categoryIds
+      locationName: $locationName
+    ) {
+      id
+      name
+      slug
+      createdAt
+      updatedAt
+      disabled
+      deleted
+      about
+      description
+      descriptionExcerpt
+      groupType
+      actionRadius
+      categories {
+        id
+        slug
+        name
+        icon
+      }
+      locationName
+      location {
+        name
+        nameDE
+        nameEN
+      }
+      myRole
+    }
+  }
+`

backend/src/graphql/queries/CreatePost.ts

@@ -0,0 +1,51 @@
+import gql from 'graphql-tag'
+
+export const CreatePost = gql`
+  mutation (
+    $id: ID
+    $title: String!
+    $slug: String
+    $content: String!
+    $categoryIds: [ID]
+    $groupId: ID
+    $postType: PostType
+    $eventInput: _EventInput
+  ) {
+    CreatePost(
+      id: $id
+      title: $title
+      slug: $slug
+      content: $content
+      categoryIds: $categoryIds
+      groupId: $groupId
+      postType: $postType
+      eventInput: $eventInput
+    ) {
+      id
+      slug
+      title
+      content
+      disabled
+      deleted
+      postType
+      author {
+        name
+      }
+      categories {
+        id
+      }
+      eventStart
+      eventEnd
+      eventLocationName
+      eventVenue
+      eventIsOnline
+      eventLocation {
+        lng
+        lat
+      }
+      isObservedByMe
+      observingUsersCount
+      language
+    }
+  }
+`

backend/src/graphql/queries/CreateRoom.ts

@@ -0,0 +1,22 @@
+import gql from 'graphql-tag'
+
+export const CreateRoom = gql`
+  mutation ($userId: ID!) {
+    CreateRoom(userId: $userId) {
+      id
+      roomId
+      roomName
+      lastMessageAt
+      unreadCount
+      #avatar
+      users {
+        _id
+        id
+        name
+        avatar {
+          url
+        }
+      }
+    }
+  }
+`

backend/src/graphql/queries/CreateSocialMedia.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const CreateSocialMedia = gql`
+  mutation ($url: String!) {
+    CreateSocialMedia(url: $url) {
+      id
+      url
+      url
+      ownedBy {
+        name
+      }
+    }
+  }
+`

backend/src/graphql/queries/DeleteComment.ts

@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const DeleteComment = gql`
+  mutation ($id: ID!) {
+    DeleteComment(id: $id) {
+      id
+      content
+      contentExcerpt
+      deleted
+    }
+  }
+`

backend/src/graphql/queries/DeletePost.ts

@@ -0,0 +1,20 @@
+import gql from 'graphql-tag'
+
+export const DeletePost = gql`
+  mutation ($id: ID!) {
+    DeletePost(id: $id) {
+      id
+      deleted
+      content
+      contentExcerpt
+      image {
+        url
+      }
+      comments {
+        deleted
+        content
+        contentExcerpt
+      }
+    }
+  }
+`

backend/src/graphql/queries/DeleteSocialMedia.ts

@@ -0,0 +1,10 @@
+import gql from 'graphql-tag'
+
+export const DeleteSocialMedia = gql`
+  mutation ($id: ID!) {
+    DeleteSocialMedia(id: $id) {
+      id
+      url
+    }
+  }
+`

backend/src/graphql/queries/DeleteUser.ts

@@ -0,0 +1,30 @@
+import gql from 'graphql-tag'
+
+export const DeleteUser = gql`
+  mutation ($id: ID!, $resource: [Deletable]) {
+    DeleteUser(id: $id, resource: $resource) {
+      id
+      name
+      about
+      deleted
+      contributions {
+        id
+        content
+        contentExcerpt
+        deleted
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+      comments {
+        id
+        content
+        contentExcerpt
+        deleted
+      }
+    }
+  }
+`

backend/src/graphql/queries/Donations.ts

@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const Donations = gql`
+  query {
+    Donations {
+      id
+      showDonations
+      goal
+      progress
+    }
+  }
+`

backend/src/graphql/queries/GroupMembers.ts

@@ -3,10 +3,14 @@ import gql from 'graphql-tag'
 export const GroupMembers = gql`
   query GroupMembers($id: ID!) {
     GroupMembers(id: $id) {
-      id
+      user {
-      name
+        id
-      slug
+        name
-      myRoleInGroup
+        slug
+      }
+      membership {
+        role
+      }
     }
   }
 `

backend/src/graphql/queries/JoinGroup.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const JoinGroup = gql`
+  mutation ($groupId: ID!, $userId: ID!) {
+    JoinGroup(groupId: $groupId, userId: $userId) {
+      user {
+        id
+        name
+        slug
+      }
+      membership {
+        role
+      }
+    }
+  }
+`

backend/src/graphql/queries/LeaveGroup.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const LeaveGroup = gql`
+  mutation ($groupId: ID!, $userId: ID!) {
+    LeaveGroup(groupId: $groupId, userId: $userId) {
+      user {
+        id
+        name
+        slug
+      }
+      membership {
+        role
+      }
+    }
+  }
+`

backend/src/graphql/queries/Post.ts

@@ -1,12 +1,39 @@
 import gql from 'graphql-tag'
 
 export const Post = gql`
-  query ($orderBy: [_PostOrdering]) {
+  query ($id: ID, $filter: _PostFilter, $first: Int, $offset: Int, $orderBy: [_PostOrdering]) {
-    Post(orderBy: $orderBy) {
+    Post(id: $id, filter: $filter, first: $first, offset: $offset, orderBy: $orderBy) {
       id
+      title
+      content
+      contentExcerpt
+      eventStart
       pinned
       createdAt
       pinnedAt
+      isObservedByMe
+      observingUsersCount
+      clickedCount
+      emotionsCount
+      emotions {
+        emotion
+        User {
+          id
+        }
+      }
+      author {
+        id
+        name
+      }
+      shoutedBy {
+        id
+      }
+      tags {
+        id
+      }
+      comments {
+        content
+      }
     }
   }
 `