diff --git a/README.md b/README.md index 0568f44f..6ac54f61 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,8 @@ - 投稿ページのタブに表示される英単語の単数形・複数形を正しくする ([MR](https://git.joinfirefish.org/firefish/firefish/-/merge_requests/10621)) - GitHub や Discord のアカウントでサインインする機能の廃止 ([MR](https://git.joinfirefish.org/firefish/firefish/-/merge_requests/10612)) - Misskey v12 のときからずっとこの機能ってちゃんと使えた記憶が無い…… + - アイコンフォントのスタイルを設定から選べるように ([MR](https://git.joinfirefish.org/firefish/firefish/-/merge_requests/10613)) + - デフォルトのアイコンの太さも細めに変更 - リアクションの履歴を公開する設定をデフォルトで有効に - 私がみんなのリアクションを見たいと思っているため - もちろん設定から無効にできます diff --git a/locales/en-US.yml b/locales/en-US.yml index 4485098c..0ec6c823 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1162,6 +1162,7 @@ detectPostLanguage: "Automatically detect the language and show a translate butt for posts in foreign languages" vibrate: "Play vibrations" openServerInfo: "Show server information by clicking the server ticker on a post" +iconSet: "Icon set" _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing @@ -2179,3 +2180,9 @@ searchEngine: "Search engine used in search bar MFM" postSearch: "Post search on this server" makePrivate: "Make private" makePrivateConfirm: "This operation will send a deletion request to remote servers and change the visibility to private. Proceed?" +_iconSets: + bold: "Bold" + light: "Light" + regular: "Regular" + fill: "Filled" + duotone: "Duotone" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 62fa4504..599ea7b0 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1000,6 +1000,7 @@ detectPostLanguage: "投稿の言語を自動検出し、外国語の投稿に languageForTranslation: "投稿翻訳に使用する言語" showBigPostButton: "投稿ボタンを巨大にする" emphasizeFollowed: "フォロワーのアカウントに表示される「フォローされています」の表示を強調する" +iconSet: "アイコンのスタイル" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てられます。サーバーの負荷が少し増えます。" @@ -2018,3 +2019,9 @@ postSearch: "このサーバーの投稿検索" indexableDescription: MastodonやFirefishなどの検索機能に、あなたの投稿が表示されるのを許可します。 makePrivate: "秘密にする" makePrivateConfirm: "リモートサーバーに削除リクエストを送信し、投稿の公開範囲を「秘密」にして他の人から見られないようにします。実行しますか?" +_iconSets: + bold: "太め" + light: "細め" + regular: "標準" + fill: "塗りつぶし" + duotone: "2色" diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts index dd21dc76..4a48aa4c 100644 --- a/packages/backend/src/services/note/create.ts +++ b/packages/backend/src/services/note/create.ts @@ -371,18 +371,16 @@ export default async ( ) .then((us) => { for (const u of us) { - getWordHardMute(data, u.userId, u.mutedWords).then( - (shouldMute) => { - if (shouldMute) { - MutedNotes.insert({ - id: genId(), - userId: u.userId, - noteId: note.id, - reason: "word", - }); - } - }, - ); + getWordHardMute(data, u.userId, u.mutedWords).then((shouldMute) => { + if (shouldMute) { + MutedNotes.insert({ + id: genId(), + userId: u.userId, + noteId: note.id, + reason: "word", + }); + } + }); } }); diff --git a/packages/client/package.json b/packages/client/package.json index dac0a336..6d18c35b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -31,6 +31,7 @@ "@types/uuid": "9.0.3", "@vitejs/plugin-vue": "4.3.4", "@vue/compiler-sfc": "3.3.4", + "@vue/runtime-core": "3.3.4", "autobind-decorator": "2.4.0", "autosize": "6.0.1", "blurhash": "2.0.5", diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index f3300a07..a4ee4f9f 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -3,8 +3,9 @@ import type * as firefish from "firefish-js"; import { i18n } from "./i18n"; import { del, get, set } from "@/scripts/idb-proxy"; import { apiUrl } from "@/config"; -import { alert, api, popup, popupMenu, success, waiting } from "@/os"; +import { alert, api, popup, popupMenu, waiting } from "@/os"; import { reloadChannel, unisonReload } from "@/scripts/unison-reload"; +import icon from "@/scripts/icon"; // TODO: 他のタブと永続化されたstateを同期 @@ -244,7 +245,7 @@ export async function openAccountMenu( ? [ { type: "parent", - icon: "ph-plus ph-bold ph-lg", + icon: `${icon("ph-plus")}`, text: i18n.ts.addAccount, children: [ { @@ -286,7 +287,7 @@ export async function openAccountMenu( : [ { type: "parent", - icon: "ph-plus ph-bold ph-lg", + icon: `${icon("ph-plus")}`, text: i18n.ts.addAccount, children: [ { diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 38397894..8d567586 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -8,7 +8,7 @@ > @@ -26,6 +26,7 @@ import { ref } from "vue"; import * as os from "@/os"; import { i18n } from "@/i18n"; +import icon from "@/scripts/icon"; const props = withDefaults( defineProps<{ diff --git a/packages/client/src/components/MkChannelPreview.vue b/packages/client/src/components/MkChannelPreview.vue index 12df63bf..f824a1b2 100644 --- a/packages/client/src/components/MkChannelPreview.vue +++ b/packages/client/src/components/MkChannelPreview.vue @@ -3,11 +3,12 @@