1
0
forked from mirror/misskey

Compare commits

..

21 Commits

Author SHA1 Message Date
かっこかり
e8bf6285cb
fix(frontend): ノートがログインしているユーザーしか見れない場合にログインをキャンセルした場合その後の動線がなくなる問題を修正 (#15101)
* fix(frontend): ノートがログインしているユーザーしか見れない場合にログインをキャンセルすると一切の処理が停止する問題を修正

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-12-10 10:42:12 +09:00
かっこかり
074b7b0bee
fix(frontend): 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正 (#15102)
* Resolve frontend/backend contradiction for home visibility embeds

This now uses the same check from `packages/frontend/src/scripts/get-note-menu.ts`

* Update Changelog

---------

Co-authored-by: CenTdemeern1 <timo.herngreen@gmail.com>
2024-12-10 10:36:03 +09:00
かっこかり
020c191e2c
fix(frontend): MiAuth認可画面のデザイン修正 (#15106) 2024-12-10 10:29:40 +09:00
syuilo
dac3b1f405 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-11-30 13:20:51 +09:00
syuilo
fa271cf84e Update about-misskey.vue 2024-11-30 13:20:49 +09:00
github-actions[bot]
8076f78d06 Bump version to 2024.11.1-alpha.0 2024-11-25 22:18:00 +00:00
anatawa12
dd56623cde
fix: unable to upload to local object storage (#15040) 2024-11-24 20:44:59 +09:00
かっこかり
a0e91b5882
fix(backend): 起動前の疎通チェックが機能しなくなっていた問題を修正 (#15043)
* check harder for connectibility

`allSettled` does not throw if a promise is rejected, so
`check_connect` never actually failed

* Update Changelog

---------

Co-authored-by: dakkar <dakkar@thenautilus.net>
2024-11-24 20:43:47 +09:00
かっこかり
eddf6a2319
fix(frontend): サーバードキュメントとMisskey関連リソースとの間にdividerが入らないことがある問題を修正 (#15044)
* fix(frontend): サーバードキュメントとMisskey関連リソースとの間にdividerが入らないことがある問題を修正

* Update Changelog
2024-11-24 15:23:21 +09:00
かっこかり
d176db517f
fix(backend/misskey-js): タイポ修正 (#15046) 2024-11-24 15:23:07 +09:00
anatawa12
ae1d0b08eb
ci: do not run chromatic on fork repositories (#15041) 2024-11-23 17:42:55 +09:00
おさむのひと
a77ad7a16b
fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する (#15033)
* fix(backend): アドレス入力で直接ユーザのプロフィールページを表示した際、前提データが足りず描画に失敗する

* fix CHANGELOG.md
2024-11-23 16:45:05 +09:00
かっこかり
00301ed04f
Update CHANGELOG.md (書き方を揃える) 2024-11-23 16:05:10 +09:00
かっこかり
d91a1be562
fix(frontend): 画面サイズが変わった際にnavbarが自動で折りたたまれない問題を修正 (#15042)
* fix(frontend): 画面サイズが変わった際にnavbarが自動で折りたたまれない問題を修正

* Update Changelog

* fix
2024-11-23 15:35:06 +09:00
syuilo
04b221409c fix(backend): use atomic command to improve security 2024-11-23 04:44:33 +09:00
かっこかり
0e90589290
Update CHANGELOG.md (typo) 2024-11-22 21:19:12 +09:00
github-actions[bot]
872cefcfb8 [skip ci] Update CHANGELOG.md (prepend template) 2024-11-22 09:15:37 +00:00
github-actions[bot]
551040ed0f Release: 2024.11.0 2024-11-22 09:15:09 +00:00
syuilo
71bfa85986
New Crowdin updates (#15027)
* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)
2024-11-22 18:01:56 +09:00
かっこかり
f25fc5215b
fix(backend): Inboxのエラーをthrowせずreturnしている問題を修正 (#15022)
* fix exception handling for Like activities

(cherry picked from commit 8f42e8434eaebe3aba5d1980c57f49dd8ad0de91)

* fix exception handling for Announce activities

(cherry picked from commit cfc3ab4b045af0674122fa49176431860176358b)

* fix exception handling for Undo activities

* Update Changelog

---------

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
2024-11-22 12:14:41 +09:00
anatawa12
1911972ae2
ci: reset prerelease number on release (#15024) 2024-11-22 12:11:45 +09:00
19 changed files with 194 additions and 109 deletions

View File

@ -60,13 +60,13 @@ jobs:
### General
-
### Client
-
### Server
-
use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
indent: ${{ vars.INDENT }}
secrets:
@ -86,6 +86,7 @@ jobs:
draft_prerelease_channel: alpha
ready_start_prerelease_channel: beta
prerelease_channel: ${{ inputs.start-rc && 'rc' || '' }}
reset_number_on_channel_change: true
secrets:
RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}

View File

@ -0,0 +1,47 @@
name: "Release Manager: release RC when ready for review"
on:
pull_request:
types: [ready_for_review]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
issues: write
pull-requests: write
jobs:
check:
runs-on: ubuntu-latest
outputs:
head: ${{ steps.get_pr.outputs.head }}
base: ${{ steps.get_pr.outputs.base }}
steps:
- uses: actions/checkout@v4
# PR情報を取得
- name: Get PR
run: |
pr_json=$(gh pr view "$PR_NUMBER" --json isDraft,headRefName,baseRefName)
echo "head=$(echo $pr_json | jq -r '.headRefName')" >> $GITHUB_OUTPUT
echo "base=$(echo $pr_json | jq -r '.baseRefName')" >> $GITHUB_OUTPUT
id: get_pr
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
release:
uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v2
needs: check
if: needs.check.outputs.head == github.event.repository.default_branch && needs.check.outputs.base == vars.STABLE_BRANCH
with:
pr_number: ${{ github.event.pull_request.number }}
user: 'github-actions[bot]'
package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
indent: ${{ vars.INDENT }}
draft_prerelease_channel: alpha
ready_start_prerelease_channel: beta
reset_number_on_channel_change: true
secrets:
RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}

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:

View File

@ -1,3 +1,21 @@
## 2024.11.1
### General
-
### Client
- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
- Fix: サーバー情報メニューに区切り線が不足していたのを修正
- Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
- Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
## 2024.11.0
### Note
@ -37,7 +55,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: 画面幅が狭い環境でデザインが崩れる問題を修正
@ -67,6 +85,8 @@
- Fix: User Webhookテスト機能のMock Payloadを修正
- Fix: アカウント削除のモデレーションログが動作していないのを修正 (#14996)
- Fix: リノートミュートが新規投稿通知に対して作用していなかった問題を修正
- Fix: Inboxの処理で生じるエラーを誤ってActivityとして処理することがある問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/730)
- Fix: セキュリティに関する修正
### Misskey.js

View File

@ -143,8 +143,8 @@ unmarkAsSensitive: "取消标记为敏感内容"
enterFileName: "输入文件名"
mute: "屏蔽"
unmute: "解除静音"
renoteMute: "屏蔽转帖"
renoteUnmute: "解除屏蔽转帖"
renoteMute: "隐藏转帖"
renoteUnmute: "解除隐藏转帖"
block: "拉黑"
unblock: "取消拉黑"
suspend: "冻结"
@ -213,7 +213,7 @@ charts: "图表"
perHour: "每小时"
perDay: "每天"
stopActivityDelivery: "停止发送活动"
blockThisInstance: "封锁此服务器"
blockThisInstance: "屏蔽此服务器"
silenceThisInstance: "静音此服务器"
mediaSilenceThisInstance: "隐藏此服务器的媒体文件"
operations: "操作"
@ -233,17 +233,17 @@ clearQueueConfirmTitle: "确定清除队列?"
clearQueueConfirmText: "未送达的帖子将不会被投递。 通常无需执行此操作。"
clearCachedFiles: "清除缓存"
clearCachedFilesConfirm: "确定要清除所有缓存的远程文件?"
blockedInstances: "被封锁的服务器"
blockedInstancesDescription: "设定要封锁的服务器,以换行分隔。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
blockedInstances: "被屏蔽的服务器"
blockedInstancesDescription: "设定要屏蔽的服务器,以换行分隔。被屏蔽的服务器将无法与本服务器进行交换通讯。子域名也同样会被屏蔽。"
silencedInstances: "被静音的服务器"
silencedInstancesDescription: "设置要静音的服务器,以换行分隔。被静音的服务器内所有的账户将默认处于「静音」状态,仅能发送关注请求,并且在未关注状态下无法提及本地账户。被阻止的实例不受影响。"
mediaSilencedInstances: "已隐藏媒体文件的服务器"
mediaSilencedInstancesDescription: "设置要隐藏媒体文件的服务器,以换行分隔。被设置为隐藏媒体文件服务器内所有账号的文件均按照「敏感内容」处理,且将无法使用自定义表情符号。被阻止的实例不受影响。"
federationAllowedHosts: "允许联合的服务器"
federationAllowedHostsDescription: "设定允许联合的服务器,以换行分隔。"
muteAndBlock: "静音/拉黑"
mutedUsers: "已静音用户"
blockedUsers: "已拉黑的用户"
muteAndBlock: "隐藏和屏蔽"
mutedUsers: "已隐藏用户"
blockedUsers: "已屏蔽的用户"
noUsers: "无用户"
editProfile: "编辑资料"
noteDeleteConfirm: "要删除该帖子吗?"
@ -683,11 +683,11 @@ emptyToDisableSmtpAuth: "用户名和密码留空可以禁用 SMTP 验证"
smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
smtpSecureInfo: "使用 STARTTLS 时关闭。"
testEmail: "邮件发送测试"
wordMute: "文字屏蔽"
wordMute: "隐藏文字"
hardWordMute: "屏蔽关键词"
regexpError: "正则表达式错误"
regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误:"
instanceMute: "被屏蔽的服务器"
instanceMute: "已隐藏的服务器"
userSaysSomething: "{name} 说了什么,但是被屏蔽词过滤了"
makeActive: "启用"
display: "显示"
@ -915,8 +915,8 @@ manageAccounts: "管理账户"
makeReactionsPublic: "将回应设置为公开"
makeReactionsPublicDescription: "将您发表过的回应设置成公开可见。"
classic: "经典"
muteThread: "屏蔽帖子列表"
unmuteThread: "取消屏蔽帖子列表"
muteThread: "隐藏帖子列表"
unmuteThread: "取消隐藏帖子列表"
followingVisibility: "关注的人的公开范围"
followersVisibility: "关注者的公开范围"
continueThread: "查看更多帖子"
@ -939,7 +939,7 @@ searchByGoogle: "Google"
instanceDefaultLightTheme: "服务器默认浅色主题"
instanceDefaultDarkTheme: "服务器默认深色主题"
instanceDefaultThemeDescription: "以对象格式输入主题代码"
mutePeriod: "屏蔽期限"
mutePeriod: "隐藏期限"
period: "截止时间"
indefinitely: "永久"
tenMinutes: "10 分钟"
@ -1779,7 +1779,7 @@ _role:
canUpdateBioMedia: "可以更新头像和横幅"
pinMax: "帖子置顶数量限制"
antennaMax: "可创建的最大天线数量"
wordMuteMax: "屏蔽词的字数限制"
wordMuteMax: "隐藏词的字数限制"
webhookMax: "Webhook 创建数量限制"
clipMax: "便签创建数量限制"
noteEachClipsMax: "单个便签内的贴文数量限制"
@ -1792,7 +1792,7 @@ _role:
canUseTranslator: "使用翻译功能"
avatarDecorationLimit: "可添加头像挂件的最大个数"
canImportAntennas: "允许导入天线"
canImportBlocking: "允许导入拉黑列表"
canImportBlocking: "允许导入屏蔽列表"
canImportFollowing: "允许导入关注列表"
canImportMuting: "允许导入屏蔽列表"
canImportUserLists: "允许导入用户列表"
@ -1942,14 +1942,14 @@ _menuDisplay:
top: "顶部"
hide: "隐藏"
_wordMute:
muteWords: "禁用词"
muteWords: "要隐藏的词"
muteWordsDescription: "AND 条件用空格分隔OR 条件用换行符分隔。"
muteWordsDescription2: "正则表达式用斜线包裹"
_instanceMute:
instanceMuteDescription: "屏蔽服务器中的所有帖子和转帖,包括这些服务器上的用户回复。"
instanceMuteDescription: "隐藏服务器中的所有帖子和转帖,包括这些服务器上的用户回复。"
instanceMuteDescription2: "一行一个"
title: "隐藏服务器已设置的帖子。"
heading: "屏蔽服务器"
heading: "已隐藏的服务器"
_theme:
explore: "寻找主题"
install: "安装主题"
@ -2089,8 +2089,8 @@ _2fa:
_permissions:
"read:account": "查看账户信息"
"write:account": "更改帐户信息"
"read:blocks": "查看黑名单"
"write:blocks": "编辑黑名单"
"read:blocks": "查看屏蔽列表"
"write:blocks": "编辑屏蔽列表"
"read:drive": "查看网盘"
"write:drive": "管理网盘文件"
"read:favorites": "查看收藏夹"
@ -2099,8 +2099,8 @@ _permissions:
"write:following": "关注/取消关注"
"read:messaging": "查看消息"
"write:messaging": "撰写或删除消息"
"read:mutes": "查看屏蔽列表"
"write:mutes": "编辑屏蔽列表"
"read:mutes": "查看隐藏列表"
"write:mutes": "编辑隐藏列表"
"write:notes": "撰写或删除帖子"
"read:notifications": "查看通知"
"write:notifications": "管理通知"
@ -2300,8 +2300,8 @@ _exportOrImport:
favoritedNotes: "收藏的帖子"
clips: "便签"
followingList: "关注中"
muteList: "屏蔽"
blockingList: "拉黑"
muteList: "隐藏"
blockingList: "屏蔽"
userLists: "列表"
excludeMutingUsers: "排除屏蔽用户"
excludeInactiveUsers: "排除不活跃用户"

View File

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

View File

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

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;

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,
});

View File

@ -28,6 +28,7 @@ import { bindThis } from '@/decorators.js';
import type { MiRemoteUser } from '@/models/User.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { AbuseReportService } from '@/core/AbuseReportService.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
import { ApNoteService } from './models/ApNoteService.js';
import { ApLoggerService } from './ApLoggerService.js';
@ -201,13 +202,16 @@ export class ApInboxService {
await this.apNoteService.extractEmojis(activity.tag ?? [], actor.host).catch(() => null);
return await this.reactionService.create(actor, note, activity._misskey_reaction ?? activity.content ?? activity.name).catch(err => {
if (err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') {
try {
await this.reactionService.create(actor, note, activity._misskey_reaction ?? activity.content ?? activity.name);
return 'ok';
} catch (err) {
if (err instanceof IdentifiableError && err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') {
return 'skip: already reacted';
} else {
throw err;
}
}).then(() => 'ok');
}
}
@bindThis
@ -288,7 +292,7 @@ export class ApInboxService {
const target = await resolver.resolve(activity.object).catch(e => {
this.logger.error(`Resolution failed: ${e}`);
return e;
throw e;
});
if (isPost(target)) return await this.announceNote(actor, activity, target);
@ -649,7 +653,7 @@ export class ApInboxService {
const object = await resolver.resolve(activity.object).catch(e => {
this.logger.error(`Resolution failed: ${e}`);
return e;
throw e;
});
// don't queue because the sender may attempt again when timeout

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: {

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 });

View File

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

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>

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';
@ -140,7 +141,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;

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' });
}

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(),
});

View File

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

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'];