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

refactor: migrate to typeorm 3.0 (#8443)

Browse source 
* wip

* wip

* wip

* Update following.ts

* wip

* wip

* wip

* Update resolve-user.ts

* maxQueryExecutionTime

* wip

* wip
This commit is contained in:
syuilo 2022-03-26 15:34:00 +09:00 • committed by GitHub
parent 41c87074e6
commit 1c67c26bd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
325 changed files with 1314 additions and 1494 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/server/web/feed.ts
View file

@ -2,7 +2,7 @@ import { Feed } from 'feed';
import config from '@/config/index.js';
import { User } from '@/models/entities/user.js';
import { Notes, DriveFiles, UserProfiles } from '@/models/index.js';
import { In } from 'typeorm';
import { In, IsNull } from 'typeorm';
export default async function(user: User) {
const author = {
@ -10,12 +10,12 @@ export default async function(user: User) {
name: user.name || user.username,
};
const profile = await UserProfiles.findOneOrFail(user.id);
const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
const notes = await Notes.find({
where: {
userId: user.id,
renoteId: null,
renoteId: IsNull(),
visibility: In(['public', 'home']),
},
order: { createdAt: -1 },
@ -39,7 +39,7 @@ export default async function(user: User) {
});
for (const note of notes) {
const files = note.fileIds.length > 0 ? await DriveFiles.find({
const files = note.fileIds.length > 0 ? await DriveFiles.findBy({
id: In(note.fileIds),
}) : [];
const file = files.find(file => file.type.startsWith('image/'));