Clean up more ActivityPub code, refactoring

This commit is contained in:
Jesse Wierzbinski 2023-10-22 19:39:42 -10:00
parent d05b077df1
commit 80a3e4c92d
No known key found for this signature in database
GPG key ID: F9A1E418934E40B0
26 changed files with 317 additions and 170 deletions

View file

@ -5,7 +5,7 @@ import { APActor } from "activitypub-types";
import { afterAll, beforeAll, describe, expect, test } from "bun:test";
import { AppDataSource } from "~database/datasource";
import { RawActivity } from "~database/entities/RawActivity";
import { User } from "~database/entities/User";
import { User, userRelations } from "~database/entities/User";
const config = getConfig();
@ -65,8 +65,11 @@ describe("POST /@test/actor", () => {
afterAll(async () => {
// Clean up user
const user = await User.findOneBy({
username: "test",
const user = await User.findOne({
where: {
username: "test",
},
relations: userRelations,
});
const activities = await RawActivity.createQueryBuilder("activity")

View file

@ -278,7 +278,7 @@ describe("API Tests", () => {
expect(account.created_at).toBeDefined();
expect(account.followers_count).toBe(0);
expect(account.following_count).toBe(0);
expect(account.statuses_count).toBe(0);
expect(account.statuses_count).toBe(2);
expect(account.note).toBe("");
expect(account.url).toBe(
`${config.http.base_url}/users/${user.username}`

View file

@ -3,7 +3,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test";
import { AppDataSource } from "~database/datasource";
import { RawActivity } from "~database/entities/RawActivity";
import { Token } from "~database/entities/Token";
import { User } from "~database/entities/User";
import { User, userRelations } from "~database/entities/User";
const config = getConfig();
@ -275,8 +275,11 @@ describe("POST /@test/inbox", () => {
afterAll(async () => {
// Clean up user
const user = await User.findOneBy({
username: "test",
const user = await User.findOne({
where: {
username: "test",
},
relations: userRelations,
});
// Clean up tokens

View file

@ -3,7 +3,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test";
import { AppDataSource } from "~database/datasource";
import { Application } from "~database/entities/Application";
import { Token } from "~database/entities/Token";
import { User } from "~database/entities/User";
import { User, userRelations } from "~database/entities/User";
const config = getConfig();
@ -150,8 +150,11 @@ describe("GET /api/v1/apps/verify_credentials", () => {
afterAll(async () => {
// Clean up user
const user = await User.findOneBy({
username: "test",
const user = await User.findOne({
where: {
username: "test",
},
relations: userRelations,
});
// Clean up tokens