Merge pull request #1388 from getfider/content-moderation

Content Moderation, revamped UI, and new "open core" licensing for some features.

Author: mattwoberts

.example.env

@@ -33,3 +33,21 @@ EMAIL_SMTP_HOST=localhost
 EMAIL_SMTP_PORT=1025
 EMAIL_SMTP_USERNAME=
 EMAIL_SMTP_PASSWORD=
+
+# Commercial License (Optional)
+#
+# COMMERCIAL_KEY: Your commercial license key from the hosted Fider platform
+#   - Purchase a Pro subscription to get a license key
+#   - Add it here to enable commercial features (content moderation)
+#   - Leave blank to run Fider in free/open-source mode
+# COMMERCIAL_KEY=FIDER-COMMERCIAL-123-1638360000-abc123...
+#
+# LICENSE_PUBLIC_KEY: (Advanced - usually not needed)
+#   - The public key is embedded in Fider and updates automatically
+#   - Only set this if instructed by support or for testing
+# LICENSE_PUBLIC_KEY=lPHzCZhOBBihIusKWs5lzXCgGxZEKBpCiplkmZSjGpU=
+#
+# LICENSE_PRIVATE_KEY: (Internal - for hosted instance only)
+#   - Used by the hosted Fider platform to generate license keys
+#   - Self-hosted users should NOT set this
+# LICENSE_PRIVATE_KEY=your-base64-encoded-private-key-here

.github/workflows/build.yml

@@ -72,7 +72,7 @@ jobs:
       - name: make test-server
         run: |
           mkdir ./dist
-          make test-server
+          make test-server SHORT=false
         env:
           BLOB_STORAGE_S3_ENDPOINT_URL: http://localhost:9000
           DATABASE_URL: postgres://fider_ci:fider_ci_pw@localhost:5432/fider_ci?sslmode=disable

.github/workflows/locale.yml

@@ -1,5 +1,6 @@
 name: Auto-Translate Missing Keys
 
+# Workflow automatic triggers disabled - only manual trigger is available
 on:
   workflow_dispatch:
     inputs:
@@ -8,11 +9,10 @@ on:
         required: false
         default: "false"
 
-  push:
-    branches:
-      - main
-    paths:
-      - "locale/en/**.json"
+  # Automatic trigger temporarily disabled
+  # push:
+  #   paths:
+  #     - "locale/en/**.json"
 
 jobs:
   translate:

.github/workflows/publish-pr-multiarch.yml

