curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-23 20:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sw-notification-action

Browse Source
This commit is contained in:
tamaina
2021-03-23 21:25:39 +09:00
parent 6711202bce a284e8c5eb
commit f2b5118bda
783 changed files with 5464 additions and 3649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/api/common/generate-native-user-token.ts
View File

@@ -1,3 +1,3 @@
import { secureRndstr } from '../../../misc/secure-rndstr';
import { secureRndstr } from '@/misc/secure-rndstr';
export default () => secureRndstr(16, true);

2
src/server/api/common/getters.ts
View File

@@ -1,4 +1,4 @@
import { IdentifiableError } from '../../../misc/identifiable-error';
import { IdentifiableError } from '@/misc/identifiable-error';
import { User } from '../../../models/entities/user';
import { Note } from '../../../models/entities/note';
import { Notes, Users } from '../../../models';

2
src/server/api/common/inject-featured.ts
View File

@@ -23,7 +23,7 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
.andWhere(`note.score > 0`)
.andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
.andWhere(`note.visibility = 'public'`)
.leftJoinAndSelect('note.user', 'user');
.innerJoinAndSelect('note.user', 'user');
if (user) {
query.andWhere('note.userId != :userId', { userId: user.id });

2
src/server/api/common/read-messaging-message.ts
View File

@@ -6,7 +6,7 @@ import { User, ILocalUser, IRemoteUser } from '../../../models/entities/user';
import { MessagingMessage } from '../../../models/entities/messaging-message';
import { MessagingMessages, UserGroupJoinings, Users } from '../../../models';
import { In } from 'typeorm';
import { IdentifiableError } from '../../../misc/identifiable-error';
import { IdentifiableError } from '@/misc/identifiable-error';
import { UserGroup } from '../../../models/entities/user-group';
import { toArray } from '../../../prelude/array';
import { renderReadActivity } from '../../../remote/activitypub/renderer/read';

4
src/server/api/common/signin.ts
View File

@@ -1,9 +1,9 @@
import * as Koa from 'koa';
import config from '../../../config';
import config from '@/config';
import { ILocalUser } from '../../../models/entities/user';
import { Signins } from '../../../models';
import { genId } from '../../../misc/gen-id';
import { genId } from '@/misc/gen-id';
import { publishMainStream } from '../../../services/stream';
export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {

4
src/server/api/common/signup.ts
View File

@@ -5,8 +5,8 @@ import { User } from '../../../models/entities/user';
import { Users, UsedUsernames } from '../../../models';
import { UserProfile } from '../../../models/entities/user-profile';
import { getConnection } from 'typeorm';
import { genId } from '../../../misc/gen-id';
import { toPunyNullable } from '../../../misc/convert-host';
import { genId } from '@/misc/gen-id';
import { toPunyNullable } from '@/misc/convert-host';
import { UserKeypair } from '../../../models/entities/user-keypair';
import { usersChart } from '../../../services/chart';
import { UsedUsername } from '../../../models/entities/used-username';