graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 04:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: fix type

Browse source
This commit is contained in:
syuilo 2022-04-17 13:14:29 +09:00
parent e0a4864bea
commit ddd655c0c1
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/remote/activitypub/renderer/flag.ts
View file

@ -5,7 +5,7 @@ import { getInstanceActor } from '@/services/instance-actor.js';
// to anonymise reporters, the reporting actor must be a system user // to anonymise reporters, the reporting actor must be a system user
// object has to be a uri or array of uris // object has to be a uri or array of uris
export const renderFlag = (user: ILocalUser, object: [string], content: string): IActivity => { export const renderFlag = (user: ILocalUser, object: [string], content: string) => {
return { return {
type: 'Flag', type: 'Flag',
actor: `${config.url}/users/${user.id}`, actor: `${config.url}/users/${user.id}`,

4
packages/backend/src/remote/activitypub/type.ts
View file

@ -48,7 +48,7 @@ export function getOneApId(value: ApObject): string {
export function getApId(value: string | IObject): string { export function getApId(value: string | IObject): string {
if (typeof value === 'string') return value; if (typeof value === 'string') return value;
if (typeof value.id === 'string') return value.id; if (typeof value.id === 'string') return value.id;
throw new Error(`cannot detemine id`); throw new Error('cannot detemine id');
} }
/** /**
@ -57,7 +57,7 @@ export function getApId(value: string | IObject): string {
export function getApType(value: IObject): string { export function getApType(value: IObject): string {
if (typeof value.type === 'string') return value.type; if (typeof value.type === 'string') return value.type;
if (Array.isArray(value.type) && typeof value.type[0] === 'string') return value.type[0]; if (Array.isArray(value.type) && typeof value.type[0] === 'string') return value.type[0];
throw new Error(`cannot detect type`); throw new Error('cannot detect type');
} }
export function getOneApHrefNullable(value: ApObject | undefined): string | undefined { export function getOneApHrefNullable(value: ApObject | undefined): string | undefined {

8
packages/backend/src/server/api/endpoints/pages/show.ts
View file

@ -1,8 +1,8 @@
import define from '../../define.js'; import { IsNull } from 'typeorm';
import { ApiError } from '../../error.js';
import { Pages, Users } from '@/models/index.js'; import { Pages, Users } from '@/models/index.js';
import { Page } from '@/models/entities/page.js'; import { Page } from '@/models/entities/page.js';
import { IsNull } from 'typeorm'; import define from '../../define.js';
import { ApiError } from '../../error.js';
export const meta = { export const meta = {
tags: ['pages'], tags: ['pages'],
@ -45,7 +45,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export // eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => { export default define(meta, paramDef, async (ps, user) => {
let page: Page | undefined; let page: Page | null = null;
if (ps.pageId) { if (ps.pageId) {
page = await Pages.findOneBy({ id: ps.pageId }); page = await Pages.findOneBy({ id: ps.pageId });