Merge branch 'develop' into pag-back

This commit is contained in:
tamaina 2023-07-24 06:12:24 +00:00
commit 560a1fecf5
8 changed files with 26 additions and 15 deletions

View file

@ -12,7 +12,7 @@
--> -->
## 13.x.x (unreleased) ## 13.14.1
### General ### General
- 招待機能を改善しました - 招待機能を改善しました

View file

@ -389,10 +389,13 @@ help: "Hjälp"
close: "Stäng" close: "Stäng"
invites: "Inbjudan" invites: "Inbjudan"
members: "Medlemmar" members: "Medlemmar"
transfer: "Överför"
text: "Text" text: "Text"
enable: "Aktivera" enable: "Aktivera"
next: "Nästa" next: "Nästa"
invitations: "Inbjudan" invitations: "Inbjudan"
invitationCode: "Inbjudningskod"
available: "Tillgängligt"
weakPassword: "Svagt Lösenord" weakPassword: "Svagt Lösenord"
normalPassword: "Medel Lösenord" normalPassword: "Medel Lösenord"
strongPassword: "Starkt Lösenord" strongPassword: "Starkt Lösenord"

View file

@ -1,7 +1,7 @@
--- ---
_lang_: "繁體中文" _lang_: "繁體中文"
headlineMisskey: "貼文連繫網絡" headlineMisskey: "貼文連繫網絡"
introMisskey: "歡迎! Misskey是一個開源且去中心化的社群網絡。\n通過「貼文」分享周邊新鮮事並告訴其他人您的想法📡\n透過「情感」功能對大家的貼文表達情感👍\n一起來探索這個新的世界吧!🚀" introMisskey: "歡迎!Misskey 是一個開源且去中心化的社群網路服務。\n發佈「貼文」向身邊的人分享您的想法📡\n利用「反應」表達您對貼文的感覺👍\n讓我們一起探索新的世界吧!🚀"
poweredByMisskeyDescription: "{name}是使用開放原始碼平台<b>Misskey</b>的服務之一(稱為 Misskey 伺服器)。\n" poweredByMisskeyDescription: "{name}是使用開放原始碼平台<b>Misskey</b>的服務之一(稱為 Misskey 伺服器)。\n"
monthAndDay: "{month}月 {day}日" monthAndDay: "{month}月 {day}日"
search: "搜尋" search: "搜尋"

View file

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "13.14.0-beta.7", "version": "13.14.1",
"codename": "nasubi", "codename": "nasubi",
"repository": { "repository": {
"type": "git", "type": "git",

View file

@ -108,8 +108,7 @@ function waitForDecode() {
.then(() => { .then(() => {
loaded = true; loaded = true;
}, error => { }, error => {
console.error('Error occurred during decoding image', img.value, error); console.log('Error occurred during decoding image', img.value, error);
throw Error(error);
}); });
} else { } else {
loaded = false; loaded = false;

View file

@ -57,14 +57,6 @@ const prepend = note => {
} }
}; };
const onUserAdded = () => {
tlComponent?.pagingComponent?.reload();
};
const onUserRemoved = () => {
tlComponent?.pagingComponent?.reload();
};
let endpoint; let endpoint;
let query; let query;
let connection; let connection;
@ -144,8 +136,6 @@ if (props.src === 'antenna') {
listId: props.list, listId: props.list,
}); });
connection.on('note', prepend); connection.on('note', prepend);
connection.on('userAdded', onUserAdded);
connection.on('userRemoved', onUserRemoved);
} else if (props.src === 'channel') { } else if (props.src === 'channel') {
endpoint = 'channels/timeline'; endpoint = 'channels/timeline';
query = { query = {

View file

@ -28,6 +28,7 @@ const common = {
template: '<MkAd v-bind="props" />', template: '<MkAd v-bind="props" />',
}; };
}, },
/* FIXME: disabled because it still didnt pass after applying #11267
async play({ canvasElement, args }) { async play({ canvasElement, args }) {
if (lock) { if (lock) {
console.warn('This test is unexpectedly running twice in parallel, fix it!'); console.warn('This test is unexpectedly running twice in parallel, fix it!');
@ -77,6 +78,7 @@ const common = {
lock = undefined; lock = undefined;
} }
}, },
*/
args: { args: {
prefer: [], prefer: [],
specify: { specify: {

View file

@ -1,3 +1,20 @@
const requestIdleCallback: typeof globalThis.requestIdleCallback = globalThis.requestIdleCallback ?? ((callback) => {
const start = performance.now();
const timeoutId = setTimeout(() => {
callback({
didTimeout: false, // polyfill でタイムアウト発火することはない
timeRemaining() {
const diff = performance.now() - start;
return Math.max(0, 50 - diff); // <https://www.w3.org/TR/requestidlecallback/#idle-periods>
},
});
});
return timeoutId;
});
const cancelIdleCallback: typeof globalThis.cancelIdleCallback = globalThis.cancelIdleCallback ?? ((timeoutId) => {
clearTimeout(timeoutId);
});
class IdlingRenderScheduler { class IdlingRenderScheduler {
#renderers: Set<FrameRequestCallback>; #renderers: Set<FrameRequestCallback>;
#rafId: number; #rafId: number;