Merge branch 'main' into add-env-for-mastodon

Author: egelhaus

.dockerignore

@@ -2,12 +2,22 @@
 # any half-built stuff in the build context as a pre-caution (also saves copying
 # 180k files in node_modules that isn't used!).
 **/node_modules
+node_modules/*
+node_modules
+docker-data/*
 dist
 .nx
+/apps/frontend/.next
+/apps/backend/dist
+/apps/workers/dist
+/apps/cron/dist
+/apps/commands/dist
 .devcontainer
 **/.git
-**/dist
 **/*.md
 **/LICENSE
 **/npm-debug.log
 **/*.vscode
+.git
+.github
+reports

.env.example

@@ -1,6 +1,6 @@
 # Configuration reference: http://docs.postiz.com/configuration/reference
 
-# === Required Settings 
+# === Required Settings
 DATABASE_URL="postgresql://postiz-user:postiz-password@localhost:5432/postiz-db-local"
 REDIS_URL="redis://localhost:6379"
 JWT_SECRET="random string for your JWT secret, make it long"
@@ -20,7 +20,6 @@ CLOUDFLARE_BUCKETNAME="your-bucket-name"
 CLOUDFLARE_BUCKET_URL="https://your-bucket-url.r2.cloudflarestorage.com/"
 CLOUDFLARE_REGION="auto"
 
-
 # === Common optional Settings
 
 ## This is a dummy key, you must create your own from Resend.
@@ -32,15 +31,14 @@ CLOUDFLARE_REGION="auto"
 #DISABLE_REGISTRATION=false
 
 # Where will social media icons be saved - local or cloudflare.
-STORAGE_PROVIDER="local" 
+STORAGE_PROVIDER="local"
 
 # Your upload directory path if you host your files locally, otherwise Cloudflare will be used.
 #UPLOAD_DIRECTORY=""
 
 # Your upload directory path if you host your files locally, otherwise Cloudflare will be used.
 #NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY=""
 
-
 # Social Media API Settings
 X_API_KEY=""
 X_API_SECRET=""
@@ -81,6 +79,7 @@ OPENAI_API_KEY=""
 NEXT_PUBLIC_DISCORD_SUPPORT=""
 NEXT_PUBLIC_POLOTNO=""
 NOT_SECURED=false
+API_LIMIT=30 # The limit of the public API hour limit
 
 # Payment settings
 FEE_AMOUNT=0.05
@@ -92,3 +91,18 @@ STRIPE_SIGNING_KEY_CONNECT=""
 # Developer Settings
 NX_ADD_PLUGINS=false
 IS_GENERAL="true" # required for now
+NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME="Authentik"
+NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL="https://raw.githubusercontent.com/walkxcode/dashboard-icons/master/png/authentik.png"
+POSTIZ_GENERIC_OAUTH="false"
+POSTIZ_OAUTH_URL="https://auth.example.com"
+POSTIZ_OAUTH_AUTH_URL="https://auth.example.com/application/o/authorize"
+POSTIZ_OAUTH_TOKEN_URL="https://auth.example.com/application/o/token"
+POSTIZ_OAUTH_USERINFO_URL="https://authentik.example.com/application/o/userinfo"
+POSTIZ_OAUTH_CLIENT_ID=""
+POSTIZ_OAUTH_CLIENT_SECRET=""
+# POSTIZ_OAUTH_SCOPE="openid profile email" # default values
+
+# Short Link Service Settings
+# DUB_TOKEN="" # Your self-hosted Dub API token
+# DUB_API_ENDPOINT="https://api.dub.co" # Your self-hosted Dub API endpoint
+# DUB_SHORT_LINK_DOMAIN="dub.sh" # Your self-hosted Dub domain

.eslintrc.json

@@ -0,0 +1,34 @@
+name: Build Extension
+
+on:
+  workflow_dispatch:
+
+jobs:
+  submit:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Zip extensions
+        run: FRONTEND_URL=https://platform.postiz.com pnpm run build:extension
+
+      - name: Upload to Nextcloud
+        env:
+          NEXTCLOUD_URL: ${{ secrets.NEXTCLOUD_URL }}
+          NEXTCLOUD_USERNAME: ${{ secrets.NEXTCLOUD_USERNAME }}
+          NEXTCLOUD_PASSWORD: ${{ secrets.NEXTCLOUD_PASSWORD }}
+        run: |
+          curl -T apps/extension/extension.zip \
+            -u "$NEXTCLOUD_USERNAME:$NEXTCLOUD_PASSWORD" \
+            "$NEXTCLOUD_URL/extension.zip"

.github/workflows/build-extension.yaml

@@ -3,8 +3,7 @@ name: Build
 
 on:
   push:
-    branches:
-      - main
+  pull_request:
 
 jobs:
   build:
@@ -21,20 +20,30 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'npm'
-          cache-dependency-path: |
-            **/package-lock.json
 
-      # https://nextjs.org/docs/pages/building-your-application/deploying/ci-build-caching#github-actions
-      - uses: actions/cache@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
         with:
           path: |
-            ~/.npm
+            ${{ env.STORE_PATH }}
             ${{ github.workspace }}/.next/cache
-
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
           restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+            ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}-
