Require signed-in users to accept terms and privacy policy

KNOWLEDGE_BASE.md

@@ -572,7 +572,7 @@ Sources: [status transitions](app/Actions/UpdateCommitStatuses.php), [timeouts](
 
 ### About, changelog, and policies
 
-The public **About** page describes the livestream project and lists up to 1,000 GitHub contributor accounts, excluding bots and known agents, most commits first; the list is cached for an hour and GitHub may take several hours to update its counts; when GitHub cannot be reached the page says so instead of showing the list. The **Changelog**, opened from the navigation or the side column, lists the pull requests merged into `production` on GitHub, a few days at a time. The **Brand** page at `/brand` offers the logo, wordmark, colors, typography, and wallpapers; right-clicking the logo in the navigation also copies it or links there. **Terms** and **Privacy** explain acceptable use and data handling. Public posts may be indexed or copied outside /dev/null; content and search queries can be processed by automated or AI services. Read those policies before posting sensitive information or relying on deletion to remove every external copy.
+The public **About** page describes the livestream project and lists up to 1,000 GitHub contributor accounts, excluding bots and known agents, most commits first; the list is cached for an hour and GitHub may take several hours to update its counts; when GitHub cannot be reached the page says so instead of showing the list. The **Changelog**, opened from the navigation or the side column, lists the pull requests merged into `production` on GitHub, a few days at a time. The **Brand** page at `/brand` offers the logo, wordmark, colors, typography, and wallpapers; right-clicking the logo in the navigation also copies it or links there. **Terms** and **Privacy** explain acceptable use and data handling. Signed-in people must accept both before they can keep using /dev/null, on the web and in the apps, and must accept them again whenever a new version takes effect; the web asks in a dialog that only closes by accepting or logging out. Public posts may be indexed or copied outside /dev/null; content and search queries can be processed by automated or AI services. Read those policies before posting sensitive information or relying on deletion to remove every external copy.
 
 To count active people, /dev/null remembers only the **last day** (not the time) you were signed in and used the site or the API; background refreshes do not count. That day is never shown to other people, is included in your export, and is deleted with your account. Daily active-people numbers are kept as anonymous counts. Visitor analytics come from **Fathom**, which counts anonymously: the browser sends a `guest-visit` event once per session when you are not signed in, a `signin-click` event when you tap to sign in, and a `signup` event right after an account is created, with nothing that identifies you.
 

app/Http/Controllers/UserTermsController.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers;
+
+use App\Actions\UpdateUserTermsAcceptance;
+use App\Http\Requests\UpdateUserTermsRequest;
+use App\Models\User;
+use Illuminate\Container\Attributes\CurrentUser;
+use Illuminate\Http\RedirectResponse;
+
+final readonly class UserTermsController
+{
+    /**
+     * Records that the person accepted the terms and privacy policy in the dialog the web shows until they do.
+     */
+    public function update(UpdateUserTermsRequest $request, #[CurrentUser] User $user, UpdateUserTermsAcceptance $action): RedirectResponse
+    {
+        $action->handle($user);
+
+        return back();
+    }
+}

app/Http/Middleware/HandleInertiaRequests.php

@@ -93,6 +93,11 @@ public function share(Request $request): array
                 'isAdmin' => $isAdmin,
                 'automaticTranslation' => $user->automatic_translation ?? true,
                 'mustReadCommitRules' => $user instanceof User && $user->commit_rules_accepted_at === null,
+                // The version of the terms they still have to accept, and whether they accepted an earlier one...
+                'termsToAccept' => $user instanceof User && ! $user->hasAcceptedCurrentTerms() ? [
+                    'version' => config('legal.terms_version'),
+                    'updated' => $user->terms_accepted_at !== null,
+                ] : null,
                 'log' => fn (): ?Log => $request->user()?->log,
                 'unreadNotificationsCount' => fn (): int => $user instanceof User ? resolve(NotificationGroupsQuery::class)->unreadCount($user, ListNotificationsRequest::rememberedType($request, $user)) : 0,
                 'unreadMessagesCount' => fn (): int => $user?->remotes_enabled ? resolve(ConversationsQuery::class)->unreadCount($user) : 0,

app/Http/Requests/UpdateUserTermsRequest.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+/**
+ * The page says which version of the terms the person was shown, so a tab left open across a new version can't accept
+ * one it never showed them.
+ */
+final class UpdateUserTermsRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, list<mixed>>
+     */
+    public function rules(): array
+    {
+        return [
+            'version' => ['required', 'string', Rule::in([config('legal.terms_version')])],
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function messages(): array
+    {
+        return [
+            'version.in' => 'The terms changed while this page was open. Reload the page to read the new version.',
+        ];
+    }
+}

resources/js/components/terms-dialog.tsx

@@ -0,0 +1,129 @@
+import { Form, Link, router, usePage } from '@inertiajs/react';
+import PrivacyController from '@/actions/App/Http/Controllers/PrivacyController';
+import TermsController from '@/actions/App/Http/Controllers/TermsController';
+import UserTermsController from '@/actions/App/Http/Controllers/UserTermsController';
+import InputError from '@/components/input-error';
+import { Button } from '@/components/ui/button';
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogTitle,
+} from '@/components/ui/dialog';
+import { WordmarkText } from '@/components/wordmark-text';
+import { clearRecentSearches } from '@/hooks/use-recent-searches';
+import { clearStashes } from '@/hooks/use-stash';
+import { TERMS_EFFECTIVE_DATE } from '@/lib/legal';
+import { logout } from '@/routes';
+
+/**
+ * Until they accept the terms and privacy policy in force, a signed-in person can't use the web: the dialog can't be
+ * dismissed, and a new version brings it back. The terms and privacy pages open in a new tab, where it isn't shown.
+ */
+export function TermsDialog() {
+    const { component, props } = usePage();
+    const { user, termsToAccept } = props.auth;
+
+    if (
+        user === null ||
+        termsToAccept === null ||
+        component === 'terms/show' ||
+        component === 'privacy/show'
+    ) {
+        return null;
+    }
+
+    const linkClassName = 'text-foreground underline underline-offset-4';
+
+    return (
+        <Dialog open>
+            <DialogContent
+                showCloseButton={false}
+                onEscapeKeyDown={(event) => event.preventDefault()}
+                onInteractOutside={(event) => event.preventDefault()}
+                data-test="terms-dialog"
+            >
+                <DialogTitle>
+                    {termsToAccept.updated
+                        ? 'We updated our terms'
+                        : 'Terms and privacy'}
+                </DialogTitle>
+                <DialogDescription asChild>
+                    <div className="grid gap-3">
+                        <p>
+                            <WordmarkText>
+                                {termsToAccept.updated
+                                    ? `The terms of service and the privacy policy changed on ${TERMS_EFFECTIVE_DATE}. To keep using /dev/null, read them and accept them.`
+                                    : 'To keep using /dev/null, read and accept the terms of service and the privacy policy.'}
+                            </WordmarkText>
+                        </p>
+                        <p>
+                            Read the{' '}
+                            <Link
+                                href={TermsController.show.url()}
+                                target="_blank"
+                                className={linkClassName}
+                            >
+                                terms of service
+                            </Link>{' '}
+                            and the{' '}
+                            <Link
+                                href={PrivacyController.show.url()}
+                                target="_blank"
+                                className={linkClassName}
+                            >
+                                privacy policy
+                            </Link>
+                            .
+                        </p>
+                    </div>
+                </DialogDescription>
+
+                <Form
+                    {...UserTermsController.update.form()}
+                    options={{ preserveScroll: true, preserveState: true }}
+                    className="grid gap-4"
+                >
+                    {({ processing, errors }) => (
+                        <>
+                            <input
+                                type="hidden"
+                                name="version"
+                                value={termsToAccept.version}
+                            />
+                            <InputError message={errors.version} />
+                            <DialogFooter className="gap-2">
+                                <Button
+                                    variant="outline"
+                                    asChild
+                                    disabled={processing}
+                                >
+                                    <Link
+                                        href={logout()}
+                                        as="button"
+                                        type="button"
+                                        onClick={() => {
+                                            clearStashes(user.id);
+                                            clearRecentSearches(user.id);
+                                            router.flushAll();
+                                        }}
+                                    >
+                                        Log out
+                                    </Link>
+                                </Button>
+                                <Button
+                                    type="submit"
+                                    disabled={processing}
+                                    data-test="accept-terms-button"
+                                >
+                                    I accept
+                                </Button>
+                            </DialogFooter>
+                        </>
+                    )}
+                </Form>
+            </DialogContent>
+        </Dialog>
+    );
+}

resources/js/components/ui/dialog.tsx

@@ -47,8 +47,11 @@ function DialogOverlay({
 function DialogContent({
   className,
   children,
+  showCloseButton = true,
   ...props
-}: React.ComponentProps<typeof DialogPrimitive.Content>) {
+}: React.ComponentProps<typeof DialogPrimitive.Content> & {
+  showCloseButton?: boolean
+}) {
   return (
     <DialogPortal data-slot="dialog-portal">
       <DialogOverlay />
@@ -61,10 +64,12 @@ function DialogContent({
         {...props}
       >
         {children}
+        {showCloseButton && (
         <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
           <XIcon />
           <span className="sr-only">Close</span>
         </DialogPrimitive.Close>
+        )}
       </DialogPrimitive.Content>
     </DialogPortal>
   )

resources/js/layouts/app-layout.tsx

@@ -21,6 +21,7 @@ import { KeyboardShortcutsDialog } from '@/components/keyboard-shortcuts-dialog'
 import { LocalSignInDialog } from '@/components/local-sign-in-dialog';
 import { ProductHuntBanner } from '@/components/product-hunt-banner';
 import { SearchDialog } from '@/components/search-dialog';
+import { TermsDialog } from '@/components/terms-dialog';
 import { useChat, useRemoteAlerts, useUnreadMessages } from '@/hooks/use-chat';
 import { useIsComposerInView } from '@/hooks/use-composer-visibility';
 import { usePageDeletion } from '@/hooks/use-deleted-resources';
@@ -187,7 +188,7 @@ export default function AppLayout({ children }: AppLayoutProps) {
                     canModerate={auth.isAdmin}
                 />
 
-                {isGuest && <LocalSignInDialog />}
+                {isGuest ? <LocalSignInDialog /> : <TermsDialog />}
 
                 {isGuest && <GuestJoinSheet />}
             </div>

resources/js/pages/onboarding/show.tsx

@@ -19,6 +19,7 @@ import { GitHubProfile } from '@/components/github-profile';
 import InputError from '@/components/input-error';
 import { KeyboardShortcutsDialog } from '@/components/keyboard-shortcuts-dialog';
 import { LaneOptions, LanePreview } from '@/components/lane-picker';
+import { TermsDialog } from '@/components/terms-dialog';
 import { Button } from '@/components/ui/button';
 import { Spinner } from '@/components/ui/spinner';
 import { UserAvatar } from '@/components/user-avatar';
@@ -935,6 +936,7 @@ export default function Show({
                 onOpenChange={setIsShowingShortcuts}
                 canModerate={auth.isAdmin}
             />
+            <TermsDialog />
         </>
     );
 }

resources/js/types/auth.ts

@@ -47,6 +47,7 @@ export type Auth = {
     isAdmin: boolean;
     automaticTranslation: boolean;
     mustReadCommitRules: boolean;
+    termsToAccept: { version: string; updated: boolean } | null;
     log: Log | null;
     unreadNotificationsCount: number;
     unreadMessagesCount: number;

routes/web.php

@@ -124,6 +124,7 @@
 use App\Http\Controllers\UserRemotesController;
 use App\Http\Controllers\UserSearchController;
 use App\Http\Controllers\UserSitemapController;
+use App\Http\Controllers\UserTermsController;
 use App\Http\Controllers\UserTimeoutController;
 use App\Http\Controllers\UserTimezoneController;
 use App\Http\Controllers\UserTranslationLanguageController;
@@ -507,6 +508,9 @@
 
     Route::put('settings/remotes', [UserRemotesController::class, 'update'])->name('user-remotes.update');
 
+    // User Terms, accepted from the dialog every page shows until the current version is...
+    Route::put('settings/terms', [UserTermsController::class, 'update'])->name('user-terms.update');
+
     // User Live...
     Route::put('settings/live', [UserLiveController::class, 'update'])
         ->middleware(PreventPostingInTimeout::class)