Merge branch 'develop' into feat/scylladb

docs/api-change.md

@@ -1,6 +1,6 @@
 # Changes to the Firefish API
 
-Breaking changes are indecated by the :warning: icon.
+Breaking changes are indicated by the :warning: icon.
 
 ## v1.0.5 (unreleased)
 

locales/ca-ES.yml

@@ -1441,7 +1441,8 @@ _accountDelete:
   requestAccountDelete: Sol·licitar la supressió del compte
 _ad:
   back: Enrera
-  reduceFrequencyOfThisAd: Mostrar aquest anunci menys
+  reduceFrequencyOfThisAd: Mostrar menys aquest anunci
+  adsBy: Anunci comunitari per {by}
 _gallery:
   my: La meva Galeria
   liked: Publicacions que m'han agradat
@@ -1539,8 +1540,8 @@ low: Baixa
 emailNotConfiguredWarning: L'adreça de correu electrònic no està definida.
 instanceSecurity: Seguretat del servidor
 privateMode: Mode Privat
-allowedInstances: Servidors a la llista blanca
+allowedInstances: Servidors permesos
-allowedInstancesDescription: Llista blanca de Hosts amb qui federar, cadascún separat
+allowedInstancesDescription: Llista permesa de Hosts amb qui federar, cadascún separat
   per una línia nova (només s'aplica en mode privat).
 previewNoteText: Mostra la vista prèvia
 customCss: CSS personalitzat
@@ -1552,7 +1553,7 @@ troubleshooting: Resolució de problemes
 learnMore: Més informació
 misskeyUpdated: Firefish s'ha actualitzat!
 translate: Tradueix
-translatedFrom: Traduït per {x}
+translatedFrom: Traduït desde {x}
 aiChanMode: Ai-chan a la interfície d'usuari clàssica
 keepCw: Mantenir els avisos de contingut
 pubSub: Comptes Pub/Sub
@@ -1646,8 +1647,8 @@ customCssWarn: Aquesta configuració només s'ha d'utilitzar si sabeu què fa. L
 squareAvatars: Mostra avatars quadrats
 secureModeInfo: Quan es faci una solicitut d'altres servidors no contestar sense una
   prova.
-privateModeInfo: Quan està activat, només els servidors a la llista blanca es poden
+privateModeInfo: Quan està activat, només els servidors a la llista es poden federar
-  federar amb el vostre servidor. Totes les publicacions s'amagaran al públic.
+  amb el vostre servidor. Totes les publicacions s'amagaran al públic.
 useBlurEffect: Utilitzeu efectes de desenfocament a la interfície d'usuari
 accountDeletionInProgress: La supressió del compte està en curs
 unmuteThread: Desfés el silenci al fil

locales/en-US.yml

@@ -83,7 +83,8 @@ exportRequested: "You've requested an export. This may take a while. It will be
   to your Drive once completed."
 importRequested: "You've requested an import. This may take a while."
 lists: "Lists"
-listsDesc: "Lists let you create timelines with specified users. They can be accessed from the timelines page."
+listsDesc: "Lists let you create timelines with specified users. They can be accessed
+  from the timelines page."
 noLists: "You don't have any lists"
 note: "Post"
 notes: "Posts"
@@ -408,7 +409,8 @@ avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference
   them. Would you like to disable the other Captcha systems currently active? If you
   would like them to stay enabled, press cancel."
 antennas: "Antennas"
-antennasDesc: "Antennas display new posts matching the criteria you set!\n They can be accessed from the timelines page."
+antennasDesc: "Antennas display new posts matching the criteria you set!\n They can
+  be accessed from the timelines page."
 manageAntennas: "Manage Antennas"
 name: "Name"
 antennaSource: "Antenna source"
@@ -603,7 +605,8 @@ output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
 expandOnNoteClick: "Open post on click"
-expandOnNoteClickDesc: "If disabled, you can still open posts in the right-click menu or by clicking the timestamp."
+expandOnNoteClickDesc: "If disabled, you can still open posts in the right-click menu
+  or by clicking the timestamp."
 updateRemoteUser: "Update remote user information"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
@@ -743,8 +746,8 @@ unclip: "Unclip"
 confirmToUnclipAlreadyClippedNote: "This post is already part of the \"{name}\" clip.
   Do you want to remove it from this clip instead?"
 public: "Public"
-i18nInfo: "Firefish is being translated into various languages by volunteers. You can
+i18nInfo: "Firefish is being translated into various languages by volunteers. You
-  help at {link}."
+  can help at {link}."
 manageAccessTokens: "Manage access tokens"
 accountInfo: "Account Info"
 notesCount: "Number of posts"
@@ -779,7 +782,8 @@ pageLikedCount: "Number of received Page likes"
 contact: "Contact"
 useSystemFont: "Use the system's default font"
 clips: "Clips"
-clipsDesc: "Clips are like share-able categorized bookmarks. You can create clips from the menu of individual posts."
+clipsDesc: "Clips are like share-able categorized bookmarks. You can create clips
+  from the menu of individual posts."
 experimentalFeatures: "Experimental features"
 developer: "Developer"
 makeExplorable: "Make account visible in \"Explore\""
@@ -888,10 +892,10 @@ secureMode: "Secure Mode (Authorized Fetch)"
 instanceSecurity: "Server Security"
 secureModeInfo: "When requesting from other servers, do not send back without proof."
 privateMode: "Private Mode"
-privateModeInfo: "When enabled, only whitelisted servers can federate with your server.
+privateModeInfo: "When enabled, only allowlisted servers can federate with your server.
   All posts will be hidden from the public."
-allowedInstances: "Whitelisted Servers"
+allowedInstances: "Allowlisted Servers"
-allowedInstancesDescription: "Hosts of servers to be whitelisted for federation, each
+allowedInstancesDescription: "Hosts of servers to be allowlisted for federation, each
   separated by a new line (only applies in private mode)."
 previewNoteText: "Show preview"
 customCss: "Custom CSS"
@@ -1083,8 +1087,8 @@ license: "License"
 indexPosts: "Index Posts"
 indexFrom: "Index from Post ID onwards"
 indexFromDescription: "Leave blank to index every post"
-indexNotice: "Now indexing. This will probably take a while, please don't restart\
+indexNotice: "Now indexing. This will probably take a while, please don't restart
-  \ your server for at least an hour."
+  your server for at least an hour."
 customKaTeXMacro: "Custom KaTeX macros"
 customKaTeXMacroDescription: "Set up macros to write mathematical expressions easily!
   The notation conforms to the LaTeX command definitions and is written as \\newcommand{\\
@@ -1132,9 +1136,11 @@ origin: "Origin"
 delete2fa: "Disable 2FA"
 deletePasskeys: "Delete passkeys"
 delete2faConfirm: "This will irreversibly delete 2FA on this account. Proceed?"
-deletePasskeysConfirm: "This will irreversibly delete all passkeys and security keys on this account. Proceed?"
+deletePasskeysConfirm: "This will irreversibly delete all passkeys and security keys
+  on this account. Proceed?"
 inputNotMatch: "Input does not match"
-addRe: "Add \"re:\" at the beginning of comment in reply to a post with a content warning"
+addRe: "Add \"re:\" at the beginning of comment in reply to a post with a content
+  warning"
 confirm: "Confirm"
 importZip: "Import ZIP"
 exportZip: "Export ZIP"
@@ -1142,7 +1148,8 @@ emojiPackCreator: "Emoji pack creator"
 indexable: "Indexable"
 indexableDescription: "Allow built-in search to show your public posts"
 languageForTranslation: "Post translation language"
-detectPostLanguage: "Automatically detect the language and show a translate button for posts in foreign languages"
+detectPostLanguage: "Automatically detect the language and show a translate button
+  for posts in foreign languages"
 vibrate: "Play vibrations"
 openServerInfo: "Show server information by clicking the server ticker on a post"
 
@@ -1237,8 +1244,8 @@ _registry:
   domain: "Domain"
   createKey: "Create key"
 _aboutFirefish:
-  about: "Firefish is a fork of Misskey made by ThatOneCalculator, which has been in
+  about: "Firefish is a fork of Misskey made by ThatOneCalculator, which has been
-    development since 2022."
+    in development since 2022."
   contributors: "Main contributors"
   allContributors: "All contributors"
   misskeyContributors: "Misskey contributors"
@@ -1247,13 +1254,15 @@ _aboutFirefish:
   donate: "Donate to Firefish"
   donateTitle: "Enjoying Firefish?"
   pleaseDonateToFirefish: "Please consider donating to Firefish to support its development."
-  pleaseDonateToHost: "Please also consider donating to your home server, {host}, to help support its operation costs."
+  pleaseDonateToHost: "Please also consider donating to your home server, {host},
+    to help support its operation costs."
   donateHost: "Donate to {host}"
   morePatrons: "We also appreciate the support of many other helpers not listed here.
     Thank you! 🥰"
   sponsors: "Firefish sponsors"
   patrons: "Firefish patrons"
-  patronsList: "Listed chronologically, not by donation size. Donate with the link above to get your name on here!"
+  patronsList: "Listed chronologically, not by donation size. Donate with the link
+    above to get your name on here!"
 _nsfw:
   respect: "Hide NSFW media"
   ignore: "Don't hide NSFW media"
@@ -1268,7 +1277,8 @@ _mfm:
     can be used in many places. Here you can view a list of all available MFM syntax."
   dummy: "Firefish expands the world of the Fediverse"
   advanced: "Advanced MFM"
-  advancedDescription: "If disabled, only allows for basic markup unless animated MFM is playing"
+  advancedDescription: "If disabled, only allows for basic markup unless animated
+    MFM is playing"
   mention: "Mention"
   mentionDescription: "You can specify a user by using an At-Symbol and a username."
   hashtag: "Hashtag"
@@ -1524,10 +1534,10 @@ _tutorial:
   step5_4: "The Local {icon} timeline is where you can see posts from everyone else
     on this server."
   step5_5: "The Social {icon} timeline is a combination of the Home and Local timelines."
-  step5_6: "The Recommended {icon} timeline is where you can see posts from servers\
+  step5_6: "The Recommended {icon} timeline is where you can see posts from servers
-    \ the admins recommend."
+    the admins recommend."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other\
+  step5_7: "The Global {icon} timeline is where you can see posts from every other
-    \ connected server."
+    connected server."
   step6_1: "So, what is this place?"
   step6_2: "Well, you didn't just join Firefish. You joined a portal to the Fediverse,
     an interconnected network of thousands of servers."
@@ -1540,23 +1550,29 @@ _2fa:
   registerTOTP: "Register authenticator app"
   step1: "First, install an authentication app (such as {a} or {b}) on your device."
   step2: "Then, scan the QR code displayed on this screen."
-  step2Click: "Clicking on this QR code will allow you to register 2FA to your security key or phone authenticator app."
+  step2Click: "Clicking on this QR code will allow you to register 2FA to your security
+    key or phone authenticator app."
   step2Url: "You can also enter this URL if you're using a desktop program:"
   step3Title: "Enter an authentication code"
   step3: "Enter the token provided by your app to finish setup."
   step4: "From now on, any future login attempts will ask for such a login token."
   securityKeyNotSupported: "Your browser does not support security keys."
-  registerTOTPBeforeKey: "Please set up an authenticator app to register a security or pass key."
+  registerTOTPBeforeKey: "Please set up an authenticator app to register a security
-  securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your account."
+    or pass key."
+  securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup
+    authentication via hardware security keys that support FIDO2 to further secure
+    your account."
   chromePasskeyNotSupported: "Chrome passkeys are currently not supported."
   registerSecurityKey: "Register a security or pass key"
   securityKeyName: "Enter a key name"
   tapSecurityKey: "Please follow your browser to register the security or pass key"
   removeKey: "Remove security key"
   removeKeyConfirm: "Really delete the {name} key?"
-  whyTOTPOnlyRenew: "The authenticator app cannot be removed as long as a security key is registered."
+  whyTOTPOnlyRenew: "The authenticator app cannot be removed as long as a security
+    key is registered."
   renewTOTP: "Reconfigure authenticator app"
-  renewTOTPConfirm: "This will cause verification codes from your previous app to stop working"
+  renewTOTPConfirm: "This will cause verification codes from your previous app to
+    stop working"
   renewTOTPOk: "Reconfigure"
   renewTOTPCancel: "Cancel"
   token: "2FA Token"
@@ -1704,10 +1720,9 @@ _profile:
   youCanIncludeHashtags: "You can also include hashtags in your bio."
   metadata: "Additional Information"
   metadataEdit: "Edit additional Information"
-  metadataDescription:
+  metadataDescription: "Using these, you can display additional information fields
-    "Using these, you can display additional information fields
+    in your profile. You can add an {a} tag or {l} tag with {rel} to verify the link
-    in your profile. You can add an {a} tag or {l} tag with {rel}
+    on your profile!"
-    to verify the link on your profile!"
   metadataLabel: "Label"
   metadataContent: "Content"
   changeAvatar: "Change avatar"
@@ -2118,9 +2133,9 @@ _deck:
 _experiments:
   title: "Experiments"
   enablePostImports: "Enable post imports"
-  postImportsCaption: "Allows users to import their posts from past Firefish,\
+  postImportsCaption: "Allows users to import their posts from past Firefish, Misskey,
-    \ Misskey, Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during\
+    Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during load if
-    \ load if your queue is bottlenecked."
+    your queue is bottlenecked."
 _dialog:
   charactersExceeded: "Max characters exceeded! Current: {current}/Limit: {max}"
   charactersBelow: "Not enough characters! Current: {current}/Limit: {min}"

locales/id-ID.yml

@@ -953,7 +953,8 @@ _accountDelete:
   inProgress: "Penghapusan sedang dalam proses"
 _ad:
   back: "Kembali"
-  reduceFrequencyOfThisAd: "Tampilkan iklan ini lebih sedikit"
+  reduceFrequencyOfThisAd: "Tampilkan banner ini lebih sedikit"
+  adsBy: Banner komunitas oleh {by}
 _forgotPassword:
   enterEmail: "Masukkan alamat surel yang kamu gunakan pada saat mendaftar. Sebuah
     tautan untuk mengatur ulang kata sandi kamu akan dikirimkan ke alamat surel tersebut."
@@ -1923,9 +1924,9 @@ moderation: Moderasi
 userSaysSomethingReason: '{name} mengatakan {reason}'
 secureMode: Mode Aman (Pengambilan Terotorisasi)
 secureModeInfo: Saat meminta dari server lain, jangan kirim kembali tanpa bukti.
-privateModeInfo: Saat aktif, hanya server yang masuk daftar putih dapat terfederasi
+privateModeInfo: Saat aktif, hanya server yang masuk daftar yang diizinkan yang dapat
-  dengan servermu. Semua postingan akan disembunyikan dari publik.
+  terfederasi dengan servermu. Semua postingan akan disembunyikan dari publik.
-allowedInstances: Server Masuk Daftar Putih
+allowedInstances: Daftar Server Diizinkan
 newer: lebih baru
 userSaysSomethingReasonReply: '{name} membalas postingan berisi {reason}'
 userSaysSomethingReasonRenote: '{name} memposting ulang postingan berisi {reason}'
@@ -1935,8 +1936,8 @@ jumpToPrevious: Lompat ke sebelumnya
 flagSpeakAsCatDescription: Postinganmu akan nyampak dalam mode kucing
 cw: Peringatan konten
 flagSpeakAsCat: Bicara sebagai kucing
-allowedInstancesDescription: Host server akan masuk daftar putih untuk federasi, mereka
+allowedInstancesDescription: Server host akan masuk daftar yang diizinkan untuk federasi,
-  dipisahkan dengan baris baru (hanya diterapkan pada mode pribadi).
+  mereka dipisahkan dengan baris baru (hanya diterapkan pada mode pribadi).
 xl: XL
 privateMode: Mode Pribadi
 seperateRenoteQuote: Tombol posting ulang dan kutip terpisah
@@ -2182,3 +2183,4 @@ languageForTranslation: Bahasa terjemahan kiriman
 openServerInfo: Tampilkan informasi server dengan mengeklik ticker server di sebuah
   kiriman
 vibrate: Putar getaran
+clickToShowPatterns: Klik untuk menampilkan pola modul

locales/it-IT.yml

@@ -901,7 +901,8 @@ _accountDelete:
     caricato.
 _ad:
   back: "Indietro"
-  reduceFrequencyOfThisAd: "Mostra meno spesso questa pubblicità"
+  reduceFrequencyOfThisAd: "Mostra meno spesso questo banner"
+  adsBy: Banner della comunità da {by}
 _forgotPassword:
   enterEmail: "Inserisci l'e-mail che hai registrato nel tuo profilo. Il link di ripristino
     della password verrà inviato a questo indirizzo."
@@ -1997,11 +1998,11 @@ secureMode: Modalità sicura (Acquisizione autorizzata)
 secureModeInfo: Le richieste dai server remoti non ricevono risposta senza prima una
   verifica.
 privateMode: Modalità privata
-allowedInstancesDescription: Gli host dei server che saranno federati in esclusiva,
+allowedInstancesDescription: Gli host dei server con cui sarà permessa la federazione,
   uno per riga (funziona solo in modalità privata).
-privateModeInfo: Se abilitata, solo i server in una whitelist potranno essere federati
+privateModeInfo: Se abilitata, solo i server nell'elenco potranno essere federati
   con questo server. Tutti i post saranno nascosti al pubblico.
-allowedInstances: Whitelist dei server
+allowedInstances: Elenco server permessi
 customCssWarn: Questa impostazione dovrebbe essere usata solo se sai cosa stai facendo.
   Inserire valori errati potrebbe bloccare il funzionamento del client.
 lastCommunication: Ultima comunicazione
@@ -2170,3 +2171,4 @@ languageForTranslation: Linguaggio di traduzione dei post
 openServerInfo: Mostra informazioni sul server cliccando sul riquadro del server in
   un post
 vibrate: Abilita la vibrazione
+clickToShowPatterns: Clicca per vedere i pattern del modulo

locales/zh-CN.yml

@@ -58,7 +58,7 @@ followRequestAccepted: "关注请求已通过"
 mention: "提及"
 mentions: "提及"
 directNotes: "私信"
-importAndExport: "导入/导出数据"
+importAndExport: "导入 / 导出数据"
 import: "导入"
 export: "导出"
 files: "文件"
@@ -675,7 +675,7 @@ driveFilesCount: "网盘的文件数"
 driveUsage: "网盘的空间用量"
 noCrawle: "要求搜索引擎不索引该用户"
 noCrawleDescription: "要求外部搜索引擎不收录（索引）您的内容。"
-lockedAccountInfo: "即使通过了关注请求，只要您不将帖子可见范围设置成“关注者”，任何人都可以看到您的帖子。"
+lockedAccountInfo: "即使通过了关注请求，只要您不将帖子可见范围设置成「关注者」，任何人都可以看到您的帖子。"
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
 loadRawImages: "加载原始图像而不是显示缩略图"
 disableShowingAnimatedImages: "不播放动画"
@@ -1245,7 +1245,7 @@ _tutorial:
   step6_1: "那么，这里是什么地方？"
   step6_2: "好吧，您不只是加入 Firefish。您已经加入了 Fediverse 的一个门户，这是一个由成千上万台服务器组成的互联网络。"
   step6_3: "每个服务器的工作方式不同，并不是所有的服务器都运行 Firefish。但这个服务器是的! 这有点复杂，但您很快就会明白的。"
-  step6_4: "现在，去吧，去探索，去享受乐趣吧!"
+  step6_4: "现在，去吧，去探索，去享受乐趣吧！"
 _2fa:
   alreadyRegistered: "您已经注册了两步验证设备。"
   registerTOTP: "注册身份验证器应用"
@@ -1917,7 +1917,7 @@ _skinTones:
 isModerator: 监察员
 isAdmin: 管理员
 findOtherInstance: 寻找其它服务器
-moveFromDescription: 这将为您的旧账号设置一个别名，以便您可以从该旧账号迁移到当前账号。在从旧账号迁移之前执行此操作。请输入格式如@person@server.com
+moveFromDescription: 这将为您的旧账号设置一个别名，以便您可以从该旧账号迁移到当前账号。在从旧账号迁移之前执行此操作。请输入格式如 @person@server.com
   的账号标签
 indexPosts: 索引帖子
 signupsDisabled: 该服务器目前关闭注册，但您随时可以在另一台服务器上注册！如果您有该服务器的邀请码，请在下面输入。

package.json

@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://git.joinfirefish.org/firefish/firefish.git"
 	},
-	"packageManager": "pnpm@8.7.6",
+	"packageManager": "pnpm@8.8.0",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && ./scripts/build-greet.sh && pnpm --filter !sw -r --parallel run build && pnpm --filter sw run build && pnpm run gulp",
@@ -66,7 +66,7 @@
 		"gulp-replace": "1.1.4",
 		"gulp-terser": "2.1.0",
 		"install-peers": "^1.0.4",
-		"pnpm": "8.7.1",
+		"pnpm": "8.8.0",
 		"start-server-and-test": "1.15.2",
 		"typescript": "5.2.2"
 	}

