mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-23 00:29:22 +09:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge 3c81926f71 into e8518de054

Browse Source
This commit is contained in:
github-actions[bot] 2024-12-22 04:36:20 +00:00 committed by GitHub
commit d82e60d254
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
29 changed files with 355 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/storybook.yml vendored
View File

@ -15,6 +15,8 @@ on:
jobs:
build:
# chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
if: github.repository == 'misskey-dev/misskey'
runs-on: ubuntu-latest
env:

24
CHANGELOG.md
View File

@ -1,3 +1,25 @@
## 2024.11.1
### General
-
### Client
- Enhance: PC画面でチャンネルが複数列で表示されるように
(Cherry-picked from https://github.com/Otaku-Social/maniakey/pull/13)
- Enhance: 照会に失敗した場合、その理由を表示するように
- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
- Fix: サーバー情報メニューに区切り線が不足していたのを修正
- Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
- Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
- Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正
### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
## 2024.11.0
### Note
@ -37,7 +59,7 @@
- Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
- Fix: Encode RSS urls with escape sequences before fetching allowing query parameters to be used
- Fix: リンク切れを修正
= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正
- Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正
(Cherry-picked from https://github.com/taiyme/misskey/pull/305)
- Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
- Fix: 画面幅が狭い環境でデザインが崩れる問題を修正

59
locales/index.d.ts vendored
View File

@ -10601,6 +10601,65 @@ export interface Locale extends ILocale {
*/
"sent": string;
};
"_remoteLookupErrors": {
"_federationNotAllowed": {
/**
* このサーバーとは通信できません
*/
"title": string;
/**
* このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。
* サーバー管理者にお問い合わせください。
*/
"description": string;
};
"_uriInvalid": {
/**
* URIが不正です
*/
"title": string;
/**
* 入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。
*/
"description": string;
};
"_requestFailed": {
/**
* リクエストに失敗しました
*/
"title": string;
/**
* このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。
*/
"description": string;
};
"_responseInvalid": {
/**
* レスポンスが不正です
*/
"title": string;
/**
* このサーバーと通信することはできましたが、得られたデータが不正なものでした。
*/
"description": string;
};
"_responseInvalidIdHostNotMatch": {
/**
* 入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。
*/
"description": string;
};
"_noSuchObject": {
/**
* 見つかりません
*/
"title": string;
/**
* 要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。
*/
"description": string;
};
};
}
declare const locales: {
[lang: string]: Locale;

19
locales/ja-JP.yml
View File

@ -2826,3 +2826,22 @@ _selfXssPrevention:
_followRequest:
recieved: "受け取った申請"
sent: "送った申請"
_remoteLookupErrors:
_federationNotAllowed:
title: "このサーバーとは通信できません"
description: "このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。\nサーバー管理者にお問い合わせください。"
_uriInvalid:
title: "URIが不正です"
description: "入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。"
_requestFailed:
title: "リクエストに失敗しました"
description: "このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。"
_responseInvalid:
title: "レスポンスが不正です"
description: "このサーバーと通信することはできましたが、得られたデータが不正なものでした。"
_responseInvalidIdHostNotMatch:
description: "入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。"
_noSuchObject:
title: "見つかりません"
description: "要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。"

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "2024.11.0",
"version": "2024.11.1-alpha.0",
"codename": "nasubi",
"repository": {
"type": "git",

2
packages/backend/scripts/check_connect.js
View File

@ -53,4 +53,4 @@ const promises = Array
connectToPostgres()
]);
await Promise.allSettled(promises);
await Promise.all(promises);

2
packages/backend/src/core/S3Service.ts
View File

@ -28,7 +28,7 @@ export class S3Service {
? `${meta.objectStorageUseSSL ? 'https' : 'http'}://${meta.objectStorageEndpoint}`
: `${meta.objectStorageUseSSL ? 'https' : 'http'}://example.net`; // dummy url to select http(s) agent
const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy);
const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy, true);
const handlerOption: NodeHttpHandlerOptions = {};
if (meta.objectStorageUseSSL) {
handlerOption.httpsAgent = agent as https.Agent;

4
packages/backend/src/core/WebAuthnService.ts
View File

@ -189,14 +189,12 @@ export class WebAuthnService {
*/
@bindThis
public async verifySignInWithPasskeyAuthentication(context: string, response: AuthenticationResponseJSON): Promise<MiUser['id'] | null> {
const challenge = await this.redisClient.get(`webauthn:challenge:${context}`);
const challenge = await this.redisClient.getdel(`webauthn:challenge:${context}`);
if (!challenge) {
throw new IdentifiableError('2d16e51c-007b-4edd-afd2-f7dd02c947f6', `challenge '${context}' not found`);
}
await this.redisClient.del(`webauthn:challenge:${context}`);
const key = await this.userSecurityKeysRepository.findOneBy({
id: response.id,
});

25
packages/backend/src/core/activitypub/ApResolverService.ts
View File

@ -20,6 +20,7 @@ import { ApDbResolverService } from './ApDbResolverService.js';
import { ApRendererService } from './ApRendererService.js';
import { ApRequestService } from './ApRequestService.js';
import type { IObject, ICollection, IOrderedCollection } from './type.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
export class Resolver {
private history: Set<string>;
@ -66,7 +67,7 @@ export class Resolver {
if (isCollectionOrOrderedCollection(collection)) {
return collection;
} else {
throw new Error(`unrecognized collection type: ${collection.type}`);
throw new IdentifiableError('f100eccf-f347-43fb-9b45-96a0831fb635', `unrecognized collection type: ${collection.type}`);
}
}
@ -80,15 +81,15 @@ export class Resolver {
// URLs with fragment parts cannot be resolved correctly because
// the fragment part does not get transmitted over HTTP(S).
// Avoid strange behaviour by not trying to resolve these at all.
throw new Error(`cannot resolve URL with fragment: ${value}`);
throw new IdentifiableError('b94fd5b1-0e3b-4678-9df2-dad4cd515ab2', `cannot resolve URL with fragment: ${value}`);
}
if (this.history.has(value)) {
throw new Error('cannot resolve already resolved one');
throw new IdentifiableError('0dc86cf6-7cd6-4e56-b1e6-5903d62d7ea5', 'cannot resolve already resolved one');
}
if (this.history.size > this.recursionLimit) {
throw new Error(`hit recursion limit: ${this.utilityService.extractDbHost(value)}`);
throw new IdentifiableError('d592da9f-822f-4d91-83d7-4ceefabcf3d2', `hit recursion limit: ${this.utilityService.extractDbHost(value)}`);
}
this.history.add(value);
@ -99,7 +100,7 @@ export class Resolver {
}
if (!this.utilityService.isFederationAllowedHost(host)) {
throw new Error('Instance is blocked');
throw new IdentifiableError('09d79f9e-64f1-4316-9cfa-e75c4d091574', 'Instance is blocked');
}
if (this.config.signToActivityPubGet && !this.user) {
@ -115,7 +116,7 @@ export class Resolver {
!(object['@context'] as unknown[]).includes('https://www.w3.org/ns/activitystreams') :
object['@context'] !== 'https://www.w3.org/ns/activitystreams'
) {
throw new Error('invalid response');
throw new IdentifiableError('72180409-793c-4973-868e-5a118eb5519b', 'invalid response');
}
// HttpRequestService / ApRequestService have already checked that
@ -123,11 +124,11 @@ export class Resolver {
// object after redirects; here we double-check that no redirects
// bounced between hosts
if (object.id == null) {
throw new Error('invalid AP object: missing id');
throw new IdentifiableError('ad2dc287-75c1-44c4-839d-3d2e64576675', 'invalid AP object: missing id');
}
if (this.utilityService.punyHost(object.id) !== this.utilityService.punyHost(value)) {
throw new Error(`invalid AP object ${value}: id ${object.id} has different host`);
throw new IdentifiableError('fd93c2fa-69a8-440f-880b-bf178e0ec877', `invalid AP object ${value}: id ${object.id} has different host`);
}
return object;
@ -136,7 +137,7 @@ export class Resolver {
@bindThis
private resolveLocal(url: string): Promise<IObject> {
const parsed = this.apDbResolverService.parseUri(url);
if (!parsed.local) throw new Error('resolveLocal: not local');
if (!parsed.local) throw new IdentifiableError('02b40cd0-fa92-4b0c-acc9-fb2ada952ab8', 'resolveLocal: not local');
switch (parsed.type) {
case 'notes':
@ -165,7 +166,7 @@ export class Resolver {
case 'follows':
return this.followRequestsRepository.findOneBy({ id: parsed.id })
.then(async followRequest => {
if (followRequest == null) throw new Error('resolveLocal: invalid follow request ID');
if (followRequest == null) throw new IdentifiableError('a9d946e5-d276-47f8-95fb-f04230289bb0', 'resolveLocal: invalid follow request ID');
const [follower, followee] = await Promise.all([
this.usersRepository.findOneBy({
id: followRequest.followerId,
@ -177,12 +178,12 @@ export class Resolver {
}),
]);
if (follower == null || followee == null) {
throw new Error('resolveLocal: follower or followee does not exist');
throw new IdentifiableError('06ae3170-1796-4d93-a697-2611ea6d83b6', 'resolveLocal: follower or followee does not exist');
}
return this.apRendererService.addContext(this.apRendererService.renderFollow(follower as MiLocalUser | MiRemoteUser, followee as MiLocalUser | MiRemoteUser, url));
});
default:
throw new Error(`resolveLocal: type ${parsed.type} unhandled`);
throw new IdentifiableError('7a5d2fc0-94bc-4db6-b8b8-1bf24a2e23d0', `resolveLocal: type ${parsed.type} unhandled`);
}
}
}

65
packages/backend/src/server/api/endpoints/ap/show.ts
View File

@ -19,6 +19,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js';
import { ApiError } from '../../error.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
export const meta = {
tags: ['federation'],
@ -32,6 +33,31 @@ export const meta = {
},
errors: {
federationNotAllowed: {
message: 'Federation for this host is not allowed.',
code: 'FEDERATION_NOT_ALLOWED',
id: '974b799e-1a29-4889-b706-18d4dd93e266',
},
uriInvalid: {
message: 'URI is invalid.',
code: 'URI_INVALID',
id: '1a5eab56-e47b-48c2-8d5e-217b897d70db',
},
requestFailed: {
message: 'Request failed.',
code: 'REQUEST_FAILED',
id: '81b539cf-4f57-4b29-bc98-032c33c0792e',
},
responseInvalid: {
message: 'Response from remote server is invalid.',
code: 'RESPONSE_INVALID',
id: '70193c39-54f3-4813-82f0-70a680f7495b',
},
responseInvalidIdHostNotMatch: {
message: 'Requested URI and response URI host does not match.',
code: 'RESPONSE_INVALID_ID_HOST_NOT_MATCH',
id: 'a2c9c61a-cb72-43ab-a964-3ca5fddb410a',
},
noSuchObject: {
message: 'No such object.',
code: 'NO_SUCH_OBJECT',
@ -110,7 +136,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
*/
@bindThis
private async fetchAny(uri: string, me: MiLocalUser | null | undefined): Promise<SchemaType<typeof meta['res']> | null> {
if (!this.utilityService.isFederationAllowedUri(uri)) return null;
if (!this.utilityService.isFederationAllowedUri(uri)) {
throw new ApiError(meta.errors.federationNotAllowed);
}
let local = await this.mergePack(me, ...await Promise.all([
this.apDbResolverService.getUserFromApId(uri),
@ -125,7 +153,40 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
// リモートから一旦オブジェクトフェッチ
const resolver = this.apResolverService.createResolver();
const object = await resolver.resolve(uri) as any;
const object = await resolver.resolve(uri).catch((err) => {
if (err instanceof IdentifiableError) {
switch (err.id) {
// resolve
case 'b94fd5b1-0e3b-4678-9df2-dad4cd515ab2':
throw new ApiError(meta.errors.uriInvalid);
case '0dc86cf6-7cd6-4e56-b1e6-5903d62d7ea5':
case 'd592da9f-822f-4d91-83d7-4ceefabcf3d2':
throw new ApiError(meta.errors.requestFailed);
case '09d79f9e-64f1-4316-9cfa-e75c4d091574':
throw new ApiError(meta.errors.federationNotAllowed);
case '72180409-793c-4973-868e-5a118eb5519b':
case 'ad2dc287-75c1-44c4-839d-3d2e64576675':
throw new ApiError(meta.errors.responseInvalid);
case 'fd93c2fa-69a8-440f-880b-bf178e0ec877':
throw new ApiError(meta.errors.responseInvalidIdHostNotMatch);
// resolveLocal
case '02b40cd0-fa92-4b0c-acc9-fb2ada952ab8':
throw new ApiError(meta.errors.uriInvalid);
case 'a9d946e5-d276-47f8-95fb-f04230289bb0':
case '06ae3170-1796-4d93-a697-2611ea6d83b6':
throw new ApiError(meta.errors.noSuchObject);
case '7a5d2fc0-94bc-4db6-b8b8-1bf24a2e23d0':
throw new ApiError(meta.errors.responseInvalid);
}
}
throw new ApiError(meta.errors.requestFailed);
});
if (object.id == null) {
throw new ApiError(meta.errors.responseInvalid);
}
// /@user のような正規id以外で取得できるURIが指定されていた場合、ここで初めて正規URIが確定する
// これはDBに存在する可能性があるため再度DB検索

2
packages/backend/src/server/api/openapi/gen-spec.ts
View File

@ -183,7 +183,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
},
...(endpoint.meta.limit ? {
'429': {
description: 'To many requests',
description: 'Too many requests',
content: {
'application/json': {
schema: {

7
packages/backend/src/server/web/ClientServerService.ts
View File

@ -585,7 +585,10 @@ export class ClientServerService {
reply.header('X-Robots-Tag', 'noai');
}
const _user = await this.userEntityService.pack(user);
const _user = await this.userEntityService.pack(user, null, {
schema: 'UserDetailed',
userProfile: profile,
});
return await reply.view('user', {
user, profile, me,
@ -868,7 +871,7 @@ export class ClientServerService {
});
if (note == null) return;
if (note.visibility !== 'public') return;
if (['specified', 'followers'].includes(note.visibility)) return;
if (note.userHost != null) return;
const _note = await this.noteEntityService.pack(note, null, { detail: true });

6
packages/backend/test-federation/test/note.test.ts
View File

@ -131,11 +131,7 @@ describe('Note', () => {
rejects(
async () => await bob.client.request('ap/show', { uri: `https://a.test/notes/${note.id}` }),
(err: any) => {
/**
* FIXME: this error is not handled
* @see https://github.com/misskey-dev/misskey/issues/12736
*/
strictEqual(err.code, 'INTERNAL_ERROR');
strictEqual(err.code, 'REQUEST_FAILED');
return true;
},
);

2
packages/frontend/src/components/MkChannelPreview.vue
View File

@ -125,7 +125,9 @@ const bannerStyle = computed(() => {
position: absolute;
top: 16px;
left: 16px;
max-width: calc(100% - 32px);
padding: 12px 16px;
box-sizing: border-box;
background: rgba(0, 0, 0, 0.7);
color: #fff;
font-size: 1.2em;

1
packages/frontend/src/pages/about-misskey.vue
View File

@ -384,6 +384,7 @@ const patrons = [
'こまつぶり',
'まゆつな空高',
'asata',
'ruru',
];
const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));

35
packages/frontend/src/pages/channels.vue
View File

@ -6,9 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<MkStickyContainer>
<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :contentMax="700">
<MkSpacer :contentMax="1200">
<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
<div v-if="tab === 'search'" key="search">
<div v-if="tab === 'search'" key="search" :class="$style.searchRoot">
<div class="_gaps">
<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
<template #prefix><i class="ti ti-search"></i></template>
@ -27,23 +27,31 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div v-if="tab === 'featured'" key="featured">
<MkPagination v-slot="{items}" :pagination="featuredPagination">
<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
<div :class="$style.root">
<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
</div>
</MkPagination>
</div>
<div v-else-if="tab === 'favorites'" key="favorites">
<MkPagination v-slot="{items}" :pagination="favoritesPagination">
<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
<div :class="$style.root">
<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
</div>
</MkPagination>
</div>
<div v-else-if="tab === 'following'" key="following">
<MkPagination v-slot="{items}" :pagination="followingPagination">
<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
<div :class="$style.root">
<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
</div>
</MkPagination>
</div>
<div v-else-if="tab === 'owned'" key="owned">
<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
<MkPagination v-slot="{items}" :pagination="ownedPagination">
<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
<div :class="$style.root">
<MkChannelPreview v-for="channel in items" :key="channel.id" :channel="channel"/>
</div>
</MkPagination>
</div>
</MkHorizontalSwipe>
@ -85,6 +93,7 @@ onMounted(() => {
const featuredPagination = {
endpoint: 'channels/featured' as const,
limit: 10,
noPaging: true,
};
const favoritesPagination = {
@ -157,3 +166,17 @@ definePageMetadata(() => ({
icon: 'ti ti-device-tv',
}));
</script>
<style lang="scss" module>
.searchRoot {
width: 100%;
max-width: 700px;
margin: 0 auto;
}
.root {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
gap: var(--MI-margin);
}
</style>

5
packages/frontend/src/pages/clip.vue
View File

@ -46,9 +46,10 @@ import { clipsCache } from '@/cache.js';
import { isSupportShare } from '@/scripts/navigator.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
import { genEmbedCode } from '@/scripts/get-embed-code.js';
import { getServerContext } from '@/server-context.js';
import { assertServerContext, serverContext } from '@/server-context.js';
const CTX_CLIP = getServerContext('clip');
// contextは非ログイン状態の情報しかないためログイン時は利用できない
const CTX_CLIP = !$i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
const props = defineProps<{
clipId: string,

5
packages/frontend/src/pages/custom-emojis-manager.vue
View File

@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #default="{items}">
<div class="ldhfsamy">
<button v-for="emoji in items" :key="emoji.id" class="emoji _panel _button" :class="{ selected: selectedEmojis.includes(emoji.id) }" @click="selectMode ? toggleSelect(emoji) : edit(emoji)">
<img :src="`/emoji/${emoji.name}.webp`" class="img" :alt="emoji.name"/>
<img :src="emoji.url" class="img" :alt="emoji.name"/>
<div class="body">
<div class="name _monospace">{{ emoji.name }}</div>
<div class="info">{{ emoji.category }}</div>
@ -57,7 +57,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #default="{items}">
<div class="ldhfsamy">
<div v-for="emoji in items" :key="emoji.id" class="emoji _panel _button" @click="remoteMenu(emoji, $event)">
<img :src="`/emoji/${emoji.name}@${emoji.host}.webp`" class="img" :alt="emoji.name"/>
<img :src="getProxiedImageUrl(emoji.url, 'emoji')" class="img" :alt="emoji.name"/>
<div class="body">
<div class="name _monospace">{{ emoji.name }}</div>
<div class="info">{{ emoji.host }}</div>
@ -83,6 +83,7 @@ import FormSplit from '@/components/form/split.vue';
import { selectFile } from '@/scripts/select-file.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { getProxiedImageUrl } from '@/scripts/media-proxy.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';

2
packages/frontend/src/pages/emoji-edit-dialog.vue
View File

@ -118,7 +118,7 @@ watch(roleIdsThatCanBeUsedThisEmojiAsReaction, async () => {
rolesThatCanBeUsedThisEmojiAsReaction.value = (await Promise.all(roleIdsThatCanBeUsedThisEmojiAsReaction.value.map((id) => misskeyApi('admin/roles/show', { roleId: id }).catch(() => null)))).filter(x => x != null);
}, { immediate: true });
const imgUrl = computed(() => file.value ? file.value.url : props.emoji ? `/emoji/${props.emoji.name}.webp` : null);
const imgUrl = computed(() => file.value ? file.value.url : props.emoji ? props.emoji.url : null);
async function changeImage(ev: Event) {
file.value = await selectFile(ev.currentTarget ?? ev.target, null);

1
packages/frontend/src/pages/miauth.vue
View File

@ -117,5 +117,6 @@ definePageMetadata(() => ({
border-radius: var(--MI-radius);
background-color: var(--MI_THEME-panel);
overflow-x: scroll;
white-space: nowrap;
}
</style>

12
packages/frontend/src/pages/note.vue
View File

@ -50,6 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, watch, ref } from 'vue';
import * as Misskey from 'misskey-js';
import { host } from '@@/js/config.js';
import type { Paging } from '@/components/MkPagination.vue';
import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
import MkNotes from '@/components/MkNotes.vue';
@ -62,9 +63,11 @@ import { dateString } from '@/filters/date.js';
import MkClipPreview from '@/components/MkClipPreview.vue';
import { defaultStore } from '@/store.js';
import { pleaseLogin } from '@/scripts/please-login.js';
import { getServerContext } from '@/server-context.js';
import { serverContext, assertServerContext } from '@/server-context.js';
import { $i } from '@/account.js';
const CTX_NOTE = getServerContext('note');
// contextは非ログイン状態の情報しかないためログイン時は利用できない
const CTX_NOTE = !$i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
const props = defineProps<{
noteId: string;
@ -140,7 +143,12 @@ function fetchNote() {
}).catch(err => {
if (err.id === '8e75455b-738c-471d-9f80-62693f33372e') {
pleaseLogin({
path: '/',
message: i18n.ts.thisContentsAreMarkedAsSigninRequiredByAuthor,
openOnRemote: {
type: 'lookup',
url: `https://${host}/notes/${props.noteId}`,
},
});
}
error.value = err;

5
packages/frontend/src/pages/user/index.vue
View File

@ -39,7 +39,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';
import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
import { getServerContext } from '@/server-context.js';
import { serverContext, assertServerContext } from '@/server-context.js';
const XHome = defineAsyncComponent(() => import('./home.vue'));
const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue'));
@ -53,7 +53,8 @@ const XFlashs = defineAsyncComponent(() => import('./flashs.vue'));
const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
const XRaw = defineAsyncComponent(() => import('./raw.vue'));
const CTX_USER = getServerContext('user');
// contextは非ログイン状態の情報しかないためログイン時は利用できない
const CTX_USER = !$i && assertServerContext(serverContext, 'user') ? serverContext.user : null;
const props = withDefaults(defineProps<{
acct: string;

38
packages/frontend/src/scripts/lookup.ts
View File

@ -33,7 +33,43 @@ export async function lookup(router?: Router) {
uri: query,
});
os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
os.promiseDialog(promise, null, (err) => {
let title = i18n.ts.somethingHappened;
let text = err.message + '\n' + err.id;
switch (err.id) {
case '974b799e-1a29-4889-b706-18d4dd93e266':
title = i18n.ts._remoteLookupErrors._federationNotAllowed.title;
text = i18n.ts._remoteLookupErrors._federationNotAllowed.description;
break;
case '1a5eab56-e47b-48c2-8d5e-217b897d70db':
title = i18n.ts._remoteLookupErrors._uriInvalid.title;
text = i18n.ts._remoteLookupErrors._uriInvalid.description;
break;
case '81b539cf-4f57-4b29-bc98-032c33c0792e':
title = i18n.ts._remoteLookupErrors._requestFailed.title;
text = i18n.ts._remoteLookupErrors._requestFailed.description;
break;
case '70193c39-54f3-4813-82f0-70a680f7495b':
title = i18n.ts._remoteLookupErrors._responseInvalid.title;
text = i18n.ts._remoteLookupErrors._responseInvalid.description;
break;
case 'a2c9c61a-cb72-43ab-a964-3ca5fddb410a':
title = i18n.ts._remoteLookupErrors._responseInvalid.title;
text = i18n.ts._remoteLookupErrors._responseInvalidIdHostNotMatch.description;
break;
case 'dc94d745-1262-4e63-a17d-fecaa57efc82':
title = i18n.ts._remoteLookupErrors._noSuchObject.title;
text = i18n.ts._remoteLookupErrors._noSuchObject.description;
break;
}
os.alert({
type: 'error',
title,
text,
});
}, i18n.ts.fetchingAsApObject);
const res = await promise;

12
packages/frontend/src/server-context.ts
View File

@ -2,22 +2,20 @@
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as Misskey from 'misskey-js';
import { $i } from '@/account.js';
const providedContextEl = document.getElementById('misskey_clientCtx');
export type ServerContext = {
clip?: Misskey.entities.Clip;
note?: Misskey.entities.Note;
user?: Misskey.entities.UserLite;
user?: Misskey.entities.UserDetailed;
} | null;
export const serverContext: ServerContext = (providedContextEl && providedContextEl.textContent) ? JSON.parse(providedContextEl.textContent) : null;
export function getServerContext<K extends keyof NonNullable<ServerContext>>(entity: K): Required<Pick<NonNullable<ServerContext>, K>> | null {
// contextは非ログイン状態の情報しかないためログイン時は利用できない
if ($i) return null;
return serverContext ? (serverContext[entity] ?? null) : null;
export function assertServerContext<K extends keyof NonNullable<ServerContext>>(ctx: ServerContext, entity: K): ctx is Required<Pick<NonNullable<ServerContext>, K>> {
if (ctx == null) return false;
return entity in ctx && ctx[entity] != null;
}

2
packages/frontend/src/ui/_common_/common.ts
View File

@ -124,7 +124,7 @@ export function openInstanceMenu(ev: MouseEvent) {
});
}
if (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) {
if (instance.impressumUrl != null || instance.tosUrl != null || instance.privacyPolicyUrl != null) {
menuItems.push({ type: 'divider' });
}

22
packages/frontend/src/ui/_common_/navbar.vue
View File

@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</component>
</template>
<div :class="$style.divider"></div>
<MkA v-if="$i.isAdmin || $i.isModerator" v-tooltip.noDelay.right="i18n.ts.controlPanel" :class="$style.item" :activeClass="$style.active" to="/admin">
<MkA v-if="$i != null && ($i.isAdmin || $i.isModerator)" v-tooltip.noDelay.right="i18n.ts.controlPanel" :class="$style.item" :activeClass="$style.active" to="/admin">
<i :class="$style.itemIcon" class="ti ti-dashboard ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.controlPanel }}</span>
</MkA>
<button class="_button" :class="$style.item" @click="more">
@ -48,10 +48,10 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkA>
</div>
<div :class="$style.bottom">
<button v-tooltip.noDelay.right="i18n.ts.note" class="_button" :class="[$style.post]" data-cy-open-post-form @click="os.post">
<button v-tooltip.noDelay.right="i18n.ts.note" class="_button" :class="[$style.post]" data-cy-open-post-form @click="() => { os.post(); }">
<i class="ti ti-pencil ti-fw" :class="$style.postIcon"></i><span :class="$style.postText">{{ i18n.ts.note }}</span>
</button>
<button v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="_button" :class="[$style.account]" @click="openAccountMenu">
<button v-if="$i != null" v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="_button" :class="[$style.account]" @click="openAccountMenu">
<MkAvatar :user="$i" :class="$style.avatar"/><MkAcct class="_nowrap" :class="$style.acct" :user="$i"/>
</button>
</div>
@ -83,8 +83,12 @@ import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
const iconOnly = ref(false);
const forceIconOnly = ref(window.innerWidth <= 1279);
const iconOnly = computed(() => {
return forceIconOnly.value || (defaultStore.reactiveState.menuDisplay.value === 'sideIcon');
});
const menu = computed(() => defaultStore.state.menu);
const otherMenuItemIndicated = computed(() => {
@ -95,14 +99,10 @@ const otherMenuItemIndicated = computed(() => {
return false;
});
const forceIconOnly = window.innerWidth <= 1279;
function calcViewState() {
iconOnly.value = forceIconOnly || (defaultStore.state.menuDisplay === 'sideIcon');
forceIconOnly.value = window.innerWidth <= 1279;
}
calcViewState();
window.addEventListener('resize', calcViewState);
watch(defaultStore.reactiveState.menuDisplay, () => {
@ -120,8 +120,10 @@ function openAccountMenu(ev: MouseEvent) {
}
function more(ev: MouseEvent) {
const target = getHTMLElementOrNull(ev.currentTarget ?? ev.target);
if (!target) return;
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
src: ev.currentTarget ?? ev.target,
src: target,
}, {
closed: () => dispose(),
});

2
packages/misskey-js/package.json
View File

@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
"version": "2024.11.0",
"version": "2024.11.1-alpha.0",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",

2
packages/misskey-js/src/api.ts
View File

@ -44,7 +44,7 @@ export class APIClient {
credential?: APIClient['credential'];
fetch?: APIClient['fetch'] | null | undefined;
}) {
this.origin = opts.origin;
this.origin = opts.origin.replace(/\/$/, '');
this.credential = opts.credential;
// ネイティブ関数をそのまま変数に代入して使おうとするとChromiumではIllegal invocationエラーが発生するため、
// 環境で実装されているfetchを使う場合は無名関数でラップして使用する

110
packages/misskey-js/src/autogen/types.ts
View File

@ -10593,7 +10593,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -11112,7 +11112,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -11179,7 +11179,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -11573,7 +11573,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -11633,7 +11633,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -11756,7 +11756,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -13351,7 +13351,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -14184,7 +14184,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -14531,7 +14531,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -14656,7 +14656,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -15151,7 +15151,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -15624,7 +15624,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -15684,7 +15684,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -15747,7 +15747,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -15806,7 +15806,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -15866,7 +15866,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -16373,7 +16373,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -16648,7 +16648,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -17908,7 +17908,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -17969,7 +17969,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18020,7 +18020,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18071,7 +18071,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18122,7 +18122,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18173,7 +18173,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18224,7 +18224,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18275,7 +18275,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18512,7 +18512,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18572,7 +18572,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18631,7 +18631,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18690,7 +18690,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18749,7 +18749,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18817,7 +18817,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -18885,7 +18885,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -19877,7 +19877,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -20114,7 +20114,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -20174,7 +20174,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -20544,7 +20544,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -21023,7 +21023,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -21191,7 +21191,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -21688,7 +21688,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -21746,7 +21746,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -21804,7 +21804,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -22464,7 +22464,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -22898,7 +22898,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -23142,7 +23142,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -23278,7 +23278,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -23416,7 +23416,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -23550,7 +23550,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -23882,7 +23882,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -23949,7 +23949,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -24279,7 +24279,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -24829,7 +24829,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -26108,7 +26108,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -27398,7 +27398,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@ -27512,7 +27512,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
/** @description To many requests */
/** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];