spec(frontend): Skeb Buttonの実装 (MisskeyIO#573)

This commit is contained in:
まっちゃとーにゅ 2024-03-29 17:05:02 +09:00 committed by GitHub
parent 197e39781d
commit efc5d97eab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 483 additions and 4 deletions

View file

@ -66,6 +66,14 @@ type Source = {
scope?: 'local' | 'global' | string[];
};
skebStatus?: {
method: string;
endpoint: string;
headers: { [x: string]: string };
parameters: { [x: string]: string };
userIdParameterName: string;
}
proxy?: string;
proxySmtp?: string;
proxyBypassHosts?: string[];
@ -140,6 +148,13 @@ export type Config = {
index: string;
scope?: 'local' | 'global' | string[];
} | undefined;
skebStatus: {
method: string;
endpoint: string;
headers: { [x: string]: string };
parameters: { [x: string]: string };
userIdParameterName: string;
} | undefined;
proxy: string | undefined;
proxySmtp: string | undefined;
proxyBypassHosts: string[] | undefined;
@ -266,6 +281,7 @@ export function loadConfig(): Config {
redisForObjectStorageQueue: config.redisForObjectStorageQueue ? convertRedisOptions(config.redisForObjectStorageQueue, host) : redisForJobQueue,
redisForWebhookDeliverQueue: config.redisForWebhookDeliverQueue ? convertRedisOptions(config.redisForWebhookDeliverQueue, host) : redisForJobQueue,
redisForTimelines: config.redisForTimelines ? convertRedisOptions(config.redisForTimelines, host) : redis,
skebStatus: config.skebStatus,
id: config.id,
proxy: config.proxy,
proxySmtp: config.proxySmtp,

View file

@ -112,6 +112,7 @@ export class MetaEntityService {
mediaProxy: this.config.mediaProxy,
enableUrlPreview: instance.urlPreviewEnabled,
enableSkebStatus: !!this.config.skebStatus,
};
}

View file

@ -216,6 +216,10 @@ export const packedMetaLiteSchema = {
type: 'boolean',
optional: false, nullable: false,
},
enableSkebStatus: {
type: 'boolean',
optional: false, nullable: false,
},
backgroundImageUrl: {
type: 'string',
optional: false, nullable: true,

View file

@ -350,6 +350,7 @@ import * as ep___users_following from './endpoints/users/following.js';
import * as ep___users_gallery_posts from './endpoints/users/gallery/posts.js';
import * as ep___users_getFollowingBirthdayUsers from './endpoints/users/get-following-birthday-users.js';
import * as ep___users_getFrequentlyRepliedUsers from './endpoints/users/get-frequently-replied-users.js';
import * as ep___users_getSkebStatus from './endpoints/users/get-skeb-status.js';
import * as ep___users_featuredNotes from './endpoints/users/featured-notes.js';
import * as ep___users_lists_create from './endpoints/users/lists/create.js';
import * as ep___users_lists_delete from './endpoints/users/lists/delete.js';
@ -736,6 +737,7 @@ const $users_following: Provider = { provide: 'ep:users/following', useClass: ep
const $users_gallery_posts: Provider = { provide: 'ep:users/gallery/posts', useClass: ep___users_gallery_posts.default };
const $users_getFollowingBirthdayUsers: Provider = { provide: 'ep:users/get-following-birthday-users', useClass: ep___users_getFollowingBirthdayUsers.default };
const $users_getFrequentlyRepliedUsers: Provider = { provide: 'ep:users/get-frequently-replied-users', useClass: ep___users_getFrequentlyRepliedUsers.default };
const $users_getSkebStatus: Provider = { provide: 'ep:users/get-skeb-status', useClass: ep___users_getSkebStatus.default };
const $users_featuredNotes: Provider = { provide: 'ep:users/featured-notes', useClass: ep___users_featuredNotes.default };
const $users_lists_create: Provider = { provide: 'ep:users/lists/create', useClass: ep___users_lists_create.default };
const $users_lists_delete: Provider = { provide: 'ep:users/lists/delete', useClass: ep___users_lists_delete.default };
@ -1126,6 +1128,7 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
$users_gallery_posts,
$users_getFollowingBirthdayUsers,
$users_getFrequentlyRepliedUsers,
$users_getSkebStatus,
$users_featuredNotes,
$users_lists_create,
$users_lists_delete,
@ -1508,6 +1511,7 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
$users_gallery_posts,
$users_getFollowingBirthdayUsers,
$users_getFrequentlyRepliedUsers,
$users_getSkebStatus,
$users_featuredNotes,
$users_lists_create,
$users_lists_delete,

View file

@ -350,6 +350,7 @@ import * as ep___users_following from './endpoints/users/following.js';
import * as ep___users_gallery_posts from './endpoints/users/gallery/posts.js';
import * as ep___users_getFollowingBirthdayUsers from './endpoints/users/get-following-birthday-users.js';
import * as ep___users_getFrequentlyRepliedUsers from './endpoints/users/get-frequently-replied-users.js';
import * as ep___users_getSkebStatus from './endpoints/users/get-skeb-status.js';
import * as ep___users_featuredNotes from './endpoints/users/featured-notes.js';
import * as ep___users_lists_create from './endpoints/users/lists/create.js';
import * as ep___users_lists_delete from './endpoints/users/lists/delete.js';
@ -734,6 +735,7 @@ const eps = [
['users/gallery/posts', ep___users_gallery_posts],
['users/get-following-birthday-users', ep___users_getFollowingBirthdayUsers],
['users/get-frequently-replied-users', ep___users_getFrequentlyRepliedUsers],
['users/get-skeb-status', ep___users_getSkebStatus],
['users/featured-notes', ep___users_featuredNotes],
['users/lists/create', ep___users_lists_create],
['users/lists/delete', ep___users_lists_delete],

View file

@ -0,0 +1,148 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { LoggerService } from '@/core/LoggerService.js';
import { HttpRequestService } from '@/core/HttpRequestService.js';
import type { Config } from '@/config.js';
import { ApiError } from '../../error.js';
export const meta = {
tags: ['users'],
requireCredential: false,
allowGet: true,
cacheSec: 60 * 5,
res: {
type: 'object',
properties: {
screenName: {
type: 'string',
optional: false, nullable: false,
},
isCreator: {
type: 'boolean',
optional: false, nullable: false,
},
isAcceptable: {
type: 'boolean',
optional: false, nullable: false,
},
creatorRequestCount: {
type: 'integer',
optional: false, nullable: false,
},
clientRequestCount: {
type: 'integer',
optional: false, nullable: false,
},
skills: {
type: 'array',
optional: false, nullable: false,
items: {
type: 'object',
properties: {
amount: {
type: 'integer',
optional: false, nullable: false,
},
genre: {
type: 'string',
optional: false, nullable: false,
enum: ['art', 'comic', 'voice', 'novel', 'video', 'music', 'correction'],
},
},
},
},
},
},
errors: {
skebStatusNotAvailable: {
message: 'Skeb status is not available.',
code: 'SKEB_STATUS_NOT_AVAILABLE',
id: '1dd37c9c-7e97-4c24-be98-227a78b21d80',
httpStatusCode: 403,
},
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: '88d582ae-69d9-45e0-a8b3-13f9945e48bf',
httpStatusCode: 404,
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
},
required: ['userId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
@Inject(DI.config)
private config: Config,
private loggerService: LoggerService,
private httpRequestService: HttpRequestService,
) {
super(meta, paramDef, async (ps) => {
if (!this.config.skebStatus) throw new ApiError(meta.errors.skebStatusNotAvailable);
const logger = this.loggerService.getLogger('api:users:get-skeb-status');
const url = new URL(this.config.skebStatus.endpoint);
for (const [key, value] of Object.entries(this.config.skebStatus.parameters)) {
url.searchParams.set(key, value);
}
url.searchParams.set(this.config.skebStatus.userIdParameterName, ps.userId);
logger.info('Requesting Skeb status', { url: url.href, userId: ps.userId });
const res = await this.httpRequestService.send(
url.href,
{
method: this.config.skebStatus.method,
headers: {
...this.config.skebStatus.headers,
Accept: 'application/json',
},
timeout: 5000,
},
{
throwErrorWhenResponseNotOk: false,
},
);
const json = (await res.json()) as {
screen_name: string,
is_creator: boolean,
is_acceptable: boolean,
creator_request_count: number,
client_request_count: number,
skills: { amount: number, genre: 'art' | 'comic' | 'voice' | 'novel' | 'video' | 'music' | 'correction' }[],
ban_reason?: string | null
error?: unknown,
};
if (res.status > 399 || (json.error ?? json.ban_reason)) {
logger.error('Skeb status response error', { url: url.href, userId: ps.userId, status: res.status, statusText: res.statusText, error: json.error ?? json.ban_reason });
throw new ApiError(meta.errors.noSuchUser);
}
logger.info('Skeb status response', { url: url.href, userId: ps.userId, status: res.status, statusText: res.statusText, skebStatus: json });
return {
screenName: json.screen_name,
isCreator: json.is_creator,
isAcceptable: json.is_acceptable,
creatorRequestCount: json.creator_request_count,
clientRequestCount: json.client_request_count,
skills: json.skills,
};
});
}
}