Merge branch 'develop' into redis

This commit is contained in:
naskya 2024-04-20 23:15:58 +09:00
commit b08175fb83
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
5 changed files with 3 additions and 34 deletions

View file

@ -32,7 +32,7 @@ import Followers from "./activitypub/followers.js";
import Outbox, { packActivity } from "./activitypub/outbox.js"; import Outbox, { packActivity } from "./activitypub/outbox.js";
import { serverLogger } from "./index.js"; import { serverLogger } from "./index.js";
import { config } from "@/config.js"; import { config } from "@/config.js";
import Koa from "koa"; import type Koa from "koa";
import * as crypto from "node:crypto"; import * as crypto from "node:crypto";
import { inspect } from "node:util"; import { inspect } from "node:util";
import type { IActivity } from "@/remote/activitypub/type.js"; import type { IActivity } from "@/remote/activitypub/type.js";

View file

@ -1,4 +1,4 @@
import { Readable, ReadableOptions } from "node:stream"; import { Readable, type ReadableOptions } from "node:stream";
import { Buffer } from "node:buffer"; import { Buffer } from "node:buffer";
import * as fs from "node:fs"; import * as fs from "node:fs";

View file

@ -1,4 +1,3 @@
import type { KVs } from "../core.js";
import Chart from "../core.js"; import Chart from "../core.js";
import type { User } from "@/models/entities/user.js"; import type { User } from "@/models/entities/user.js";
import { name, schema } from "./entities/active-users.js"; import { name, schema } from "./entities/active-users.js";

View file

@ -1,4 +1,5 @@
import { Window } from "happy-dom"; import { Window } from "happy-dom";
import type { HTMLAnchorElement, HTMLLinkElement } from "happy-dom";
import { config } from "@/config.js"; import { config } from "@/config.js";
async function getRelMeLinks(url: string): Promise<string[]> { async function getRelMeLinks(url: string): Promise<string[]> {

View file

@ -3,7 +3,6 @@ import type { Note } from "@/models/entities/note.js";
import type { User } from "@/models/entities/user.js"; import type { User } from "@/models/entities/user.js";
import { import {
NoteUnreads, NoteUnreads,
Users,
Followings, Followings,
ChannelFollowings, ChannelFollowings,
} from "@/models/index.js"; } from "@/models/index.js";
@ -120,34 +119,4 @@ export default async function (
]), ]),
}); });
} }
// if (readAntennaNotes.length > 0) {
// await AntennaNotes.update(
// {
// antennaId: In(myAntennas.map((a) => a.id)),
// noteId: In(readAntennaNotes.map((n) => n.id)),
// },
// {
// read: true,
// },
// );
// // TODO: まとめてクエリしたい
// for (const antenna of myAntennas) {
// const count = await AntennaNotes.countBy({
// antennaId: antenna.id,
// read: false,
// });
// if (count === 0) {
// publishMainStream(userId, "readAntenna", antenna);
// }
// }
// Users.getHasUnreadAntenna(userId).then((unread) => {
// if (!unread) {
// publishMainStream(userId, "readAllAntennas");
// }
// });
// }
} }