summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints
diff options
context:
space:
mode:
author4ster1sk <146138447+4ster1sk@users.noreply.github.com>2024-11-07 15:10:10 +0900
committerGitHub <noreply@github.com>2024-11-07 15:10:10 +0900
commitbca690f256721815fb1c918c1f66a2172f4fcf40 (patch)
tree895bc162711f87e4bf47a3922f2bb5e186f38e5a /packages/backend/src/server/api/endpoints
parentchore: little type trick in pizzax.ts (#14891) (diff)
downloadsharkey-bca690f256721815fb1c918c1f66a2172f4fcf40.tar.gz
sharkey-bca690f256721815fb1c918c1f66a2172f4fcf40.tar.bz2
sharkey-bca690f256721815fb1c918c1f66a2172f4fcf40.zip
fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように (#14904)
Diffstat (limited to 'packages/backend/src/server/api/endpoints')
-rw-r--r--packages/backend/src/server/api/endpoints/i/update.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 2183beac7c..d91e2fef4b 100644
--- 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.description === 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;