packages/backend/src/server/web/style.css

@@ -1,7 +1,18 @@
+/* atkinson-hyperlegible-regular - latin_latin-ext */
+@font-face {
+	font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+	font-family: "Atkinson Hyperlegible";
+	font-style: normal;
+	font-weight: 400;
+	src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2")
+		format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
 html {
 	background-color: var(--bg);
 	color: var(--fg);
 }
+
 @media (prefers-color-scheme: dark) {
 	html {
 		--bg: rgb(17, 17, 27);
@@ -104,7 +115,7 @@ html {
 	}
 }
 
-@media(prefers-reduced-motion) {
+@media (prefers-reduced-motion) {
 	#splashSpinner {
 		display: block;
 	}
@@ -122,5 +133,5 @@ html {
 	height: 0;
 	text-align: center;
 	padding-top: 100px;
-	font-family: sans-serif;
+	font-family: "Atkinson Hyperlegible", sans-serif;
 }

packages/client/src/components/MkDialog.vue

@@ -54,7 +54,12 @@
 				<Mfm :text="i18n.ts.password" />
 			</header>
 			<div v-if="text" :class="$style.text">
-				<Mfm :text="text" />
+				<span
+					v-if="isPlaintext === true"
+					style="white-space: pre-line"
+					>{{ text }}</span
+				>
+				<Mfm v-else :text="text" />
 			</div>
 			<MkInput
 				v-if="input && input.type !== 'paragraph'"
@@ -245,6 +250,7 @@ const props = withDefaults(
 			| "search";
 		title: string;
 		text?: string;
+		isPlaintext?: boolean;
 		input?: Input;
 		select?: Select;
 		icon?: string;
@@ -268,6 +274,7 @@ const props = withDefaults(
 		isYesNo: false,
 
 		cancelableByBgClick: true,
+		isPlaintext: false,
 	},
 );
 

packages/client/src/components/MkMedia.vue

@@ -138,6 +138,7 @@ function captionPopup() {
 	os.alert({
 		type: "info",
 		text: props.media.comment,
+		isPlaintext: true,
 	});
 }
 

packages/client/src/components/MkMediaList.vue

@@ -332,6 +332,7 @@ const previewableCount = props.mediaList.filter((media) =>
 	overflow-x: clip;
 	overflow-y: auto;
 	overscroll-behavior: contain;
+	white-space: pre-line;
 }
 
 .pwsp__alt-text:empty {

packages/client/src/components/MkNote.vue

@@ -939,7 +939,7 @@ defineExpose({
 					padding: 8px;
 					opacity: 0.7;
 					&:disabled {
-						opacity: 0.5 !important;
+						opacity: 0.2 !important;
 					}
 					flex-grow: 1;
 					max-width: 3.5em;

packages/client/src/components/MkNoteSub.vue

@@ -543,7 +543,7 @@ function noteClick(e) {
 					padding: 8px;
 					opacity: 0.7;
 					&:disabled {
-						opacity: 0.5 !important;
+						opacity: 0.2 !important;
 					}
 					flex-grow: 1;
 					max-width: 3.5em;

packages/client/src/components/MkRenoteButton.vue

@@ -3,7 +3,7 @@
 		v-if="canRenote"
 		ref="buttonRef"
 		v-tooltip.noDelay.bottom="i18n.ts.renote"
-		class="button _button canRenote"
+		class="button _button"
 		:class="{ renoted: hasRenotedBefore }"
 		@click.stop="renote(false, $event)"
 	>
@@ -13,7 +13,7 @@
 	<button
 		v-else
 		v-tooltip.noDelay.bottom="i18n.ts.disabled"
-		class="eddddedb _button"
+		class="_button"
 		disabled="true"
 	>
 		<i class="ph-rocket-launch ph-bold ph-lg"></i>
@@ -266,7 +266,7 @@ const renote = (viaKeyboard = false, ev?: MouseEvent) => {
 
 <style lang="scss" scoped>
 .button {
-	&:not(.canRenote) {
+	&:not(.button) {
 		cursor: default;
 	}
 	&.renoted {

packages/client/src/os.ts

@@ -277,6 +277,7 @@ export function alert(props: {
 	type?: "error" | "info" | "success" | "warning" | "waiting" | "question";
 	title?: string | null;
 	text?: string | null;
+	isPlaintext?: boolean;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
 		if (props.text == null && props.type === "error") {
@@ -301,6 +302,7 @@ export function confirm(props: {
 	text?: string | null;
 	okText?: string;
 	cancelText?: string;
+	isPlaintext?: boolean;
 }): Promise<{ canceled: boolean }> {
 	return new Promise((resolve, reject) => {
 		popup(
@@ -323,6 +325,7 @@ export function yesno(props: {
 	type: "error" | "info" | "success" | "warning" | "waiting" | "question";
 	title?: string | null;
 	text?: string | null;
+	isPlaintext?: boolean;
 }): Promise<{ canceled: boolean }> {
 	return new Promise((resolve, reject) => {
 		popup(

packages/client/src/style.scss

@@ -25,6 +25,43 @@
 	//--ad: rgb(255 169 0 / 10%);
 }
 
+/* atkinson-hyperlegible-regular - latin_latin-ext */
+@font-face {
+	font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+	font-family: "Atkinson Hyperlegible";
+	font-style: normal;
+	font-weight: 400;
+	src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2")
+		format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+/* atkinson-hyperlegible-italic - latin_latin-ext */
+@font-face {
+	font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+	font-family: "Atkinson Hyperlegible";
+	font-style: italic;
+	font-weight: 400;
+	src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-italic.woff2")
+		format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+/* atkinson-hyperlegible-700 - latin_latin-ext */
+@font-face {
+	font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+	font-family: "Atkinson Hyperlegible";
+	font-style: normal;
+	font-weight: 700;
+	src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700.woff2")
+		format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+/* atkinson-hyperlegible-700italic - latin_latin-ext */
+@font-face {
+	font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+	font-family: "Atkinson Hyperlegible";
+	font-style: italic;
+	font-weight: 700;
+	src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700italic.woff2")
+		format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
 ::selection {
 	color: #fff;
 	background-color: var(--accent);
@@ -39,7 +76,8 @@ html {
 	accent-color: var(--accent);
 	overflow: auto;
 	overflow-wrap: break-word;
-	font-family: Roboto, HelveticaNeue, Arial, sans-serif;
+	font-family: "Atkinson Hyperlegible", Roboto, HelveticaNeue, Arial,
+		sans-serif;
 	font-size: 14px;
 	line-height: 1.6;
 	text-size-adjust: 100%;
@@ -50,8 +88,8 @@ html {
 	-webkit-text-size-adjust: none;
 
 	&.useCJKFont {
-		font-family: "Hiragino Maru Gothic Pro", "BIZ UDGothic", Roboto,
+		font-family: "Hiragino Maru Gothic Pro", "BIZ UDGothic",
-			HelveticaNeue, Arial, sans-serif;
+			"Atkinson Hyperlegible", Roboto, HelveticaNeue, Arial, sans-serif;
 	}
 
 	&.useSystemFont {

pnpm-lock.yaml

@@ -85,8 +85,8 @@ importers:
         specifier: ^1.0.4
         version: 1.0.4
       pnpm:
-        specifier: 8.7.1
+        specifier: 8.8.0
-        version: 8.7.1
+        version: 8.8.0
       start-server-and-test:
         specifier: 1.15.2
         version: 1.15.2
@@ -15210,8 +15210,8 @@ packages:
     engines: {node: '>=14.19.0'}
     dev: false
 
-  /pnpm@8.7.1:
+  /pnpm@8.8.0:
-    resolution: {integrity: sha512-Qbt3EhYUaXFS2k4FLQA7r2/eYz/JoDeG680/3UXG0Ga03LPuY4GgdvCLe+zO3M7ZnWG4VI4bAwk7QpJyfr5eqA==}
+    resolution: {integrity: sha512-eY5rMiZpzmPI2oVr1irR97bzb036oKwCWvK91wDQndXcqUPlytPtrF0bO668Syw/uA+7hTf5NnM8Mr4ux4BRRA==}
     engines: {node: '>=16.14'}
     hasBin: true
     dev: true