Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sw-notification-action

Browse source
This commit is contained in:
tamaina 2021-03-23 21:25:39 +09:00
commit f2b5118bda
783 changed files with 5464 additions and 3649 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/services/messages/create.ts
View file

@ -2,7 +2,7 @@ import { User } from '../../models/entities/user';
import { UserGroup } from '../../models/entities/user-group';
import { DriveFile } from '../../models/entities/drive-file';
import { MessagingMessages, UserGroupJoinings, Mutings, Users } from '../../models';
import { genId } from '../../misc/gen-id';
import { genId } from '@/misc/gen-id';
import { MessagingMessage } from '../../models/entities/messaging-message';
import { publishMessagingStream, publishMessagingIndexStream, publishMainStream, publishGroupMessagingStream } from '../stream';
import { pushNotification } from '../push-notification';
@ -14,7 +14,7 @@ import { renderActivity } from '../../remote/activitypub/renderer';
import { deliver } from '../../queue';
export async function createMessage(user: User, recipientUser: User | undefined, recipientGroup: UserGroup | undefined, text: string | undefined, file: DriveFile | null, uri?: string) {
const message = await MessagingMessages.save({
const message = {
id: genId(),
createdAt: new Date(),
fileId: file ? file.id : null,
@ -25,7 +25,9 @@ export async function createMessage(user: User, recipientUser: User | undefined,
isRead: false,
reads: [] as any[],
uri
} as MessagingMessage);
} as MessagingMessage;
await MessagingMessages.insert(message);
const messageObj = await MessagingMessages.pack(message);

2
src/services/messages/delete.ts
View file

@ -1,4 +1,4 @@
import config from '../../config';
import config from '@/config';
import { MessagingMessages, Users } from '../../models';
import { MessagingMessage } from '../../models/entities/messaging-message';
import { publishGroupMessagingStream, publishMessagingStream } from '../stream';