graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 19:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug

Browse source
This commit is contained in:
syuilo 2018-08-02 09:37:13 +09:00
parent ce0f6f7ebe
commit e691524416
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/services/note/create.ts
View file

@ -164,14 +164,19 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
} }
// 通知 // 通知
if (isLocalUser(data.reply._user)) {
nm.push(data.reply.userId, 'reply'); nm.push(data.reply.userId, 'reply');
} }
}
// If it is renote // If it is renote
if (data.renote) { if (data.renote) {
// Notify
const type = data.text ? 'quote' : 'renote'; const type = data.text ? 'quote' : 'renote';
// Notify
if (isLocalUser(data.renote._user)) {
nm.push(data.renote.userId, type); nm.push(data.renote.userId, type);
}
// Fetch watchers // Fetch watchers
nmRelatedPromises.push(notifyToWatchersOfRenotee(data.renote, user, nm, type)); nmRelatedPromises.push(notifyToWatchersOfRenotee(data.renote, user, nm, type));
@ -181,17 +186,11 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
watch(user._id, data.renote); watch(user._id, data.renote);
} }
// If it is quote renote
if (data.text) {
// Add mention
nm.push(data.renote.userId, 'quote');
} else {
// Publish event // Publish event
if (!user._id.equals(data.renote.userId)) { if (!user._id.equals(data.renote.userId)) {
publishUserStream(data.renote.userId, 'renote', noteObj); publishUserStream(data.renote.userId, 'renote', noteObj);
} }
} }
}
if (!silent) { if (!silent) {
publish(user, note, noteObj, data.reply, data.renote, data.visibleUsers, noteActivity); publish(user, note, noteObj, data.reply, data.renote, data.visibleUsers, noteActivity);