@@ -0,0 +1,38 @@
+name: Manually Publish PR with ARM64
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number'
+        required: true
+        type: string
+
+jobs:
+  publish-pr-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: .
+          build-args: COMMITHASH=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64/v8
+          tags: getfider/fider:PR_${{ inputs.pr_number }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.gitignore

@@ -25,3 +25,5 @@ tsconfig.tsbuildinfo
 etc/*.pem
 fider_schema.sql
 fider.sql
+.zed/debug.json
+WARP.md

.test.env

@@ -40,3 +40,7 @@ EMAIL_MAILGUN_DOMAIN=mydomain.com
 
 USER_LIST_ENABLED=true
 USER_LIST_APIKEY=abcdefg
+
+# Ed25519 license keys for testing
+LICENSE_PUBLIC_KEY=9o3OnNs9tnnD780fZcTYas8uhcA90MWtin1rWGhXVPE=
+LICENSE_PRIVATE_KEY=fwRNcFEiusrH0Hx1aBlOobE+6hm2/CPXUkUTWXj3cQn2jc6c2z22ecPvzR9lxNhqzy6FwD3Qxa2KfWtYaFdU8Q==

COMMERCIAL_MODERATION_PLAN.md

@@ -0,0 +1,213 @@
+# Commercial Content Moderation Restructure Plan
+
+## Overview
+
+Moving Fider's content moderation feature from open source (AGPL) to commercial licensing using an "open core" model. The commercial code will reside in a `commercial/` folder with a restrictive license, while the open source core provides infrastructure and gracefully degrades when commercial features aren't licensed.
+
+## Key Architectural Decisions
+
+### 1. Webpack Integration (Simple Solution)
+- Update `webpack.config.js` to scan both folders:
+  ```js
+  paths: [
+    ...glob.sync(`./public/**/*.{html,tsx}`, { nodir: true }),
+    ...glob.sync(`./commercial/**/*.{html,tsx}`, { nodir: true })
+  ]
+  ```
+- Commercial code gets bundled but legal license prevents usage
+- No complex conditional compilation needed
+
+### 2. Backend Package Separation Strategy
+
+**Handlers - Dynamic Route Registration**
+- Open source: Register stub routes returning "upgrade" messages
+- Commercial: Override routes with real handlers via dynamic registration
+- License validation controls active routes
+
+**Services - Stub + Override Pattern**  
+- Open source: Register stub bus handlers returning "not licensed" errors
+- Commercial: Override with real implementations via bus registration
+- Same command/query types, different implementations
+
+## What Moves to Commercial (Strong Legal Protection)
+
+### Commercial Folder Structure
+```
+commercial/
+├── LICENSE (restrictive commercial license)
+├── pages/
+│   └── Administration/
+│       └── ContentModeration.page.tsx (~300 lines)
+├── components/
+│   └── ModerationIndicator.tsx
+├── handlers/
+│   ├── moderation.go (ModerationPage, GetModerationItems, GetModerationCount)
+│   └── apiv1/
+│       ├── moderation.go (all API endpoints)
+│       └── moderation_test.go
+├── services/
+│   └── moderation.go (approve/decline business logic)
+└── init.go (service/route registration)
+```
+
+### Frontend (Moves to Commercial)
+- Complete moderation admin UI (ContentModeration.page.tsx + styles)
+- Moderation indicator component showing pending counts
+- All moderation-specific UI components
+
+### Backend (Moves to Commercial)
+- All HTTP handlers (`ModerationPage`, `GetModerationItems`, `GetModerationCount`)
+- All API endpoints (`/api/v1/admin/moderation/*` routes)
+- Business logic implementations (approve/decline/verify/block functions)
+- Route registrations for moderation endpoints
+- Tests for commercial functionality
+
+## What Stays Open Source (Minimal Infrastructure)
+
+### Database/Models (Cannot Move - Bus System Dependency)
+- `app/models/cmd/moderation.go` - Command type definitions
+- `app/models/query/moderation.go` - Query type definitions
+- Database schema, migrations (`is_moderation_enabled`, `is_approved` columns)
+- Entity definitions (`ModerationItem` structs)
+
+### Settings Infrastructure
+- Privacy settings toggle (shows "upgrade" message if unlicensed)
+- Basic tenant property (`isModerationEnabled`)
+- License validation service
+
+### Content Flow Logic
+- Logic that marks content as needing approval
+- Basic "content requires moderation" checks throughout codebase
+- Content queuing when moderation is enabled
+
+### Locale Files
+- All `moderation.*` translation strings (used by upgrade messages too)
+
+## Technical Implementation Details
+
+### 1. Handler Registration Pattern
+```go
+// Open source routes.go - stub routes
+ui.Get("/admin/moderation", upgradeHandler("content-moderation"))
+ui.Get("/_api/admin/moderation/items", upgradeHandler("content-moderation"))
+
+// Commercial init.go - overrides routes
+func init() {
+    if license.IsCommercialFeatureEnabled("content-moderation") {
+        web.RegisterRoute("GET", "/admin/moderation", handlers.ModerationPage())
+        web.RegisterRoute("GET", "/_api/admin/moderation/items", handlers.GetModerationItems())
+        // ... all other moderation routes
+    }
+}
+```
+
+### 2. Service Registration Pattern
+```go
+// Open source postgres.go - register stubs
+func (s *Service) Init() {
+    bus.AddHandler(approvePostStub)   // Returns "feature not licensed"
+    bus.AddHandler(declinePostStub)
+    bus.AddHandler(getModerationItemsStub)
+    // ... other stubs
+}
+
+// Commercial service init - override with real handlers
+func (cs *CommercialService) Init() {
+    if license.IsCommercialFeatureEnabled("content-moderation") {
+        bus.AddHandler(approvePost)       // Real implementation
+        bus.AddHandler(declinePost)
+        bus.AddHandler(getModerationItems)
+        // ... other real handlers
+    }
+}
+```
+
+### 3. License Validation Service
+```go
+// app/services/license.go
+type LicenseService interface {
+    IsCommercialFeatureEnabled(feature string) bool
+}
+
+// Implementation checks for valid commercial license
+// Controls route registration and service overrides
+```
+
+## Implementation Phases
+
+### Phase 1: Setup Commercial Infrastructure
+1. Create `commercial/` folder structure
+2. Add restrictive LICENSE file to commercial folder
+3. Update webpack.config.js to scan commercial folder
+4. Create license validation service interface
+
+### Phase 2: Move Frontend Components
+1. Move `ContentModeration.page.tsx` to `commercial/pages/Administration/`
+2. Move `ModerationIndicator.tsx` to `commercial/components/`
+3. Test that webpack builds both locations correctly
+4. Add license checks in components to show upgrade messages
+
+### Phase 3: Implement Backend Service Separation  
+1. Create stub implementations for all moderation commands/queries
+2. Register stubs in open source postgres service
+3. Move real implementations to `commercial/services/moderation.go`
+4. Implement commercial service registration with license checks
+
+### Phase 4: Implement Route Separation
+1. Replace direct handler calls with upgrade handlers in routes.go
+2. Move real handlers to `commercial/handlers/`
+3. Implement dynamic route registration in commercial init
+4. Test route overriding works correctly
+
+### Phase 5: Testing & Validation
+1. Move tests to commercial folder
+2. Test open source build without commercial features
+3. Test commercial build with license validation
+4. Verify graceful degradation and upgrade messaging
+5. Test that forking open source works without commercial parts
+
+## Key Benefits
+
+### Strong Commercial Protection
+- Recreating moderation requires rebuilding entire UI + API + business logic
+- Substantial engineering effort (days/weeks) to replicate functionality
+- Clear legal separation under different licenses
+
+### Clean Architecture  
+- Open source provides database infrastructure and settings
+- Commercial enhances with actual moderation functionality
+- No broken states - content flows normally when moderation disabled
+- True open core model: commercial builds on open source foundation
+
+### Simple Build Process
+- Single repository with clear folder separation
+- Standard webpack build process
+- License provides protection, not technical hiding
+- Easy development workflow
+
+## Migration Considerations
+
+### Existing Moderation Data
+- All existing moderation settings and data remain compatible
+- Database schema stays in open source (infrastructure)
+- Only the management interface becomes commercial
+
+### User Experience
+- **With License**: Full moderation functionality as before
+- **Without License**: Moderation simply disabled, standard user flow
+- **Upgrade Path**: Clear messaging and sales funnel for commercial features
+
+### Development Workflow  
+- Developers can see all code (legal license controls usage)
+- Standard build process works for both open source and commercial
+- Clean separation makes it easy to add more commercial features
+
+## Success Metrics
+
+1. **Legal Protection**: Someone forking open source cannot easily recreate moderation
+2. **Functional Separation**: Open source works perfectly without moderation
+3. **Build Compatibility**: Both open source and commercial versions build successfully  
+4. **Clean Boundaries**: Clear understanding of what's core vs commercial
+5. **Scalability**: Pattern works for future commercial features
+
+This plan provides genuine open core protection while maintaining clean architecture and manageable implementation complexity.