+
+      - name: Install dependencies
+        run: pnpm install
 
-      - run: npm ci
-      - run: npm run build
+      - name: Build
+        run: pnpm run build

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: egelhaus
           password: ${{ github.token }}
 
       - name: Set image tag

.github/workflows/pr-docker-build renamed to .github/workflows/pr-docker-build.yml

@@ -0,0 +1,32 @@
+name: Publish Extension
+
+on:
+  workflow_dispatch:
+
+jobs:
+  submit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Zip extensions
+        run: FRONTEND_URL=https://platform.postiz.com pnpm run build:extension
+
+      - name: Publish to Chrome Web Store
+        uses: mnao305/[email protected]
+        with:
+          extension-id: ${{ secrets.CHROME_EXTENSION_ID }}
+          client-id: ${{ secrets.CHROME_CLIENT_ID }}
+          client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
+          refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}
+          file-path: apps/extension/extension.zip

.github/workflows/publish-extension.yml

@@ -0,0 +1,33 @@
+name: Close inactive issues
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "*/30 * * * *"
+
+jobs:
+  close-issues:
+    if: github.repository == 'gitroomhq/postiz-app'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          days-before-issue-stale: 90
+          days-before-issue-close: 7
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 90 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale." 
+          exempt-issue-labels: "no-stale-bot"
+          
+          days-before-pr-stale: 90
+          days-before-pr-close: 7
+          stale-pr-label: "stale" 
+          stale-pr-message: "This PR is stale because it has been open for 90 days with no activity."
+          close-pr-message: "This PR was closed because it has been inactive for 7 days since being marked as stale." 
+          exempt-pr-label: "no-stale-bot" 
+          
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          operations-per-run: 180

.github/workflows/stale.yml

@@ -0,0 +1,5 @@
+ignore-workspace-root-check=true
+node-linker=hoisted
+restrict-manifest-changes=true
+sync-injected-deps-after-scripts[]=build
+inject-workspace-packages=true

.npmrc

@@ -1,78 +1,19 @@
-# This Dockerfile is used for producing 3 container images.
-#
-# base - which is thrown away, that contains node and the basic infrastructure. 
-# devcontainer - which is used for development, and contains the source code and the node_modules.
-# dist - which is used for production, and contains the built source code and the node_modules.
-
-ARG NODE_VERSION="20.17"
-
-# Base image
-FROM docker.io/node:${NODE_VERSION}-alpine3.19 AS base
-
-## Just reduce unccessary noise in the logs.
-ENV NPM_CONFIG_UPDATE_NOTIFIER=false
-ENV NEXT_TELEMETRY_DISABLED=1
-
-RUN apk add --no-cache \
-	caddy \
-	bash=5.2.21-r0 \
-	supervisor=4.2.5-r4
+FROM node:20-alpine3.19
+RUN apk add --no-cache g++ make py3-pip supervisor bash caddy
+RUN npm --no-update-notifier --no-fund --global install [email protected] pm2
 
 WORKDIR /app
 
-EXPOSE 3000
-EXPOSE 4200
-EXPOSE 5000
-
-COPY var/docker/entrypoint.sh /app/entrypoint.sh
+COPY . /app
 COPY var/docker/supervisord.conf /etc/supervisord.conf
-COPY var/docker/supervisord /app/supervisord_available_configs/
 COPY var/docker/Caddyfile /app/Caddyfile
-COPY .env.example /config/postiz.env
-
-VOLUME /config
-VOLUME /uploads
-
-LABEL org.opencontainers.image.source=https://github.com/gitroomhq/postiz-app
-
-ENTRYPOINT ["/app/entrypoint.sh"]
-
-# Builder image
-FROM base AS devcontainer
-
-RUN apk add --no-cache \
-	pkgconfig \
-	gcc \
-	pixman-dev \
-	cairo-dev \
-	pango-dev \
-	make \
-	build-base
-
-COPY nx.json tsconfig.base.json package.json package-lock.json build.plugins.js /app/
-COPY apps /app/apps/
-COPY libraries /app/libraries/
-
-RUN npm ci --no-fund && npx nx run-many --target=build --projects=frontend,backend,workers,cron
-
-VOLUME /config
-VOLUME /uploads
-
-LABEL org.opencontainers.image.title="Postiz App (DevContainer)"
-
-# Output image
-FROM base AS dist
-
-COPY --from=devcontainer /app/node_modules/ /app/node_modules/
-COPY --from=devcontainer /app/dist/ /app/dist/
-
-# Required for prisma
-COPY --from=devcontainer /app/libraries/ /app/libraries/
+COPY var/docker/entrypoint.sh /app/entrypoint.sh
+COPY var/docker/supervisord/caddy.conf /etc/supervisor.d/caddy.conf
+RUN chmod +x /app/entrypoint.sh
 
-COPY package.json nx.json /app/
+RUN pnpm install
+RUN pnpm run build
 
-VOLUME /config
-VOLUME /uploads
+EXPOSE 4200
 
-## Labels at the bottom, because CI will eventually add dates, commit hashes, etc.
-LABEL org.opencontainers.image.title="Postiz App (Production)"
+CMD ["pnpm", "run", "pm2"]