summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/web/feed.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/web/feed.ts
parent.js (diff)
downloadmisskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
misskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
misskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip
refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
Diffstat (limited to 'packages/backend/src/server/web/feed.ts')
-rw-r--r--packages/backend/src/server/web/feed.ts8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/server/web/feed.ts b/packages/backend/src/server/web/feed.ts
index b98e3f8bf6..eba8dc58d4 100644
--- a/packages/backend/src/server/web/feed.ts
+++ b/packages/backend/src/server/web/feed.ts
@@ -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/'));