merge: timeline 1

This commit is contained in:
syuilo 2023-10-03 20:26:11 +09:00 committed by Mar0xy
parent fe4345d191
commit f6ba5cfaf4
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
84 changed files with 1898 additions and 947 deletions

View file

@ -36,7 +36,6 @@ import { MiHashtag } from '@/models/Hashtag.js';
import { MiInstance } from '@/models/Instance.js';
import { MiMeta } from '@/models/Meta.js';
import { MiModerationLog } from '@/models/ModerationLog.js';
import { MiMutedNote } from '@/models/MutedNote.js';
import { MiMuting } from '@/models/Muting.js';
import { MiRenoteMuting } from '@/models/RenoteMuting.js';
import { MiNote } from '@/models/Note.js';
@ -62,7 +61,7 @@ import { MiUserIp } from '@/models/UserIp.js';
import { MiUserKeypair } from '@/models/UserKeypair.js';
import { MiUserList } from '@/models/UserList.js';
import { MiUserListFavorite } from '@/models/UserListFavorite.js';
import { MiUserListJoining } from '@/models/UserListJoining.js';
import { MiUserListMembership } from '@/models/UserListMembership.js';
import { MiUserNotePining } from '@/models/UserNotePining.js';
import { MiUserPending } from '@/models/UserPending.js';
import { MiUserProfile } from '@/models/UserProfile.js';
@ -139,7 +138,7 @@ export const entities = [
MiUserPublickey,
MiUserList,
MiUserListFavorite,
MiUserListJoining,
MiUserListMembership,
MiUserNotePining,
MiUserSecurityKey,
MiUsedUsername,
@ -175,7 +174,6 @@ export const entities = [
MiPromoNote,
MiPromoRead,
MiRelay,
MiMutedNote,
MiChannel,
MiChannelFollowing,
MiChannelFavorite,