Merge pull request 'Separate cat-avatar mode and speak-as-cat nyanification' (#9798) from supakaity/hajkey:hk/cat-speak into develop

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9798

locales/en-US.yml

@@ -146,6 +146,8 @@ flagAsBot: "Mark this account as a bot"
 flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Calckey's internal systems to treat this account as a bot."
 flagAsCat: "Are you a cat? 😺"
 flagAsCatDescription: "You'll get cat ears and speak like a cat!"
+flagSpeakAsCat: "Speak as a cat"
+flagSpeakAsCatDescription: "Your posts will get nyanified when in cat mode"
 flagShowTimelineReplies: "Show replies in timeline"
 flagShowTimelineRepliesDescription: "Shows replies of users to posts of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"

packages/backend/migration/1680426269172-SpeakAsCat.js

@@ -0,0 +1,20 @@
+export class SpeakAsCat1680426269172 {
+    name = 'SpeakAsCat1680426269172'
+
+    async up(queryRunner) {
+        await queryRunner.query(`
+            ALTER TABLE "user"
+            ADD "speakAsCat" boolean NOT NULL DEFAULT true
+        `);
+        await queryRunner.query(`
+            COMMENT ON COLUMN "user"."speakAsCat"
+						IS 'Whether to speak as a cat if isCat.'
+        `);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`
+            ALTER TABLE "user" DROP COLUMN "speakAsCat"
+        `);
+    }
+}

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

@@ -156,6 +156,12 @@ export class User {
 	})
 	public isCat: boolean;
 
+	@Column('boolean', {
+		default: true,
+		comment: 'Whether to speak as a cat if isCat.',
+	})
+	public speakAsCat: boolean;
+
 	@Column('boolean', {
 		default: false,
 		comment: 'Whether the User is the admin.',

packages/backend/src/models/repositories/note.ts

@@ -263,7 +263,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				: {}),
 		});
 
-		if (packed.user.isCat && packed.text) {
+		if (packed.user.isCat && packed.user.speakAsCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
 			function nyaizeNode(node: mfm.MfmNode) {
 				if (node.type === "quote") return;

packages/backend/src/models/repositories/user.ts

@@ -438,6 +438,7 @@ export const UserRepository = db.getRepository(User).extend({
 			isModerator: user.isModerator || falsy,
 			isBot: user.isBot || falsy,
 			isCat: user.isCat || falsy,
+			speakAsCat: user.speakAsCat || falsy,
 			instance: user.host
 				? userInstanceCache
 						.fetch(

packages/backend/src/models/schema/user.ts

@@ -66,6 +66,11 @@ export const packedUserLiteSchema = {
 			nullable: false,
 			optional: true,
 		},
+		speakAsCat: {
+			type: "boolean",
+			nullable: false,
+			optional: true,
+		},
 		emojis: {
 			type: "array",
 			nullable: false,

packages/backend/src/server/api/endpoints/i/update.ts

@@ -104,6 +104,7 @@ export const paramDef = {
 		noCrawle: { type: "boolean" },
 		isBot: { type: "boolean" },
 		isCat: { type: "boolean" },
+		speakAsCat: { type: "boolean" },
 		showTimelineReplies: { type: "boolean" },
 		injectFeaturedNote: { type: "boolean" },
 		receiveAnnouncementEmail: { type: "boolean" },
@@ -191,6 +192,7 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 		profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
 	if (typeof ps.noCrawle === "boolean") profileUpdates.noCrawle = ps.noCrawle;
 	if (typeof ps.isCat === "boolean") updates.isCat = ps.isCat;
+	if (typeof ps.speakAsCat === "boolean") updates.speakAsCat = ps.speakAsCat;
 	if (typeof ps.injectFeaturedNote === "boolean")
 		profileUpdates.injectFeaturedNote = ps.injectFeaturedNote;
 	if (typeof ps.receiveAnnouncementEmail === "boolean")

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

@@ -59,6 +59,7 @@
 	</FormSlot>
 
 	<FormSwitch v-model="profile.isCat" class="_formBlock">{{ i18n.ts.flagAsCat }}<template #caption>{{ i18n.ts.flagAsCatDescription }}</template></FormSwitch>
+	<FormSwitch v-if="profile.isCat" v-model="profile.speakAsCat" class="_formBlock">{{ i18n.ts.flagSpeakAsCat }}<template #caption>{{ i18n.ts.flagSpeakAsCatDescription }}</template></FormSwitch>
 	<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock">{{ i18n.ts.flagShowTimelineReplies }}<template #caption>{{ i18n.ts.flagShowTimelineRepliesDescription }} {{ i18n.ts.reflectMayTakeTime }}</template></FormSwitch>
 	<FormSwitch v-model="profile.isBot" class="_formBlock">{{ i18n.ts.flagAsBot }}<template #caption>{{ i18n.ts.flagAsBotDescription }}</template></FormSwitch>
 	<div v-if="saveButton == true">
@@ -92,6 +93,7 @@ const profile = reactive({
 	lang: $i?.lang,
 	isBot: $i?.isBot,
 	isCat: $i?.isCat,
+	speakAsCat: $i?.speakAsCat,
 	showTimelineReplies: $i?.showTimelineReplies,
 });
 
@@ -135,6 +137,7 @@ function save() {
 		lang: profile.lang || null,
 		isBot: !!profile.isBot,
 		isCat: !!profile.isCat,
+		speakAsCat: !!profile.speakAsCat,
 		showTimelineReplies: !!profile.showTimelineReplies,
 	});
 }