usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP Emojiのupdatedは採用しないように (#5220) 

* AP Emojiのupdatedは採用しない

* updated判定は残す
This commit is contained in:
MeiMei 2019-07-28 05:32:40 +09:00 committed by syuilo
parent c3003cb363
commit 6138d46509
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/remote/activitypub/models/note.ts
View File

@ -302,6 +302,7 @@ export async function extractEmojis(tags: ITag[], host: string): Promise<Emoji[]
if ((tag.updated != null && exists.updatedAt == null) if ((tag.updated != null && exists.updatedAt == null)
|| (tag.id != null && exists.uri == null) || (tag.id != null && exists.uri == null)
|| (tag.updated != null && exists.updatedAt != null && new Date(tag.updated) > exists.updatedAt) || (tag.updated != null && exists.updatedAt != null && new Date(tag.updated) > exists.updatedAt)
|| (tag.icon!.url !== exists.url)
) { ) {
await Emojis.update({ await Emojis.update({
host, host,
@ -309,7 +310,7 @@ export async function extractEmojis(tags: ITag[], host: string): Promise<Emoji[]
}, { }, {
uri: tag.id, uri: tag.id,
url: tag.icon!.url, url: tag.icon!.url,
updatedAt: new Date(tag.updated!), updatedAt: new Date(),
}); });
return await Emojis.findOne({ return await Emojis.findOne({
@ -329,7 +330,7 @@ export async function extractEmojis(tags: ITag[], host: string): Promise<Emoji[]
name, name,
uri: tag.id, uri: tag.id,
url: tag.icon!.url, url: tag.icon!.url,
updatedAt: tag.updated ? new Date(tag.updated) : undefined, updatedAt: new Date(),
aliases: [] aliases: []
} as Partial<Emoji>); } as Partial<Emoji>);
})); }));