Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
5e7e90b916
28
.github/workflows/check-misskey-js-version.yml
vendored
Normal file
28
.github/workflows/check-misskey-js-version.yml
vendored
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
name: Check CherryPick JS version
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ develop ]
|
||||||
|
paths:
|
||||||
|
- packages/cherrypick-js/package.json
|
||||||
|
- package.json
|
||||||
|
pull_request:
|
||||||
|
branches: [ develop ]
|
||||||
|
paths:
|
||||||
|
- packages/cherrypick-js/package.json
|
||||||
|
- package.json
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-version:
|
||||||
|
# ルートの package.json と packages/cherrypick-js/package.json のバージョンが一致しているかを確認する
|
||||||
|
name: Check version
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4.1.1
|
||||||
|
- name: Check version
|
||||||
|
run: |
|
||||||
|
if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/cherrypick-js/package.json)" ]; then
|
||||||
|
echo "Version mismatch!"
|
||||||
|
exit 1
|
||||||
|
fi
|
67
.github/workflows/deploy-test-environment.yml
vendored
67
.github/workflows/deploy-test-environment.yml
vendored
|
@ -1,66 +1,23 @@
|
||||||
name: Deploy test environment
|
name: deploy-test-environment
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
#push:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
repository:
|
repository:
|
||||||
description: 'Repository to deploy (optional)'
|
description: 'Repository to deploy (optional)'
|
||||||
|
type: string
|
||||||
required: false
|
required: false
|
||||||
branch:
|
branch_or_hash:
|
||||||
description: 'Branch to deploy (optional)'
|
description: 'Branch or Commit hash to deploy (optional)'
|
||||||
|
type: string
|
||||||
required: false
|
required: false
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy-test-environment:
|
deploy-test-environment:
|
||||||
runs-on: ubuntu-latest
|
uses: joinmisskey/misskey-tga/.github/workflows/deploy-test-environment.yml@main
|
||||||
steps:
|
with:
|
||||||
- name: Set environment variable (for tput command & pnpm)
|
repository: ${{ github.event.inputs.repository }}
|
||||||
run: |
|
branch_or_hash: ${{ github.event.inputs.branch_or_hash }}
|
||||||
echo "TERM=xterm" >> $GITHUB_ENV
|
secrets:
|
||||||
REPOSITORY=${{ github.event.inputs.repository || github.repository }}
|
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
||||||
echo "REPOSITORY=$REPOSITORY" >> $GITHUB_ENV
|
|
||||||
BRANCH=${{ github.event.inputs.branch || github.ref_name }}
|
|
||||||
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: ${{ env.REPOSITORY }}
|
|
||||||
ref: ${{ env.BRANCH }}
|
|
||||||
|
|
||||||
- name: Get the latest commit SHA
|
|
||||||
run: |
|
|
||||||
SHA=$(git log -1 --format="%H")
|
|
||||||
echo "SHA=$SHA" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Start cloudflare tunnel (quick)
|
|
||||||
run: |
|
|
||||||
wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb
|
|
||||||
sudo dpkg -i cloudflared-linux-amd64.deb
|
|
||||||
sudo cloudflared tunnel --metrics localhost:55555 --url localhost:3000 > /dev/null 2>&1 &
|
|
||||||
sleep 15
|
|
||||||
TUNNEL_RESPONSE=$(curl http://localhost:55555/quicktunnel)
|
|
||||||
TUNNEL_DOMAIN=$(echo $TUNNEL_RESPONSE | grep -o '"hostname":"[^"]*' | grep -o '[^"]*$')
|
|
||||||
echo "::add-mask::$TUNNEL_DOMAIN"
|
|
||||||
echo "TUNNEL_DOMAIN=$TUNNEL_DOMAIN" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Install misskey
|
|
||||||
run: |
|
|
||||||
wget https://raw.githubusercontent.com/joinmisskey/bash-install/v4/misskey-install.sh
|
|
||||||
wget https://raw.githubusercontent.com/joinmisskey/bash-install/v4/testenv_githubactions.txt
|
|
||||||
sed -i "s/host=127.0.0.1/host=$TUNNEL_DOMAIN/g" testenv_githubactions.txt
|
|
||||||
sed -i "s|git_repository=https://github.com/misskey-dev/misskey|git_repository=https://github.com/$REPOSITORY|g" testenv_githubactions.txt
|
|
||||||
sed -i "s|git_branch=master|git_branch=$BRANCH|g" testenv_githubactions.txt
|
|
||||||
sudo chmod 555 ./misskey-install.sh
|
|
||||||
sudo bash -x ./misskey-install.sh -c ./testenv_githubactions.txt
|
|
||||||
|
|
||||||
- name: Post tunnel info to Discord
|
|
||||||
run: |
|
|
||||||
CURRENT_TIME=$(TZ=Asia/Tokyo date +'%Y-%m-%d %H:%M:%S JST')
|
|
||||||
COMMIT_URL="https://github.com/$REPOSITORY/commit/$SHA"
|
|
||||||
curl -X POST -H "Content-Type: application/json" -d "{\"content\": \"==============================\nURL: https://$TUNNEL_DOMAIN\nRepository: $REPOSITORY\nBranch: $BRANCH\nCommit: $COMMIT_URL\nTime: $CURRENT_TIME\n==============================\"}" ${{ secrets.DISCORD_WEBHOOK_URL }}
|
|
||||||
|
|
||||||
- name: Wait
|
|
||||||
run: |
|
|
||||||
timeout 3600 tail -f /var/log/syslog || true
|
|
||||||
|
|
|
@ -21,6 +21,9 @@
|
||||||
- Feat: [mCaptcha](https://github.com/mCaptcha/mCaptcha)のサポートを追加
|
- Feat: [mCaptcha](https://github.com/mCaptcha/mCaptcha)のサポートを追加
|
||||||
- Fix: リストライムラインの「リノートを表示」が正しく機能しない問題を修正
|
- Fix: リストライムラインの「リノートを表示」が正しく機能しない問題を修正
|
||||||
- Feat: Add support for TrueMail
|
- Feat: Add support for TrueMail
|
||||||
|
- Fix: リモートユーザーのリアクション一覧がすべて見えてしまうのを修正
|
||||||
|
* すべてのリモートユーザーのリアクション一覧を見えないようにします
|
||||||
|
- Enhance: モデレーターはすべてのユーザーのリアクション一覧を見られるように
|
||||||
|
|
||||||
### Client
|
### Client
|
||||||
- Feat: 新しいゲームを追加
|
- Feat: 新しいゲームを追加
|
||||||
|
@ -58,6 +61,7 @@
|
||||||
- Fix: プラグインで`Plugin:register_note_post_interruptor`を使用すると、ノートが投稿できなくなる問題を修正
|
- Fix: プラグインで`Plugin:register_note_post_interruptor`を使用すると、ノートが投稿できなくなる問題を修正
|
||||||
- Enhance: ページ遷移時にPlayerを閉じるように
|
- Enhance: ページ遷移時にPlayerを閉じるように
|
||||||
- Fix: iOSで大きな画像を変換してアップロードできない問題を修正
|
- Fix: iOSで大きな画像を変換してアップロードできない問題を修正
|
||||||
|
- Fix: 「アニメーション画像を再生しない」もしくは「データセーバー(アイコン)」を有効にしていても、アイコンデコレーションのアニメーションが停止されない問題を修正
|
||||||
|
|
||||||
### Server
|
### Server
|
||||||
- Enhance: 連合先のレートリミットに引っかかった際にリトライするようになりました
|
- Enhance: 連合先のレートリミットに引っかかった際にリトライするようになりました
|
||||||
|
@ -71,6 +75,7 @@
|
||||||
- Fix: ipv4とipv6の両方が利用可能な環境でallowedPrivateNetworksが設定されていた場合プライベートipの検証ができていなかった問題を修正
|
- Fix: ipv4とipv6の両方が利用可能な環境でallowedPrivateNetworksが設定されていた場合プライベートipの検証ができていなかった問題を修正
|
||||||
- Fix: properly handle cc followers
|
- Fix: properly handle cc followers
|
||||||
- Fix: ジョブに関する設定の名前を修正 relashionshipJobPerSec -> relationshipJobPerSec
|
- Fix: ジョブに関する設定の名前を修正 relashionshipJobPerSec -> relationshipJobPerSec
|
||||||
|
- Fix: コントロールパネル->モデレーション->「誰でも新規登録できるようにする」の初期値をONからOFFに変更 #13122
|
||||||
|
|
||||||
### Service Worker
|
### Service Worker
|
||||||
- Enhance: オフライン表示のデザインを改善・多言語対応
|
- Enhance: オフライン表示のデザインを改善・多言語対応
|
||||||
|
|
|
@ -3,6 +3,6 @@ import { genOpenapiSpec } from './built/server/api/openapi/gen-spec.js'
|
||||||
import { writeFileSync } from "node:fs";
|
import { writeFileSync } from "node:fs";
|
||||||
|
|
||||||
const config = loadConfig();
|
const config = loadConfig();
|
||||||
const spec = genOpenapiSpec(config);
|
const spec = genOpenapiSpec(config, true);
|
||||||
|
|
||||||
writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
|
writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
|
|
@ -0,0 +1,16 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and other misskey, cherrypick contributors
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
export class FixMetaDisableRegistration1706791962000 {
|
||||||
|
name = 'FixMetaDisableRegistration1706791962000'
|
||||||
|
|
||||||
|
async up(queryRunner) {
|
||||||
|
await queryRunner.query(`alter table meta alter column "disableRegistration" set default true;`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async down(queryRunner) {
|
||||||
|
await queryRunner.query(`alter table meta alter column "disableRegistration" set default false;`);
|
||||||
|
}
|
||||||
|
}
|
|
@ -447,7 +447,7 @@ export class UserEntityService implements OnModuleInit {
|
||||||
}),
|
}),
|
||||||
pinnedPageId: profile!.pinnedPageId,
|
pinnedPageId: profile!.pinnedPageId,
|
||||||
pinnedPage: profile!.pinnedPageId ? this.pageEntityService.pack(profile!.pinnedPageId, me) : null,
|
pinnedPage: profile!.pinnedPageId ? this.pageEntityService.pack(profile!.pinnedPageId, me) : null,
|
||||||
publicReactions: profile!.publicReactions,
|
publicReactions: this.isLocalUser(user) ? profile!.publicReactions : false, // https://github.com/misskey-dev/misskey/issues/12964
|
||||||
followersVisibility: profile!.followersVisibility,
|
followersVisibility: profile!.followersVisibility,
|
||||||
followingVisibility: profile!.followingVisibility,
|
followingVisibility: profile!.followingVisibility,
|
||||||
twoFactorEnabled: profile!.twoFactorEnabled,
|
twoFactorEnabled: profile!.twoFactorEnabled,
|
||||||
|
|
|
@ -123,6 +123,7 @@ export interface Schema extends OfSchema {
|
||||||
readonly example?: any;
|
readonly example?: any;
|
||||||
readonly format?: string;
|
readonly format?: string;
|
||||||
readonly ref?: keyof typeof refs;
|
readonly ref?: keyof typeof refs;
|
||||||
|
readonly selfRef?: boolean;
|
||||||
readonly enum?: ReadonlyArray<string | null>;
|
readonly enum?: ReadonlyArray<string | null>;
|
||||||
readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
|
readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
|
||||||
readonly maxLength?: number;
|
readonly maxLength?: number;
|
||||||
|
|
|
@ -53,6 +53,7 @@ const sectionBlockSchema = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
optional: false, nullable: false,
|
optional: false, nullable: false,
|
||||||
ref: 'PageBlock',
|
ref: 'PageBlock',
|
||||||
|
selfRef: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -10,6 +10,9 @@ import { QueryService } from '@/core/QueryService.js';
|
||||||
import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js';
|
import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import { MiNoteReaction } from '@/models/_.js';
|
import { MiNoteReaction } from '@/models/_.js';
|
||||||
|
import { CacheService } from '@/core/CacheService.js';
|
||||||
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
||||||
|
import { RoleService } from '@/core/RoleService.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -35,6 +38,11 @@ export const meta = {
|
||||||
code: 'REACTIONS_NOT_PUBLIC',
|
code: 'REACTIONS_NOT_PUBLIC',
|
||||||
id: '673a7dd2-6924-1093-e0c0-e68456ceae5c',
|
id: '673a7dd2-6924-1093-e0c0-e68456ceae5c',
|
||||||
},
|
},
|
||||||
|
isRemoteUser: {
|
||||||
|
message: 'Currently unavailable to display reactions of remote users. See https://github.com/misskey-dev/misskey/issues/12964',
|
||||||
|
code: 'IS_REMOTE_USER',
|
||||||
|
id: '6b95fa98-8cf9-2350-e284-f0ffdb54a805',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
@ -63,14 +71,24 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
@Inject(DI.noteReactionsRepository)
|
@Inject(DI.noteReactionsRepository)
|
||||||
private noteReactionsRepository: NoteReactionsRepository,
|
private noteReactionsRepository: NoteReactionsRepository,
|
||||||
|
|
||||||
|
private cacheService: CacheService,
|
||||||
|
private userEntityService: UserEntityService,
|
||||||
private noteReactionEntityService: NoteReactionEntityService,
|
private noteReactionEntityService: NoteReactionEntityService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
|
private roleService: RoleService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: ps.userId });
|
const iAmModerator = me ? await this.roleService.isModerator(me) : false; // Moderators can see reactions of all users
|
||||||
|
if (!iAmModerator) {
|
||||||
|
const user = await this.cacheService.findUserById(ps.userId);
|
||||||
|
if (this.userEntityService.isRemoteUser(user)) {
|
||||||
|
throw new ApiError(meta.errors.isRemoteUser);
|
||||||
|
}
|
||||||
|
|
||||||
if ((me == null || me.id !== ps.userId) && !profile.publicReactions) {
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: ps.userId });
|
||||||
throw new ApiError(meta.errors.reactionsNotPublic);
|
if ((me == null || me.id !== ps.userId) && !profile.publicReactions) {
|
||||||
|
throw new ApiError(meta.errors.reactionsNotPublic);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const query = this.notesRepository.createQueryBuilder('note')
|
const query = this.notesRepository.createQueryBuilder('note')
|
||||||
|
|
|
@ -6,9 +6,9 @@
|
||||||
import type { Config } from '@/config.js';
|
import type { Config } from '@/config.js';
|
||||||
import endpoints, { IEndpoint } from '../endpoints.js';
|
import endpoints, { IEndpoint } from '../endpoints.js';
|
||||||
import { errors as basicErrors } from './errors.js';
|
import { errors as basicErrors } from './errors.js';
|
||||||
import { schemas, convertSchemaToOpenApiSchema } from './schemas.js';
|
import { getSchemas, convertSchemaToOpenApiSchema } from './schemas.js';
|
||||||
|
|
||||||
export function genOpenapiSpec(config: Config) {
|
export function genOpenapiSpec(config: Config, includeSelfRef = false) {
|
||||||
const spec = {
|
const spec = {
|
||||||
openapi: '3.1.0',
|
openapi: '3.1.0',
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ export function genOpenapiSpec(config: Config) {
|
||||||
paths: {} as any,
|
paths: {} as any,
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
schemas: schemas,
|
schemas: getSchemas(includeSelfRef),
|
||||||
|
|
||||||
securitySchemes: {
|
securitySchemes: {
|
||||||
bearerAuth: {
|
bearerAuth: {
|
||||||
|
@ -57,7 +57,7 @@ export function genOpenapiSpec(config: Config) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const resSchema = endpoint.meta.res ? convertSchemaToOpenApiSchema(endpoint.meta.res, 'res') : {};
|
const resSchema = endpoint.meta.res ? convertSchemaToOpenApiSchema(endpoint.meta.res, 'res', includeSelfRef) : {};
|
||||||
|
|
||||||
let desc = (endpoint.meta.description ? endpoint.meta.description : 'No description provided.') + '\n\n';
|
let desc = (endpoint.meta.description ? endpoint.meta.description : 'No description provided.') + '\n\n';
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ export function genOpenapiSpec(config: Config) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const requestType = endpoint.meta.requireFile ? 'multipart/form-data' : 'application/json';
|
const requestType = endpoint.meta.requireFile ? 'multipart/form-data' : 'application/json';
|
||||||
const schema = { ...convertSchemaToOpenApiSchema(endpoint.params, 'param') };
|
const schema = { ...convertSchemaToOpenApiSchema(endpoint.params, 'param', false) };
|
||||||
|
|
||||||
if (endpoint.meta.requireFile) {
|
if (endpoint.meta.requireFile) {
|
||||||
schema.properties = {
|
schema.properties = {
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
import type { Schema } from '@/misc/json-schema.js';
|
import type { Schema } from '@/misc/json-schema.js';
|
||||||
import { refs } from '@/misc/json-schema.js';
|
import { refs } from '@/misc/json-schema.js';
|
||||||
|
|
||||||
export function convertSchemaToOpenApiSchema(schema: Schema, type: 'param' | 'res') {
|
export function convertSchemaToOpenApiSchema(schema: Schema, type: 'param' | 'res', includeSelfRef: boolean): any {
|
||||||
// optional, nullable, refはスキーマ定義に含まれないので分離しておく
|
// optional, nullable, refはスキーマ定義に含まれないので分離しておく
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
const { optional, nullable, ref, ...res }: any = schema;
|
const { optional, nullable, ref, selfRef, ...res }: any = schema;
|
||||||
|
|
||||||
if (schema.type === 'object' && schema.properties) {
|
if (schema.type === 'object' && schema.properties) {
|
||||||
if (type === 'res') {
|
if (type === 'res') {
|
||||||
|
@ -21,20 +21,20 @@ export function convertSchemaToOpenApiSchema(schema: Schema, type: 'param' | 're
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const k of Object.keys(schema.properties)) {
|
for (const k of Object.keys(schema.properties)) {
|
||||||
res.properties[k] = convertSchemaToOpenApiSchema(schema.properties[k], type);
|
res.properties[k] = convertSchemaToOpenApiSchema(schema.properties[k], type, includeSelfRef);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (schema.type === 'array' && schema.items) {
|
if (schema.type === 'array' && schema.items) {
|
||||||
res.items = convertSchemaToOpenApiSchema(schema.items, type);
|
res.items = convertSchemaToOpenApiSchema(schema.items, type, includeSelfRef);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const o of ['anyOf', 'oneOf', 'allOf'] as const) {
|
for (const o of ['anyOf', 'oneOf', 'allOf'] as const) {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
if (o in schema) res[o] = schema[o]!.map(schema => convertSchemaToOpenApiSchema(schema, type));
|
if (o in schema) res[o] = schema[o]!.map(schema => convertSchemaToOpenApiSchema(schema, type, includeSelfRef));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 'res' && schema.ref) {
|
if (type === 'res' && schema.ref && (!schema.selfRef || includeSelfRef)) {
|
||||||
const $ref = `#/components/schemas/${schema.ref}`;
|
const $ref = `#/components/schemas/${schema.ref}`;
|
||||||
if (schema.nullable || schema.optional) {
|
if (schema.nullable || schema.optional) {
|
||||||
res.allOf = [{ $ref }];
|
res.allOf = [{ $ref }];
|
||||||
|
@ -54,35 +54,37 @@ export function convertSchemaToOpenApiSchema(schema: Schema, type: 'param' | 're
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const schemas = {
|
export function getSchemas(includeSelfRef: boolean) {
|
||||||
Error: {
|
return {
|
||||||
type: 'object',
|
Error: {
|
||||||
properties: {
|
type: 'object',
|
||||||
error: {
|
properties: {
|
||||||
type: 'object',
|
error: {
|
||||||
description: 'An error object.',
|
type: 'object',
|
||||||
properties: {
|
description: 'An error object.',
|
||||||
code: {
|
properties: {
|
||||||
type: 'string',
|
code: {
|
||||||
description: 'An error code. Unique within the endpoint.',
|
type: 'string',
|
||||||
},
|
description: 'An error code. Unique within the endpoint.',
|
||||||
message: {
|
},
|
||||||
type: 'string',
|
message: {
|
||||||
description: 'An error message.',
|
type: 'string',
|
||||||
},
|
description: 'An error message.',
|
||||||
id: {
|
},
|
||||||
type: 'string',
|
id: {
|
||||||
format: 'uuid',
|
type: 'string',
|
||||||
description: 'An error ID. This ID is static.',
|
format: 'uuid',
|
||||||
|
description: 'An error ID. This ID is static.',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
required: ['code', 'id', 'message'],
|
||||||
},
|
},
|
||||||
required: ['code', 'id', 'message'],
|
|
||||||
},
|
},
|
||||||
|
required: ['error'],
|
||||||
},
|
},
|
||||||
required: ['error'],
|
|
||||||
},
|
|
||||||
|
|
||||||
...Object.fromEntries(
|
...Object.fromEntries(
|
||||||
Object.entries(refs).map(([key, schema]) => [key, convertSchemaToOpenApiSchema(schema, 'res')]),
|
Object.entries(refs).map(([key, schema]) => [key, convertSchemaToOpenApiSchema(schema, 'res', includeSelfRef)]),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"name": "cherrypick-js",
|
"name": "cherrypick-js",
|
||||||
"version": "4.7.0-beta.1",
|
"version": "4.7.0-beta.1",
|
||||||
"basedMisskeyVersion": "2024.2.0-beta.7",
|
"basedMisskeyVersion": "2024.2.0-beta.8",
|
||||||
"description": "CherryPick SDK for JavaScript",
|
"description": "CherryPick SDK for JavaScript",
|
||||||
"types": "./built/dts/index.d.ts",
|
"types": "./built/dts/index.d.ts",
|
||||||
"exports": {
|
"exports": {
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
"rollup": "4.9.6",
|
"rollup": "4.9.6",
|
||||||
"sanitize-html": "2.11.0",
|
"sanitize-html": "2.11.0",
|
||||||
"sass": "1.70.0",
|
"sass": "1.70.0",
|
||||||
"shiki": "0.14.7",
|
"shiki": "1.0.0-beta.3",
|
||||||
"strict-event-emitter-types": "2.0.0",
|
"strict-event-emitter-types": "2.0.0",
|
||||||
"temml": "0.10.20",
|
"temml": "0.10.20",
|
||||||
"textarea-caret": "3.1.0",
|
"textarea-caret": "3.1.0",
|
||||||
|
@ -145,6 +145,7 @@
|
||||||
"vite-plugin-turbosnap": "1.0.3",
|
"vite-plugin-turbosnap": "1.0.3",
|
||||||
"vitest": "0.34.6",
|
"vitest": "0.34.6",
|
||||||
"vitest-fetch-mock": "0.2.2",
|
"vitest-fetch-mock": "0.2.2",
|
||||||
|
"vue-component-type-helpers": "^1.8.27",
|
||||||
"vue-eslint-parser": "9.4.2",
|
"vue-eslint-parser": "9.4.2",
|
||||||
"vue-tsc": "1.8.27"
|
"vue-tsc": "1.8.27"
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,13 +88,18 @@ export async function mainBoot() {
|
||||||
// ▼南半球
|
// ▼南半球
|
||||||
if (month === 7 || month === 8) {
|
if (month === 7 || month === 8) {
|
||||||
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
||||||
new SnowfallEffect().render();
|
new SnowfallEffect({}).render();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// ▼北半球
|
// ▼北半球
|
||||||
if (month === 12 || month === 1) {
|
if (month === 12 || month === 1) {
|
||||||
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
||||||
new SnowfallEffect().render();
|
new SnowfallEffect({}).render();
|
||||||
|
} else if (month === 3 || month === 4) {
|
||||||
|
const SakuraEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
|
||||||
|
new SakuraEffect({
|
||||||
|
sakura: true,
|
||||||
|
}).render();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,13 +5,13 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<!-- eslint-disable vue/no-v-html -->
|
<!-- eslint-disable vue/no-v-html -->
|
||||||
<template>
|
<template>
|
||||||
<div :class="['codeBlockRoot', { 'codeEditor': codeEditor }]" v-html="html"></div>
|
<div :class="[$style.codeBlockRoot, { [$style.codeEditor]: codeEditor }]" v-html="html"></div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { ref, computed, watch } from 'vue';
|
import { ref, computed, watch } from 'vue';
|
||||||
import { BUNDLED_LANGUAGES } from 'shiki';
|
import { bundledLanguagesInfo } from 'shiki';
|
||||||
import type { Lang as ShikiLang } from 'shiki';
|
import type { BuiltinLanguage } from 'shiki';
|
||||||
import { getHighlighter } from '@/scripts/code-highlighter.js';
|
import { getHighlighter } from '@/scripts/code-highlighter.js';
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
|
@ -22,24 +22,25 @@ const props = defineProps<{
|
||||||
|
|
||||||
const highlighter = await getHighlighter();
|
const highlighter = await getHighlighter();
|
||||||
|
|
||||||
const codeLang = ref<ShikiLang | 'aiscript'>('js');
|
const codeLang = ref<BuiltinLanguage | 'aiscript'>('js');
|
||||||
const html = computed(() => highlighter.codeToHtml(props.code, {
|
const html = computed(() => highlighter.codeToHtml(props.code, {
|
||||||
lang: codeLang.value,
|
lang: codeLang.value,
|
||||||
theme: 'dark-plus',
|
theme: 'dark-plus',
|
||||||
}));
|
}));
|
||||||
|
|
||||||
async function fetchLanguage(to: string): Promise<void> {
|
async function fetchLanguage(to: string): Promise<void> {
|
||||||
const language = to as ShikiLang;
|
const language = to as BuiltinLanguage;
|
||||||
|
|
||||||
// Check for the loaded languages, and load the language if it's not loaded yet.
|
// Check for the loaded languages, and load the language if it's not loaded yet.
|
||||||
if (!highlighter.getLoadedLanguages().includes(language)) {
|
if (!highlighter.getLoadedLanguages().includes(language)) {
|
||||||
// Check if the language is supported by Shiki
|
// Check if the language is supported by Shiki
|
||||||
const bundles = BUNDLED_LANGUAGES.filter((bundle) => {
|
const bundles = bundledLanguagesInfo.filter((bundle) => {
|
||||||
// Languages are specified by their id, they can also have aliases (i. e. "js" and "javascript")
|
// Languages are specified by their id, they can also have aliases (i. e. "js" and "javascript")
|
||||||
return bundle.id === language || bundle.aliases?.includes(language);
|
return bundle.id === language || bundle.aliases?.includes(language);
|
||||||
});
|
});
|
||||||
if (bundles.length > 0) {
|
if (bundles.length > 0) {
|
||||||
await highlighter.loadLanguage(language);
|
console.log(`Loading language: ${language}`);
|
||||||
|
await highlighter.loadLanguage(bundles[0].import);
|
||||||
codeLang.value = language;
|
codeLang.value = language;
|
||||||
} else {
|
} else {
|
||||||
codeLang.value = 'js';
|
codeLang.value = 'js';
|
||||||
|
@ -57,8 +58,8 @@ watch(() => props.lang, (to) => {
|
||||||
}, { immediate: true });
|
}, { immediate: true });
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style module lang="scss">
|
||||||
.codeBlockRoot :deep(.shiki) {
|
.codeBlockRoot :global(.shiki) {
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
margin: .5em 0;
|
margin: .5em 0;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
@ -74,7 +75,7 @@ watch(() => props.lang, (to) => {
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
& :deep(.shiki) {
|
& :global(.shiki) {
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
|
|
|
@ -14,10 +14,10 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</button>
|
</button>
|
||||||
</header>
|
</header>
|
||||||
<Transition
|
<Transition
|
||||||
:enterActiveClass="defaultStore.state.animation ? $style['folder-toggle-enter-active'] : ''"
|
:enterActiveClass="defaultStore.state.animation ? $style.folderToggleEnterActive : ''"
|
||||||
:leaveActiveClass="defaultStore.state.animation ? $style['folder-toggle-leave-active'] : ''"
|
:leaveActiveClass="defaultStore.state.animation ? $style.folderToggleLeaveActive : ''"
|
||||||
:enterFromClass="defaultStore.state.animation ? $style['folder-toggle-enter-from'] : ''"
|
:enterFromClass="defaultStore.state.animation ? $style.folderToggleEnterFrom : ''"
|
||||||
:leaveToClass="defaultStore.state.animation ? $style['folder-toggle-leave-to'] : ''"
|
:leaveToClass="defaultStore.state.animation ? $style.folderToggleLeaveTo : ''"
|
||||||
@enter="enter"
|
@enter="enter"
|
||||||
@afterEnter="afterEnter"
|
@afterEnter="afterEnter"
|
||||||
@leave="leave"
|
@leave="leave"
|
||||||
|
@ -116,12 +116,12 @@ onMounted(() => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" module>
|
<style lang="scss" module>
|
||||||
.folder-toggle-enter-active, .folder-toggle-leave-active {
|
.folderToggleEnterActive, .folderToggleLeaveActive {
|
||||||
overflow-y: clip;
|
overflow-y: clip;
|
||||||
transition: opacity 0.5s, height 0.5s !important;
|
transition: opacity 0.5s, height 0.5s !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.folder-toggle-enter-from, .folder-toggle-leave-to {
|
.folderToggleEnterFrom, .folderToggleLeaveTo {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -325,10 +325,15 @@ const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
|
||||||
const translating = ref(false);
|
const translating = ref(false);
|
||||||
const viewTextSource = ref(false);
|
const viewTextSource = ref(false);
|
||||||
const noNyaize = ref(false);
|
const noNyaize = ref(false);
|
||||||
const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i.id));
|
const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
|
||||||
const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
|
const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const renoteCollapsed = ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) ?? (appearNote.value.myReaction != null)));
|
const renoteCollapsed = ref(
|
||||||
|
defaultStore.state.collapseRenotes && isRenote && (
|
||||||
|
($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131
|
||||||
|
(appearNote.value.myReaction != null)
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
const collapseLabel = computed(() => {
|
const collapseLabel = computed(() => {
|
||||||
return concat([
|
return concat([
|
||||||
|
|
|
@ -101,7 +101,13 @@ function search() {
|
||||||
limit: 10,
|
limit: 10,
|
||||||
detail: false,
|
detail: false,
|
||||||
}).then(_users => {
|
}).then(_users => {
|
||||||
users.value = _users;
|
users.value = _users.filter((u) => {
|
||||||
|
if (props.includeSelf === false) {
|
||||||
|
return u.id !== $i?.id;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,18 +137,22 @@ onMounted(() => {
|
||||||
misskeyApi('users/show', {
|
misskeyApi('users/show', {
|
||||||
userIds: defaultStore.state.recentlyUsedUsers,
|
userIds: defaultStore.state.recentlyUsedUsers,
|
||||||
}).then(foundUsers => {
|
}).then(foundUsers => {
|
||||||
const _users = foundUsers.filter((u) => {
|
let _users = foundUsers;
|
||||||
|
_users = _users.filter((u) => {
|
||||||
if (props.localOnly) {
|
if (props.localOnly) {
|
||||||
return u.host == null;
|
return u.host == null;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (props.includeSelf && _users.find(x => $i ? x.id === $i.id : true) == null) {
|
_users = _users.filter((u) => {
|
||||||
recentUsers.value = [$i!, ..._users];
|
if (props.includeSelf === false) {
|
||||||
} else {
|
return u.id !== $i?.id;
|
||||||
recentUsers.value = _users;
|
} else {
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
recentUsers.value = _users;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<img
|
<img
|
||||||
v-for="decoration in decorations ?? user.avatarDecorations"
|
v-for="decoration in decorations ?? user.avatarDecorations"
|
||||||
:class="[$style.decoration]"
|
:class="[$style.decoration]"
|
||||||
:src="decoration.url"
|
:src="getDecorationUrl(decoration)"
|
||||||
:style="{
|
:style="{
|
||||||
rotate: getDecorationAngle(decoration),
|
rotate: getDecorationAngle(decoration),
|
||||||
scale: getDecorationScale(decoration),
|
scale: getDecorationScale(decoration),
|
||||||
|
@ -84,6 +84,11 @@ function onClick(ev: MouseEvent): void {
|
||||||
emit('click', ev);
|
emit('click', ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDecorationUrl(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
||||||
|
if (defaultStore.state.disableShowingAnimatedImages || defaultStore.state.dataSaver.avatar || (['interaction', 'inactive'].includes(<string>defaultStore.state.showingAnimatedImages) && !playAnimation.value)) return getStaticImageUrl(decoration.url);
|
||||||
|
return decoration.url;
|
||||||
|
}
|
||||||
|
|
||||||
function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
||||||
const angle = decoration.angle ?? 0;
|
const angle = decoration.angle ?? 0;
|
||||||
return angle === 0 ? undefined : `${angle * 360}deg`;
|
return angle === 0 ? undefined : `${angle * 360}deg`;
|
||||||
|
|
|
@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<img
|
<img
|
||||||
v-for="decoration in decorations ?? user.avatarDecorations"
|
v-for="decoration in decorations ?? user.avatarDecorations"
|
||||||
:class="[$style.decoration]"
|
:class="[$style.decoration]"
|
||||||
:src="decoration.url"
|
:src="getDecorationUrl(decoration)"
|
||||||
:style="{
|
:style="{
|
||||||
rotate: getDecorationAngle(decoration),
|
rotate: getDecorationAngle(decoration),
|
||||||
scale: getDecorationScale(decoration),
|
scale: getDecorationScale(decoration),
|
||||||
|
@ -106,6 +106,11 @@ function onClick(ev: MouseEvent): void {
|
||||||
emit('click', ev);
|
emit('click', ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDecorationUrl(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
||||||
|
if (defaultStore.state.disableShowingAnimatedImages || defaultStore.state.dataSaver.avatar || (['interaction', 'inactive'].includes(<string>defaultStore.state.showingAnimatedImages) && !playAnimation.value)) return getStaticImageUrl(decoration.url);
|
||||||
|
return decoration.url;
|
||||||
|
}
|
||||||
|
|
||||||
function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
||||||
const angle = decoration.angle ?? 0;
|
const angle = decoration.angle ?? 0;
|
||||||
return angle === 0 ? undefined : `${angle * 360}deg`;
|
return angle === 0 ? undefined : `${angle * 360}deg`;
|
||||||
|
|
|
@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<img
|
<img
|
||||||
v-for="decoration in decorations ?? user.avatarDecorations"
|
v-for="decoration in decorations ?? user.avatarDecorations"
|
||||||
:class="[$style.decoration]"
|
:class="[$style.decoration]"
|
||||||
:src="decoration.url"
|
:src="getDecorationUrl(decoration)"
|
||||||
:style="{
|
:style="{
|
||||||
rotate: getDecorationAngle(decoration),
|
rotate: getDecorationAngle(decoration),
|
||||||
scale: getDecorationScale(decoration),
|
scale: getDecorationScale(decoration),
|
||||||
|
@ -83,6 +83,11 @@ function onClick(ev: MouseEvent): void {
|
||||||
emit('click', ev);
|
emit('click', ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDecorationUrl(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
||||||
|
if (defaultStore.state.disableShowingAnimatedImages || defaultStore.state.dataSaver.avatar || (['interaction', 'inactive'].includes(<string>defaultStore.state.showingAnimatedImages) && !playAnimation.value)) return getStaticImageUrl(decoration.url);
|
||||||
|
return decoration.url;
|
||||||
|
}
|
||||||
|
|
||||||
function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) {
|
||||||
const angle = decoration.angle ?? 0;
|
const angle = decoration.angle ?? 0;
|
||||||
return angle === 0 ? undefined : `${angle * 360}deg`;
|
return angle === 0 ? undefined : `${angle * 360}deg`;
|
||||||
|
|
|
@ -9,6 +9,7 @@ import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
|
||||||
import { EventEmitter } from 'eventemitter3';
|
import { EventEmitter } from 'eventemitter3';
|
||||||
import insertTextAtCursor from 'insert-text-at-cursor';
|
import insertTextAtCursor from 'insert-text-at-cursor';
|
||||||
import * as Misskey from 'cherrypick-js';
|
import * as Misskey from 'cherrypick-js';
|
||||||
|
import type { ComponentProps } from 'vue-component-type-helpers';
|
||||||
import { misskeyApi } from '@/scripts/misskey-api.js';
|
import { misskeyApi } from '@/scripts/misskey-api.js';
|
||||||
import { i18n } from '@/i18n.js';
|
import { i18n } from '@/i18n.js';
|
||||||
import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
|
import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
|
||||||
|
@ -144,7 +145,7 @@ export function claimZIndex(priority: keyof typeof zIndexes = 'low'): number {
|
||||||
return zIndexes[priority];
|
return zIndexes[priority];
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function popup(component: Component, props: Record<string, any>, events = {}, disposeEvent?: string) {
|
export async function popup<T extends Component>(component: T, props: ComponentProps<T>, events = {}, disposeEvent?: string) {
|
||||||
markRaw(component);
|
markRaw(component);
|
||||||
|
|
||||||
const id = ++popupIdCount;
|
const id = ++popupIdCount;
|
||||||
|
|
|
@ -70,10 +70,7 @@ function fetchGroup() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function invite() {
|
function invite() {
|
||||||
os.selectUser({
|
os.selectUser({ includeSelf: false, localOnly: true }).then(user => {
|
||||||
includeSelf: false,
|
|
||||||
localOnly: true,
|
|
||||||
}).then(user => {
|
|
||||||
os.apiWithDialog('users/groups/invite', {
|
os.apiWithDialog('users/groups/invite', {
|
||||||
groupId: group.value.id,
|
groupId: group.value.id,
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
|
@ -112,10 +109,7 @@ async function renameGroup() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function transfer() {
|
function transfer() {
|
||||||
os.selectUser({
|
os.selectUser({ includeSelf: false, localOnly: true }).then(user => {
|
||||||
includeSelf: false,
|
|
||||||
localOnly: true,
|
|
||||||
}).then(user => {
|
|
||||||
os.apiWithDialog('users/groups/transfer', {
|
os.apiWithDialog('users/groups/transfer', {
|
||||||
groupId: group.value.id,
|
groupId: group.value.id,
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
|
|
|
@ -196,7 +196,7 @@ async function matchHeatbeat() {
|
||||||
async function matchUser() {
|
async function matchUser() {
|
||||||
pleaseLogin();
|
pleaseLogin();
|
||||||
|
|
||||||
const user = await os.selectUser({ localOnly: true });
|
const user = await os.selectUser({ includeSelf: false, localOnly: true });
|
||||||
if (user == null) return;
|
if (user == null) return;
|
||||||
|
|
||||||
matchingUser.value = user;
|
matchingUser.value = user;
|
||||||
|
|
|
@ -129,7 +129,7 @@ const menuDef = computed(() => [{
|
||||||
icon: 'ti ti-music',
|
icon: 'ti ti-music',
|
||||||
text: i18n.ts.soundsAndVibrations,
|
text: i18n.ts.soundsAndVibrations,
|
||||||
to: '/settings/sounds-and-vibrations',
|
to: '/settings/sounds-and-vibrations',
|
||||||
active: currentPage.value?.route.name === 'soundsAndVibrations',
|
active: currentPage.value?.route.name === 'sounds-and-vibrations',
|
||||||
}, {
|
}, {
|
||||||
icon: 'ti ti-plug',
|
icon: 'ti ti-plug',
|
||||||
text: i18n.ts.plugins,
|
text: i18n.ts.plugins,
|
||||||
|
|
|
@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<template>
|
<template>
|
||||||
<MkStickyContainer>
|
<MkStickyContainer>
|
||||||
<template #header>
|
<template #header>
|
||||||
<MkTab v-if="($i && ($i.id === user.id)) || user.publicReactions" v-model="tab" :class="$style.tab">
|
<MkTab v-if="($i && ($i.id === user.id || $i.isAdmin || $i.isModerator)) || user.publicReactions" v-model="tab" :class="$style.tab">
|
||||||
<option :value="null">{{ i18n.ts.notes }}</option>
|
<option :value="null">{{ i18n.ts.notes }}</option>
|
||||||
<option value="all">{{ i18n.ts.all }}</option>
|
<option value="all">{{ i18n.ts.all }}</option>
|
||||||
<option value="featured">{{ i18n.ts.featured }}</option>
|
<option value="featured">{{ i18n.ts.featured }}</option>
|
||||||
|
|
|
@ -122,7 +122,7 @@ const routes: RouteDef[] = [{
|
||||||
component: page(() => import('@/pages/settings/statusbar.vue')),
|
component: page(() => import('@/pages/settings/statusbar.vue')),
|
||||||
}, {
|
}, {
|
||||||
path: '/sounds-and-vibrations',
|
path: '/sounds-and-vibrations',
|
||||||
name: 'soundsAndVibrations',
|
name: 'sounds-and-vibrations',
|
||||||
component: page(() => import('@/pages/settings/sounds-and-vibrations.vue')),
|
component: page(() => import('@/pages/settings/sounds-and-vibrations.vue')),
|
||||||
}, {
|
}, {
|
||||||
path: '/plugin/install',
|
path: '/plugin/install',
|
||||||
|
@ -188,6 +188,10 @@ const routes: RouteDef[] = [{
|
||||||
path: '/lycheebridge',
|
path: '/lycheebridge',
|
||||||
name: 'lycheebridge',
|
name: 'lycheebridge',
|
||||||
component: page(() => import('@/pages/settings/lycheebridge.vue')),
|
component: page(() => import('@/pages/settings/lycheebridge.vue')),
|
||||||
|
}, {
|
||||||
|
path: '/account-stats',
|
||||||
|
name: 'other',
|
||||||
|
component: page(() => import('@/pages/settings/account-stats.vue')),
|
||||||
}, {
|
}, {
|
||||||
path: '/',
|
path: '/',
|
||||||
component: page(() => import('@/pages/_empty_.vue')),
|
component: page(() => import('@/pages/_empty_.vue')),
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
import { setWasm, setCDN, Highlighter, getHighlighter as _getHighlighter } from 'shiki';
|
import { getHighlighterCore, loadWasm } from 'shiki/core';
|
||||||
import { version } from '@/config.js';
|
import darkPlus from 'shiki/themes/dark-plus.mjs';
|
||||||
|
import type { Highlighter, LanguageRegistration } from 'shiki';
|
||||||
setWasm(`/assets/shiki.${version}/dist/onig.wasm`);
|
|
||||||
setCDN(`/assets/shiki.${version}/`);
|
|
||||||
|
|
||||||
let _highlighter: Highlighter | null = null;
|
let _highlighter: Highlighter | null = null;
|
||||||
|
|
||||||
|
@ -14,16 +12,19 @@ export async function getHighlighter(): Promise<Highlighter> {
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function initHighlighter() {
|
export async function initHighlighter() {
|
||||||
const highlighter = await _getHighlighter({
|
const aiScriptGrammar = await import('aiscript-vscode/aiscript/syntaxes/aiscript.tmLanguage.json');
|
||||||
theme: 'dark-plus',
|
|
||||||
langs: ['js'],
|
|
||||||
});
|
|
||||||
|
|
||||||
await highlighter.loadLanguage({
|
await loadWasm(import('shiki/onig.wasm?init'));
|
||||||
path: 'languages/aiscript.tmLanguage.json',
|
|
||||||
id: 'aiscript',
|
const highlighter = await getHighlighterCore({
|
||||||
scopeName: 'source.aiscript',
|
themes: [darkPlus],
|
||||||
aliases: ['is', 'ais'],
|
langs: [
|
||||||
|
import('shiki/langs/javascript.mjs'),
|
||||||
|
{
|
||||||
|
aliases: ['is', 'ais'],
|
||||||
|
...aiScriptGrammar.default,
|
||||||
|
} as unknown as LanguageRegistration,
|
||||||
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
_highlighter = highlighter;
|
_highlighter = highlighter;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -101,7 +101,7 @@ const announcements = {
|
||||||
limit: 10,
|
limit: 10,
|
||||||
};
|
};
|
||||||
|
|
||||||
const isTimelineAvailable = ref(instance.policies?.ltlAvailable || instance.policies?.gtlAvailable);
|
const isTimelineAvailable = ref(instance.policies.ltlAvailable || instance.policies.gtlAvailable);
|
||||||
|
|
||||||
const showMenu = ref(false);
|
const showMenu = ref(false);
|
||||||
const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
|
const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
|
||||||
|
|
|
@ -59,7 +59,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
|
||||||
if (!account) return null;
|
if (!account) return null;
|
||||||
const userDetail = await cli.request('users/show', { userId: data.body.userId }, account.token);
|
const userDetail = await cli.request('users/show', { userId: data.body.userId }, account.token);
|
||||||
return [t('_notification.youWereFollowed'), {
|
return [t('_notification.youWereFollowed'), {
|
||||||
body: `${getUserName(data.body.user)} (@${data.body.user?.username}${data.body.user?.host != null ? '@' + data.body.user.host : ''})`,
|
body: `${getUserName(data.body.user)} (@${data.body.user.username}${data.body.user.host != null ? '@' + data.body.user.host : ''})`,
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('user-plus'),
|
badge: iconUrl('user-plus'),
|
||||||
data,
|
data,
|
||||||
|
|
|
@ -924,8 +924,8 @@ importers:
|
||||||
specifier: 1.70.0
|
specifier: 1.70.0
|
||||||
version: 1.70.0
|
version: 1.70.0
|
||||||
shiki:
|
shiki:
|
||||||
specifier: 0.14.7
|
specifier: 1.0.0-beta.3
|
||||||
version: 0.14.7
|
version: 1.0.0-beta.3
|
||||||
strict-event-emitter-types:
|
strict-event-emitter-types:
|
||||||
specifier: 2.0.0
|
specifier: 2.0.0
|
||||||
version: 2.0.0
|
version: 2.0.0
|
||||||
|
@ -1158,6 +1158,9 @@ importers:
|
||||||
vitest-fetch-mock:
|
vitest-fetch-mock:
|
||||||
specifier: 0.2.2
|
specifier: 0.2.2
|
||||||
version: 0.2.2(vitest@0.34.6)
|
version: 0.2.2(vitest@0.34.6)
|
||||||
|
vue-component-type-helpers:
|
||||||
|
specifier: ^1.8.27
|
||||||
|
version: 1.8.27
|
||||||
vue-eslint-parser:
|
vue-eslint-parser:
|
||||||
specifier: 9.4.2
|
specifier: 9.4.2
|
||||||
version: 9.4.2(eslint@8.56.0)
|
version: 9.4.2(eslint@8.56.0)
|
||||||
|
@ -5841,6 +5844,10 @@ packages:
|
||||||
string-argv: 0.3.1
|
string-argv: 0.3.1
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/@shikijs/core@1.0.0-beta.3:
|
||||||
|
resolution: {integrity: sha512-SCwPom2Wn8XxNlEeqdzycU93SKgzYeVsedjqDsgZaz4XiiPpZUzlHt2NAEQTwTnPcHNZapZ6vbkwJ8P11ggL3Q==}
|
||||||
|
dev: false
|
||||||
|
|
||||||
/@sideway/address@4.1.4:
|
/@sideway/address@4.1.4:
|
||||||
resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
|
resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -9363,10 +9370,6 @@ packages:
|
||||||
resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
|
resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
|
||||||
engines: {node: '>=12'}
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
/ansi-sequence-parser@1.1.1:
|
|
||||||
resolution: {integrity: sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/ansi-styles@3.2.1:
|
/ansi-styles@3.2.1:
|
||||||
resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
|
resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
|
@ -15010,6 +15013,7 @@ packages:
|
||||||
|
|
||||||
/jsonc-parser@3.2.0:
|
/jsonc-parser@3.2.0:
|
||||||
resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
|
resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
|
||||||
|
dev: true
|
||||||
|
|
||||||
/jsonfile@4.0.0:
|
/jsonfile@4.0.0:
|
||||||
resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
|
resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
|
||||||
|
@ -18722,13 +18726,10 @@ packages:
|
||||||
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
|
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
|
||||||
engines: {node: '>=8'}
|
engines: {node: '>=8'}
|
||||||
|
|
||||||
/shiki@0.14.7:
|
/shiki@1.0.0-beta.3:
|
||||||
resolution: {integrity: sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==}
|
resolution: {integrity: sha512-z7cHTNSSvwGx2DfeLwjSNLo+HcVxifgNIzLm6Ye52eXcIwNHXT0wHbhy7FDOKSKveuEHBwt9opfj3Hoc8LE1Yg==}
|
||||||
dependencies:
|
dependencies:
|
||||||
ansi-sequence-parser: 1.1.1
|
'@shikijs/core': 1.0.0-beta.3
|
||||||
jsonc-parser: 3.2.0
|
|
||||||
vscode-oniguruma: 1.7.0
|
|
||||||
vscode-textmate: 8.0.0
|
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
/side-channel@1.0.4:
|
/side-channel@1.0.4:
|
||||||
|
@ -20536,14 +20537,6 @@ packages:
|
||||||
resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
|
resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
|
|
||||||
/vscode-oniguruma@1.7.0:
|
|
||||||
resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/vscode-textmate@8.0.0:
|
|
||||||
resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/vue-component-type-helpers@1.8.27:
|
/vue-component-type-helpers@1.8.27:
|
||||||
resolution: {integrity: sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==}
|
resolution: {integrity: sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
|
@ -35,13 +35,6 @@ async function copyFrontendLocales() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function copyFrontendShikiAssets() {
|
|
||||||
await fs.cp('./packages/frontend/node_modules/shiki/dist', `./built/_frontend_dist_/shiki.${meta.version}/dist`, { dereference: true, recursive: true });
|
|
||||||
await fs.cp('./packages/frontend/node_modules/shiki/languages', `./built/_frontend_dist_/shiki.${meta.version}/languages`, { dereference: true, recursive: true });
|
|
||||||
await fs.cp('./packages/frontend/node_modules/aiscript-vscode/aiscript/syntaxes', `./built/_frontend_dist_/shiki.${meta.version}/languages`, { dereference: true, recursive: true });
|
|
||||||
await fs.cp('./packages/frontend/node_modules/shiki/themes', `./built/_frontend_dist_/shiki.${meta.version}/themes`, { dereference: true, recursive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
async function copyBackendViews() {
|
async function copyBackendViews() {
|
||||||
await fs.cp('./packages/backend/src/server/web/views', './packages/backend/built/server/web/views', { recursive: true });
|
await fs.cp('./packages/backend/src/server/web/views', './packages/backend/built/server/web/views', { recursive: true });
|
||||||
}
|
}
|
||||||
|
@ -81,7 +74,6 @@ async function build() {
|
||||||
copyFrontendFonts(),
|
copyFrontendFonts(),
|
||||||
copyFrontendTablerIcons(),
|
copyFrontendTablerIcons(),
|
||||||
copyFrontendLocales(),
|
copyFrontendLocales(),
|
||||||
copyFrontendShikiAssets(),
|
|
||||||
copyBackendViews(),
|
copyBackendViews(),
|
||||||
buildBackendScript(),
|
buildBackendScript(),
|
||||||
buildBackendStyle(),
|
buildBackendStyle(),
|
||||||
|
|
Loading…
Reference in a new issue