ghost 5.129.1 → 5.130.0

package/core/server/data/tinybird/ARCHITECTURE.md

@@ -0,0 +1,420 @@
+# Ghost Traffic Analytics Data Model Explainer
+
+This document explains the comprehensive data architecture behind Ghost's traffic analytics features, 
+covering both the MySQL database schema and Tinybird event streams, their relationships, and how they work together 
+to provide real-time analytics.
+
+## Table of Contents
+
+1. [Overview](#overview)
+2. [MySQL Schema (Ghost Database)](#mysql-schema-ghost-database)
+3. [Tinybird Event Schema](#tinybird-event-schema)
+4. [Data Flow & Relationships](#data-flow--relationships)
+5. [API Endpoints](#api-endpoints)
+6. [Mock Data Considerations](#mock-data-considerations)
+
+## Overview
+ Ghost's traffic analytics system has two data sources: MySQL and Tinybird
+
+# Ghost Analytics Architecture
+
+```mermaid
+graph TD
+    A[Ghost Admin<br/>Frontend] --> B[Ghost<br/>Main Server]
+    A --> C[Tinybird<br/>Analytics DB]
+    B --> D[MySQL<br/>Database]
+    B --> C
+```
+
+- **MySQL Database**: Stores content, members, newsletters, and member attribution events
+- **Tinybird**: Real-time analytics database that processes page views and visitor sessions
+- **Cross-system Integration**: UUID-based relationships between Ghost entities and Tinybird events
+
+The system tracks:
+- **Web Traffic**: Page views, sessions, referrers, device info (via Tinybird)
+- **Member Growth**: Signups, conversions, attribution to content (via MySQL)
+- **Newsletter Performance**: Sends, opens, clicks, revenue attribution (via MySQL + Tinybird)
+- **Content Performance**: Views, member conversions, revenue impact (hybrid)
+
+## MySQL Schema (Ghost Database)
+
+### Core Content Tables
+
+#### `posts`
+Primary content table storing all posts and pages.
+
+**Key fields for analytics:**
+- `id` (string, 24 chars) - Primary key, used in attribution events
+- `uuid` (string, 36 chars) - UUID for Tinybird correlation
+- `title` - Content title
+- `slug` - URL slug
+- `type` - 'post' or 'page'
+- `status` - 'published', 'draft', 'scheduled', 'sent'
+- `published_at` - Publication timestamp
+- `newsletter_id` - Associated newsletter (if sent via email)
+
+#### `posts_meta`
+Extended metadata for posts.
+
+**Relevant fields:**
+- `post_id` - Foreign key to posts.id
+- `meta_title`, `meta_description` - SEO metadata
+- `email_subject` - Newsletter subject line
+- `email_only` - Whether post is email-exclusive
+
+### Member & Subscription Tables
+
+#### `members`
+Core member accounts.
+
+**Key fields:**
+- `id` (string, 24 chars) - Primary key
+- `uuid` (string, 36 chars) - UUID for Tinybird correlation  
+- `email` - Member email address
+- `status` - 'free', 'paid', 'comped'
+- `created_at` - Signup timestamp
+
+#### `newsletters`
+Newsletters are series of emails. Sites can have multiple different newsletters, each with its own name & branding. Sites may have a "Daily newsletter" and a "Weekly roundup" newsletter, for example.
+
+**Key fields:**
+- `id` (string, 24 chars) - Primary key
+- `name` - Newsletter name
+- `status` - 'active', 'archived'
+
+#### `products` (tiers)
+Subscription tiers/products that members can sign up for with Stripe
+
+**Key fields:**
+- `id` (string, 24 chars) - Primary key
+- `name` - Tier name
+- `type` - 'free', 'paid'
+- `monthly_price`, `yearly_price` - Pricing
+
+### Attribution & Event Tables
+
+#### `members_created_events`
+Tracks member signups and their attribution.
+
+**Key fields:**
+- `id` - Primary key
+- `member_id` - Foreign key to members.id
+- `created_at` - Signup timestamp
+- `attribution_id` - ID of attributed resource (post.id, etc.)
+- `attribution_type` - 'post', 'page', 'url', 'tag', 'author'
+- `attribution_url` - Full URL that drove signup
+- `referrer_source` - Domain that referred the member
+- `referrer_medium` - Marketing medium
+- `referrer_url` - Full referrer URL
+- `source` - 'member', 'import', 'system', 'api', 'admin'
+
+#### `members_subscription_created_events`
+Tracks paid subscription starts and their attribution.
+
+**Key fields:**
+- `id` - Primary key
+- `member_id` - Foreign key to members.id
+- `subscription_id` - Associated subscription
+- `created_at` - Conversion timestamp
+- `attribution_id` - ID of attributed resource
+- `attribution_type` - 'post', 'page', 'url', 'tag', 'author'
+- `attribution_url` - URL that drove conversion
+- `referrer_source` - Domain that drove conversion
+- `referrer_medium` - Marketing medium
+- `referrer_url` - Full referrer URL
+
+#### `members_paid_subscription_events`
+Tracks MRR changes from subscription events.
+
+**Key fields:**
+- `member_id` - Foreign key to members.id
+- `subscription_id` - Associated subscription
+- `mrr_delta` - Monthly recurring revenue change
+- `created_at` - Event timestamp
+
+### Email & Newsletter Tables
+
+#### `emails`
+When a post is sent as an email, a row is added to this table
+
+**Key fields:**
+- `id` - Primary key
+- `post_id` - Associated post (unique)
+- `newsletter_id` - Associated newsletter
+- `status` - 'pending', 'submitted', 'failed'
+- `email_count` - Total recipients
+- `delivered_count` - Successfully delivered
+- `opened_count` - Total opens
+- `failed_count` - Failed deliveries
+- `submitted_at` - Send timestamp
+
+#### `email_recipients`
+A row for every member who received a particular email. Tracks which members received each email, and when it was delivered, opened, failed, etc.
+
+**Key fields:**
+- `email_id` - Foreign key to emails.id
+- `member_id` - Foreign key to members.id
+- `member_email` - Recipient email
+- `delivered_at` - Delivery timestamp
+- `opened_at` - Open timestamp
+- `failed_at` - Failure timestamp
+
+#### `redirects`
+All links in an email are replaced with tracking links to Ghost so we can track clicks in emails
+
+**Key fields:**
+- `id` - Primary key
+- `from` - Short redirect URL
+- `to` - Destination URL
+- `post_id` - Associated post (if applicable)
+
+#### `members_click_events`
+Email click tracking - each time a member clicks a link in an email
+
+**Key fields:**
+- `member_id` - Foreign key to members.id
+- `redirect_id` - Foreign key to redirects.id
+- `created_at` - Click timestamp
+
+### Newsletter Subscription Tables
+
+#### `members_newsletters`
+Many-to-many relationship for newsletter subscriptions. Sites can have multiple newsletters, members can be subscribed to 0 or more newsletters
+
+**Key fields:**
+- `member_id` - Foreign key to members.id
+- `newsletter_id` - Foreign key to newsletters.id
+
+#### `members_subscribe_events`
+Newsletter subscription/unsubscription events. Members can choose to subscribe/unsubscribe to any of a site's newsletters at any time
+
+**Key fields:**
+- `member_id` - Foreign key to members.id
+- `newsletter_id` - Foreign key to newsletters.id
+- `subscribed` - true/false for subscribe/unsubscribe
+- `created_at` - Event timestamp
+- `source` - Event source
+
+## Tinybird Event Schema
+
+### Analytics Events Datasource
+
+#### `analytics_events`
+
+Raw page view events streamed from the frontend. You can find the schema in `datasources` folder.
+Fields with specific data in the schema:
+
+```sql
+`action` LowCardinality(String)  -- Usually 'page_hit'
+`site_uuid` LowCardinality(String) -- Extracted from payload
+```
+
+**Payload Structure:**
+```json
+{
+  "site_uuid": "string",
+  "member_uuid": "string|undefined",  // member.uuid in MySQL
+  "member_status": "free|paid|comped|undefined", // member.status in MySQL
+  "post_uuid": "string|undefined", // post.uuid in MySQL
+  "post_type": "post|page|empty", //post.type in MySQL
+  "user-agent": "string",
+  "locale": "string",
+  "location": "string", // Country code
+  "referrer": "string", // used for member attribution
+  "pathname": "string",
+  "href": "string", // Full URL
+}
+```
+
+### Materialized View: _mv_hits
+
+#### `_mv_hits`
+
+Schema for hits can be also found in `datasources` folder.
+Explanation of some of the important fields.
+
+```sql
+`location` String      -- Country code
+`source` String        -- Referrer domain
+`pathname` String      -- URL path
+`href` String          -- Full URL
+`device` String        -- Device type
+`os` String           -- Operating system
+`browser` String      -- Browser name
+```
+
+### Tinybird Endpoints (Pipes)
+
+Endpoints which can be found in `endpoints` folder.
+
+- `api_active_visitors` - Real-time visitor counts
+- `api_kpis` - Site-wide KPI metrics
+- `api_post_visitor_counts` - Visitor counts by post UUID
+- `api_top_browsers` - Top browsers by visits
+- `api_top_devices` - Top devices by visits
+- `api_top_locations` - Top countries by visits
+- `api_top_os` - Top operating systems by visits
+- `api_top_pages` - Top pages by visits
+- `api_top_sources` - Top referrer sources by visits
+
+## Data Flow & Relationships
+
+### 1. Page View Tracking
+
+```
+Frontend → Tinybird analytics_events → _mv_hits materialized view
+```
+
+**Key Relationships:**
+- `payload.site_uuid` identifies the Ghost site
+- `payload.post_uuid` correlates to `posts.uuid` in MySQL
+- `payload.member_uuid` correlates to `members.uuid` in MySQL
+
+### 2. Member Attribution Flow
+
+```
+Member Signup → members_created_events (with attribution_*)
+Member Conversion → members_subscription_created_events (with attribution_*)
+```
+
+**Attribution Logic:**
+- `attribution_id` contains `posts.id` when attributed to specific content
+- `attribution_type` categorizes the attribution source
+- `attribution_url` stores the full URL that drove the action
+- `referrer_source` tracks the referring domain
+
+### 3. Newsletter Performance Flow
+
+```
+Post Creation → Email Send (emails table) → Individual Recipients (email_recipients)
+Click Tracking → redirects → members_click_events
+```
+
+### 4. Cross-System Data Correlation
+
+**Post Performance Analysis:**
+1. Get page views from Tinybird using `posts.uuid`
+2. Get member attribution from MySQL using `posts.id`
+3. Get email performance from MySQL using `posts.id`
+4. Combine for comprehensive post analytics
+
+**Member Journey Tracking:**
+1. Tinybird tracks anonymous page views
+2. MySQL tracks member signup with attribution
+3. MySQL tracks paid conversion with attribution
+
+## API Endpoints
+
+All endpoints require authentication (`mw.authAdminApi`) and are gated behind `labs.isSet('trafficAnalytics')`.
+
+### Core Stats Endpoints
+
+```javascript
+// Member growth
+GET /stats/member_count
+GET /stats/mrr
+GET /stats/subscriptions
+
+// Content performance  
+GET /stats/top-posts          // Attribution-based rankings
+GET /stats/top-posts-views    // View-based rankings (Tinybird)
+GET /stats/top-content        // Combined content performance
+
+// Post-specific analytics
+GET /stats/posts/:id/stats    // Individual post performance
+GET /stats/posts/:id/growth   // Member attribution for post
+GET /stats/posts/:id/top-referrers // Referrer breakdown for post
+
+// Newsletter analytics
+GET /stats/newsletter-stats        // Full newsletter performance
+GET /stats/newsletter-basic-stats  // Basic stats (faster)
+GET /stats/newsletter-click-stats  // Click-through data
+GET /stats/subscriber-count        // Subscriber growth
+
+// Traffic sources
+GET /stats/referrers           // Historical referrer data
+GET /stats/top-sources-growth  // Source performance over time
+
+// Batch endpoints
+POST /stats/posts-visitor-counts   // Bulk visitor counts (Tinybird)
+POST /stats/posts-member-counts    // Bulk member attribution (MySQL)
+```
+
+### Request/Response Patterns
+
+Most endpoints support:
+- `date_from` / `date_to` - Date range filtering
+- `limit` - Result count limiting  
+- `order` - Sort field and direction
+- `newsletter_id` - Newsletter-specific filtering
+- `timezone` 
+
+Response format:
+```json
+{
+  "data": [...],
+  "meta": {
+    "totals": {...}
+  }
+}
+```
+
+## Mock Data Considerations
+
+### Data Volume & Relationships
+
+For realistic testing, mock data should maintain proper ratios:
+
+**Content:**
+- ~100-500 posts across 6-month period
+- ~10-20 pages (about, contact, etc.)
+- 1-3 newsletters
+
+**Members:**
+- ~1000-5000 total members
+- ~70% free, ~25% paid, ~5% comped
+- ~50-100 new signups per month
+- ~10-20% conversion rate from free to paid
+
+**Page Views (Tinybird):**
+- ~10-50 views per post (varies widely)
+- ~100-500 daily total page views
+- ~60% direct/type-in, ~25% search, ~10% social, ~5% other referrers
+
+**Email Performance:**
+- ~50-80% delivery rate
+- ~20-40% open rate
+- ~2-5% click rate
+- Newsletter sends 1-4x per month
+
+### Key Constraints
+
+**UUID Relationships:**
+- `posts.uuid` must match Tinybird `post_uuid` values
+- `members.uuid` must match Tinybird `member_uuid` values
+- UUIDs should be valid v4 format
+
+**Attribution Data:**
+- `attribution_id` must reference valid `posts.id`
+- `attribution_url` should be realistic Ghost URLs
+- `referrer_source` should be realistic domains
+
+**Temporal Consistency:**
+- Member created events before subscription events
+- Posts published before attribution events
+- Email sends after post publication
+- Page views distributed realistically over time
+
+### Performance Considerations
+
+**Indexes:**
+- Date-based queries need temporal indexing
+- Attribution queries need member_id + attribution_id indexes
+- Cross-table joins need proper foreign key indexes
+
+**Query Patterns:**
+- Most analytics queries filter by date ranges
+- Post-specific queries join on post IDs/UUIDs
+- Member attribution queries are complex with multiple CTEs
+
+This data model enables comprehensive traffic analytics while maintaining performance through strategic use of both MySQL and Tinybird for their respective strengths.

package/core/server/data/tinybird/README.md

@@ -0,0 +1,84 @@
+## Tinybird Analytics
+
+This is the web analytics implementation using [Tinybird Forward](https://www.tinybird.co/docs/forward).
+
+### Requirements
+
+In order to use Tinybird locally, make sure to install the Tinybird CLI.
+**Only for the first time, run:** `yarn tb:install` from the root folder.
+
+### Using Tinybird locally
+
+To run Tinybird locally, run `yarn tb` from root. 
+
+This script will pull and start the `tinybird-local` Docker container, then run `tb dev` to deploy the Tinybird project to the `tinybird-local` container on file changes. The `tb dev` command also launches a Tinybird shell environment where you can run other `tb` CLI commands against the local container.  Read more about the [`tb dev` command here](https://www.tinybird.co/docs/forward/dev-reference/commands/tb-dev).
+
+### Connecting Tinybird to Ghost config file
+
+In order to use Tinybird local service with Ghost, the config local needs to be updated with Tinybird details.
+Config can contain information about remote and local environments.
+
+Make sure to get the proper tokens, which you can obtain by running  `tb token ls`, or if you are within Tinybird
+local shell environment, you can just run `token ls`.
+
+Make sure you use the proper tokens. If you need read, write permissions, use a token that allows both.
+
+Simply disable local to use the cloud version by switching `local: false`. 
+This is switchable both via tracker script (ideally not used with the cloud data except with a unique id) and stats page.
+
+You can enable or disable local in config script below. Update your `/ghost/core/config.local.json` or `/ghost/core/config.local.jsonc`
+with the following information.
+
+### Config
+Sample config:
+```json
+{
+   "someOtherConfigurationForEmail": {
+        "transport": "SMTP",
+        "options": {
+            "port": 12345
+        }
+    },
+    "tinybird": {
+        "tracker": {
+            "endpoint": "https://e.ghost.org/tb/web_analytics",
+            "token": "xxxxx",
+            "datasource": "analytics_events",
+            "local": {
+                "enabled": true,
+                "token": "xxxxx",
+                "endpoint": "http://localhost:7181/v0/events",
+                "datasource": "analytics_events"
+            }
+        },
+        "stats": {
+            "endpoint": "https://api.tinybird.co",
+            "token": "xxxxx",
+            "local": {
+                "enabled": true,
+                "token": "xxxxx",
+                "endpoint": "http://localhost:7181",
+                "datasource": "analytics_events"
+            }
+        }
+    }
+}
+```
+
+### Testing
+
+Tests are executed using `test run` when running `tb dev`.
+
+
+### Testing data
+
+In fixtures folder, you can find local test data. When tinybird local is running, you can append data, or remove data
+from fixture files here. As you modify the files, the datasources will be auto updated.
+
+Keep in mind that as you update fixtures, it will rebuild data, but materialized views will have appended data. Old
+data will not be cleared from them. One way to approach this to make sure data is consistent is to truncate all data
+sources before adding test data to it.
+
+### Architecture
+
+[See full documentation regarding analytics architecture in following document](ARCHITECTURE.md)

package/core/server/data/tinybird/scripts/configure-ghost.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+set -euo pipefail
+
+# This script is used to get important values from the Tinybird Local container, and setup Ghost's config
+## It is used in the e2e test CI workflow to configure Ghost to use the Tinybird local instance
+## It can also be used locally to configure Ghost to use a tinybird local instance
+
+# Store tb info output as JSON to parse multiple values
+## This includes the workspace ID and a workspace token we can use to authenticate with the Tinybird API
+TB_INFO=$(tb --output json info)
+
+# Get the workspace ID from the JSON output
+WORKSPACE_ID=$(echo "$TB_INFO" | jq -r '.local.workspace_id')
+
+# Check if workspace ID is valid
+if [ -z "$WORKSPACE_ID" ] || [ "$WORKSPACE_ID" = "null" ]; then
+    echo "Error: Failed to get workspace ID from Tinybird. Please ensure Tinybird is running and initialized." >&2
+    exit 1
+fi
+
+export TINYBIRD_WORKSPACE_ID="$WORKSPACE_ID"
+
+WORKSPACE_TOKEN=$(echo "$TB_INFO" | jq -r '.local.token')
+
+# Check if workspace token is valid
+if [ -z "$WORKSPACE_TOKEN" ] || [ "$WORKSPACE_TOKEN" = "null" ]; then
+    echo "Error: Failed to get workspace token from Tinybird. Please ensure Tinybird is running and initialized." >&2
+    exit 1
+fi
+
+# Get the admin token from the Tinybird API
+## This is different from the workspace admin token
+ADMIN_TOKEN=$(curl -s -H "Authorization: Bearer $WORKSPACE_TOKEN" http://localhost:7181/v0/tokens | jq -r '.tokens[] | select(.name == "admin token") | .token')
+
+# Check if admin token is valid
+if [ -z "$ADMIN_TOKEN" ] || [ "$ADMIN_TOKEN" = "null" ]; then
+    echo "Error: Failed to get admin token from Tinybird API. Please ensure Tinybird is properly configured." >&2
+    exit 1
+fi
+
+export TINYBIRD_ADMIN_TOKEN="$ADMIN_TOKEN"
+
+# Get the tracker token from the Tinybird API
+TRACKER_TOKEN=$(curl -s -H "Authorization: Bearer $WORKSPACE_TOKEN" http://localhost:7181/v0/tokens | jq -r '.tokens[] | select(.name == "tracker") | .token')
+
+# Check if tracker token is valid
+if [ -z "$TRACKER_TOKEN" ] || [ "$TRACKER_TOKEN" = "null" ]; then
+    echo "Error: Failed to get tracker token from Tinybird API. Please ensure Tinybird is properly configured." >&2
+    exit 1
+fi
+
+export TINYBIRD_TRACKER_TOKEN="$TRACKER_TOKEN"
+
+# Export Ghost configuration as environment variables
+export tinybird__adminToken="$TINYBIRD_ADMIN_TOKEN"
+export tinybird__workspaceId="$TINYBIRD_WORKSPACE_ID"
+export tinybird__stats__endpoint="http://localhost:7181"
+
+# If running in GitHub Actions, also export to GITHUB_ENV
+if [ -n "$GITHUB_ENV" ]; then
+    echo "tinybird__adminToken=$TINYBIRD_ADMIN_TOKEN" >> $GITHUB_ENV
+    echo "tinybird__workspaceId=$TINYBIRD_WORKSPACE_ID" >> $GITHUB_ENV
+    echo "tinybird__stats__endpoint=http://localhost:7181" >> $GITHUB_ENV
+    echo "TINYBIRD_TRACKER_TOKEN=$TINYBIRD_TRACKER_TOKEN" >> $GITHUB_ENV
+fi

package/core/server/services/activitypub/ActivityPubService.js

@@ -18,12 +18,32 @@ class ActivityPubService {
         this.identityTokenService = identityTokenService;
     }
     getExpectedWebhooks(secret) {
-        return [{
+        return [
+            {
                 event: 'post.published',
-                target_url: new URL('.ghost/activitypub/webhooks/post/published', this.siteUrl),
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/published', this.siteUrl),
                 api_version: 'v5.100.0',
                 secret
-            }];
+            },
+            {
+                event: 'post.deleted',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/deleted', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            },
+            {
+                event: 'post.unpublished',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/unpublished', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            },
+            {
+                event: 'post.published.edited',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/updated', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            }
+        ];
     }
     async checkWebhookState(expectedWebhooks, integration) {
         this.logging.info(`Checking ActivityPub Webhook state`);
@@ -55,7 +75,7 @@ class ActivityPubService {
                 .where('roles.name', 'Owner')
                 .first();
             const token = await this.identityTokenService.getTokenForUser(ownerUser.email, 'Owner');
-            const res = await (0, node_fetch_1.default)(new URL('.ghost/activitypub/site', this.siteUrl), {
+            const res = await (0, node_fetch_1.default)(new URL('.ghost/activitypub/v1/site', this.siteUrl), {
                 headers: {
                     Authorization: `Bearer ${token}`
                 }

package/core/server/services/activitypub/ActivityPubService.ts

@@ -25,12 +25,32 @@ export class ActivityPubService {
     ) {}
 
     getExpectedWebhooks(secret: string): ExpectedWebhook[] {
-        return [{
-            event: 'post.published',
-            target_url: new URL('.ghost/activitypub/webhooks/post/published', this.siteUrl),
-            api_version: 'v5.100.0',
-            secret
-        }];
+        return [
+            {
+                event: 'post.published',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/published', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            },
+            {
+                event: 'post.deleted',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/deleted', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            },
+            {
+                event: 'post.unpublished',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/unpublished', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            },
+            {
+                event: 'post.published.edited',
+                target_url: new URL('.ghost/activitypub/v1/webhooks/post/updated', this.siteUrl),
+                api_version: 'v5.100.0',
+                secret
+            }
+        ];
     }
 
     async checkWebhookState(expectedWebhooks: ExpectedWebhook[], integration: {id: string}) {
@@ -69,7 +89,7 @@ export class ActivityPubService {
                 .first();
             const token = await this.identityTokenService.getTokenForUser(ownerUser.email, 'Owner');
 
-            const res = await fetch(new URL('.ghost/activitypub/site', this.siteUrl), {
+            const res = await fetch(new URL('.ghost/activitypub/v1/site', this.siteUrl), {
                 headers: {
                     Authorization: `Bearer ${token}`
                 }

package/core/server/services/activitypub/ActivityPubServiceWrapper.js

@@ -32,16 +32,22 @@ module.exports = class ActivityPubServiceWrapper {
             IdentityTokenServiceWrapper.instance
         );
 
-        if (settingsCache.get('social_web_enabled')) {
+        const initActivityPubService = async () => {
             await ActivityPubServiceWrapper.instance.initialiseWebhooks();
             ActivityPubServiceWrapper.initialised = true;
+        };
+
+        if (settingsCache.get('social_web_enabled')) {
+            await initActivityPubService();
         } else {
-            events.on('settings.labs.edited', async () => {
+            const initActivityPubServiceLater = async () => {
                 if (settingsCache.get('social_web_enabled') && !ActivityPubServiceWrapper.initialised) {
-                    await ActivityPubServiceWrapper.instance.initialiseWebhooks();
-                    ActivityPubServiceWrapper.initialised = true;
+                    await initActivityPubService();
                 }
-            });
+            };
+
+            events.on('settings.labs.edited', initActivityPubServiceLater);
+            events.on('settings.social_web.edited', initActivityPubServiceLater);
         }
     }
 };