Merge remote-tracking branch 'misskey-dev/master' into develop

This commit is contained in:
2022-06-13 16:31:41 +09:00
10 changed files with 49 additions and 21 deletions

View File

@ -9,6 +9,8 @@ export async function readNotification(
userId: User['id'],
notificationIds: Notification['id'][]
) {
if (notificationIds.length === 0) return;
// Update documents
await Notifications.update({
id: In(notificationIds),

View File

@ -34,7 +34,11 @@ export const paramDef = {
{
type: 'object',
properties: {
notificationIds: { type: 'array', items: { type: 'string', format: 'misskey:id' } },
notificationIds: {
type: 'array',
items: { type: 'string', format: 'misskey:id' },
maxItems: 100,
},
},
required: ['notificationIds'],
},

View File

@ -24,7 +24,7 @@ export async function GenerateVideoThumbnail(source: string): Promise<IImage> {
});
// JPEGに変換 (Webpでもいいが、MastodonはWebpをサポートせず表示できなくなる)
return await convertToJpeg(498, 280);
return await convertToJpeg(file, 498, 280);
} finally {
cleanup();
}