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

Merge remote-tracking branch 'misskey-mattyatea/schedule-note' into develop

Browse source 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/RoleService.ts
#	packages/frontend/src/components/MkNoteHeader.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/navbar.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
This commit is contained in:
mattyatea 2023-12-02 00:50:04 +09:00
commit b7f9ad1944
39 changed files with 900 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

77
packages/backend/src/models/RepositoryModule.ts
View file

@ -5,7 +5,74 @@
import { Module } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiAvatarDecoration, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook } from './_.js';
import {
MiAbuseUserReport,
MiAccessToken,
MiAd,
MiAnnouncement,
MiAnnouncementRead,
MiAntenna,
MiApp,
MiAuthSession,
MiAvatarDecoration,
MiBlocking,
MiChannel,
MiChannelFavorite,
MiChannelFollowing,
MiClip,
MiClipFavorite,
MiClipNote,
MiDriveFile,
MiDriveFolder,
MiEmoji,
MiFlash,
MiFlashLike,
MiFollowRequest,
MiFollowing,
MiGalleryLike,
MiGalleryPost,
MiHashtag,
MiInstance,
MiMeta,
MiModerationLog,
MiMuting,
MiNote,
MiNoteFavorite,
MiNoteReaction,
MiNoteThreadMuting,
MiNoteUnread,
MiPage,
MiPageLike,
MiPasswordResetRequest,
MiPoll,
MiPollVote,
MiPromoNote,
MiPromoRead,
MiRegistrationTicket,
MiRegistryItem,
MiRelay,
MiRenoteMuting,
MiRetentionAggregation,
MiRole,
MiRoleAssignment,
MiSignin,
MiSwSubscription,
MiUsedUsername,
MiUser,
MiUserIp,
MiUserKeypair,
MiUserList,
MiUserListFavorite,
MiUserListMembership,
MiUserMemo,
MiUserNotePining,
MiUserPending,
MiUserProfile,
MiUserPublickey,
MiUserSecurityKey,
MiWebhook,
MiScheduledNote,
} from './_.js';
import type { DataSource } from 'typeorm';
import type { Provider } from '@nestjs/common';
@ -21,6 +88,12 @@ const $notesRepository: Provider = {
inject: [DI.db],
};
const $scheduledNotesRepository: Provider = {
provide: DI.scheduledNotesRepository,
useFactory: (db: DataSource) => db.getRepository(MiScheduledNote),
inject: [DI.db],
};
const $announcementsRepository: Provider = {
provide: DI.announcementsRepository,
useFactory: (db: DataSource) => db.getRepository(MiAnnouncement),
@ -405,6 +478,7 @@ const $userMemosRepository: Provider = {
providers: [
$usersRepository,
$notesRepository,
$scheduledNotesRepository,
$announcementsRepository,
$announcementReadsRepository,
$appsRepository,
@ -472,6 +546,7 @@ const $userMemosRepository: Provider = {
exports: [
$usersRepository,
$notesRepository,
$scheduledNotesRepository,
$announcementsRepository,
$announcementReadsRepository,
$appsRepository,

27
packages/backend/src/models/ScheduledNote.ts Normal file
View file

@ -0,0 +1,27 @@
/*
* SPDX-FileCopyrightText: syuilo and other misskey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
import type { MiNoteCreateOption } from '@/types.js';
import { id } from './util/id.js';
import { MiUser } from './User.js';
@Entity('note_schedule')
export class MiScheduledNote {
@PrimaryColumn(id())
public id: string;
@Column('jsonb')
public note: MiNoteCreateOption;
@Index()
@Column('varchar', {
length: 260,
})
public userId: MiUser['id'];
@Column('timestamp with time zone')
public scheduledAt: Date;
}

3
packages/backend/src/models/_.ts
View file

@ -68,6 +68,7 @@ import { MiRoleAssignment } from '@/models/RoleAssignment.js';
import { MiFlash } from '@/models/Flash.js';
import { MiFlashLike } from '@/models/FlashLike.js';
import { MiUserListFavorite } from '@/models/UserListFavorite.js';
import { MiScheduledNote } from './ScheduledNote.js';
import type { Repository } from 'typeorm';
export {
@ -104,6 +105,7 @@ export {
MiNoteReaction,
MiNoteThreadMuting,
MiNoteUnread,
MiScheduledNote,
MiPage,
MiPageLike,
MiPasswordResetRequest,
@ -171,6 +173,7 @@ export type NoteFavoritesRepository = Repository<MiNoteFavorite>;
export type NoteReactionsRepository = Repository<MiNoteReaction>;
export type NoteThreadMutingsRepository = Repository<MiNoteThreadMuting>;
export type NoteUnreadsRepository = Repository<MiNoteUnread>;
export type ScheduledNotesRepository = Repository<MiScheduledNote>;
export type PagesRepository = Repository<MiPage>;
export type PageLikesRepository = Repository<MiPageLike>;
export type PasswordResetRequestsRepository = Repository<MiPasswordResetRequest>;