Merge ad1e2d8020 into f1eb17f66c

2024-11-07 02:09:55 +09:00
2 changed files with 0 additions and 7 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -29,7 +29,6 @@
 - 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,7 +465,6 @@ 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;
@ -495,11 +494,6 @@ 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;