feat: ✨ togglable guest timeline

default false

rc 9

no async

welcome explore button to `/explore`

fix: 🔥 Remove meta implementation in routing for now

CALCKEY.md

@@ -68,6 +68,7 @@
   - 👍 also triggers generic like/favorite
 - [Add additional background for acrylic popups if backdrop-filter is unsupported](https://github.com/misskey-dev/misskey/pull/8671)
 - [Timeline page for non-login users](https://github.com/misskey-dev/misskey/pull/8927)
+  - Made toggleable by instance admins, off by default
 - [Add parameters to MFM rotate](https://github.com/misskey-dev/misskey/pull/8549)
 - Many changes from [Foundkey](https://akkoma.dev/FoundKeyGang/Foundkey)
 	- 0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API

locales/en-US.yml

@@ -324,6 +324,7 @@ disconnectService: "Disconnect"
 enableLocalTimeline: "Enable local timeline"
 enableGlobalTimeline: "Enable global timeline"
 enableRecommendedTimeline: "Enable recommended timeline"
+enableGuestTimeline: "Enable timelines for non-logged in users"
 disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all timelines, even if they are not enabled."
 registration: "Register"
 enableRegistration: "Enable new user registration"

locales/ja-JP.yml

@@ -324,6 +324,7 @@ disconnectService: "切断する"
 enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
 enableRecommendedTimeline: "推奨されるタイムラインを有効にする"
+enableGuestTimeline: "非ログインユーザーのタイムラインを有効にする"
 disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
 registration: "登録"
 enableRegistration: "誰でも新規登録できるようにする"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-"version": "12.118.1-calc.rc.8",
+"version": "12.118.1-calc.rc.9",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

packages/backend/migration/1660068273737GuestTimeline.js

@@ -0,0 +1,9 @@
+export class GuestTimeline1660068273737 {
+		name = 'GuestTimeline1660068273737'
+		async up(queryRunner) {
+				await queryRunner.query(`ALTER TABLE "meta" ADD "enableGuestTimeline" boolean NOT NULL DEFAULT false`);
+		}
+		async down(queryRunner) {
+				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGuestTimeline"`);
+		}
+	}

packages/backend/src/models/entities/meta.ts

@@ -57,6 +57,11 @@ export class Meta {
 	})
 	public disableGlobalTimeline: boolean;
 
+	@Column('boolean', {
+		default: false,
+	})
+	public enableGuestTimeline: boolean;
+
 	@Column('boolean', {
 		default: false,
 	})

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -398,6 +398,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		disableLocalTimeline: instance.disableLocalTimeline,
 		disableRecommendedTimeline: instance.disableRecommendedTimeline,
 		disableGlobalTimeline: instance.disableGlobalTimeline,
+		enableGuestTimeline: instance.enableGuestTimeline,
 		driveCapacityPerLocalUserMb: instance.localDriveCapacityMb,
 		driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb,
 		emailRequiredForSignup: instance.emailRequiredForSignup,

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -18,6 +18,7 @@ export const paramDef = {
 		disableLocalTimeline: { type: 'boolean', nullable: true },
 		disableRecommendedTimeline: { type: 'boolean', nullable: true },
 		disableGlobalTimeline: { type: 'boolean', nullable: true },
+		enableGuestTimeline: { type: 'boolean', nullable: true },
 		useStarForReactionFallback: { type: 'boolean', nullable: true },
 		recommendedInstances: { type: 'array', nullable: true, items: {
 			type: 'string',
@@ -141,6 +142,10 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.disableGlobalTimeline = ps.disableGlobalTimeline;
 	}
 
+	if (typeof ps.enableGuestTimeline === 'boolean') {
+		set.enableGuestTimeline = ps.enableGuestTimeline;
+	}
+
 	if (typeof ps.useStarForReactionFallback === 'boolean') {
 		set.useStarForReactionFallback = ps.useStarForReactionFallback;
 	}

packages/backend/src/server/api/endpoints/meta.ts

@@ -88,6 +88,10 @@ export const meta = {
 				type: 'boolean',
 				optional: false, nullable: false,
 			},
+			enableGuestTimeline: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
 			driveCapacityPerLocalUserMb: {
 				type: 'number',
 				optional: false, nullable: false,
@@ -366,6 +370,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		disableLocalTimeline: instance.disableLocalTimeline,
 		disableRecommendedTimeline: instance.disableRecommendedTimeline,
 		disableGlobalTimeline: instance.disableGlobalTimeline,
+		enableGuestTimeline: instance.enableGuestTimeline,
 		driveCapacityPerLocalUserMb: instance.localDriveCapacityMb,
 		driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb,
 		emailRequiredForSignup: instance.emailRequiredForSignup,
@@ -423,6 +428,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			localTimeLine: !instance.disableLocalTimeline,
 			recommendedTimeline: !instance.disableRecommendedTimeline,
 			globalTimeLine: !instance.disableGlobalTimeline,
+			guestTimeline: instance.enableGuestTimeline,
 			emailRequiredForSignup: instance.emailRequiredForSignup,
 			elasticsearch: config.elasticsearch ? true : false,
 			hcaptcha: instance.enableHcaptcha,

packages/backend/src/server/nodeinfo.ts

@@ -69,6 +69,7 @@ const nodeinfo2 = async () => {
 			disableLocalTimeline: meta.disableLocalTimeline,
 			disableRecommendedTimeline: meta.disableRecommendedTimeline,
 			disableGlobalTimeline: meta.disableGlobalTimeline,
+			enableGuestTimeline: meta.enableGuestTimeline,
 			emailRequiredForSignup: meta.emailRequiredForSignup,
 			enableHcaptcha: meta.enableHcaptcha,
 			enableRecaptcha: meta.enableRecaptcha,

packages/client/src/pages/admin/settings.vue

@@ -55,6 +55,7 @@
 					<FormSection>
 						<FormSwitch v-model="enableLocalTimeline" class="_formBlock">{{ i18n.ts.enableLocalTimeline }}</FormSwitch>
 						<FormSwitch v-model="enableGlobalTimeline" class="_formBlock">{{ i18n.ts.enableGlobalTimeline }}</FormSwitch>
+						<FormSwitch v-model="enableGuestTimeline" class="_formBlock">{{ i18n.ts.enableGuestTimeline }}</FormSwitch>
 						<FormInfo class="_formBlock">{{ i18n.ts.disablingTimelinesInfo }}</FormInfo>
 					</FormSection>
 
@@ -198,6 +199,7 @@ let defaultDarkTheme: any = $ref(null);
 let enableLocalTimeline: boolean = $ref(false);
 let enableGlobalTimeline: boolean = $ref(false);
 let enableRecommendedTimeline: boolean = $ref(false);
+let enableGuestTimeline: boolean = $ref(false);
 let pinnedUsers: string = $ref('');
 let customMOTD: string = $ref('');
 let recommendedInstances: string = $ref('');
@@ -229,6 +231,7 @@ async function init() {
 	enableLocalTimeline = !meta.disableLocalTimeline;
 	enableGlobalTimeline = !meta.disableGlobalTimeline;
 	enableRecommendedTimeline = !meta.disableRecommendedTimeline;
+	enableGuestTimeline = meta.enableGuestTimeline;
 	pinnedUsers = meta.pinnedUsers.join('\n');
 	customMOTD = meta.customMOTD.join('\n');
 	customSplashIcons = meta.customSplashIcons.join('\n');
@@ -261,6 +264,7 @@ function save() {
 		disableLocalTimeline: !enableLocalTimeline,
 		disableGlobalTimeline: !enableGlobalTimeline,
 		disableRecommendedTimeline: !enableRecommendedTimeline,
+		enableGuestTimeline: enableGuestTimeline,
 		pinnedUsers: pinnedUsers.split('\n'),
 		customMOTD: customMOTD.split('\n'),
 		customSplashIcons: customSplashIcons.split('\n'),

packages/client/src/pages/welcome.entrance.a.vue

@@ -35,7 +35,7 @@
 				<div class="action">
 					<MkButton inline rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.signup }}</MkButton>
 					<MkButton inline rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
-					<MkButton inline rounded style="margin-left: 12px;" onclick="window.location.href='/timeline'">Explore</MkButton>
+					<MkButton inline rounded style="margin-left: 12px;" onclick="window.location.href='/explore'">Explore</MkButton>
 				</div>
 			</div>
 		</div>

packages/client/src/router.ts

@@ -5,6 +5,8 @@ import MkLoading from '@/pages/_loading_.vue';
 import MkError from '@/pages/_error_.vue';
 import { ui } from '@/config';
 
+// const guestTimeline = nodeinfo.meta.enableGuestTimeline;
+
 const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
 	loader: loader,
 	loadingComponent: MkLoading,
@@ -456,6 +458,7 @@ export const routes = [{
 }, {
 	path: '/timeline',
 	component: page(() => import('./pages/timeline.vue')),
+	// loginRequired: guestTimeline,
 }, {
 	name: 'index',
 	path: '/',

packages/client/src/ui/visitor/b.vue

@@ -77,7 +77,7 @@ const announcements = {
 	endpoint: 'announcements',
 	limit: 10,
 };
-const isTimelineAvailable = !instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline;
+const isTimelineAvailable = instance.enableGuestTimeline && (!instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline);
 let showMenu = $ref(false);
 let isDesktop = $ref(window.innerWidth >= DESKTOP_THRESHOLD);
 let narrow = $ref(window.innerWidth < 1280);

packages/client/src/ui/visitor/header.vue

@@ -60,7 +60,7 @@ export default defineComponent({
 		return {
 			narrow: null,
 			showMenu: false,
-			isTimelineAvailable: !instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline,
+			isTimelineAvailable: instance.enableGuestTimeline && (!instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline),
 		};
 	},