Merge ad1e2d8020 into 794cb9ffe2

fix(backend): followedMessageではなくdescriptionになっていたのを修正 (#14908 )
Update CHANGELOG.md
2024-11-07 22:45:24 +09:00 · 2024-11-07 17:16:51 +09:00 · 2024-11-07 15:10:38 +09:00 · 2024-11-07 15:10:10 +09:00 · 2024-09-30 01:17:49 +09:00 · 2024-09-29 11:59:20 +09:00
3 changed files with 8 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -29,6 +29,7 @@
 - Enhance: 起動前の疎通チェックで、DBとメイン以外のRedisの疎通確認も行うように  
  (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/588)  
  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/715)
+- fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように
 - Fix: Nested proxy requestsを検出した際にブロックするように
  [ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)
 - Fix: 招待コードの発行可能な残り数算出に使用すべきロールポリシーの値が違う問題を修正  
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@ -465,6 +465,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const newName = updates.name === undefined ? user.name : updates.name;
 			const newDescription = profileUpdates.description === undefined ? profile.description : profileUpdates.description;
 			const newFields = profileUpdates.fields === undefined ? profile.fields : profileUpdates.fields;
+			const newFollowedMessage = profileUpdates.followedMessage === undefined ? profile.followedMessage : profileUpdates.followedMessage;

 			if (newName != null) {
 				let hasProhibitedWords = false;
@ -494,6 +495,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				]);
 			}

+			if (newFollowedMessage != null) {
+				const tokens = mfm.parse(newFollowedMessage);
+				emojis = emojis.concat(extractCustomEmojisFromMfm(tokens));
+			}
+
 			updates.emojis = emojis;
 			updates.tags = tags;

--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -399,7 +399,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	enableCondensedLine: {
 		where: 'device',
-		default: true,
+		default: false,
 	},
 	additionalUnicodeEmojiIndexes: {
 		where: 'device',
Author	SHA1	Message	Date
Kisaragi	71b593a455	Merge `ad1e2d8020` into `794cb9ffe2`	2024-11-07 22:45:24 +09:00
4ster1sk	794cb9ffe2	fix(backend): followedMessageではなくdescriptionになっていたのを修正 (#14908 )	2024-11-07 17:16:51 +09:00
syuilo	0b976064ca	Update CHANGELOG.md	2024-11-07 15:10:38 +09:00
4ster1sk	bca690f256	fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように (#14904 )	2024-11-07 15:10:10 +09:00
Kisaragi	ad1e2d8020	Merge branch 'develop' into KisaragiEffective-patch-2	2024-09-30 01:17:49 +09:00
Kisaragi	bb7e9505d3	chore(frontend): turn off enableCondensedLine by default addresses #14642	2024-09-29 11:59:20 +09:00