Compare commits
24 Commits
af41d14028
...
fb78fc0cd5
Author | SHA1 | Date |
---|---|---|
|
fb78fc0cd5 | |
|
e24233c1c7 | |
|
225154d76d | |
|
c5f9c0ce5c | |
|
cce302ae4f | |
|
e0d210e15b | |
|
0b7634b126 | |
|
d1446d195a | |
|
218070eb13 | |
|
0f8c068e84 | |
|
83762b3226 | |
|
a9c6a5444c | |
|
3c4a03a789 | |
|
900792a43e | |
|
da86f303f3 | |
|
b4acfd0c55 | |
|
899726a61e | |
|
94043ea4d3 | |
|
8dca808f88 | |
|
df290d7e38 | |
|
55f71a6fbf | |
|
2c2fb885cb | |
|
34eb626337 | |
|
cc9cd28796 |
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -4,16 +4,22 @@
|
||||||
- pnpm 10.16.0 が必要です
|
- pnpm 10.16.0 が必要です
|
||||||
|
|
||||||
### General
|
### General
|
||||||
|
- Feat: 予約投稿ができるようになりました
|
||||||
|
- デフォルトで作成可能数は1になっています。適宜ロールのポリシーで設定を行ってください。
|
||||||
- Enhance: 広告ごとにセンシティブフラグを設定できるようになりました
|
- Enhance: 広告ごとにセンシティブフラグを設定できるようになりました
|
||||||
|
|
||||||
### Client
|
### Client
|
||||||
- Feat: アカウントのQRコードを表示・読み取りできるようになりました
|
- Feat: アカウントのQRコードを表示・読み取りできるようになりました
|
||||||
|
- Feat: 動画を圧縮してアップロードできるようになりました
|
||||||
- Enhance: チャットの日本語名称がダイレクトメッセージに戻るとともに、ベータ版機能ではなくなりました
|
- Enhance: チャットの日本語名称がダイレクトメッセージに戻るとともに、ベータ版機能ではなくなりました
|
||||||
- Enhance: 画像編集にマスクエフェクト(塗りつぶし、ぼかし)を追加
|
- Enhance: 画像編集にマスクエフェクト(塗りつぶし、ぼかし、モザイク)を追加
|
||||||
|
- Enhance: 画像編集の集中線エフェクトを強化
|
||||||
- Enhance: ウォーターマークにアカウントのQRコードを追加できるように
|
- Enhance: ウォーターマークにアカウントのQRコードを追加できるように
|
||||||
|
- Enhance: テーマをドラッグ&ドロップできるように
|
||||||
- Enhance: 絵文字ピッカーのサイズをより大きくできるように
|
- Enhance: 絵文字ピッカーのサイズをより大きくできるように
|
||||||
- Enhance: 時刻計算のための基準値を一か所で管理するようにし、パフォーマンスを向上
|
- Enhance: 時刻計算のための基準値を一か所で管理するようにし、パフォーマンスを向上
|
||||||
- Fix: iOSで、デバイスがダークモードだと初回読み込み時にエラーになる問題を修正
|
- Fix: iOSで、デバイスがダークモードだと初回読み込み時にエラーになる問題を修正
|
||||||
|
- Fix: アクティビティウィジェットのグラフモードが動作しない問題を修正
|
||||||
|
|
||||||
### Server
|
### Server
|
||||||
- Enhance: ユーザーIPを確実に取得できるために設定ファイルにFastifyOptions.trustProxyを追加しました
|
- Enhance: ユーザーIPを確実に取得できるために設定ファイルにFastifyOptions.trustProxyを追加しました
|
||||||
|
@ -26,6 +32,8 @@
|
||||||
- Enhance: クリップ/リスト/アンテナ/ロール追加系メニュー項目において、表示件数を拡張
|
- Enhance: クリップ/リスト/アンテナ/ロール追加系メニュー項目において、表示件数を拡張
|
||||||
- Enhance: 「キャッシュを削除」ボタンでブラウザの内部キャッシュの削除も行えるように
|
- Enhance: 「キャッシュを削除」ボタンでブラウザの内部キャッシュの削除も行えるように
|
||||||
- Enhance: Ctrlキー(Commandキー)を押下しながらリンクをクリックすると新しいタブで開くように
|
- Enhance: Ctrlキー(Commandキー)を押下しながらリンクをクリックすると新しいタブで開くように
|
||||||
|
- Enhance: プロフィールへのリンクをユーザーポップアップのアバターに追加
|
||||||
|
- Enhance: ユーザーのノート、フォロー、フォロワーページへのリンクをユーザーポップアップに追加
|
||||||
- Fix: プッシュ通知を有効にできない問題を修正
|
- Fix: プッシュ通知を有効にできない問題を修正
|
||||||
- Fix: RSSティッカーウィジェットが正しく動作しない問題を修正
|
- Fix: RSSティッカーウィジェットが正しく動作しない問題を修正
|
||||||
- Fix: プロファイルを復元後アカウントの切り替えができない問題を修正
|
- Fix: プロファイルを復元後アカウントの切り替えができない問題を修正
|
||||||
|
|
|
@ -0,0 +1,232 @@
|
||||||
|
<!--
|
||||||
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<canvas ref="canvasEl" style="display: block; width: 100%; height: 100%; pointer-events: none;"></canvas>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { onMounted, onUnmounted, useTemplateRef } from 'vue';
|
||||||
|
import isChromatic from 'chromatic/isChromatic';
|
||||||
|
import { initShaderProgram } from '@/utility/webgl.js';
|
||||||
|
|
||||||
|
const VERTEX_SHADER = `#version 300 es
|
||||||
|
in vec2 position;
|
||||||
|
out vec2 in_uv;
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
in_uv = (position + 1.0) / 2.0;
|
||||||
|
gl_Position = vec4(position, 0.0, 1.0);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const FRAGMENT_SHADER = `#version 300 es
|
||||||
|
precision mediump float;
|
||||||
|
|
||||||
|
const float PI = 3.141592653589793;
|
||||||
|
const float TWO_PI = 6.283185307179586;
|
||||||
|
const float HALF_PI = 1.5707963267948966;
|
||||||
|
|
||||||
|
in vec2 in_uv;
|
||||||
|
uniform vec2 in_resolution;
|
||||||
|
uniform float u_scale;
|
||||||
|
uniform float u_time;
|
||||||
|
uniform float u_seed;
|
||||||
|
uniform float u_angle;
|
||||||
|
uniform float u_radius;
|
||||||
|
uniform vec3 u_color;
|
||||||
|
uniform vec2 u_ripplePositions[16];
|
||||||
|
uniform float u_rippleRadiuses[16];
|
||||||
|
out vec4 out_color;
|
||||||
|
|
||||||
|
float getRipple(vec2 uv) {
|
||||||
|
float strength = 0.0;
|
||||||
|
float thickness = 0.05;
|
||||||
|
for (int i = 0; i < 16; i++) {
|
||||||
|
if (u_rippleRadiuses[i] <= 0.0) continue;
|
||||||
|
|
||||||
|
float d = distance(uv, u_ripplePositions[i]);
|
||||||
|
|
||||||
|
// フチ
|
||||||
|
if (d < u_rippleRadiuses[i] + thickness && d > u_rippleRadiuses[i] - thickness) {
|
||||||
|
float gradate = abs(d - u_rippleRadiuses[i] + thickness) / thickness;
|
||||||
|
strength += (1.0 - u_rippleRadiuses[i]) * gradate;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 内側
|
||||||
|
if (d < u_rippleRadiuses[i] + thickness) {
|
||||||
|
strength += 0.25 * (1.0 - u_rippleRadiuses[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strength;
|
||||||
|
}
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
float x_ratio = min(in_resolution.x / in_resolution.y, 1.0);
|
||||||
|
float y_ratio = min(in_resolution.y / in_resolution.x, 1.0);
|
||||||
|
|
||||||
|
float angle = -(u_angle * PI);
|
||||||
|
vec2 centeredUv = (in_uv - vec2(0.5, 0.5)) * vec2(x_ratio, y_ratio);
|
||||||
|
vec2 rotatedUV = vec2(
|
||||||
|
centeredUv.x * cos(angle) - centeredUv.y * sin(angle),
|
||||||
|
centeredUv.x * sin(angle) + centeredUv.y * cos(angle)
|
||||||
|
);
|
||||||
|
vec2 uv = rotatedUV;
|
||||||
|
|
||||||
|
float time = u_time * 0.00025;
|
||||||
|
|
||||||
|
float size = 1.0 / u_scale;
|
||||||
|
float size_half = size / 2.0;
|
||||||
|
float modX = mod(uv.x, size);
|
||||||
|
float modY = mod(uv.y, size);
|
||||||
|
|
||||||
|
vec2 pixelated_uv = vec2(
|
||||||
|
(size * (floor((uv.x - 0.5 - size) / size) + 0.5)),
|
||||||
|
(size * (floor((uv.y - 0.5 - size) / size) + 0.5))
|
||||||
|
) + vec2(0.5 + size, 0.5 + size);
|
||||||
|
|
||||||
|
float strength = getRipple(pixelated_uv);
|
||||||
|
|
||||||
|
float opacity = min(max(strength, 0.0), 1.0);
|
||||||
|
|
||||||
|
float threshold = ((u_radius / 2.0) / u_scale);
|
||||||
|
if (length(vec2(modX - size_half, modY - size_half)) < threshold) {
|
||||||
|
out_color = vec4(u_color.r, u_color.g, u_color.b, opacity);
|
||||||
|
//out_color = vec4(1.0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// debug
|
||||||
|
//float a = min(max(getRipple(uv), 0.0), 1.0);
|
||||||
|
//out_color = vec4(u_color.r, u_color.g, u_color.b, (opacity + a) / 2.0);
|
||||||
|
|
||||||
|
out_color = vec4(0.0, 0.0, 0.0, 0.0);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const canvasEl = useTemplateRef('canvasEl');
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<{
|
||||||
|
scale?: number;
|
||||||
|
}>(), {
|
||||||
|
scale: 48,
|
||||||
|
});
|
||||||
|
|
||||||
|
let handle: ReturnType<typeof window['requestAnimationFrame']> | null = null;
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
const canvas = canvasEl.value!;
|
||||||
|
let width = canvas.offsetWidth;
|
||||||
|
let height = canvas.offsetHeight;
|
||||||
|
canvas.width = width;
|
||||||
|
canvas.height = height;
|
||||||
|
|
||||||
|
const maybeGl = canvas.getContext('webgl2', { preserveDrawingBuffer: false, alpha: true, premultipliedAlpha: false, antialias: true });
|
||||||
|
if (maybeGl == null) return;
|
||||||
|
|
||||||
|
const gl = maybeGl;
|
||||||
|
|
||||||
|
const VERTICES = new Float32Array([-1, -1, -1, 1, 1, 1, -1, -1, 1, 1, 1, -1]);
|
||||||
|
const vertexBuffer = gl.createBuffer();
|
||||||
|
gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer);
|
||||||
|
gl.bufferData(gl.ARRAY_BUFFER, VERTICES, gl.STATIC_DRAW);
|
||||||
|
|
||||||
|
//gl.clearColor(0.0, 0.0, 0.0, 0.0);
|
||||||
|
//gl.clear(gl.COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
|
const shaderProgram = initShaderProgram(gl, VERTEX_SHADER, FRAGMENT_SHADER);
|
||||||
|
|
||||||
|
gl.useProgram(shaderProgram);
|
||||||
|
|
||||||
|
const positionLocation = gl.getAttribLocation(shaderProgram, 'position');
|
||||||
|
gl.vertexAttribPointer(positionLocation, 2, gl.FLOAT, false, 0, 0);
|
||||||
|
gl.enableVertexAttribArray(positionLocation);
|
||||||
|
|
||||||
|
const in_resolution = gl.getUniformLocation(shaderProgram, 'in_resolution');
|
||||||
|
gl.uniform2fv(in_resolution, [canvas.width, canvas.height]);
|
||||||
|
|
||||||
|
const u_time = gl.getUniformLocation(shaderProgram, 'u_time');
|
||||||
|
const u_seed = gl.getUniformLocation(shaderProgram, 'u_seed');
|
||||||
|
const u_scale = gl.getUniformLocation(shaderProgram, 'u_scale');
|
||||||
|
const u_angle = gl.getUniformLocation(shaderProgram, 'u_angle');
|
||||||
|
const u_radius = gl.getUniformLocation(shaderProgram, 'u_radius');
|
||||||
|
const u_color = gl.getUniformLocation(shaderProgram, 'u_color');
|
||||||
|
gl.uniform1f(u_seed, Math.random() * 1000);
|
||||||
|
gl.uniform1f(u_scale, props.scale);
|
||||||
|
gl.uniform1f(u_angle, 0.0);
|
||||||
|
gl.uniform1f(u_radius, 0.15);
|
||||||
|
gl.uniform3fv(u_color, [0.5, 1.0, 0]);
|
||||||
|
|
||||||
|
if (isChromatic()) {
|
||||||
|
gl.uniform1f(u_time, 0);
|
||||||
|
gl.drawArrays(gl.TRIANGLES, 0, 6);
|
||||||
|
} else {
|
||||||
|
let ripples = [] as { position: [number, number]; startTime: number; }[];
|
||||||
|
const LIFE_TIME = 1000 * 4;
|
||||||
|
|
||||||
|
function render(timeStamp: number) {
|
||||||
|
let sizeChanged = false;
|
||||||
|
if (Math.abs(height - canvas.offsetHeight) > 2) {
|
||||||
|
height = canvas.offsetHeight;
|
||||||
|
canvas.height = height;
|
||||||
|
sizeChanged = true;
|
||||||
|
}
|
||||||
|
if (Math.abs(width - canvas.offsetWidth) > 2) {
|
||||||
|
width = canvas.offsetWidth;
|
||||||
|
canvas.width = width;
|
||||||
|
sizeChanged = true;
|
||||||
|
}
|
||||||
|
if (sizeChanged && gl) {
|
||||||
|
gl.uniform2fv(in_resolution, [width, height]);
|
||||||
|
gl.viewport(0, 0, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
gl.uniform1f(u_time, timeStamp);
|
||||||
|
|
||||||
|
if (Math.random() < 0.01 && ripples.length < 16) {
|
||||||
|
ripples.push({ position: [(Math.random() * 2) - 1, (Math.random() * 2) - 1], startTime: timeStamp });
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let i = 0; i < 16; i++) {
|
||||||
|
const o = gl.getUniformLocation(shaderProgram, `u_ripplePositions[${i.toString()}]`);
|
||||||
|
const r = gl.getUniformLocation(shaderProgram, `u_rippleRadiuses[${i.toString()}]`);
|
||||||
|
const ripple = ripples[i];
|
||||||
|
if (ripple == null) {
|
||||||
|
gl.uniform2f(o, 0, 0);
|
||||||
|
gl.uniform1f(r, 0.0);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const delta = timeStamp - ripple.startTime;
|
||||||
|
|
||||||
|
gl.uniform2f(o, ripple.position[0], ripple.position[1]);
|
||||||
|
gl.uniform1f(r, delta / LIFE_TIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
ripples = ripples.filter(r => (timeStamp - r.startTime) < LIFE_TIME);
|
||||||
|
if (ripples.length === 0) {
|
||||||
|
ripples.push({ position: [(Math.random() * 2) - 1, (Math.random() * 2) - 1], startTime: timeStamp });
|
||||||
|
}
|
||||||
|
|
||||||
|
gl.drawArrays(gl.TRIANGLES, 0, 6);
|
||||||
|
|
||||||
|
handle = window.requestAnimationFrame(render);
|
||||||
|
}
|
||||||
|
|
||||||
|
handle = window.requestAnimationFrame(render);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (handle) {
|
||||||
|
window.cancelAnimationFrame(handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: WebGLリソースの解放
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" module>
|
||||||
|
</style>
|
|
@ -0,0 +1,190 @@
|
||||||
|
<!--
|
||||||
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
-->
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<canvas ref="canvasEl" style="display: block; width: 100%; height: 100%; pointer-events: none;"></canvas>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { onMounted, onUnmounted, useTemplateRef } from 'vue';
|
||||||
|
import isChromatic from 'chromatic/isChromatic';
|
||||||
|
import { GLSL_LIB_SNOISE, initShaderProgram } from '@/utility/webgl.js';
|
||||||
|
|
||||||
|
const VERTEX_SHADER = `#version 300 es
|
||||||
|
in vec2 position;
|
||||||
|
out vec2 in_uv;
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
in_uv = (position + 1.0) / 2.0;
|
||||||
|
gl_Position = vec4(position, 0.0, 1.0);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const FRAGMENT_SHADER = `#version 300 es
|
||||||
|
precision mediump float;
|
||||||
|
|
||||||
|
const float PI = 3.141592653589793;
|
||||||
|
const float TWO_PI = 6.283185307179586;
|
||||||
|
const float HALF_PI = 1.5707963267948966;
|
||||||
|
|
||||||
|
${GLSL_LIB_SNOISE}
|
||||||
|
|
||||||
|
in vec2 in_uv;
|
||||||
|
uniform vec2 in_resolution;
|
||||||
|
uniform float u_scale;
|
||||||
|
uniform float u_time;
|
||||||
|
uniform float u_seed;
|
||||||
|
uniform float u_angle;
|
||||||
|
uniform float u_radius;
|
||||||
|
uniform vec3 u_color;
|
||||||
|
out vec4 out_color;
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
float x_ratio = min(in_resolution.x / in_resolution.y, 1.0);
|
||||||
|
float y_ratio = min(in_resolution.y / in_resolution.x, 1.0);
|
||||||
|
|
||||||
|
float size = 1.0 / u_scale;
|
||||||
|
float size_half = size / 2.0;
|
||||||
|
|
||||||
|
float angle = -(u_angle * PI);
|
||||||
|
vec2 centeredUv = (in_uv - vec2(0.5, 0.5)) * vec2(x_ratio, y_ratio);
|
||||||
|
vec2 rotatedUV = vec2(
|
||||||
|
centeredUv.x * cos(angle) - centeredUv.y * sin(angle),
|
||||||
|
centeredUv.x * sin(angle) + centeredUv.y * cos(angle)
|
||||||
|
);
|
||||||
|
vec2 uv = rotatedUV;
|
||||||
|
|
||||||
|
float modX = mod(uv.x, size);
|
||||||
|
float modY = mod(uv.y, size);
|
||||||
|
|
||||||
|
vec2 pixelated_uv = vec2(
|
||||||
|
(size * (floor((uv.x - 0.5 - size) / size) + 0.5)),
|
||||||
|
(size * (floor((uv.y - 0.5 - size) / size) + 0.5))
|
||||||
|
) + vec2(0.5 + size, 0.5 + size);
|
||||||
|
|
||||||
|
float time = u_time * 0.00025;
|
||||||
|
|
||||||
|
float noiseAScale = 1.0;
|
||||||
|
float noiseAX = (pixelated_uv.x + u_seed) * (u_scale / noiseAScale);
|
||||||
|
float noiseAY = (pixelated_uv.y + u_seed) * (u_scale / noiseAScale);
|
||||||
|
float noiseA = snoise(vec3(noiseAX, noiseAY, time * 2.0));
|
||||||
|
|
||||||
|
float noiseBScale = 32.0;
|
||||||
|
float noiseBX = (pixelated_uv.x + u_seed) * (u_scale / noiseBScale);
|
||||||
|
float noiseBY = (pixelated_uv.y + u_seed) * (u_scale / noiseBScale);
|
||||||
|
float noiseB = snoise(vec3(noiseBX, noiseBY, time));
|
||||||
|
|
||||||
|
float strength = 0.0;
|
||||||
|
strength += noiseA * 0.2;
|
||||||
|
strength += noiseB * 0.8;
|
||||||
|
|
||||||
|
float opacity = min(max(strength, 0.0), 1.0);
|
||||||
|
|
||||||
|
float threshold = ((u_radius / 2.0) / u_scale);
|
||||||
|
if (length(vec2(modX - size_half, modY - size_half)) < threshold) {
|
||||||
|
out_color = vec4(u_color.r, u_color.g, u_color.b, opacity);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
out_color = vec4(0.0, 0.0, 0.0, 0.0);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const canvasEl = useTemplateRef('canvasEl');
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<{
|
||||||
|
scale?: number;
|
||||||
|
}>(), {
|
||||||
|
scale: 48,
|
||||||
|
});
|
||||||
|
|
||||||
|
let handle: ReturnType<typeof window['requestAnimationFrame']> | null = null;
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
const canvas = canvasEl.value!;
|
||||||
|
let width = canvas.offsetWidth;
|
||||||
|
let height = canvas.offsetHeight;
|
||||||
|
canvas.width = width;
|
||||||
|
canvas.height = height;
|
||||||
|
|
||||||
|
const maybeGl = canvas.getContext('webgl2', { preserveDrawingBuffer: false, alpha: true, premultipliedAlpha: false, antialias: true });
|
||||||
|
if (maybeGl == null) return;
|
||||||
|
|
||||||
|
const gl = maybeGl;
|
||||||
|
|
||||||
|
const VERTICES = new Float32Array([-1, -1, -1, 1, 1, 1, -1, -1, 1, 1, 1, -1]);
|
||||||
|
const vertexBuffer = gl.createBuffer();
|
||||||
|
gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer);
|
||||||
|
gl.bufferData(gl.ARRAY_BUFFER, VERTICES, gl.STATIC_DRAW);
|
||||||
|
|
||||||
|
//gl.clearColor(0.0, 0.0, 0.0, 0.0);
|
||||||
|
//gl.clear(gl.COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
|
const shaderProgram = initShaderProgram(gl, VERTEX_SHADER, FRAGMENT_SHADER);
|
||||||
|
|
||||||
|
gl.useProgram(shaderProgram);
|
||||||
|
|
||||||
|
const positionLocation = gl.getAttribLocation(shaderProgram, 'position');
|
||||||
|
gl.vertexAttribPointer(positionLocation, 2, gl.FLOAT, false, 0, 0);
|
||||||
|
gl.enableVertexAttribArray(positionLocation);
|
||||||
|
|
||||||
|
const in_resolution = gl.getUniformLocation(shaderProgram, 'in_resolution');
|
||||||
|
gl.uniform2fv(in_resolution, [canvas.width, canvas.height]);
|
||||||
|
|
||||||
|
const u_time = gl.getUniformLocation(shaderProgram, 'u_time');
|
||||||
|
const u_seed = gl.getUniformLocation(shaderProgram, 'u_seed');
|
||||||
|
const u_scale = gl.getUniformLocation(shaderProgram, 'u_scale');
|
||||||
|
const u_angle = gl.getUniformLocation(shaderProgram, 'u_angle');
|
||||||
|
const u_radius = gl.getUniformLocation(shaderProgram, 'u_radius');
|
||||||
|
const u_color = gl.getUniformLocation(shaderProgram, 'u_color');
|
||||||
|
gl.uniform1f(u_seed, Math.random() * 1000);
|
||||||
|
gl.uniform1f(u_scale, props.scale);
|
||||||
|
gl.uniform1f(u_angle, 0.0);
|
||||||
|
gl.uniform1f(u_radius, 0.15);
|
||||||
|
gl.uniform3fv(u_color, [0.5, 1.0, 0]);
|
||||||
|
|
||||||
|
if (isChromatic()) {
|
||||||
|
gl.uniform1f(u_time, 0);
|
||||||
|
gl.drawArrays(gl.TRIANGLES, 0, 6);
|
||||||
|
} else {
|
||||||
|
function render(timeStamp: number) {
|
||||||
|
let sizeChanged = false;
|
||||||
|
if (Math.abs(height - canvas.offsetHeight) > 2) {
|
||||||
|
height = canvas.offsetHeight;
|
||||||
|
canvas.height = height;
|
||||||
|
sizeChanged = true;
|
||||||
|
}
|
||||||
|
if (Math.abs(width - canvas.offsetWidth) > 2) {
|
||||||
|
width = canvas.offsetWidth;
|
||||||
|
canvas.width = width;
|
||||||
|
sizeChanged = true;
|
||||||
|
}
|
||||||
|
if (sizeChanged && gl) {
|
||||||
|
gl.uniform2fv(in_resolution, [width, height]);
|
||||||
|
gl.viewport(0, 0, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
gl.uniform1f(u_time, timeStamp);
|
||||||
|
|
||||||
|
gl.drawArrays(gl.TRIANGLES, 0, 6);
|
||||||
|
|
||||||
|
handle = window.requestAnimationFrame(render);
|
||||||
|
}
|
||||||
|
|
||||||
|
handle = window.requestAnimationFrame(render);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (handle) {
|
||||||
|
window.cancelAnimationFrame(handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: WebGLリソースの解放
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" module>
|
||||||
|
</style>
|
|
@ -1030,6 +1030,10 @@ export interface Locale extends ILocale {
|
||||||
* 処理中
|
* 処理中
|
||||||
*/
|
*/
|
||||||
"processing": string;
|
"processing": string;
|
||||||
|
/**
|
||||||
|
* 準備中
|
||||||
|
*/
|
||||||
|
"preprocessing": string;
|
||||||
/**
|
/**
|
||||||
* プレビュー
|
* プレビュー
|
||||||
*/
|
*/
|
||||||
|
@ -5282,6 +5286,10 @@ export interface Locale extends ILocale {
|
||||||
* 下書き
|
* 下書き
|
||||||
*/
|
*/
|
||||||
"draft": string;
|
"draft": string;
|
||||||
|
/**
|
||||||
|
* 下書きと予約投稿
|
||||||
|
*/
|
||||||
|
"draftsAndScheduledNotes": string;
|
||||||
/**
|
/**
|
||||||
* リアクションする際に確認する
|
* リアクションする際に確認する
|
||||||
*/
|
*/
|
||||||
|
@ -5509,6 +5517,14 @@ export interface Locale extends ILocale {
|
||||||
* 低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。
|
* 低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。
|
||||||
*/
|
*/
|
||||||
"defaultImageCompressionLevel_description": string;
|
"defaultImageCompressionLevel_description": string;
|
||||||
|
/**
|
||||||
|
* デフォルトの圧縮度
|
||||||
|
*/
|
||||||
|
"defaultCompressionLevel": string;
|
||||||
|
/**
|
||||||
|
* 低くすると品質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、品質は低下します。
|
||||||
|
*/
|
||||||
|
"defaultCompressionLevel_description": string;
|
||||||
/**
|
/**
|
||||||
* 分
|
* 分
|
||||||
*/
|
*/
|
||||||
|
@ -5541,6 +5557,56 @@ export interface Locale extends ILocale {
|
||||||
* ユーザー指定ノートを作成
|
* ユーザー指定ノートを作成
|
||||||
*/
|
*/
|
||||||
"createUserSpecifiedNote": string;
|
"createUserSpecifiedNote": string;
|
||||||
|
/**
|
||||||
|
* 投稿を予約
|
||||||
|
*/
|
||||||
|
"schedulePost": string;
|
||||||
|
/**
|
||||||
|
* {x}に投稿を予約します
|
||||||
|
*/
|
||||||
|
"scheduleToPostOnX": ParameterizedString<"x">;
|
||||||
|
/**
|
||||||
|
* {x}に投稿が予約されています
|
||||||
|
*/
|
||||||
|
"scheduledToPostOnX": ParameterizedString<"x">;
|
||||||
|
/**
|
||||||
|
* 予約
|
||||||
|
*/
|
||||||
|
"schedule": string;
|
||||||
|
/**
|
||||||
|
* 予約
|
||||||
|
*/
|
||||||
|
"scheduled": string;
|
||||||
|
"_compression": {
|
||||||
|
"_quality": {
|
||||||
|
/**
|
||||||
|
* 高品質
|
||||||
|
*/
|
||||||
|
"high": string;
|
||||||
|
/**
|
||||||
|
* 中品質
|
||||||
|
*/
|
||||||
|
"medium": string;
|
||||||
|
/**
|
||||||
|
* 低品質
|
||||||
|
*/
|
||||||
|
"low": string;
|
||||||
|
};
|
||||||
|
"_size": {
|
||||||
|
/**
|
||||||
|
* サイズ大
|
||||||
|
*/
|
||||||
|
"large": string;
|
||||||
|
/**
|
||||||
|
* サイズ中
|
||||||
|
*/
|
||||||
|
"medium": string;
|
||||||
|
/**
|
||||||
|
* サイズ小
|
||||||
|
*/
|
||||||
|
"small": string;
|
||||||
|
};
|
||||||
|
};
|
||||||
"_order": {
|
"_order": {
|
||||||
/**
|
/**
|
||||||
* 新しい順
|
* 新しい順
|
||||||
|
@ -7891,6 +7957,10 @@ export interface Locale extends ILocale {
|
||||||
* サーバーサイドのノートの下書きの作成可能数
|
* サーバーサイドのノートの下書きの作成可能数
|
||||||
*/
|
*/
|
||||||
"noteDraftLimit": string;
|
"noteDraftLimit": string;
|
||||||
|
/**
|
||||||
|
* 予約投稿の同時作成可能数
|
||||||
|
*/
|
||||||
|
"scheduledNoteLimit": string;
|
||||||
/**
|
/**
|
||||||
* ウォーターマーク機能の使用可否
|
* ウォーターマーク機能の使用可否
|
||||||
*/
|
*/
|
||||||
|
@ -10286,6 +10356,14 @@ export interface Locale extends ILocale {
|
||||||
* アンケートの結果が出ました
|
* アンケートの結果が出ました
|
||||||
*/
|
*/
|
||||||
"pollEnded": string;
|
"pollEnded": string;
|
||||||
|
/**
|
||||||
|
* 予約ノートが投稿されました
|
||||||
|
*/
|
||||||
|
"scheduledNotePosted": string;
|
||||||
|
/**
|
||||||
|
* 予約ノートの投稿に失敗しました
|
||||||
|
*/
|
||||||
|
"scheduledNotePostFailed": string;
|
||||||
/**
|
/**
|
||||||
* 新しい投稿
|
* 新しい投稿
|
||||||
*/
|
*/
|
||||||
|
@ -12350,6 +12428,10 @@ export interface Locale extends ILocale {
|
||||||
* ぼかし
|
* ぼかし
|
||||||
*/
|
*/
|
||||||
"blur": string;
|
"blur": string;
|
||||||
|
/**
|
||||||
|
* モザイク
|
||||||
|
*/
|
||||||
|
"pixelate": string;
|
||||||
/**
|
/**
|
||||||
* 色調補正
|
* 色調補正
|
||||||
*/
|
*/
|
||||||
|
@ -12599,6 +12681,18 @@ export interface Locale extends ILocale {
|
||||||
* 下書き一覧
|
* 下書き一覧
|
||||||
*/
|
*/
|
||||||
"listDrafts": string;
|
"listDrafts": string;
|
||||||
|
/**
|
||||||
|
* 投稿予約
|
||||||
|
*/
|
||||||
|
"schedule": string;
|
||||||
|
/**
|
||||||
|
* 予約投稿一覧
|
||||||
|
*/
|
||||||
|
"listScheduledNotes": string;
|
||||||
|
/**
|
||||||
|
* 予約解除
|
||||||
|
*/
|
||||||
|
"cancelSchedule": string;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* 二次元コード
|
* 二次元コード
|
||||||
|
|
|
@ -253,6 +253,7 @@ noteDeleteConfirm: "このノートを削除しますか?"
|
||||||
pinLimitExceeded: "これ以上ピン留めできません"
|
pinLimitExceeded: "これ以上ピン留めできません"
|
||||||
done: "完了"
|
done: "完了"
|
||||||
processing: "処理中"
|
processing: "処理中"
|
||||||
|
preprocessing: "準備中"
|
||||||
preview: "プレビュー"
|
preview: "プレビュー"
|
||||||
default: "デフォルト"
|
default: "デフォルト"
|
||||||
defaultValueIs: "デフォルト: {value}"
|
defaultValueIs: "デフォルト: {value}"
|
||||||
|
@ -1316,6 +1317,7 @@ acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします
|
||||||
federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
|
federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
|
||||||
federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
|
federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
|
||||||
draft: "下書き"
|
draft: "下書き"
|
||||||
|
draftsAndScheduledNotes: "下書きと予約投稿"
|
||||||
confirmOnReact: "リアクションする際に確認する"
|
confirmOnReact: "リアクションする際に確認する"
|
||||||
reactAreYouSure: "\" {emoji} \" をリアクションしますか?"
|
reactAreYouSure: "\" {emoji} \" をリアクションしますか?"
|
||||||
markAsSensitiveConfirm: "このメディアをセンシティブとして設定しますか?"
|
markAsSensitiveConfirm: "このメディアをセンシティブとして設定しますか?"
|
||||||
|
@ -1372,6 +1374,8 @@ redisplayAllTips: "全ての「ヒントとコツ」を再表示"
|
||||||
hideAllTips: "全ての「ヒントとコツ」を非表示"
|
hideAllTips: "全ての「ヒントとコツ」を非表示"
|
||||||
defaultImageCompressionLevel: "デフォルトの画像圧縮度"
|
defaultImageCompressionLevel: "デフォルトの画像圧縮度"
|
||||||
defaultImageCompressionLevel_description: "低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。"
|
defaultImageCompressionLevel_description: "低くすると画質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、画質は低下します。"
|
||||||
|
defaultCompressionLevel: "デフォルトの圧縮度"
|
||||||
|
defaultCompressionLevel_description: "低くすると品質を保てますが、ファイルサイズは増加します。<br>高くするとファイルサイズを減らせますが、品質は低下します。"
|
||||||
inMinutes: "分"
|
inMinutes: "分"
|
||||||
inDays: "日"
|
inDays: "日"
|
||||||
safeModeEnabled: "セーフモードが有効です"
|
safeModeEnabled: "セーフモードが有効です"
|
||||||
|
@ -1380,6 +1384,21 @@ customCssIsDisabledBecauseSafeMode: "セーフモードが有効なため、カ
|
||||||
themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。"
|
themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。"
|
||||||
thankYouForTestingBeta: "ベータ版の検証にご協力いただきありがとうございます!"
|
thankYouForTestingBeta: "ベータ版の検証にご協力いただきありがとうございます!"
|
||||||
createUserSpecifiedNote: "ユーザー指定ノートを作成"
|
createUserSpecifiedNote: "ユーザー指定ノートを作成"
|
||||||
|
schedulePost: "投稿を予約"
|
||||||
|
scheduleToPostOnX: "{x}に投稿を予約します"
|
||||||
|
scheduledToPostOnX: "{x}に投稿が予約されています"
|
||||||
|
schedule: "予約"
|
||||||
|
scheduled: "予約"
|
||||||
|
|
||||||
|
_compression:
|
||||||
|
_quality:
|
||||||
|
high: "高品質"
|
||||||
|
medium: "中品質"
|
||||||
|
low: "低品質"
|
||||||
|
_size:
|
||||||
|
large: "サイズ大"
|
||||||
|
medium: "サイズ中"
|
||||||
|
small: "サイズ小"
|
||||||
|
|
||||||
_order:
|
_order:
|
||||||
newest: "新しい順"
|
newest: "新しい順"
|
||||||
|
@ -2043,6 +2062,7 @@ _role:
|
||||||
uploadableFileTypes_caption: "MIMEタイプを指定します。改行で区切って複数指定できるほか、アスタリスク(*)でワイルドカード指定できます。(例: image/*)"
|
uploadableFileTypes_caption: "MIMEタイプを指定します。改行で区切って複数指定できるほか、アスタリスク(*)でワイルドカード指定できます。(例: image/*)"
|
||||||
uploadableFileTypes_caption2: "ファイルによっては種別を判定できないことがあります。そのようなファイルを許可する場合は {x} を指定に追加してください。"
|
uploadableFileTypes_caption2: "ファイルによっては種別を判定できないことがあります。そのようなファイルを許可する場合は {x} を指定に追加してください。"
|
||||||
noteDraftLimit: "サーバーサイドのノートの下書きの作成可能数"
|
noteDraftLimit: "サーバーサイドのノートの下書きの作成可能数"
|
||||||
|
scheduledNoteLimit: "予約投稿の同時作成可能数"
|
||||||
watermarkAvailable: "ウォーターマーク機能の使用可否"
|
watermarkAvailable: "ウォーターマーク機能の使用可否"
|
||||||
_condition:
|
_condition:
|
||||||
roleAssignedTo: "マニュアルロールにアサイン済み"
|
roleAssignedTo: "マニュアルロールにアサイン済み"
|
||||||
|
@ -2715,6 +2735,8 @@ _notification:
|
||||||
youReceivedFollowRequest: "フォローリクエストが来ました"
|
youReceivedFollowRequest: "フォローリクエストが来ました"
|
||||||
yourFollowRequestAccepted: "フォローリクエストが承認されました"
|
yourFollowRequestAccepted: "フォローリクエストが承認されました"
|
||||||
pollEnded: "アンケートの結果が出ました"
|
pollEnded: "アンケートの結果が出ました"
|
||||||
|
scheduledNotePosted: "予約ノートが投稿されました"
|
||||||
|
scheduledNotePostFailed: "予約ノートの投稿に失敗しました"
|
||||||
newNote: "新しい投稿"
|
newNote: "新しい投稿"
|
||||||
unreadAntennaNote: "アンテナ {name}"
|
unreadAntennaNote: "アンテナ {name}"
|
||||||
roleAssigned: "ロールが付与されました"
|
roleAssigned: "ロールが付与されました"
|
||||||
|
@ -3307,6 +3329,7 @@ _imageEffector:
|
||||||
invert: "色の反転"
|
invert: "色の反転"
|
||||||
grayscale: "白黒"
|
grayscale: "白黒"
|
||||||
blur: "ぼかし"
|
blur: "ぼかし"
|
||||||
|
pixelate: "モザイク"
|
||||||
colorAdjust: "色調補正"
|
colorAdjust: "色調補正"
|
||||||
colorClamp: "色の圧縮"
|
colorClamp: "色の圧縮"
|
||||||
colorClampAdvanced: "色の圧縮(高度)"
|
colorClampAdvanced: "色の圧縮(高度)"
|
||||||
|
@ -3372,6 +3395,9 @@ _drafts:
|
||||||
restoreFromDraft: "下書きから復元"
|
restoreFromDraft: "下書きから復元"
|
||||||
restore: "復元"
|
restore: "復元"
|
||||||
listDrafts: "下書き一覧"
|
listDrafts: "下書き一覧"
|
||||||
|
schedule: "投稿予約"
|
||||||
|
listScheduledNotes: "予約投稿一覧"
|
||||||
|
cancelSchedule: "予約解除"
|
||||||
|
|
||||||
qr: "二次元コード"
|
qr: "二次元コード"
|
||||||
_qr:
|
_qr:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "2025.9.1-alpha.1",
|
"version": "2025.9.1-alpha.2",
|
||||||
"codename": "nasubi",
|
"codename": "nasubi",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
export class ScheduledPost1758677617888 {
|
||||||
|
name = 'ScheduledPost1758677617888'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {QueryRunner} queryRunner
|
||||||
|
*/
|
||||||
|
async up(queryRunner) {
|
||||||
|
await queryRunner.query(`ALTER TABLE "note_draft" ADD "scheduledAt" TIMESTAMP WITH TIME ZONE`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "note_draft" ADD "isActuallyScheduled" boolean NOT NULL DEFAULT false`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {QueryRunner} queryRunner
|
||||||
|
*/
|
||||||
|
async down(queryRunner) {
|
||||||
|
await queryRunner.query(`ALTER TABLE "note_draft" DROP COLUMN "isActuallyScheduled"`);
|
||||||
|
await queryRunner.query(`ALTER TABLE "note_draft" DROP COLUMN "scheduledAt"`);
|
||||||
|
}
|
||||||
|
}
|
|
@ -13,7 +13,7 @@ import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mf
|
||||||
import { extractHashtags } from '@/misc/extract-hashtags.js';
|
import { extractHashtags } from '@/misc/extract-hashtags.js';
|
||||||
import type { IMentionedRemoteUsers } from '@/models/Note.js';
|
import type { IMentionedRemoteUsers } from '@/models/Note.js';
|
||||||
import { MiNote } from '@/models/Note.js';
|
import { MiNote } from '@/models/Note.js';
|
||||||
import type { ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
|
import type { BlockingsRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, FollowingsRepository, InstancesRepository, MiFollowing, MiMeta, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
|
||||||
import type { MiDriveFile } from '@/models/DriveFile.js';
|
import type { MiDriveFile } from '@/models/DriveFile.js';
|
||||||
import type { MiApp } from '@/models/App.js';
|
import type { MiApp } from '@/models/App.js';
|
||||||
import { concat } from '@/misc/prelude/array.js';
|
import { concat } from '@/misc/prelude/array.js';
|
||||||
|
@ -56,6 +56,7 @@ import { trackPromise } from '@/misc/promise-tracker.js';
|
||||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
||||||
import { CollapsedQueue } from '@/misc/collapsed-queue.js';
|
import { CollapsedQueue } from '@/misc/collapsed-queue.js';
|
||||||
import { CacheService } from '@/core/CacheService.js';
|
import { CacheService } from '@/core/CacheService.js';
|
||||||
|
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
||||||
|
|
||||||
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
|
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
|
||||||
|
|
||||||
|
@ -192,6 +193,12 @@ export class NoteCreateService implements OnApplicationShutdown {
|
||||||
@Inject(DI.channelFollowingsRepository)
|
@Inject(DI.channelFollowingsRepository)
|
||||||
private channelFollowingsRepository: ChannelFollowingsRepository,
|
private channelFollowingsRepository: ChannelFollowingsRepository,
|
||||||
|
|
||||||
|
@Inject(DI.blockingsRepository)
|
||||||
|
private blockingsRepository: BlockingsRepository,
|
||||||
|
|
||||||
|
@Inject(DI.driveFilesRepository)
|
||||||
|
private driveFilesRepository: DriveFilesRepository,
|
||||||
|
|
||||||
private userEntityService: UserEntityService,
|
private userEntityService: UserEntityService,
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
|
@ -221,6 +228,167 @@ export class NoteCreateService implements OnApplicationShutdown {
|
||||||
this.updateNotesCountQueue = new CollapsedQueue(process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
|
this.updateNotesCountQueue = new CollapsedQueue(process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
public async fetchAndCreate(user: {
|
||||||
|
id: MiUser['id'];
|
||||||
|
username: MiUser['username'];
|
||||||
|
host: MiUser['host'];
|
||||||
|
isBot: MiUser['isBot'];
|
||||||
|
isCat: MiUser['isCat'];
|
||||||
|
}, data: {
|
||||||
|
createdAt: Date;
|
||||||
|
replyId: MiNote['id'] | null;
|
||||||
|
renoteId: MiNote['id'] | null;
|
||||||
|
fileIds: MiDriveFile['id'][];
|
||||||
|
text: string | null;
|
||||||
|
cw: string | null;
|
||||||
|
visibility: string;
|
||||||
|
visibleUserIds: MiUser['id'][];
|
||||||
|
channelId: MiChannel['id'] | null;
|
||||||
|
localOnly: boolean;
|
||||||
|
reactionAcceptance: MiNote['reactionAcceptance'];
|
||||||
|
poll: IPoll | null;
|
||||||
|
apMentions?: MinimumUser[] | null;
|
||||||
|
apHashtags?: string[] | null;
|
||||||
|
apEmojis?: string[] | null;
|
||||||
|
}): Promise<MiNote> {
|
||||||
|
const visibleUsers = data.visibleUserIds.length > 0 ? await this.usersRepository.findBy({
|
||||||
|
id: In(data.visibleUserIds),
|
||||||
|
}) : [];
|
||||||
|
|
||||||
|
let files: MiDriveFile[] = [];
|
||||||
|
if (data.fileIds.length > 0) {
|
||||||
|
files = await this.driveFilesRepository.createQueryBuilder('file')
|
||||||
|
.where('file.userId = :userId AND file.id IN (:...fileIds)', {
|
||||||
|
userId: user.id,
|
||||||
|
fileIds: data.fileIds,
|
||||||
|
})
|
||||||
|
.orderBy('array_position(ARRAY[:...fileIds], "id"::text)')
|
||||||
|
.setParameters({ fileIds: data.fileIds })
|
||||||
|
.getMany();
|
||||||
|
|
||||||
|
if (files.length !== data.fileIds.length) {
|
||||||
|
throw new IdentifiableError('801c046c-5bf5-4234-ad2b-e78fc20a2ac7', 'No such file');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let renote: MiNote | null = null;
|
||||||
|
if (data.renoteId != null) {
|
||||||
|
// Fetch renote to note
|
||||||
|
renote = await this.notesRepository.findOne({
|
||||||
|
where: { id: data.renoteId },
|
||||||
|
relations: ['user', 'renote', 'reply'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (renote == null) {
|
||||||
|
throw new IdentifiableError('53983c56-e163-45a6-942f-4ddc485d4290', 'No such renote target');
|
||||||
|
} else if (isRenote(renote) && !isQuote(renote)) {
|
||||||
|
throw new IdentifiableError('bde24c37-121f-4e7d-980d-cec52f599f02', 'Cannot renote pure renote');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check blocking
|
||||||
|
if (renote.userId !== user.id) {
|
||||||
|
const blockExist = await this.blockingsRepository.exists({
|
||||||
|
where: {
|
||||||
|
blockerId: renote.userId,
|
||||||
|
blockeeId: user.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (blockExist) {
|
||||||
|
throw new IdentifiableError('2b4fe776-4414-4a2d-ae39-f3418b8fd4d3', 'You have been blocked by the user');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (renote.visibility === 'followers' && renote.userId !== user.id) {
|
||||||
|
// 他人のfollowers noteはreject
|
||||||
|
throw new IdentifiableError('90b9d6f0-893a-4fef-b0f1-e9a33989f71a', 'Renote target visibility');
|
||||||
|
} else if (renote.visibility === 'specified') {
|
||||||
|
// specified / direct noteはreject
|
||||||
|
throw new IdentifiableError('48d7a997-da5c-4716-b3c3-92db3f37bf7d', 'Renote target visibility');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (renote.channelId && renote.channelId !== data.channelId) {
|
||||||
|
// チャンネルのノートに対しリノート要求がきたとき、チャンネル外へのリノート可否をチェック
|
||||||
|
// リノートのユースケースのうち、チャンネル内→チャンネル外は少数だと考えられるため、JOINはせず必要な時に都度取得する
|
||||||
|
const renoteChannel = await this.channelsRepository.findOneBy({ id: renote.channelId });
|
||||||
|
if (renoteChannel == null) {
|
||||||
|
// リノートしたいノートが書き込まれているチャンネルが無い
|
||||||
|
throw new IdentifiableError('b060f9a6-8909-4080-9e0b-94d9fa6f6a77', 'No such channel');
|
||||||
|
} else if (!renoteChannel.allowRenoteToExternal) {
|
||||||
|
// リノート作成のリクエストだが、対象チャンネルがリノート禁止だった場合
|
||||||
|
throw new IdentifiableError('7e435f4a-780d-4cfc-a15a-42519bd6fb67', 'Channel does not allow renote to external');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let reply: MiNote | null = null;
|
||||||
|
if (data.replyId != null) {
|
||||||
|
// Fetch reply
|
||||||
|
reply = await this.notesRepository.findOne({
|
||||||
|
where: { id: data.replyId },
|
||||||
|
relations: ['user'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (reply == null) {
|
||||||
|
throw new IdentifiableError('60142edb-1519-408e-926d-4f108d27bee0', 'No such reply target');
|
||||||
|
} else if (isRenote(reply) && !isQuote(reply)) {
|
||||||
|
throw new IdentifiableError('f089e4e2-c0e7-4f60-8a23-e5a6bf786b36', 'Cannot reply to pure renote');
|
||||||
|
} else if (!await this.noteEntityService.isVisibleForMe(reply, user.id)) {
|
||||||
|
throw new IdentifiableError('11cd37b3-a411-4f77-8633-c580ce6a8dce', 'No such reply target');
|
||||||
|
} else if (reply.visibility === 'specified' && data.visibility !== 'specified') {
|
||||||
|
throw new IdentifiableError('ced780a1-2012-4caf-bc7e-a95a291294cb', 'Cannot reply to specified note with different visibility');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check blocking
|
||||||
|
if (reply.userId !== user.id) {
|
||||||
|
const blockExist = await this.blockingsRepository.exists({
|
||||||
|
where: {
|
||||||
|
blockerId: reply.userId,
|
||||||
|
blockeeId: user.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (blockExist) {
|
||||||
|
throw new IdentifiableError('b0df6025-f2e8-44b4-a26a-17ad99104612', 'You have been blocked by the user');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.poll) {
|
||||||
|
if (data.poll.expiresAt != null) {
|
||||||
|
if (data.poll.expiresAt.getTime() < Date.now()) {
|
||||||
|
throw new IdentifiableError('0c11c11e-0c8d-48e7-822c-76ccef660068', 'Poll expiration must be future time');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let channel: MiChannel | null = null;
|
||||||
|
if (data.channelId != null) {
|
||||||
|
channel = await this.channelsRepository.findOneBy({ id: data.channelId, isArchived: false });
|
||||||
|
|
||||||
|
if (channel == null) {
|
||||||
|
throw new IdentifiableError('bfa3905b-25f5-4894-b430-da331a490e4b', 'No such channel');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.create(user, {
|
||||||
|
createdAt: data.createdAt,
|
||||||
|
files: files,
|
||||||
|
poll: data.poll,
|
||||||
|
text: data.text,
|
||||||
|
reply,
|
||||||
|
renote,
|
||||||
|
cw: data.cw,
|
||||||
|
localOnly: data.localOnly,
|
||||||
|
reactionAcceptance: data.reactionAcceptance,
|
||||||
|
visibility: data.visibility,
|
||||||
|
visibleUsers,
|
||||||
|
channel,
|
||||||
|
apMentions: data.apMentions,
|
||||||
|
apHashtags: data.apHashtags,
|
||||||
|
apEmojis: data.apEmojis,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public async create(user: {
|
public async create(user: {
|
||||||
id: MiUser['id'];
|
id: MiUser['id'];
|
||||||
|
|
|
@ -5,32 +5,18 @@
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import { In } from 'typeorm';
|
import { In } from 'typeorm';
|
||||||
import type { noteVisibilities, noteReactionAcceptances } from '@/types.js';
|
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import type { MiNoteDraft, NoteDraftsRepository, MiNote, MiDriveFile, MiChannel, UsersRepository, DriveFilesRepository, NotesRepository, BlockingsRepository, ChannelsRepository } from '@/models/_.js';
|
import type { MiNoteDraft, NoteDraftsRepository, MiNote, MiDriveFile, MiChannel, UsersRepository, DriveFilesRepository, NotesRepository, BlockingsRepository, ChannelsRepository } from '@/models/_.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { RoleService } from '@/core/RoleService.js';
|
import { RoleService } from '@/core/RoleService.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
import type { MiLocalUser, MiUser } from '@/models/User.js';
|
import type { MiLocalUser, MiUser } from '@/models/User.js';
|
||||||
import { IPoll } from '@/models/Poll.js';
|
|
||||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
||||||
import { isRenote, isQuote } from '@/misc/is-renote.js';
|
import { isRenote, isQuote } from '@/misc/is-renote.js';
|
||||||
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
||||||
|
import { QueueService } from '@/core/QueueService.js';
|
||||||
|
|
||||||
export type NoteDraftOptions = {
|
export type NoteDraftOptions = Omit<MiNoteDraft, 'id' | 'userId' | 'user' | 'reply' | 'renote' | 'channel'>;
|
||||||
replyId?: MiNote['id'] | null;
|
|
||||||
renoteId?: MiNote['id'] | null;
|
|
||||||
text?: string | null;
|
|
||||||
cw?: string | null;
|
|
||||||
localOnly?: boolean | null;
|
|
||||||
reactionAcceptance?: typeof noteReactionAcceptances[number];
|
|
||||||
visibility?: typeof noteVisibilities[number];
|
|
||||||
fileIds?: MiDriveFile['id'][];
|
|
||||||
visibleUserIds?: MiUser['id'][];
|
|
||||||
hashtag?: string;
|
|
||||||
channelId?: MiChannel['id'] | null;
|
|
||||||
poll?: (IPoll & { expiredAfter?: number | null }) | null;
|
|
||||||
};
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class NoteDraftService {
|
export class NoteDraftService {
|
||||||
|
@ -56,6 +42,7 @@ export class NoteDraftService {
|
||||||
private roleService: RoleService,
|
private roleService: RoleService,
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
|
private queueService: QueueService,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,36 +59,43 @@ export class NoteDraftService {
|
||||||
@bindThis
|
@bindThis
|
||||||
public async create(me: MiLocalUser, data: NoteDraftOptions): Promise<MiNoteDraft> {
|
public async create(me: MiLocalUser, data: NoteDraftOptions): Promise<MiNoteDraft> {
|
||||||
//#region check draft limit
|
//#region check draft limit
|
||||||
|
const policies = await this.roleService.getUserPolicies(me.id);
|
||||||
|
|
||||||
const currentCount = await this.noteDraftsRepository.countBy({
|
const currentCount = await this.noteDraftsRepository.countBy({
|
||||||
userId: me.id,
|
userId: me.id,
|
||||||
});
|
});
|
||||||
if (currentCount >= (await this.roleService.getUserPolicies(me.id)).noteDraftLimit) {
|
if (currentCount >= policies.noteDraftLimit) {
|
||||||
throw new IdentifiableError('9ee33bbe-fde3-4c71-9b51-e50492c6b9c8', 'Too many drafts');
|
throw new IdentifiableError('9ee33bbe-fde3-4c71-9b51-e50492c6b9c8', 'Too many drafts');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data.isActuallyScheduled) {
|
||||||
|
const currentScheduledCount = await this.noteDraftsRepository.countBy({
|
||||||
|
userId: me.id,
|
||||||
|
isActuallyScheduled: true,
|
||||||
|
});
|
||||||
|
if (currentScheduledCount >= policies.scheduledNoteLimit) {
|
||||||
|
throw new IdentifiableError('c3275f19-4558-4c59-83e1-4f684b5fab66', 'Too many scheduled notes');
|
||||||
|
}
|
||||||
|
}
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
if (data.poll) {
|
await this.validate(me, data);
|
||||||
if (typeof data.poll.expiresAt === 'number') {
|
|
||||||
if (data.poll.expiresAt < Date.now()) {
|
const draft = await this.noteDraftsRepository.insertOne({
|
||||||
throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
|
...data,
|
||||||
}
|
id: this.idService.gen(),
|
||||||
} else if (typeof data.poll.expiredAfter === 'number') {
|
userId: me.id,
|
||||||
data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
|
});
|
||||||
}
|
|
||||||
|
if (draft.scheduledAt && draft.isActuallyScheduled) {
|
||||||
|
this.schedule(draft);
|
||||||
}
|
}
|
||||||
|
|
||||||
const appliedDraft = await this.checkAndSetDraftNoteOptions(me, this.noteDraftsRepository.create(), data);
|
|
||||||
|
|
||||||
appliedDraft.id = this.idService.gen();
|
|
||||||
appliedDraft.userId = me.id;
|
|
||||||
const draft = this.noteDraftsRepository.save(appliedDraft);
|
|
||||||
|
|
||||||
return draft;
|
return draft;
|
||||||
}
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: NoteDraftOptions): Promise<MiNoteDraft> {
|
public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: Partial<NoteDraftOptions>): Promise<MiNoteDraft> {
|
||||||
const draft = await this.noteDraftsRepository.findOneBy({
|
const draft = await this.noteDraftsRepository.findOneBy({
|
||||||
id: draftId,
|
id: draftId,
|
||||||
userId: me.id,
|
userId: me.id,
|
||||||
|
@ -111,19 +105,36 @@ export class NoteDraftService {
|
||||||
throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
|
throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.poll) {
|
//#region check draft limit
|
||||||
if (typeof data.poll.expiresAt === 'number') {
|
const policies = await this.roleService.getUserPolicies(me.id);
|
||||||
if (data.poll.expiresAt < Date.now()) {
|
|
||||||
throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
|
if (!draft.isActuallyScheduled && data.isActuallyScheduled) {
|
||||||
}
|
const currentScheduledCount = await this.noteDraftsRepository.countBy({
|
||||||
} else if (typeof data.poll.expiredAfter === 'number') {
|
userId: me.id,
|
||||||
data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
|
isActuallyScheduled: true,
|
||||||
|
});
|
||||||
|
if (currentScheduledCount >= policies.scheduledNoteLimit) {
|
||||||
|
throw new IdentifiableError('bacdf856-5c51-4159-b88a-804fa5103be5', 'Too many scheduled notes');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//#endregion
|
||||||
|
|
||||||
const appliedDraft = await this.checkAndSetDraftNoteOptions(me, draft, data);
|
await this.validate(me, data);
|
||||||
|
|
||||||
return await this.noteDraftsRepository.save(appliedDraft);
|
const updatedDraft = await this.noteDraftsRepository.createQueryBuilder().update()
|
||||||
|
.set(data)
|
||||||
|
.where('id = :id', { id: draftId })
|
||||||
|
.returning('*')
|
||||||
|
.execute()
|
||||||
|
.then((response) => response.raw[0]);
|
||||||
|
|
||||||
|
this.clearSchedule(draftId).then(() => {
|
||||||
|
if (updatedDraft.scheduledAt != null && updatedDraft.isActuallyScheduled) {
|
||||||
|
this.schedule(updatedDraft);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return updatedDraft;
|
||||||
}
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
|
@ -138,6 +149,8 @@ export class NoteDraftService {
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.noteDraftsRepository.delete(draft.id);
|
await this.noteDraftsRepository.delete(draft.id);
|
||||||
|
|
||||||
|
this.clearSchedule(draftId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
|
@ -154,27 +167,20 @@ export class NoteDraftService {
|
||||||
return draft;
|
return draft;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 関連エンティティを取得し紐づける部分を共通化する
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public async checkAndSetDraftNoteOptions(
|
public async validate(
|
||||||
me: MiLocalUser,
|
me: MiLocalUser,
|
||||||
draft: MiNoteDraft,
|
data: Partial<NoteDraftOptions>,
|
||||||
data: NoteDraftOptions,
|
): Promise<void> {
|
||||||
): Promise<MiNoteDraft> {
|
if (data.pollExpiresAt != null) {
|
||||||
data.visibility ??= 'public';
|
if (data.pollExpiresAt.getTime() < Date.now()) {
|
||||||
data.localOnly ??= false;
|
throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
|
||||||
if (data.reactionAcceptance === undefined) data.reactionAcceptance = null;
|
}
|
||||||
if (data.channelId != null) {
|
|
||||||
data.visibility = 'public';
|
|
||||||
data.visibleUserIds = [];
|
|
||||||
data.localOnly = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let appliedDraft = draft;
|
|
||||||
|
|
||||||
//#region visibleUsers
|
//#region visibleUsers
|
||||||
let visibleUsers: MiUser[] = [];
|
let visibleUsers: MiUser[] = [];
|
||||||
if (data.visibleUserIds != null) {
|
if (data.visibleUserIds != null && data.visibleUserIds.length > 0) {
|
||||||
visibleUsers = await this.usersRepository.findBy({
|
visibleUsers = await this.usersRepository.findBy({
|
||||||
id: In(data.visibleUserIds),
|
id: In(data.visibleUserIds),
|
||||||
});
|
});
|
||||||
|
@ -184,7 +190,7 @@ export class NoteDraftService {
|
||||||
//#region files
|
//#region files
|
||||||
let files: MiDriveFile[] = [];
|
let files: MiDriveFile[] = [];
|
||||||
const fileIds = data.fileIds ?? null;
|
const fileIds = data.fileIds ?? null;
|
||||||
if (fileIds != null) {
|
if (fileIds != null && fileIds.length > 0) {
|
||||||
files = await this.driveFilesRepository.createQueryBuilder('file')
|
files = await this.driveFilesRepository.createQueryBuilder('file')
|
||||||
.where('file.userId = :userId AND file.id IN (:...fileIds)', {
|
.where('file.userId = :userId AND file.id IN (:...fileIds)', {
|
||||||
userId: me.id,
|
userId: me.id,
|
||||||
|
@ -288,27 +294,37 @@ export class NoteDraftService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//#endregion
|
//#endregion
|
||||||
|
}
|
||||||
|
|
||||||
appliedDraft = {
|
@bindThis
|
||||||
...appliedDraft,
|
public async schedule(draft: MiNoteDraft): Promise<void> {
|
||||||
visibility: data.visibility,
|
if (!draft.isActuallyScheduled) return;
|
||||||
cw: data.cw ?? null,
|
if (draft.scheduledAt == null) return;
|
||||||
fileIds: fileIds ?? [],
|
if (draft.scheduledAt.getTime() <= Date.now()) return;
|
||||||
replyId: data.replyId ?? null,
|
|
||||||
renoteId: data.renoteId ?? null,
|
|
||||||
channelId: data.channelId ?? null,
|
|
||||||
text: data.text ?? null,
|
|
||||||
hashtag: data.hashtag ?? null,
|
|
||||||
hasPoll: data.poll != null,
|
|
||||||
pollChoices: data.poll ? data.poll.choices : [],
|
|
||||||
pollMultiple: data.poll ? data.poll.multiple : false,
|
|
||||||
pollExpiresAt: data.poll ? data.poll.expiresAt : null,
|
|
||||||
pollExpiredAfter: data.poll ? data.poll.expiredAfter ?? null : null,
|
|
||||||
visibleUserIds: data.visibleUserIds ?? [],
|
|
||||||
localOnly: data.localOnly,
|
|
||||||
reactionAcceptance: data.reactionAcceptance,
|
|
||||||
} satisfies MiNoteDraft;
|
|
||||||
|
|
||||||
return appliedDraft;
|
const delay = draft.scheduledAt.getTime() - Date.now();
|
||||||
|
this.queueService.postScheduledNoteQueue.add(draft.id, {
|
||||||
|
noteDraftId: draft.id,
|
||||||
|
}, {
|
||||||
|
delay,
|
||||||
|
removeOnComplete: {
|
||||||
|
age: 3600 * 24 * 7, // keep up to 7 days
|
||||||
|
count: 30,
|
||||||
|
},
|
||||||
|
removeOnFail: {
|
||||||
|
age: 3600 * 24 * 7, // keep up to 7 days
|
||||||
|
count: 100,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
public async clearSchedule(draftId: MiNoteDraft['id']): Promise<void> {
|
||||||
|
const jobs = await this.queueService.postScheduledNoteQueue.getJobs(['delayed', 'waiting', 'active']);
|
||||||
|
for (const job of jobs) {
|
||||||
|
if (job.data.noteDraftId === draftId) {
|
||||||
|
await job.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,11 +16,13 @@ import {
|
||||||
RelationshipJobData,
|
RelationshipJobData,
|
||||||
UserWebhookDeliverJobData,
|
UserWebhookDeliverJobData,
|
||||||
SystemWebhookDeliverJobData,
|
SystemWebhookDeliverJobData,
|
||||||
|
PostScheduledNoteJobData,
|
||||||
} from '../queue/types.js';
|
} from '../queue/types.js';
|
||||||
import type { Provider } from '@nestjs/common';
|
import type { Provider } from '@nestjs/common';
|
||||||
|
|
||||||
export type SystemQueue = Bull.Queue<Record<string, unknown>>;
|
export type SystemQueue = Bull.Queue<Record<string, unknown>>;
|
||||||
export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
|
export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
|
||||||
|
export type PostScheduledNoteQueue = Bull.Queue<PostScheduledNoteJobData>;
|
||||||
export type DeliverQueue = Bull.Queue<DeliverJobData>;
|
export type DeliverQueue = Bull.Queue<DeliverJobData>;
|
||||||
export type InboxQueue = Bull.Queue<InboxJobData>;
|
export type InboxQueue = Bull.Queue<InboxJobData>;
|
||||||
export type DbQueue = Bull.Queue;
|
export type DbQueue = Bull.Queue;
|
||||||
|
@ -41,6 +43,12 @@ const $endedPollNotification: Provider = {
|
||||||
inject: [DI.config],
|
inject: [DI.config],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const $postScheduledNote: Provider = {
|
||||||
|
provide: 'queue:postScheduledNote',
|
||||||
|
useFactory: (config: Config) => new Bull.Queue(QUEUE.POST_SCHEDULED_NOTE, baseQueueOptions(config, QUEUE.POST_SCHEDULED_NOTE)),
|
||||||
|
inject: [DI.config],
|
||||||
|
};
|
||||||
|
|
||||||
const $deliver: Provider = {
|
const $deliver: Provider = {
|
||||||
provide: 'queue:deliver',
|
provide: 'queue:deliver',
|
||||||
useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER)),
|
useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER)),
|
||||||
|
@ -89,6 +97,7 @@ const $systemWebhookDeliver: Provider = {
|
||||||
providers: [
|
providers: [
|
||||||
$system,
|
$system,
|
||||||
$endedPollNotification,
|
$endedPollNotification,
|
||||||
|
$postScheduledNote,
|
||||||
$deliver,
|
$deliver,
|
||||||
$inbox,
|
$inbox,
|
||||||
$db,
|
$db,
|
||||||
|
@ -100,6 +109,7 @@ const $systemWebhookDeliver: Provider = {
|
||||||
exports: [
|
exports: [
|
||||||
$system,
|
$system,
|
||||||
$endedPollNotification,
|
$endedPollNotification,
|
||||||
|
$postScheduledNote,
|
||||||
$deliver,
|
$deliver,
|
||||||
$inbox,
|
$inbox,
|
||||||
$db,
|
$db,
|
||||||
|
@ -113,6 +123,7 @@ export class QueueModule implements OnApplicationShutdown {
|
||||||
constructor(
|
constructor(
|
||||||
@Inject('queue:system') public systemQueue: SystemQueue,
|
@Inject('queue:system') public systemQueue: SystemQueue,
|
||||||
@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
|
@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
|
||||||
|
@Inject('queue:postScheduledNote') public postScheduledNoteQueue: PostScheduledNoteQueue,
|
||||||
@Inject('queue:deliver') public deliverQueue: DeliverQueue,
|
@Inject('queue:deliver') public deliverQueue: DeliverQueue,
|
||||||
@Inject('queue:inbox') public inboxQueue: InboxQueue,
|
@Inject('queue:inbox') public inboxQueue: InboxQueue,
|
||||||
@Inject('queue:db') public dbQueue: DbQueue,
|
@Inject('queue:db') public dbQueue: DbQueue,
|
||||||
|
@ -129,6 +140,7 @@ export class QueueModule implements OnApplicationShutdown {
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
this.systemQueue.close(),
|
this.systemQueue.close(),
|
||||||
this.endedPollNotificationQueue.close(),
|
this.endedPollNotificationQueue.close(),
|
||||||
|
this.postScheduledNoteQueue.close(),
|
||||||
this.deliverQueue.close(),
|
this.deliverQueue.close(),
|
||||||
this.inboxQueue.close(),
|
this.inboxQueue.close(),
|
||||||
this.dbQueue.close(),
|
this.dbQueue.close(),
|
||||||
|
|
|
@ -31,6 +31,7 @@ import type {
|
||||||
DbQueue,
|
DbQueue,
|
||||||
DeliverQueue,
|
DeliverQueue,
|
||||||
EndedPollNotificationQueue,
|
EndedPollNotificationQueue,
|
||||||
|
PostScheduledNoteQueue,
|
||||||
InboxQueue,
|
InboxQueue,
|
||||||
ObjectStorageQueue,
|
ObjectStorageQueue,
|
||||||
RelationshipQueue,
|
RelationshipQueue,
|
||||||
|
@ -44,6 +45,7 @@ import type * as Bull from 'bullmq';
|
||||||
export const QUEUE_TYPES = [
|
export const QUEUE_TYPES = [
|
||||||
'system',
|
'system',
|
||||||
'endedPollNotification',
|
'endedPollNotification',
|
||||||
|
'postScheduledNote',
|
||||||
'deliver',
|
'deliver',
|
||||||
'inbox',
|
'inbox',
|
||||||
'db',
|
'db',
|
||||||
|
@ -92,6 +94,7 @@ export class QueueService {
|
||||||
|
|
||||||
@Inject('queue:system') public systemQueue: SystemQueue,
|
@Inject('queue:system') public systemQueue: SystemQueue,
|
||||||
@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
|
@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
|
||||||
|
@Inject('queue:postScheduledNote') public postScheduledNoteQueue: PostScheduledNoteQueue,
|
||||||
@Inject('queue:deliver') public deliverQueue: DeliverQueue,
|
@Inject('queue:deliver') public deliverQueue: DeliverQueue,
|
||||||
@Inject('queue:inbox') public inboxQueue: InboxQueue,
|
@Inject('queue:inbox') public inboxQueue: InboxQueue,
|
||||||
@Inject('queue:db') public dbQueue: DbQueue,
|
@Inject('queue:db') public dbQueue: DbQueue,
|
||||||
|
@ -717,6 +720,7 @@ export class QueueService {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'system': return this.systemQueue;
|
case 'system': return this.systemQueue;
|
||||||
case 'endedPollNotification': return this.endedPollNotificationQueue;
|
case 'endedPollNotification': return this.endedPollNotificationQueue;
|
||||||
|
case 'postScheduledNote': return this.postScheduledNoteQueue;
|
||||||
case 'deliver': return this.deliverQueue;
|
case 'deliver': return this.deliverQueue;
|
||||||
case 'inbox': return this.inboxQueue;
|
case 'inbox': return this.inboxQueue;
|
||||||
case 'db': return this.dbQueue;
|
case 'db': return this.dbQueue;
|
||||||
|
|
|
@ -69,6 +69,7 @@ export type RolePolicies = {
|
||||||
chatAvailability: 'available' | 'readonly' | 'unavailable';
|
chatAvailability: 'available' | 'readonly' | 'unavailable';
|
||||||
uploadableFileTypes: string[];
|
uploadableFileTypes: string[];
|
||||||
noteDraftLimit: number;
|
noteDraftLimit: number;
|
||||||
|
scheduledNoteLimit: number;
|
||||||
watermarkAvailable: boolean;
|
watermarkAvailable: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -116,6 +117,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
|
||||||
'audio/*',
|
'audio/*',
|
||||||
],
|
],
|
||||||
noteDraftLimit: 10,
|
noteDraftLimit: 10,
|
||||||
|
scheduledNoteLimit: 1,
|
||||||
watermarkAvailable: true,
|
watermarkAvailable: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -440,6 +442,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
|
||||||
return [...set];
|
return [...set];
|
||||||
}),
|
}),
|
||||||
noteDraftLimit: calc('noteDraftLimit', vs => Math.max(...vs)),
|
noteDraftLimit: calc('noteDraftLimit', vs => Math.max(...vs)),
|
||||||
|
scheduledNoteLimit: calc('scheduledNoteLimit', vs => Math.max(...vs)),
|
||||||
watermarkAvailable: calc('watermarkAvailable', vs => vs.some(v => v === true)),
|
watermarkAvailable: calc('watermarkAvailable', vs => vs.some(v => v === true)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,6 +105,8 @@ export class NoteDraftEntityService implements OnModuleInit {
|
||||||
const packed: Packed<'NoteDraft'> = await awaitAll({
|
const packed: Packed<'NoteDraft'> = await awaitAll({
|
||||||
id: noteDraft.id,
|
id: noteDraft.id,
|
||||||
createdAt: this.idService.parse(noteDraft.id).date.toISOString(),
|
createdAt: this.idService.parse(noteDraft.id).date.toISOString(),
|
||||||
|
scheduledAt: noteDraft.scheduledAt?.getTime() ?? null,
|
||||||
|
isActuallyScheduled: noteDraft.isActuallyScheduled,
|
||||||
userId: noteDraft.userId,
|
userId: noteDraft.userId,
|
||||||
user: packedUsers?.get(noteDraft.userId) ?? this.userEntityService.pack(noteDraft.user ?? noteDraft.userId, me),
|
user: packedUsers?.get(noteDraft.userId) ?? this.userEntityService.pack(noteDraft.user ?? noteDraft.userId, me),
|
||||||
text: text,
|
text: text,
|
||||||
|
@ -112,13 +114,13 @@ export class NoteDraftEntityService implements OnModuleInit {
|
||||||
visibility: noteDraft.visibility,
|
visibility: noteDraft.visibility,
|
||||||
localOnly: noteDraft.localOnly,
|
localOnly: noteDraft.localOnly,
|
||||||
reactionAcceptance: noteDraft.reactionAcceptance,
|
reactionAcceptance: noteDraft.reactionAcceptance,
|
||||||
visibleUserIds: noteDraft.visibility === 'specified' ? noteDraft.visibleUserIds : undefined,
|
visibleUserIds: noteDraft.visibleUserIds,
|
||||||
hashtag: noteDraft.hashtag ?? undefined,
|
hashtag: noteDraft.hashtag,
|
||||||
fileIds: noteDraft.fileIds,
|
fileIds: noteDraft.fileIds,
|
||||||
files: packedFiles != null ? this.packAttachedFiles(noteDraft.fileIds, packedFiles) : this.driveFileEntityService.packManyByIds(noteDraft.fileIds),
|
files: packedFiles != null ? this.packAttachedFiles(noteDraft.fileIds, packedFiles) : this.driveFileEntityService.packManyByIds(noteDraft.fileIds),
|
||||||
replyId: noteDraft.replyId,
|
replyId: noteDraft.replyId,
|
||||||
renoteId: noteDraft.renoteId,
|
renoteId: noteDraft.renoteId,
|
||||||
channelId: noteDraft.channelId ?? undefined,
|
channelId: noteDraft.channelId,
|
||||||
channel: channel ? {
|
channel: channel ? {
|
||||||
id: channel.id,
|
id: channel.id,
|
||||||
name: channel.name,
|
name: channel.name,
|
||||||
|
@ -127,6 +129,12 @@ export class NoteDraftEntityService implements OnModuleInit {
|
||||||
allowRenoteToExternal: channel.allowRenoteToExternal,
|
allowRenoteToExternal: channel.allowRenoteToExternal,
|
||||||
userId: channel.userId,
|
userId: channel.userId,
|
||||||
} : undefined,
|
} : undefined,
|
||||||
|
poll: noteDraft.hasPoll ? {
|
||||||
|
choices: noteDraft.pollChoices,
|
||||||
|
multiple: noteDraft.pollMultiple,
|
||||||
|
expiresAt: noteDraft.pollExpiresAt?.toISOString(),
|
||||||
|
expiredAfter: noteDraft.pollExpiredAfter,
|
||||||
|
} : null,
|
||||||
|
|
||||||
...(opts.detail ? {
|
...(opts.detail ? {
|
||||||
reply: noteDraft.replyId ? nullIfEntityNotFound(this.noteEntityService.pack(noteDraft.replyId, me, {
|
reply: noteDraft.replyId ? nullIfEntityNotFound(this.noteEntityService.pack(noteDraft.replyId, me, {
|
||||||
|
@ -138,13 +146,6 @@ export class NoteDraftEntityService implements OnModuleInit {
|
||||||
detail: true,
|
detail: true,
|
||||||
skipHide: opts.skipHide,
|
skipHide: opts.skipHide,
|
||||||
})) : undefined,
|
})) : undefined,
|
||||||
|
|
||||||
poll: noteDraft.hasPoll ? {
|
|
||||||
choices: noteDraft.pollChoices,
|
|
||||||
multiple: noteDraft.pollMultiple,
|
|
||||||
expiresAt: noteDraft.pollExpiresAt?.toISOString(),
|
|
||||||
expiredAfter: noteDraft.pollExpiredAfter,
|
|
||||||
} : undefined,
|
|
||||||
} : {} ),
|
} : {} ),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,18 @@ import type { OnModuleInit } from '@nestjs/common';
|
||||||
import type { UserEntityService } from './UserEntityService.js';
|
import type { UserEntityService } from './UserEntityService.js';
|
||||||
import type { NoteEntityService } from './NoteEntityService.js';
|
import type { NoteEntityService } from './NoteEntityService.js';
|
||||||
|
|
||||||
const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'renote:grouped', 'quote', 'reaction', 'reaction:grouped', 'pollEnded'] as (typeof groupedNotificationTypes[number])[]);
|
const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set([
|
||||||
|
'note',
|
||||||
|
'mention',
|
||||||
|
'reply',
|
||||||
|
'renote',
|
||||||
|
'renote:grouped',
|
||||||
|
'quote',
|
||||||
|
'reaction',
|
||||||
|
'reaction:grouped',
|
||||||
|
'pollEnded',
|
||||||
|
'scheduledNotePosted',
|
||||||
|
] as (typeof groupedNotificationTypes[number])[]);
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class NotificationEntityService implements OnModuleInit {
|
export class NotificationEntityService implements OnModuleInit {
|
||||||
|
|
|
@ -126,7 +126,7 @@ export class MiNoteDraft {
|
||||||
@JoinColumn()
|
@JoinColumn()
|
||||||
public channel: MiChannel | null;
|
public channel: MiChannel | null;
|
||||||
|
|
||||||
// 以下、Pollについて追加
|
//#region 以下、Pollについて追加
|
||||||
|
|
||||||
@Column('boolean', {
|
@Column('boolean', {
|
||||||
default: false,
|
default: false,
|
||||||
|
@ -151,13 +151,15 @@ export class MiNoteDraft {
|
||||||
})
|
})
|
||||||
public pollExpiredAfter: number | null;
|
public pollExpiredAfter: number | null;
|
||||||
|
|
||||||
// ここまで追加
|
//#endregion
|
||||||
|
|
||||||
constructor(data: Partial<MiNoteDraft>) {
|
@Column('timestamp with time zone', {
|
||||||
if (data == null) return;
|
nullable: true,
|
||||||
|
})
|
||||||
|
public scheduledAt: Date | null;
|
||||||
|
|
||||||
for (const [k, v] of Object.entries(data)) {
|
@Column('boolean', {
|
||||||
(this as any)[k] = v;
|
default: false,
|
||||||
}
|
})
|
||||||
}
|
public isActuallyScheduled: boolean;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import { MiNote } from './Note.js';
|
||||||
import { MiAccessToken } from './AccessToken.js';
|
import { MiAccessToken } from './AccessToken.js';
|
||||||
import { MiRole } from './Role.js';
|
import { MiRole } from './Role.js';
|
||||||
import { MiDriveFile } from './DriveFile.js';
|
import { MiDriveFile } from './DriveFile.js';
|
||||||
|
import { MiNoteDraft } from './NoteDraft.js';
|
||||||
|
|
||||||
// misskey-js の notificationTypes と同期すべし
|
// misskey-js の notificationTypes と同期すべし
|
||||||
export type MiNotification = {
|
export type MiNotification = {
|
||||||
|
@ -60,6 +61,16 @@ export type MiNotification = {
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
notifierId: MiUser['id'];
|
notifierId: MiUser['id'];
|
||||||
noteId: MiNote['id'];
|
noteId: MiNote['id'];
|
||||||
|
} | {
|
||||||
|
type: 'scheduledNotePosted';
|
||||||
|
id: string;
|
||||||
|
createdAt: string;
|
||||||
|
noteId: MiNote['id'];
|
||||||
|
} | {
|
||||||
|
type: 'scheduledNotePostFailed';
|
||||||
|
id: string;
|
||||||
|
createdAt: string;
|
||||||
|
noteDraftId: MiNoteDraft['id'];
|
||||||
} | {
|
} | {
|
||||||
type: 'receiveFollowRequest';
|
type: 'receiveFollowRequest';
|
||||||
id: string;
|
id: string;
|
||||||
|
|
|
@ -23,7 +23,7 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
cw: {
|
cw: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: true, nullable: true,
|
optional: false, nullable: true,
|
||||||
},
|
},
|
||||||
userId: {
|
userId: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
@ -37,27 +37,23 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
replyId: {
|
replyId: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: true, nullable: true,
|
optional: false, nullable: true,
|
||||||
format: 'id',
|
format: 'id',
|
||||||
example: 'xxxxxxxxxx',
|
|
||||||
},
|
},
|
||||||
renoteId: {
|
renoteId: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: true, nullable: true,
|
optional: false, nullable: true,
|
||||||
format: 'id',
|
format: 'id',
|
||||||
example: 'xxxxxxxxxx',
|
|
||||||
},
|
},
|
||||||
reply: {
|
reply: {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
optional: true, nullable: true,
|
optional: true, nullable: true,
|
||||||
ref: 'Note',
|
ref: 'Note',
|
||||||
description: 'The reply target note contents if exists. If the reply target has been deleted since the draft was created, this will be null while replyId is not null.',
|
|
||||||
},
|
},
|
||||||
renote: {
|
renote: {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
optional: true, nullable: true,
|
optional: true, nullable: true,
|
||||||
ref: 'Note',
|
ref: 'Note',
|
||||||
description: 'The renote target note contents if exists. If the renote target has been deleted since the draft was created, this will be null while renoteId is not null.',
|
|
||||||
},
|
},
|
||||||
visibility: {
|
visibility: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
@ -66,7 +62,7 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
visibleUserIds: {
|
visibleUserIds: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
optional: true, nullable: false,
|
optional: false, nullable: false,
|
||||||
items: {
|
items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: false, nullable: false,
|
optional: false, nullable: false,
|
||||||
|
@ -75,7 +71,7 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
fileIds: {
|
fileIds: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
optional: true, nullable: false,
|
optional: false, nullable: false,
|
||||||
items: {
|
items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: false, nullable: false,
|
optional: false, nullable: false,
|
||||||
|
@ -93,11 +89,11 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
hashtag: {
|
hashtag: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: true, nullable: false,
|
optional: false, nullable: true,
|
||||||
},
|
},
|
||||||
poll: {
|
poll: {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
optional: true, nullable: true,
|
optional: false, nullable: true,
|
||||||
properties: {
|
properties: {
|
||||||
expiresAt: {
|
expiresAt: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
@ -124,9 +120,8 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
channelId: {
|
channelId: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: true, nullable: true,
|
optional: false, nullable: true,
|
||||||
format: 'id',
|
format: 'id',
|
||||||
example: 'xxxxxxxxxx',
|
|
||||||
},
|
},
|
||||||
channel: {
|
channel: {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
|
@ -160,12 +155,20 @@ export const packedNoteDraftSchema = {
|
||||||
},
|
},
|
||||||
localOnly: {
|
localOnly: {
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
optional: true, nullable: false,
|
optional: false, nullable: false,
|
||||||
},
|
},
|
||||||
reactionAcceptance: {
|
reactionAcceptance: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
optional: false, nullable: true,
|
optional: false, nullable: true,
|
||||||
enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote', null],
|
enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote', null],
|
||||||
},
|
},
|
||||||
|
scheduledAt: {
|
||||||
|
type: 'number',
|
||||||
|
optional: false, nullable: true,
|
||||||
|
},
|
||||||
|
isActuallyScheduled: {
|
||||||
|
type: 'boolean',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
|
@ -207,6 +207,36 @@ export const packedNotificationSchema = {
|
||||||
optional: false, nullable: false,
|
optional: false, nullable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
...baseSchema.properties,
|
||||||
|
type: {
|
||||||
|
type: 'string',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
enum: ['scheduledNotePosted'],
|
||||||
|
},
|
||||||
|
note: {
|
||||||
|
type: 'object',
|
||||||
|
ref: 'Note',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
...baseSchema.properties,
|
||||||
|
type: {
|
||||||
|
type: 'string',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
enum: ['scheduledNotePostFailed'],
|
||||||
|
},
|
||||||
|
noteDraft: {
|
||||||
|
type: 'object',
|
||||||
|
ref: 'NoteDraft',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
}, {
|
}, {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
properties: {
|
properties: {
|
||||||
|
|
|
@ -317,6 +317,10 @@ export const packedRolePoliciesSchema = {
|
||||||
type: 'integer',
|
type: 'integer',
|
||||||
optional: false, nullable: false,
|
optional: false, nullable: false,
|
||||||
},
|
},
|
||||||
|
scheduledNoteLimit: {
|
||||||
|
type: 'integer',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
},
|
||||||
watermarkAvailable: {
|
watermarkAvailable: {
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
optional: false, nullable: false,
|
optional: false, nullable: false,
|
||||||
|
|
|
@ -609,6 +609,8 @@ export const packedMeDetailedOnlySchema = {
|
||||||
quote: { optional: true, ...notificationRecieveConfig },
|
quote: { optional: true, ...notificationRecieveConfig },
|
||||||
reaction: { optional: true, ...notificationRecieveConfig },
|
reaction: { optional: true, ...notificationRecieveConfig },
|
||||||
pollEnded: { optional: true, ...notificationRecieveConfig },
|
pollEnded: { optional: true, ...notificationRecieveConfig },
|
||||||
|
scheduledNotePosted: { optional: true, ...notificationRecieveConfig },
|
||||||
|
scheduledNotePostFailed: { optional: true, ...notificationRecieveConfig },
|
||||||
receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
|
receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
|
||||||
followRequestAccepted: { optional: true, ...notificationRecieveConfig },
|
followRequestAccepted: { optional: true, ...notificationRecieveConfig },
|
||||||
roleAssigned: { optional: true, ...notificationRecieveConfig },
|
roleAssigned: { optional: true, ...notificationRecieveConfig },
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { QueueLoggerService } from './QueueLoggerService.js';
|
||||||
import { QueueProcessorService } from './QueueProcessorService.js';
|
import { QueueProcessorService } from './QueueProcessorService.js';
|
||||||
import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
|
import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
|
||||||
import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
|
import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
|
||||||
|
import { PostScheduledNoteProcessorService } from './processors/PostScheduledNoteProcessorService.js';
|
||||||
import { InboxProcessorService } from './processors/InboxProcessorService.js';
|
import { InboxProcessorService } from './processors/InboxProcessorService.js';
|
||||||
import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
|
import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
|
||||||
import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
|
import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
|
||||||
|
@ -79,6 +80,7 @@ import { RelationshipProcessorService } from './processors/RelationshipProcessor
|
||||||
UserWebhookDeliverProcessorService,
|
UserWebhookDeliverProcessorService,
|
||||||
SystemWebhookDeliverProcessorService,
|
SystemWebhookDeliverProcessorService,
|
||||||
EndedPollNotificationProcessorService,
|
EndedPollNotificationProcessorService,
|
||||||
|
PostScheduledNoteProcessorService,
|
||||||
DeliverProcessorService,
|
DeliverProcessorService,
|
||||||
InboxProcessorService,
|
InboxProcessorService,
|
||||||
AggregateRetentionProcessorService,
|
AggregateRetentionProcessorService,
|
||||||
|
|
|
@ -14,6 +14,7 @@ import { CheckModeratorsActivityProcessorService } from '@/queue/processors/Chec
|
||||||
import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
|
import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
|
||||||
import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
|
import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
|
||||||
import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
|
import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js';
|
||||||
|
import { PostScheduledNoteProcessorService } from './processors/PostScheduledNoteProcessorService.js';
|
||||||
import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
|
import { DeliverProcessorService } from './processors/DeliverProcessorService.js';
|
||||||
import { InboxProcessorService } from './processors/InboxProcessorService.js';
|
import { InboxProcessorService } from './processors/InboxProcessorService.js';
|
||||||
import { DeleteDriveFilesProcessorService } from './processors/DeleteDriveFilesProcessorService.js';
|
import { DeleteDriveFilesProcessorService } from './processors/DeleteDriveFilesProcessorService.js';
|
||||||
|
@ -85,6 +86,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
|
||||||
private relationshipQueueWorker: Bull.Worker;
|
private relationshipQueueWorker: Bull.Worker;
|
||||||
private objectStorageQueueWorker: Bull.Worker;
|
private objectStorageQueueWorker: Bull.Worker;
|
||||||
private endedPollNotificationQueueWorker: Bull.Worker;
|
private endedPollNotificationQueueWorker: Bull.Worker;
|
||||||
|
private postScheduledNoteQueueWorker: Bull.Worker;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@Inject(DI.config)
|
@Inject(DI.config)
|
||||||
|
@ -94,6 +96,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
|
||||||
private userWebhookDeliverProcessorService: UserWebhookDeliverProcessorService,
|
private userWebhookDeliverProcessorService: UserWebhookDeliverProcessorService,
|
||||||
private systemWebhookDeliverProcessorService: SystemWebhookDeliverProcessorService,
|
private systemWebhookDeliverProcessorService: SystemWebhookDeliverProcessorService,
|
||||||
private endedPollNotificationProcessorService: EndedPollNotificationProcessorService,
|
private endedPollNotificationProcessorService: EndedPollNotificationProcessorService,
|
||||||
|
private postScheduledNoteProcessorService: PostScheduledNoteProcessorService,
|
||||||
private deliverProcessorService: DeliverProcessorService,
|
private deliverProcessorService: DeliverProcessorService,
|
||||||
private inboxProcessorService: InboxProcessorService,
|
private inboxProcessorService: InboxProcessorService,
|
||||||
private deleteDriveFilesProcessorService: DeleteDriveFilesProcessorService,
|
private deleteDriveFilesProcessorService: DeleteDriveFilesProcessorService,
|
||||||
|
@ -520,6 +523,21 @@ export class QueueProcessorService implements OnApplicationShutdown {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
//#region post scheduled note
|
||||||
|
{
|
||||||
|
this.postScheduledNoteQueueWorker = new Bull.Worker(QUEUE.POST_SCHEDULED_NOTE, async (job) => {
|
||||||
|
if (this.config.sentryForBackend) {
|
||||||
|
return Sentry.startSpan({ name: 'Queue: PostScheduledNote' }, () => this.postScheduledNoteProcessorService.process(job));
|
||||||
|
} else {
|
||||||
|
return this.postScheduledNoteProcessorService.process(job);
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
...baseWorkerOptions(this.config, QUEUE.POST_SCHEDULED_NOTE),
|
||||||
|
autorun: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
//#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
|
@ -534,6 +552,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
|
||||||
this.relationshipQueueWorker.run(),
|
this.relationshipQueueWorker.run(),
|
||||||
this.objectStorageQueueWorker.run(),
|
this.objectStorageQueueWorker.run(),
|
||||||
this.endedPollNotificationQueueWorker.run(),
|
this.endedPollNotificationQueueWorker.run(),
|
||||||
|
this.postScheduledNoteQueueWorker.run(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -549,6 +568,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
|
||||||
this.relationshipQueueWorker.close(),
|
this.relationshipQueueWorker.close(),
|
||||||
this.objectStorageQueueWorker.close(),
|
this.objectStorageQueueWorker.close(),
|
||||||
this.endedPollNotificationQueueWorker.close(),
|
this.endedPollNotificationQueueWorker.close(),
|
||||||
|
this.postScheduledNoteQueueWorker.close(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ export const QUEUE = {
|
||||||
INBOX: 'inbox',
|
INBOX: 'inbox',
|
||||||
SYSTEM: 'system',
|
SYSTEM: 'system',
|
||||||
ENDED_POLL_NOTIFICATION: 'endedPollNotification',
|
ENDED_POLL_NOTIFICATION: 'endedPollNotification',
|
||||||
|
POST_SCHEDULED_NOTE: 'postScheduledNote',
|
||||||
DB: 'db',
|
DB: 'db',
|
||||||
RELATIONSHIP: 'relationship',
|
RELATIONSHIP: 'relationship',
|
||||||
OBJECT_STORAGE: 'objectStorage',
|
OBJECT_STORAGE: 'objectStorage',
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
|
import type { NoteDraftsRepository } from '@/models/_.js';
|
||||||
|
import type Logger from '@/logger.js';
|
||||||
|
import { NotificationService } from '@/core/NotificationService.js';
|
||||||
|
import { bindThis } from '@/decorators.js';
|
||||||
|
import { NoteCreateService } from '@/core/NoteCreateService.js';
|
||||||
|
import { QueueLoggerService } from '../QueueLoggerService.js';
|
||||||
|
import type * as Bull from 'bullmq';
|
||||||
|
import type { PostScheduledNoteJobData } from '../types.js';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PostScheduledNoteProcessorService {
|
||||||
|
private logger: Logger;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DI.noteDraftsRepository)
|
||||||
|
private noteDraftsRepository: NoteDraftsRepository,
|
||||||
|
|
||||||
|
private noteCreateService: NoteCreateService,
|
||||||
|
private notificationService: NotificationService,
|
||||||
|
private queueLoggerService: QueueLoggerService,
|
||||||
|
) {
|
||||||
|
this.logger = this.queueLoggerService.logger.createSubLogger('post-scheduled-note');
|
||||||
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
public async process(job: Bull.Job<PostScheduledNoteJobData>): Promise<void> {
|
||||||
|
const draft = await this.noteDraftsRepository.findOne({ where: { id: job.data.noteDraftId }, relations: ['user'] });
|
||||||
|
if (draft == null || draft.user == null || draft.scheduledAt == null || !draft.isActuallyScheduled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const note = await this.noteCreateService.fetchAndCreate(draft.user, {
|
||||||
|
createdAt: new Date(),
|
||||||
|
fileIds: draft.fileIds,
|
||||||
|
poll: draft.hasPoll ? {
|
||||||
|
choices: draft.pollChoices,
|
||||||
|
multiple: draft.pollMultiple,
|
||||||
|
expiresAt: draft.pollExpiredAfter ? new Date(Date.now() + draft.pollExpiredAfter) : draft.pollExpiresAt ? new Date(draft.pollExpiresAt) : null,
|
||||||
|
} : null,
|
||||||
|
text: draft.text ?? null,
|
||||||
|
replyId: draft.replyId,
|
||||||
|
renoteId: draft.renoteId,
|
||||||
|
cw: draft.cw,
|
||||||
|
localOnly: draft.localOnly,
|
||||||
|
reactionAcceptance: draft.reactionAcceptance,
|
||||||
|
visibility: draft.visibility,
|
||||||
|
visibleUserIds: draft.visibleUserIds,
|
||||||
|
channelId: draft.channelId,
|
||||||
|
});
|
||||||
|
|
||||||
|
// await不要
|
||||||
|
this.noteDraftsRepository.remove(draft);
|
||||||
|
|
||||||
|
// await不要
|
||||||
|
this.notificationService.createNotification(draft.userId, 'scheduledNotePosted', {
|
||||||
|
noteId: note.id,
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
this.notificationService.createNotification(draft.userId, 'scheduledNotePostFailed', {
|
||||||
|
noteDraftId: draft.id,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -109,6 +109,10 @@ export type EndedPollNotificationJobData = {
|
||||||
noteId: MiNote['id'];
|
noteId: MiNote['id'];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type PostScheduledNoteJobData = {
|
||||||
|
noteDraftId: string;
|
||||||
|
};
|
||||||
|
|
||||||
export type SystemWebhookDeliverJobData<T extends SystemWebhookEventType = SystemWebhookEventType> = {
|
export type SystemWebhookDeliverJobData<T extends SystemWebhookEventType = SystemWebhookEventType> = {
|
||||||
type: T;
|
type: T;
|
||||||
content: SystemWebhookPayload<T>;
|
content: SystemWebhookPayload<T>;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, SystemQueue, UserWebhookDeliverQueue, SystemWebhookDeliverQueue } from '@/core/QueueModule.js';
|
import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, PostScheduledNoteQueue, InboxQueue, ObjectStorageQueue, SystemQueue, UserWebhookDeliverQueue, SystemWebhookDeliverQueue } from '@/core/QueueModule.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
tags: ['admin'],
|
tags: ['admin'],
|
||||||
|
@ -49,6 +49,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
constructor(
|
constructor(
|
||||||
@Inject('queue:system') public systemQueue: SystemQueue,
|
@Inject('queue:system') public systemQueue: SystemQueue,
|
||||||
@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
|
@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
|
||||||
|
@Inject('queue:postScheduledNote') public postScheduledNoteQueue: PostScheduledNoteQueue,
|
||||||
@Inject('queue:deliver') public deliverQueue: DeliverQueue,
|
@Inject('queue:deliver') public deliverQueue: DeliverQueue,
|
||||||
@Inject('queue:inbox') public inboxQueue: InboxQueue,
|
@Inject('queue:inbox') public inboxQueue: InboxQueue,
|
||||||
@Inject('queue:db') public dbQueue: DbQueue,
|
@Inject('queue:db') public dbQueue: DbQueue,
|
||||||
|
|
|
@ -103,6 +103,8 @@ export const meta = {
|
||||||
quote: { optional: true, ...notificationRecieveConfig },
|
quote: { optional: true, ...notificationRecieveConfig },
|
||||||
reaction: { optional: true, ...notificationRecieveConfig },
|
reaction: { optional: true, ...notificationRecieveConfig },
|
||||||
pollEnded: { optional: true, ...notificationRecieveConfig },
|
pollEnded: { optional: true, ...notificationRecieveConfig },
|
||||||
|
scheduledNotePosted: { optional: true, ...notificationRecieveConfig },
|
||||||
|
scheduledNotePostFailed: { optional: true, ...notificationRecieveConfig },
|
||||||
receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
|
receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
|
||||||
followRequestAccepted: { optional: true, ...notificationRecieveConfig },
|
followRequestAccepted: { optional: true, ...notificationRecieveConfig },
|
||||||
roleAssigned: { optional: true, ...notificationRecieveConfig },
|
roleAssigned: { optional: true, ...notificationRecieveConfig },
|
||||||
|
|
|
@ -209,6 +209,8 @@ export const paramDef = {
|
||||||
quote: notificationRecieveConfig,
|
quote: notificationRecieveConfig,
|
||||||
reaction: notificationRecieveConfig,
|
reaction: notificationRecieveConfig,
|
||||||
pollEnded: notificationRecieveConfig,
|
pollEnded: notificationRecieveConfig,
|
||||||
|
scheduledNotePosted: notificationRecieveConfig,
|
||||||
|
scheduledNotePostFailed: notificationRecieveConfig,
|
||||||
receiveFollowRequest: notificationRecieveConfig,
|
receiveFollowRequest: notificationRecieveConfig,
|
||||||
followRequestAccepted: notificationRecieveConfig,
|
followRequestAccepted: notificationRecieveConfig,
|
||||||
roleAssigned: notificationRecieveConfig,
|
roleAssigned: notificationRecieveConfig,
|
||||||
|
|
|
@ -6,17 +6,10 @@
|
||||||
import ms from 'ms';
|
import ms from 'ms';
|
||||||
import { In } from 'typeorm';
|
import { In } from 'typeorm';
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import type { MiUser } from '@/models/User.js';
|
|
||||||
import type { UsersRepository, NotesRepository, BlockingsRepository, DriveFilesRepository, ChannelsRepository } from '@/models/_.js';
|
|
||||||
import type { MiDriveFile } from '@/models/DriveFile.js';
|
|
||||||
import type { MiNote } from '@/models/Note.js';
|
|
||||||
import type { MiChannel } from '@/models/Channel.js';
|
|
||||||
import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
|
import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
||||||
import { NoteCreateService } from '@/core/NoteCreateService.js';
|
import { NoteCreateService } from '@/core/NoteCreateService.js';
|
||||||
import { DI } from '@/di-symbols.js';
|
|
||||||
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
|
||||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
|
@ -223,168 +216,28 @@ export const paramDef = {
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
||||||
constructor(
|
constructor(
|
||||||
@Inject(DI.usersRepository)
|
|
||||||
private usersRepository: UsersRepository,
|
|
||||||
|
|
||||||
@Inject(DI.notesRepository)
|
|
||||||
private notesRepository: NotesRepository,
|
|
||||||
|
|
||||||
@Inject(DI.blockingsRepository)
|
|
||||||
private blockingsRepository: BlockingsRepository,
|
|
||||||
|
|
||||||
@Inject(DI.driveFilesRepository)
|
|
||||||
private driveFilesRepository: DriveFilesRepository,
|
|
||||||
|
|
||||||
@Inject(DI.channelsRepository)
|
|
||||||
private channelsRepository: ChannelsRepository,
|
|
||||||
|
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private noteCreateService: NoteCreateService,
|
private noteCreateService: NoteCreateService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
let visibleUsers: MiUser[] = [];
|
|
||||||
if (ps.visibleUserIds) {
|
|
||||||
visibleUsers = await this.usersRepository.findBy({
|
|
||||||
id: In(ps.visibleUserIds),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let files: MiDriveFile[] = [];
|
|
||||||
const fileIds = ps.fileIds ?? ps.mediaIds ?? null;
|
|
||||||
if (fileIds != null) {
|
|
||||||
files = await this.driveFilesRepository.createQueryBuilder('file')
|
|
||||||
.where('file.userId = :userId AND file.id IN (:...fileIds)', {
|
|
||||||
userId: me.id,
|
|
||||||
fileIds,
|
|
||||||
})
|
|
||||||
.orderBy('array_position(ARRAY[:...fileIds], "id"::text)')
|
|
||||||
.setParameters({ fileIds })
|
|
||||||
.getMany();
|
|
||||||
|
|
||||||
if (files.length !== fileIds.length) {
|
|
||||||
throw new ApiError(meta.errors.noSuchFile);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let renote: MiNote | null = null;
|
|
||||||
if (ps.renoteId != null) {
|
|
||||||
// Fetch renote to note
|
|
||||||
renote = await this.notesRepository.findOne({
|
|
||||||
where: { id: ps.renoteId },
|
|
||||||
relations: ['user', 'renote', 'reply'],
|
|
||||||
});
|
|
||||||
|
|
||||||
if (renote == null) {
|
|
||||||
throw new ApiError(meta.errors.noSuchRenoteTarget);
|
|
||||||
} else if (isRenote(renote) && !isQuote(renote)) {
|
|
||||||
throw new ApiError(meta.errors.cannotReRenote);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check blocking
|
|
||||||
if (renote.userId !== me.id) {
|
|
||||||
const blockExist = await this.blockingsRepository.exists({
|
|
||||||
where: {
|
|
||||||
blockerId: renote.userId,
|
|
||||||
blockeeId: me.id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (blockExist) {
|
|
||||||
throw new ApiError(meta.errors.youHaveBeenBlocked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (renote.visibility === 'followers' && renote.userId !== me.id) {
|
|
||||||
// 他人のfollowers noteはreject
|
|
||||||
throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
|
|
||||||
} else if (renote.visibility === 'specified') {
|
|
||||||
// specified / direct noteはreject
|
|
||||||
throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (renote.channelId && renote.channelId !== ps.channelId) {
|
|
||||||
// チャンネルのノートに対しリノート要求がきたとき、チャンネル外へのリノート可否をチェック
|
|
||||||
// リノートのユースケースのうち、チャンネル内→チャンネル外は少数だと考えられるため、JOINはせず必要な時に都度取得する
|
|
||||||
const renoteChannel = await this.channelsRepository.findOneBy({ id: renote.channelId });
|
|
||||||
if (renoteChannel == null) {
|
|
||||||
// リノートしたいノートが書き込まれているチャンネルが無い
|
|
||||||
throw new ApiError(meta.errors.noSuchChannel);
|
|
||||||
} else if (!renoteChannel.allowRenoteToExternal) {
|
|
||||||
// リノート作成のリクエストだが、対象チャンネルがリノート禁止だった場合
|
|
||||||
throw new ApiError(meta.errors.cannotRenoteOutsideOfChannel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let reply: MiNote | null = null;
|
|
||||||
if (ps.replyId != null) {
|
|
||||||
// Fetch reply
|
|
||||||
reply = await this.notesRepository.findOne({
|
|
||||||
where: { id: ps.replyId },
|
|
||||||
relations: ['user'],
|
|
||||||
});
|
|
||||||
|
|
||||||
if (reply == null) {
|
|
||||||
throw new ApiError(meta.errors.noSuchReplyTarget);
|
|
||||||
} else if (isRenote(reply) && !isQuote(reply)) {
|
|
||||||
throw new ApiError(meta.errors.cannotReplyToPureRenote);
|
|
||||||
} else if (!await this.noteEntityService.isVisibleForMe(reply, me.id)) {
|
|
||||||
throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
|
|
||||||
} else if (reply.visibility === 'specified' && ps.visibility !== 'specified') {
|
|
||||||
throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check blocking
|
|
||||||
if (reply.userId !== me.id) {
|
|
||||||
const blockExist = await this.blockingsRepository.exists({
|
|
||||||
where: {
|
|
||||||
blockerId: reply.userId,
|
|
||||||
blockeeId: me.id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (blockExist) {
|
|
||||||
throw new ApiError(meta.errors.youHaveBeenBlocked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ps.poll) {
|
|
||||||
if (typeof ps.poll.expiresAt === 'number') {
|
|
||||||
if (ps.poll.expiresAt < Date.now()) {
|
|
||||||
throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
|
|
||||||
}
|
|
||||||
} else if (typeof ps.poll.expiredAfter === 'number') {
|
|
||||||
ps.poll.expiresAt = Date.now() + ps.poll.expiredAfter;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let channel: MiChannel | null = null;
|
|
||||||
if (ps.channelId != null) {
|
|
||||||
channel = await this.channelsRepository.findOneBy({ id: ps.channelId, isArchived: false });
|
|
||||||
|
|
||||||
if (channel == null) {
|
|
||||||
throw new ApiError(meta.errors.noSuchChannel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 投稿を作成
|
|
||||||
try {
|
try {
|
||||||
const note = await this.noteCreateService.create(me, {
|
const note = await this.noteCreateService.fetchAndCreate(me, {
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
files: files,
|
fileIds: ps.fileIds ?? ps.mediaIds ?? [],
|
||||||
poll: ps.poll ? {
|
poll: ps.poll ? {
|
||||||
choices: ps.poll.choices,
|
choices: ps.poll.choices,
|
||||||
multiple: ps.poll.multiple ?? false,
|
multiple: ps.poll.multiple ?? false,
|
||||||
expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
expiresAt: ps.poll.expiredAfter ? new Date(Date.now() + ps.poll.expiredAfter) : ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
||||||
} : undefined,
|
} : null,
|
||||||
text: ps.text ?? undefined,
|
text: ps.text ?? null,
|
||||||
reply,
|
replyId: ps.replyId ?? null,
|
||||||
renote,
|
renoteId: ps.renoteId ?? null,
|
||||||
cw: ps.cw,
|
cw: ps.cw ?? null,
|
||||||
localOnly: ps.localOnly,
|
localOnly: ps.localOnly,
|
||||||
reactionAcceptance: ps.reactionAcceptance,
|
reactionAcceptance: ps.reactionAcceptance,
|
||||||
visibility: ps.visibility,
|
visibility: ps.visibility,
|
||||||
visibleUsers,
|
visibleUserIds: ps.visibleUserIds ?? [],
|
||||||
channel,
|
channelId: ps.channelId ?? null,
|
||||||
apMentions: ps.noExtractMentions ? [] : undefined,
|
apMentions: ps.noExtractMentions ? [] : undefined,
|
||||||
apHashtags: ps.noExtractHashtags ? [] : undefined,
|
apHashtags: ps.noExtractHashtags ? [] : undefined,
|
||||||
apEmojis: ps.noExtractEmojis ? [] : undefined,
|
apEmojis: ps.noExtractEmojis ? [] : undefined,
|
||||||
|
@ -393,16 +246,46 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
return {
|
return {
|
||||||
createdNote: await this.noteEntityService.pack(note, me),
|
createdNote: await this.noteEntityService.pack(note, me),
|
||||||
};
|
};
|
||||||
} catch (e) {
|
} catch (err) {
|
||||||
// TODO: 他のErrorもここでキャッチしてエラーメッセージを当てるようにしたい
|
// TODO: 他のErrorもここでキャッチしてエラーメッセージを当てるようにしたい
|
||||||
if (e instanceof IdentifiableError) {
|
if (err instanceof IdentifiableError) {
|
||||||
if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') {
|
if (err.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') {
|
||||||
throw new ApiError(meta.errors.containsProhibitedWords);
|
throw new ApiError(meta.errors.containsProhibitedWords);
|
||||||
} else if (e.id === '9f466dab-c856-48cd-9e65-ff90ff750580') {
|
} else if (err.id === '9f466dab-c856-48cd-9e65-ff90ff750580') {
|
||||||
throw new ApiError(meta.errors.containsTooManyMentions);
|
throw new ApiError(meta.errors.containsTooManyMentions);
|
||||||
|
} else if (err.id === '801c046c-5bf5-4234-ad2b-e78fc20a2ac7') {
|
||||||
|
throw new ApiError(meta.errors.noSuchFile);
|
||||||
|
} else if (err.id === '53983c56-e163-45a6-942f-4ddc485d4290') {
|
||||||
|
throw new ApiError(meta.errors.noSuchRenoteTarget);
|
||||||
|
} else if (err.id === 'bde24c37-121f-4e7d-980d-cec52f599f02') {
|
||||||
|
throw new ApiError(meta.errors.cannotReRenote);
|
||||||
|
} else if (err.id === '2b4fe776-4414-4a2d-ae39-f3418b8fd4d3') {
|
||||||
|
throw new ApiError(meta.errors.youHaveBeenBlocked);
|
||||||
|
} else if (err.id === '90b9d6f0-893a-4fef-b0f1-e9a33989f71a') {
|
||||||
|
throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
|
||||||
|
} else if (err.id === '48d7a997-da5c-4716-b3c3-92db3f37bf7d') {
|
||||||
|
throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
|
||||||
|
} else if (err.id === 'b060f9a6-8909-4080-9e0b-94d9fa6f6a77') {
|
||||||
|
throw new ApiError(meta.errors.noSuchChannel);
|
||||||
|
} else if (err.id === '7e435f4a-780d-4cfc-a15a-42519bd6fb67') {
|
||||||
|
throw new ApiError(meta.errors.cannotRenoteOutsideOfChannel);
|
||||||
|
} else if (err.id === '60142edb-1519-408e-926d-4f108d27bee0') {
|
||||||
|
throw new ApiError(meta.errors.noSuchReplyTarget);
|
||||||
|
} else if (err.id === 'f089e4e2-c0e7-4f60-8a23-e5a6bf786b36') {
|
||||||
|
throw new ApiError(meta.errors.cannotReplyToPureRenote);
|
||||||
|
} else if (err.id === '11cd37b3-a411-4f77-8633-c580ce6a8dce') {
|
||||||
|
throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
|
||||||
|
} else if (err.id === 'ced780a1-2012-4caf-bc7e-a95a291294cb') {
|
||||||
|
throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
|
||||||
|
} else if (err.id === 'b0df6025-f2e8-44b4-a26a-17ad99104612') {
|
||||||
|
throw new ApiError(meta.errors.youHaveBeenBlocked);
|
||||||
|
} else if (err.id === '0c11c11e-0c8d-48e7-822c-76ccef660068') {
|
||||||
|
throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
|
||||||
|
} else if (err.id === 'bfa3905b-25f5-4894-b430-da331a490e4b') {
|
||||||
|
throw new ApiError(meta.errors.noSuchChannel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw e;
|
throw err;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,6 +124,12 @@ export const meta = {
|
||||||
id: '9ee33bbe-fde3-4c71-9b51-e50492c6b9c8',
|
id: '9ee33bbe-fde3-4c71-9b51-e50492c6b9c8',
|
||||||
},
|
},
|
||||||
|
|
||||||
|
tooManyScheduledNotes: {
|
||||||
|
message: 'You cannot create scheduled notes any more.',
|
||||||
|
code: 'TOO_MANY_SCHEDULED_NOTES',
|
||||||
|
id: '22ae69eb-09e3-4541-a850-773cfa45e693',
|
||||||
|
},
|
||||||
|
|
||||||
cannotRenoteToExternal: {
|
cannotRenoteToExternal: {
|
||||||
message: 'Cannot Renote to External.',
|
message: 'Cannot Renote to External.',
|
||||||
code: 'CANNOT_RENOTE_TO_EXTERNAL',
|
code: 'CANNOT_RENOTE_TO_EXTERNAL',
|
||||||
|
@ -162,7 +168,7 @@ export const paramDef = {
|
||||||
fileIds: {
|
fileIds: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
uniqueItems: true,
|
uniqueItems: true,
|
||||||
minItems: 1,
|
minItems: 0,
|
||||||
maxItems: 16,
|
maxItems: 16,
|
||||||
items: { type: 'string', format: 'misskey:id' },
|
items: { type: 'string', format: 'misskey:id' },
|
||||||
},
|
},
|
||||||
|
@ -183,8 +189,10 @@ export const paramDef = {
|
||||||
},
|
},
|
||||||
required: ['choices'],
|
required: ['choices'],
|
||||||
},
|
},
|
||||||
|
scheduledAt: { type: 'integer', nullable: true },
|
||||||
|
isActuallyScheduled: { type: 'boolean', default: false },
|
||||||
},
|
},
|
||||||
required: [],
|
required: ['visibility', 'visibleUserIds', 'cw', 'hashtag', 'localOnly', 'reactionAcceptance', 'replyId', 'renoteId', 'channelId', 'text', 'fileIds', 'poll', 'scheduledAt', 'isActuallyScheduled'],
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
|
@ -196,22 +204,23 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const draft = await this.noteDraftService.create(me, {
|
const draft = await this.noteDraftService.create(me, {
|
||||||
fileIds: ps.fileIds,
|
fileIds: ps.fileIds,
|
||||||
poll: ps.poll ? {
|
pollChoices: ps.poll?.choices ?? [],
|
||||||
choices: ps.poll.choices,
|
pollMultiple: ps.poll?.multiple ?? false,
|
||||||
multiple: ps.poll.multiple ?? false,
|
pollExpiresAt: ps.poll?.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
||||||
expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
pollExpiredAfter: ps.poll?.expiredAfter ?? null,
|
||||||
expiredAfter: ps.poll.expiredAfter ?? null,
|
hasPoll: ps.poll != null,
|
||||||
} : undefined,
|
text: ps.text,
|
||||||
text: ps.text ?? null,
|
replyId: ps.replyId,
|
||||||
replyId: ps.replyId ?? undefined,
|
renoteId: ps.renoteId,
|
||||||
renoteId: ps.renoteId ?? undefined,
|
cw: ps.cw,
|
||||||
cw: ps.cw ?? null,
|
hashtag: ps.hashtag,
|
||||||
...(ps.hashtag ? { hashtag: ps.hashtag } : {}),
|
|
||||||
localOnly: ps.localOnly,
|
localOnly: ps.localOnly,
|
||||||
reactionAcceptance: ps.reactionAcceptance,
|
reactionAcceptance: ps.reactionAcceptance,
|
||||||
visibility: ps.visibility,
|
visibility: ps.visibility,
|
||||||
visibleUserIds: ps.visibleUserIds ?? [],
|
visibleUserIds: ps.visibleUserIds,
|
||||||
channelId: ps.channelId ?? undefined,
|
channelId: ps.channelId,
|
||||||
|
scheduledAt: ps.scheduledAt ? new Date(ps.scheduledAt) : null,
|
||||||
|
isActuallyScheduled: ps.isActuallyScheduled,
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
if (err instanceof IdentifiableError) {
|
if (err instanceof IdentifiableError) {
|
||||||
switch (err.id) {
|
switch (err.id) {
|
||||||
|
@ -241,6 +250,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
|
throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
|
||||||
case '215dbc76-336c-4d2a-9605-95766ba7dab0':
|
case '215dbc76-336c-4d2a-9605-95766ba7dab0':
|
||||||
throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
|
throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
|
||||||
|
case 'c3275f19-4558-4c59-83e1-4f684b5fab66':
|
||||||
|
throw new ApiError(meta.errors.tooManyScheduledNotes);
|
||||||
default:
|
default:
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ export const paramDef = {
|
||||||
untilId: { type: 'string', format: 'misskey:id' },
|
untilId: { type: 'string', format: 'misskey:id' },
|
||||||
sinceDate: { type: 'integer' },
|
sinceDate: { type: 'integer' },
|
||||||
untilDate: { type: 'integer' },
|
untilDate: { type: 'integer' },
|
||||||
|
scheduled: { type: 'boolean', nullable: true },
|
||||||
},
|
},
|
||||||
required: [],
|
required: [],
|
||||||
} as const;
|
} as const;
|
||||||
|
@ -58,6 +59,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
const query = this.queryService.makePaginationQuery<MiNoteDraft>(this.noteDraftsRepository.createQueryBuilder('drafts'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
|
const query = this.queryService.makePaginationQuery<MiNoteDraft>(this.noteDraftsRepository.createQueryBuilder('drafts'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
|
||||||
.andWhere('drafts.userId = :meId', { meId: me.id });
|
.andWhere('drafts.userId = :meId', { meId: me.id });
|
||||||
|
|
||||||
|
if (ps.scheduled === true) {
|
||||||
|
query.andWhere('drafts.isActuallyScheduled = true');
|
||||||
|
} else if (ps.scheduled === false) {
|
||||||
|
query.andWhere('drafts.isActuallyScheduled = false');
|
||||||
|
}
|
||||||
|
|
||||||
const drafts = await query
|
const drafts = await query
|
||||||
.limit(ps.limit)
|
.limit(ps.limit)
|
||||||
.getMany();
|
.getMany();
|
||||||
|
|
|
@ -159,6 +159,12 @@ export const meta = {
|
||||||
code: 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY',
|
code: 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY',
|
||||||
id: '215dbc76-336c-4d2a-9605-95766ba7dab0',
|
id: '215dbc76-336c-4d2a-9605-95766ba7dab0',
|
||||||
},
|
},
|
||||||
|
|
||||||
|
tooManyScheduledNotes: {
|
||||||
|
message: 'You cannot create scheduled notes any more.',
|
||||||
|
code: 'TOO_MANY_SCHEDULED_NOTES',
|
||||||
|
id: '02f5df79-08ae-4a33-8524-f1503c8f6212',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
limit: {
|
limit: {
|
||||||
|
@ -171,14 +177,14 @@ export const paramDef = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
properties: {
|
properties: {
|
||||||
draftId: { type: 'string', nullable: false, format: 'misskey:id' },
|
draftId: { type: 'string', nullable: false, format: 'misskey:id' },
|
||||||
visibility: { type: 'string', enum: ['public', 'home', 'followers', 'specified'], default: 'public' },
|
visibility: { type: 'string', enum: ['public', 'home', 'followers', 'specified'] },
|
||||||
visibleUserIds: { type: 'array', uniqueItems: true, items: {
|
visibleUserIds: { type: 'array', uniqueItems: true, items: {
|
||||||
type: 'string', format: 'misskey:id',
|
type: 'string', format: 'misskey:id',
|
||||||
} },
|
} },
|
||||||
cw: { type: 'string', nullable: true, minLength: 1, maxLength: 100 },
|
cw: { type: 'string', nullable: true, minLength: 1, maxLength: 100 },
|
||||||
hashtag: { type: 'string', nullable: true, maxLength: 200 },
|
hashtag: { type: 'string', nullable: true, maxLength: 200 },
|
||||||
localOnly: { type: 'boolean', default: false },
|
localOnly: { type: 'boolean' },
|
||||||
reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null },
|
reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'] },
|
||||||
replyId: { type: 'string', format: 'misskey:id', nullable: true },
|
replyId: { type: 'string', format: 'misskey:id', nullable: true },
|
||||||
renoteId: { type: 'string', format: 'misskey:id', nullable: true },
|
renoteId: { type: 'string', format: 'misskey:id', nullable: true },
|
||||||
channelId: { type: 'string', format: 'misskey:id', nullable: true },
|
channelId: { type: 'string', format: 'misskey:id', nullable: true },
|
||||||
|
@ -194,7 +200,7 @@ export const paramDef = {
|
||||||
fileIds: {
|
fileIds: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
uniqueItems: true,
|
uniqueItems: true,
|
||||||
minItems: 1,
|
minItems: 0,
|
||||||
maxItems: 16,
|
maxItems: 16,
|
||||||
items: { type: 'string', format: 'misskey:id' },
|
items: { type: 'string', format: 'misskey:id' },
|
||||||
},
|
},
|
||||||
|
@ -215,6 +221,8 @@ export const paramDef = {
|
||||||
},
|
},
|
||||||
required: ['choices'],
|
required: ['choices'],
|
||||||
},
|
},
|
||||||
|
scheduledAt: { type: 'integer', nullable: true },
|
||||||
|
isActuallyScheduled: { type: 'boolean' },
|
||||||
},
|
},
|
||||||
required: ['draftId'],
|
required: ['draftId'],
|
||||||
} as const;
|
} as const;
|
||||||
|
@ -228,22 +236,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const draft = await this.noteDraftService.update(me, ps.draftId, {
|
const draft = await this.noteDraftService.update(me, ps.draftId, {
|
||||||
fileIds: ps.fileIds,
|
fileIds: ps.fileIds,
|
||||||
poll: ps.poll ? {
|
pollChoices: ps.poll?.choices,
|
||||||
choices: ps.poll.choices,
|
pollMultiple: ps.poll?.multiple,
|
||||||
multiple: ps.poll.multiple ?? false,
|
pollExpiresAt: ps.poll?.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
||||||
expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
pollExpiredAfter: ps.poll?.expiredAfter,
|
||||||
expiredAfter: ps.poll.expiredAfter ?? null,
|
text: ps.text,
|
||||||
} : undefined,
|
replyId: ps.replyId,
|
||||||
text: ps.text ?? null,
|
renoteId: ps.renoteId,
|
||||||
replyId: ps.replyId ?? undefined,
|
cw: ps.cw,
|
||||||
renoteId: ps.renoteId ?? undefined,
|
hashtag: ps.hashtag,
|
||||||
cw: ps.cw ?? null,
|
|
||||||
...(ps.hashtag ? { hashtag: ps.hashtag } : {}),
|
|
||||||
localOnly: ps.localOnly,
|
localOnly: ps.localOnly,
|
||||||
reactionAcceptance: ps.reactionAcceptance,
|
reactionAcceptance: ps.reactionAcceptance,
|
||||||
visibility: ps.visibility,
|
visibility: ps.visibility,
|
||||||
visibleUserIds: ps.visibleUserIds ?? [],
|
visibleUserIds: ps.visibleUserIds,
|
||||||
channelId: ps.channelId ?? undefined,
|
channelId: ps.channelId,
|
||||||
|
scheduledAt: ps.scheduledAt ? new Date(ps.scheduledAt) : null,
|
||||||
|
isActuallyScheduled: ps.isActuallyScheduled,
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
if (err instanceof IdentifiableError) {
|
if (err instanceof IdentifiableError) {
|
||||||
switch (err.id) {
|
switch (err.id) {
|
||||||
|
@ -285,6 +293,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
throw new ApiError(meta.errors.containsProhibitedWords);
|
throw new ApiError(meta.errors.containsProhibitedWords);
|
||||||
case '4de0363a-3046-481b-9b0f-feff3e211025':
|
case '4de0363a-3046-481b-9b0f-feff3e211025':
|
||||||
throw new ApiError(meta.errors.containsTooManyMentions);
|
throw new ApiError(meta.errors.containsTooManyMentions);
|
||||||
|
case 'bacdf856-5c51-4159-b88a-804fa5103be5':
|
||||||
|
throw new ApiError(meta.errors.tooManyScheduledNotes);
|
||||||
default:
|
default:
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,8 @@
|
||||||
* quote - 投稿が引用Renoteされた
|
* quote - 投稿が引用Renoteされた
|
||||||
* reaction - 投稿にリアクションされた
|
* reaction - 投稿にリアクションされた
|
||||||
* pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した
|
* pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した
|
||||||
|
* scheduledNotePosted - 予約したノートが投稿された
|
||||||
|
* scheduledNotePostFailed - 予約したノートの投稿に失敗した
|
||||||
* receiveFollowRequest - フォローリクエストされた
|
* receiveFollowRequest - フォローリクエストされた
|
||||||
* followRequestAccepted - 自分の送ったフォローリクエストが承認された
|
* followRequestAccepted - 自分の送ったフォローリクエストが承認された
|
||||||
* roleAssigned - ロールが付与された
|
* roleAssigned - ロールが付与された
|
||||||
|
@ -32,6 +34,8 @@ export const notificationTypes = [
|
||||||
'quote',
|
'quote',
|
||||||
'reaction',
|
'reaction',
|
||||||
'pollEnded',
|
'pollEnded',
|
||||||
|
'scheduledNotePosted',
|
||||||
|
'scheduledNotePostFailed',
|
||||||
'receiveFollowRequest',
|
'receiveFollowRequest',
|
||||||
'followRequestAccepted',
|
'followRequestAccepted',
|
||||||
'roleAssigned',
|
'roleAssigned',
|
||||||
|
|
|
@ -64,6 +64,8 @@ function toBase62(n: number): string {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getConfig(): UserConfig {
|
export function getConfig(): UserConfig {
|
||||||
|
const localesHash = toBase62(hash(JSON.stringify(locales)));
|
||||||
|
|
||||||
return {
|
return {
|
||||||
base: '/embed_vite/',
|
base: '/embed_vite/',
|
||||||
|
|
||||||
|
@ -148,9 +150,9 @@ export function getConfig(): UserConfig {
|
||||||
// dependencies of i18n.ts
|
// dependencies of i18n.ts
|
||||||
'config': ['@@/js/config.js'],
|
'config': ['@@/js/config.js'],
|
||||||
},
|
},
|
||||||
entryFileNames: 'scripts/[hash:8].js',
|
entryFileNames: `scripts/${localesHash}-[hash:8].js`,
|
||||||
chunkFileNames: 'scripts/[hash:8].js',
|
chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
|
||||||
assetFileNames: 'assets/[hash:8][extname]',
|
assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
|
||||||
paths(id) {
|
paths(id) {
|
||||||
for (const p of externalPackages) {
|
for (const p of externalPackages) {
|
||||||
if (p.match.test(id)) {
|
if (p.match.test(id)) {
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
"json5": "2.2.3",
|
"json5": "2.2.3",
|
||||||
"magic-string": "0.30.18",
|
"magic-string": "0.30.18",
|
||||||
"matter-js": "0.20.0",
|
"matter-js": "0.20.0",
|
||||||
|
"mediabunny": "1.15.1",
|
||||||
"mfm-js": "0.25.0",
|
"mfm-js": "0.25.0",
|
||||||
"misskey-bubble-game": "workspace:*",
|
"misskey-bubble-game": "workspace:*",
|
||||||
"misskey-js": "workspace:*",
|
"misskey-js": "workspace:*",
|
||||||
|
|
|
@ -216,7 +216,7 @@ watch(enabled, () => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const penMode = ref<'fill' | 'blur' | null>(null);
|
const penMode = ref<'fill' | 'blur' | 'pixelate' | null>(null);
|
||||||
|
|
||||||
function showPenMenu(ev: MouseEvent) {
|
function showPenMenu(ev: MouseEvent) {
|
||||||
os.popupMenu([{
|
os.popupMenu([{
|
||||||
|
@ -229,6 +229,11 @@ function showPenMenu(ev: MouseEvent) {
|
||||||
action: () => {
|
action: () => {
|
||||||
penMode.value = 'blur';
|
penMode.value = 'blur';
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
text: i18n.ts._imageEffector._fxs.pixelate,
|
||||||
|
action: () => {
|
||||||
|
penMode.value = 'pixelate';
|
||||||
|
},
|
||||||
}], ev.currentTarget ?? ev.target);
|
}], ev.currentTarget ?? ev.target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,6 +296,19 @@ function onImagePointerdown(ev: PointerEvent) {
|
||||||
radius: 3,
|
radius: 3,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
} else if (penMode.value === 'pixelate') {
|
||||||
|
layers.push({
|
||||||
|
id,
|
||||||
|
fxId: 'pixelate',
|
||||||
|
params: {
|
||||||
|
offsetX: 0,
|
||||||
|
offsetY: 0,
|
||||||
|
scaleX: 0.1,
|
||||||
|
scaleY: 0.1,
|
||||||
|
angle: 0,
|
||||||
|
strength: 0.2,
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
_move(ev.offsetX, ev.offsetY);
|
_move(ev.offsetX, ev.offsetY);
|
||||||
|
|
|
@ -15,101 +15,151 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
@esc="cancel()"
|
@esc="cancel()"
|
||||||
>
|
>
|
||||||
<template #header>
|
<template #header>
|
||||||
{{ i18n.ts.drafts }} ({{ currentDraftsCount }}/{{ $i?.policies.noteDraftLimit }})
|
{{ i18n.ts.draftsAndScheduledNotes }} ({{ currentDraftsCount }}/{{ $i?.policies.noteDraftLimit }})
|
||||||
</template>
|
</template>
|
||||||
<div class="_spacer">
|
|
||||||
<MkPagination :paginator="paginator" withControl>
|
|
||||||
<template #empty>
|
|
||||||
<MkResult type="empty" :text="i18n.ts._drafts.noDrafts"/>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template #default="{ items }">
|
<MkStickyContainer>
|
||||||
<div class="_gaps_s">
|
<template #header>
|
||||||
<div
|
<MkTabs
|
||||||
v-for="draft in (items as unknown as Misskey.entities.NoteDraft[])"
|
v-model:tab="tab"
|
||||||
:key="draft.id"
|
centered
|
||||||
v-panel
|
:class="$style.tabs"
|
||||||
:class="[$style.draft]"
|
:tabs="[
|
||||||
>
|
{
|
||||||
<div :class="$style.draftBody" class="_gaps_s">
|
key: 'drafts',
|
||||||
<div :class="$style.draftInfo">
|
title: i18n.ts.drafts,
|
||||||
<div :class="$style.draftMeta">
|
icon: 'ti ti-pencil-question',
|
||||||
<div v-if="draft.reply" class="_nowrap">
|
},
|
||||||
<i class="ti ti-arrow-back-up"></i> <I18n :src="i18n.ts._drafts.replyTo" tag="span">
|
{
|
||||||
<template #user>
|
key: 'scheduled',
|
||||||
<Mfm v-if="draft.reply.user.name != null" :text="draft.reply.user.name" :plain="true" :nowrap="true"/>
|
title: i18n.ts.scheduled,
|
||||||
<MkAcct v-else :user="draft.reply.user"/>
|
icon: 'ti ti-calendar-clock',
|
||||||
</template>
|
},
|
||||||
</I18n>
|
]"
|
||||||
</div>
|
/>
|
||||||
<div v-else-if="draft.replyId" class="_nowrap">
|
</template>
|
||||||
<i class="ti ti-arrow-back-up"></i> <I18n :src="i18n.ts._drafts.replyTo" tag="span">
|
|
||||||
<template #user>
|
<div class="_spacer">
|
||||||
{{ i18n.ts.deletedNote }}
|
<MkPagination :key="tab" :paginator="tab === 'scheduled' ? scheduledPaginator : draftsPaginator" withControl>
|
||||||
</template>
|
<template #empty>
|
||||||
</I18n>
|
<MkResult type="empty" :text="i18n.ts._drafts.noDrafts"/>
|
||||||
</div>
|
</template>
|
||||||
<div v-if="draft.renote && draft.text != null" class="_nowrap">
|
|
||||||
<i class="ti ti-quote"></i> <I18n :src="i18n.ts._drafts.quoteOf" tag="span">
|
<template #default="{ items }">
|
||||||
<template #user>
|
<div class="_gaps_s">
|
||||||
<Mfm v-if="draft.renote.user.name != null" :text="draft.renote.user.name" :plain="true" :nowrap="true"/>
|
<div
|
||||||
<MkAcct v-else :user="draft.renote.user"/>
|
v-for="draft in (items as unknown as Misskey.entities.NoteDraft[])"
|
||||||
</template>
|
:key="draft.id"
|
||||||
</I18n>
|
v-panel
|
||||||
</div>
|
:class="[$style.draft]"
|
||||||
<div v-else-if="draft.renoteId" class="_nowrap">
|
>
|
||||||
<i class="ti ti-quote"></i> <I18n :src="i18n.ts._drafts.quoteOf" tag="span">
|
<div :class="$style.draftBody" class="_gaps_s">
|
||||||
<template #user>
|
<MkInfo v-if="draft.scheduledAt != null && draft.isActuallyScheduled">
|
||||||
{{ i18n.ts.deletedNote }}
|
<I18n :src="i18n.ts.scheduledToPostOnX" tag="span">
|
||||||
</template>
|
<template #x>
|
||||||
</I18n>
|
<MkTime :time="draft.scheduledAt" :mode="'detail'" style="font-weight: bold;"/>
|
||||||
</div>
|
</template>
|
||||||
<div v-if="draft.channel" class="_nowrap">
|
</I18n>
|
||||||
<i class="ti ti-device-tv"></i> {{ i18n.tsx._drafts.postTo({ channel: draft.channel.name }) }}
|
</MkInfo>
|
||||||
|
<div :class="$style.draftInfo">
|
||||||
|
<div :class="$style.draftMeta">
|
||||||
|
<div v-if="draft.reply" class="_nowrap">
|
||||||
|
<i class="ti ti-arrow-back-up"></i> <I18n :src="i18n.ts._drafts.replyTo" tag="span">
|
||||||
|
<template #user>
|
||||||
|
<Mfm v-if="draft.reply.user.name != null" :text="draft.reply.user.name" :plain="true" :nowrap="true"/>
|
||||||
|
<MkAcct v-else :user="draft.reply.user"/>
|
||||||
|
</template>
|
||||||
|
</I18n>
|
||||||
|
</div>
|
||||||
|
<div v-else-if="draft.replyId" class="_nowrap">
|
||||||
|
<i class="ti ti-arrow-back-up"></i> <I18n :src="i18n.ts._drafts.replyTo" tag="span">
|
||||||
|
<template #user>
|
||||||
|
{{ i18n.ts.deletedNote }}
|
||||||
|
</template>
|
||||||
|
</I18n>
|
||||||
|
</div>
|
||||||
|
<div v-if="draft.renote && draft.text != null" class="_nowrap">
|
||||||
|
<i class="ti ti-quote"></i> <I18n :src="i18n.ts._drafts.quoteOf" tag="span">
|
||||||
|
<template #user>
|
||||||
|
<Mfm v-if="draft.renote.user.name != null" :text="draft.renote.user.name" :plain="true" :nowrap="true"/>
|
||||||
|
<MkAcct v-else :user="draft.renote.user"/>
|
||||||
|
</template>
|
||||||
|
</I18n>
|
||||||
|
</div>
|
||||||
|
<div v-else-if="draft.renoteId" class="_nowrap">
|
||||||
|
<i class="ti ti-quote"></i> <I18n :src="i18n.ts._drafts.quoteOf" tag="span">
|
||||||
|
<template #user>
|
||||||
|
{{ i18n.ts.deletedNote }}
|
||||||
|
</template>
|
||||||
|
</I18n>
|
||||||
|
</div>
|
||||||
|
<div v-if="draft.channel" class="_nowrap">
|
||||||
|
<i class="ti ti-device-tv"></i> {{ i18n.tsx._drafts.postTo({ channel: draft.channel.name }) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div :class="$style.draftContent">
|
||||||
<div :class="$style.draftContent">
|
<Mfm :text="getNoteSummary(draft, { showRenote: false, showReply: false })" :plain="true" :author="draft.user"/>
|
||||||
<Mfm :text="getNoteSummary(draft, { showRenote: false, showReply: false })" :plain="true" :author="draft.user"/>
|
</div>
|
||||||
</div>
|
<div :class="$style.draftFooter">
|
||||||
<div :class="$style.draftFooter">
|
<div :class="$style.draftVisibility">
|
||||||
<div :class="$style.draftVisibility">
|
<span :title="i18n.ts._visibility[draft.visibility]">
|
||||||
<span :title="i18n.ts._visibility[draft.visibility]">
|
<i v-if="draft.visibility === 'public'" class="ti ti-world"></i>
|
||||||
<i v-if="draft.visibility === 'public'" class="ti ti-world"></i>
|
<i v-else-if="draft.visibility === 'home'" class="ti ti-home"></i>
|
||||||
<i v-else-if="draft.visibility === 'home'" class="ti ti-home"></i>
|
<i v-else-if="draft.visibility === 'followers'" class="ti ti-lock"></i>
|
||||||
<i v-else-if="draft.visibility === 'followers'" class="ti ti-lock"></i>
|
<i v-else-if="draft.visibility === 'specified'" class="ti ti-mail"></i>
|
||||||
<i v-else-if="draft.visibility === 'specified'" class="ti ti-mail"></i>
|
</span>
|
||||||
</span>
|
<span v-if="draft.localOnly" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span>
|
||||||
<span v-if="draft.localOnly" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span>
|
</div>
|
||||||
|
<MkTime :time="draft.createdAt" :class="$style.draftCreatedAt" mode="detail" colored/>
|
||||||
</div>
|
</div>
|
||||||
<MkTime :time="draft.createdAt" :class="$style.draftCreatedAt" mode="detail" colored/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div :class="$style.draftActions" class="_buttons">
|
<div :class="$style.draftActions" class="_buttons">
|
||||||
<MkButton
|
<template v-if="draft.scheduledAt != null && draft.isActuallyScheduled">
|
||||||
:class="$style.itemButton"
|
<MkButton
|
||||||
small
|
:class="$style.itemButton"
|
||||||
@click="restoreDraft(draft)"
|
small
|
||||||
>
|
@click="cancelSchedule(draft)"
|
||||||
<i class="ti ti-corner-up-left"></i>
|
>
|
||||||
{{ i18n.ts._drafts.restore }}
|
<i class="ti ti-calendar-x"></i> {{ i18n.ts._drafts.cancelSchedule }}
|
||||||
</MkButton>
|
</MkButton>
|
||||||
<MkButton
|
<!-- TODO
|
||||||
v-tooltip="i18n.ts._drafts.delete"
|
<MkButton
|
||||||
danger
|
:class="$style.itemButton"
|
||||||
small
|
small
|
||||||
:iconOnly="true"
|
@click="reSchedule(draft)"
|
||||||
:class="$style.itemButton"
|
>
|
||||||
@click="deleteDraft(draft)"
|
<i class="ti ti-calendar-time"></i> {{ i18n.ts._drafts.reSchedule }}
|
||||||
>
|
</MkButton>
|
||||||
<i class="ti ti-trash"></i>
|
-->
|
||||||
</MkButton>
|
</template>
|
||||||
|
<MkButton
|
||||||
|
v-else
|
||||||
|
:class="$style.itemButton"
|
||||||
|
small
|
||||||
|
@click="restoreDraft(draft)"
|
||||||
|
>
|
||||||
|
<i class="ti ti-corner-up-left"></i> {{ i18n.ts._drafts.restore }}
|
||||||
|
</MkButton>
|
||||||
|
<MkButton
|
||||||
|
v-tooltip="i18n.ts._drafts.delete"
|
||||||
|
danger
|
||||||
|
small
|
||||||
|
:iconOnly="true"
|
||||||
|
:class="$style.itemButton"
|
||||||
|
style="margin-left: auto;"
|
||||||
|
@click="deleteDraft(draft)"
|
||||||
|
>
|
||||||
|
<i class="ti ti-trash"></i>
|
||||||
|
</MkButton>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</template>
|
||||||
</template>
|
</MkPagination>
|
||||||
</MkPagination>
|
</div>
|
||||||
</div>
|
</MkStickyContainer>
|
||||||
</MkModalWindow>
|
</MkModalWindow>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -125,6 +175,12 @@ import * as os from '@/os.js';
|
||||||
import { $i } from '@/i.js';
|
import { $i } from '@/i.js';
|
||||||
import { misskeyApi } from '@/utility/misskey-api';
|
import { misskeyApi } from '@/utility/misskey-api';
|
||||||
import { Paginator } from '@/utility/paginator.js';
|
import { Paginator } from '@/utility/paginator.js';
|
||||||
|
import MkTabs from '@/components/MkTabs.vue';
|
||||||
|
import MkInfo from '@/components/MkInfo.vue';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
scheduled?: boolean;
|
||||||
|
}>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(ev: 'restore', draft: Misskey.entities.NoteDraft): void;
|
(ev: 'restore', draft: Misskey.entities.NoteDraft): void;
|
||||||
|
@ -132,8 +188,20 @@ const emit = defineEmits<{
|
||||||
(ev: 'closed'): void;
|
(ev: 'closed'): void;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const paginator = markRaw(new Paginator('notes/drafts/list', {
|
const tab = ref<'drafts' | 'scheduled'>(props.scheduled ? 'scheduled' : 'drafts');
|
||||||
|
|
||||||
|
const draftsPaginator = markRaw(new Paginator('notes/drafts/list', {
|
||||||
limit: 10,
|
limit: 10,
|
||||||
|
params: {
|
||||||
|
scheduled: false,
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
const scheduledPaginator = markRaw(new Paginator('notes/drafts/list', {
|
||||||
|
limit: 10,
|
||||||
|
params: {
|
||||||
|
scheduled: true,
|
||||||
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const currentDraftsCount = ref(0);
|
const currentDraftsCount = ref(0);
|
||||||
|
@ -162,7 +230,17 @@ async function deleteDraft(draft: Misskey.entities.NoteDraft) {
|
||||||
if (canceled) return;
|
if (canceled) return;
|
||||||
|
|
||||||
os.apiWithDialog('notes/drafts/delete', { draftId: draft.id }).then(() => {
|
os.apiWithDialog('notes/drafts/delete', { draftId: draft.id }).then(() => {
|
||||||
paginator.reload();
|
draftsPaginator.reload();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cancelSchedule(draft: Misskey.entities.NoteDraft) {
|
||||||
|
os.apiWithDialog('notes/drafts/update', {
|
||||||
|
draftId: draft.id,
|
||||||
|
isActuallyScheduled: false,
|
||||||
|
scheduledAt: null,
|
||||||
|
}).then(() => {
|
||||||
|
scheduledPaginator.reload();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -220,4 +298,11 @@ async function deleteDraft(draft: Misskey.entities.NoteDraft) {
|
||||||
padding-top: 16px;
|
padding-top: 16px;
|
||||||
border-top: solid 1px var(--MI_THEME-divider);
|
border-top: solid 1px var(--MI_THEME-divider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tabs {
|
||||||
|
background: color(from var(--MI_THEME-bg) srgb r g b / 0.75);
|
||||||
|
-webkit-backdrop-filter: var(--MI-blur, blur(15px));
|
||||||
|
backdrop-filter: var(--MI-blur, blur(15px));
|
||||||
|
border-bottom: solid 0.5px var(--MI_THEME-divider);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<div :class="$style.root">
|
<div :class="$style.root">
|
||||||
<div :class="$style.head">
|
<div :class="$style.head">
|
||||||
<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && 'note' in notification" :class="$style.icon" :user="notification.note.user" link preview/>
|
<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && 'note' in notification" :class="$style.icon" :user="notification.note.user" link preview/>
|
||||||
<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login', 'createToken'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
|
<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login', 'createToken', 'scheduledNotePosted', 'scheduledNotePostFailed'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
|
||||||
<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
|
<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
|
||||||
<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
|
<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
|
||||||
<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
|
<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
|
||||||
|
@ -23,6 +23,8 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
[$style.t_mention]: notification.type === 'mention',
|
[$style.t_mention]: notification.type === 'mention',
|
||||||
[$style.t_quote]: notification.type === 'quote',
|
[$style.t_quote]: notification.type === 'quote',
|
||||||
[$style.t_pollEnded]: notification.type === 'pollEnded',
|
[$style.t_pollEnded]: notification.type === 'pollEnded',
|
||||||
|
[$style.t_scheduledNotePosted]: notification.type === 'scheduledNotePosted',
|
||||||
|
[$style.t_scheduledNotePostFailed]: notification.type === 'scheduledNotePostFailed',
|
||||||
[$style.t_achievementEarned]: notification.type === 'achievementEarned',
|
[$style.t_achievementEarned]: notification.type === 'achievementEarned',
|
||||||
[$style.t_exportCompleted]: notification.type === 'exportCompleted',
|
[$style.t_exportCompleted]: notification.type === 'exportCompleted',
|
||||||
[$style.t_login]: notification.type === 'login',
|
[$style.t_login]: notification.type === 'login',
|
||||||
|
@ -39,6 +41,8 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<i v-else-if="notification.type === 'mention'" class="ti ti-at"></i>
|
<i v-else-if="notification.type === 'mention'" class="ti ti-at"></i>
|
||||||
<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
|
<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
|
||||||
<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
|
<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
|
||||||
|
<i v-else-if="notification.type === 'scheduledNotePosted'" class="ti ti-send"></i>
|
||||||
|
<i v-else-if="notification.type === 'scheduledNotePostFailed'" class="ti ti-alert-triangle"></i>
|
||||||
<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
|
<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
|
||||||
<i v-else-if="notification.type === 'exportCompleted'" class="ti ti-archive"></i>
|
<i v-else-if="notification.type === 'exportCompleted'" class="ti ti-archive"></i>
|
||||||
<i v-else-if="notification.type === 'login'" class="ti ti-login-2"></i>
|
<i v-else-if="notification.type === 'login'" class="ti ti-login-2"></i>
|
||||||
|
@ -60,6 +64,8 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<div :class="$style.tail">
|
<div :class="$style.tail">
|
||||||
<header :class="$style.header">
|
<header :class="$style.header">
|
||||||
<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
|
<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
|
||||||
|
<span v-else-if="notification.type === 'scheduledNotePosted'">{{ i18n.ts._notification.scheduledNotePosted }}</span>
|
||||||
|
<span v-else-if="notification.type === 'scheduledNotePostFailed'">{{ i18n.ts._notification.scheduledNotePostFailed }}</span>
|
||||||
<span v-else-if="notification.type === 'note'">{{ i18n.ts._notification.newNote }}: <MkUserName :user="notification.note.user"/></span>
|
<span v-else-if="notification.type === 'note'">{{ i18n.ts._notification.newNote }}: <MkUserName :user="notification.note.user"/></span>
|
||||||
<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
|
<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
|
||||||
<span v-else-if="notification.type === 'chatRoomInvitationReceived'">{{ i18n.ts._notification.chatRoomInvitationReceived }}</span>
|
<span v-else-if="notification.type === 'chatRoomInvitationReceived'">{{ i18n.ts._notification.chatRoomInvitationReceived }}</span>
|
||||||
|
@ -103,6 +109,11 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
||||||
<i class="ti ti-quote" :class="$style.quote"></i>
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
||||||
</MkA>
|
</MkA>
|
||||||
|
<MkA v-else-if="notification.type === 'scheduledNotePosted'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
||||||
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
||||||
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
||||||
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
||||||
|
</MkA>
|
||||||
<div v-else-if="notification.type === 'roleAssigned'" :class="$style.text">
|
<div v-else-if="notification.type === 'roleAssigned'" :class="$style.text">
|
||||||
{{ notification.role.name }}
|
{{ notification.role.name }}
|
||||||
</div>
|
</div>
|
||||||
|
@ -338,6 +349,16 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.t_scheduledNotePosted {
|
||||||
|
background: var(--eventOther);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.t_scheduledNotePostFailed {
|
||||||
|
background: var(--eventOther);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
.t_achievementEarned {
|
.t_achievementEarned {
|
||||||
background: var(--eventAchievement);
|
background: var(--eventAchievement);
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|
|
@ -15,9 +15,9 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<div :class="$style.headerLeft">
|
<div :class="$style.headerLeft">
|
||||||
<button v-if="!fixed" :class="$style.cancel" class="_button" @click="cancel"><i class="ti ti-x"></i></button>
|
<button v-if="!fixed" :class="$style.cancel" class="_button" @click="cancel"><i class="ti ti-x"></i></button>
|
||||||
<button v-click-anime v-tooltip="i18n.ts.switchAccount" :class="$style.account" class="_button" @click="openAccountMenu">
|
<button v-click-anime v-tooltip="i18n.ts.switchAccount" :class="$style.account" class="_button" @click="openAccountMenu">
|
||||||
<MkAvatar :user="postAccount ?? $i" :class="$style.avatar"/>
|
<img :class="$style.avatar" :src="(postAccount ?? $i).avatarUrl" style="border-radius: 100%;"/>
|
||||||
</button>
|
</button>
|
||||||
<button v-if="$i.policies.noteDraftLimit > 0" v-tooltip="(postAccount != null && postAccount.id !== $i.id) ? null : i18n.ts.draft" class="_button" :class="$style.draftButton" :disabled="postAccount != null && postAccount.id !== $i.id" @click="showDraftMenu"><i class="ti ti-pencil-minus"></i></button>
|
<button v-if="$i.policies.noteDraftLimit > 0" v-tooltip="(postAccount != null && postAccount.id !== $i.id) ? null : i18n.ts.draftsAndScheduledNotes" class="_button" :class="$style.draftButton" :disabled="postAccount != null && postAccount.id !== $i.id" @click="showDraftMenu"><i class="ti ti-list"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div :class="$style.headerRight">
|
<div :class="$style.headerRight">
|
||||||
<template v-if="!(targetChannel != null && fixed)">
|
<template v-if="!(targetChannel != null && fixed)">
|
||||||
|
@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<template v-if="posted"></template>
|
<template v-if="posted"></template>
|
||||||
<template v-else-if="posting"><MkEllipsis/></template>
|
<template v-else-if="posting"><MkEllipsis/></template>
|
||||||
<template v-else>{{ submitText }}</template>
|
<template v-else>{{ submitText }}</template>
|
||||||
<i style="margin-left: 6px;" :class="posted ? 'ti ti-check' : replyTargetNote ? 'ti ti-arrow-back-up' : renoteTargetNote ? 'ti ti-quote' : 'ti ti-send'"></i>
|
<i style="margin-left: 6px;" :class="submitIcon"></i>
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -61,6 +61,13 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button>
|
<button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<MkInfo v-if="scheduledAt != null" :class="$style.scheduledAt">
|
||||||
|
<I18n :src="i18n.ts.scheduleToPostOnX" tag="span">
|
||||||
|
<template #x>
|
||||||
|
<MkTime :time="scheduledAt" :mode="'detail'" style="font-weight: bold;"/>
|
||||||
|
</template>
|
||||||
|
</I18n> - <button class="_textButton" @click="cancelSchedule()">{{ i18n.ts.cancel }}</button>
|
||||||
|
</MkInfo>
|
||||||
<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
|
<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
|
||||||
<div v-show="useCw" :class="$style.cwOuter">
|
<div v-show="useCw" :class="$style.cwOuter">
|
||||||
<input ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown" @keyup="onKeyup" @compositionend="onCompositionEnd">
|
<input ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown" @keyup="onKeyup" @compositionend="onCompositionEnd">
|
||||||
|
@ -105,7 +112,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { inject, watch, nextTick, onMounted, defineAsyncComponent, provide, shallowRef, ref, computed, useTemplateRef } from 'vue';
|
import { inject, watch, nextTick, onMounted, defineAsyncComponent, provide, shallowRef, ref, computed, useTemplateRef, onUnmounted } from 'vue';
|
||||||
import * as mfm from 'mfm-js';
|
import * as mfm from 'mfm-js';
|
||||||
import * as Misskey from 'misskey-js';
|
import * as Misskey from 'misskey-js';
|
||||||
import insertTextAtCursor from 'insert-text-at-cursor';
|
import insertTextAtCursor from 'insert-text-at-cursor';
|
||||||
|
@ -199,6 +206,7 @@ if (props.initialVisibleUsers) {
|
||||||
props.initialVisibleUsers.forEach(u => pushVisibleUser(u));
|
props.initialVisibleUsers.forEach(u => pushVisibleUser(u));
|
||||||
}
|
}
|
||||||
const reactionAcceptance = ref(store.s.reactionAcceptance);
|
const reactionAcceptance = ref(store.s.reactionAcceptance);
|
||||||
|
const scheduledAt = ref<number | null>(null);
|
||||||
const draghover = ref(false);
|
const draghover = ref(false);
|
||||||
const quoteId = ref<string | null>(null);
|
const quoteId = ref<string | null>(null);
|
||||||
const hasNotSpecifiedMentions = ref(false);
|
const hasNotSpecifiedMentions = ref(false);
|
||||||
|
@ -218,6 +226,10 @@ const uploader = useUploader({
|
||||||
multiple: true,
|
multiple: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
uploader.dispose();
|
||||||
|
});
|
||||||
|
|
||||||
uploader.events.on('itemUploaded', ctx => {
|
uploader.events.on('itemUploaded', ctx => {
|
||||||
files.value.push(ctx.item.uploaded!);
|
files.value.push(ctx.item.uploaded!);
|
||||||
uploader.removeItem(ctx.item);
|
uploader.removeItem(ctx.item);
|
||||||
|
@ -258,11 +270,17 @@ const placeholder = computed((): string => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const submitText = computed((): string => {
|
const submitText = computed((): string => {
|
||||||
return renoteTargetNote.value
|
return scheduledAt.value != null
|
||||||
? i18n.ts.quote
|
? i18n.ts.schedule
|
||||||
: replyTargetNote.value
|
: renoteTargetNote.value
|
||||||
? i18n.ts.reply
|
? i18n.ts.quote
|
||||||
: i18n.ts.note;
|
: replyTargetNote.value
|
||||||
|
? i18n.ts.reply
|
||||||
|
: i18n.ts.note;
|
||||||
|
});
|
||||||
|
|
||||||
|
const submitIcon = computed((): string => {
|
||||||
|
return posted.value ? 'ti ti-check' : scheduledAt.value != null ? 'ti ti-calendar-time' : replyTargetNote.value ? 'ti ti-arrow-back-up' : renoteTargetNote.value ? 'ti ti-quote' : 'ti ti-send';
|
||||||
});
|
});
|
||||||
|
|
||||||
const textLength = computed((): number => {
|
const textLength = computed((): number => {
|
||||||
|
@ -410,6 +428,7 @@ function watchForDraft() {
|
||||||
watch(localOnly, () => saveDraft());
|
watch(localOnly, () => saveDraft());
|
||||||
watch(quoteId, () => saveDraft());
|
watch(quoteId, () => saveDraft());
|
||||||
watch(reactionAcceptance, () => saveDraft());
|
watch(reactionAcceptance, () => saveDraft());
|
||||||
|
watch(scheduledAt, () => saveDraft());
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkMissingMention() {
|
function checkMissingMention() {
|
||||||
|
@ -601,7 +620,13 @@ function showOtherSettings() {
|
||||||
action: () => {
|
action: () => {
|
||||||
toggleReactionAcceptance();
|
toggleReactionAcceptance();
|
||||||
},
|
},
|
||||||
}, { type: 'divider' }, {
|
}, ...($i.policies.scheduledNoteLimit > 0 ? [{
|
||||||
|
icon: 'ti ti-calendar-time',
|
||||||
|
text: i18n.ts.schedulePost + '...',
|
||||||
|
action: () => {
|
||||||
|
schedule();
|
||||||
|
},
|
||||||
|
}] : []), { type: 'divider' }, {
|
||||||
type: 'switch',
|
type: 'switch',
|
||||||
icon: 'ti ti-eye',
|
icon: 'ti ti-eye',
|
||||||
text: i18n.ts.preview,
|
text: i18n.ts.preview,
|
||||||
|
@ -650,6 +675,7 @@ function clear() {
|
||||||
files.value = [];
|
files.value = [];
|
||||||
poll.value = null;
|
poll.value = null;
|
||||||
quoteId.value = null;
|
quoteId.value = null;
|
||||||
|
scheduledAt.value = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onKeydown(ev: KeyboardEvent) {
|
function onKeydown(ev: KeyboardEvent) {
|
||||||
|
@ -805,6 +831,7 @@ function saveDraft() {
|
||||||
...( visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
|
...( visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
|
||||||
quoteId: quoteId.value,
|
quoteId: quoteId.value,
|
||||||
reactionAcceptance: reactionAcceptance.value,
|
reactionAcceptance: reactionAcceptance.value,
|
||||||
|
scheduledAt: scheduledAt.value,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -819,7 +846,9 @@ function deleteDraft() {
|
||||||
miLocalStorage.setItem('drafts', JSON.stringify(draftData));
|
miLocalStorage.setItem('drafts', JSON.stringify(draftData));
|
||||||
}
|
}
|
||||||
|
|
||||||
async function saveServerDraft(clearLocal = false) {
|
async function saveServerDraft(options: {
|
||||||
|
isActuallyScheduled?: boolean;
|
||||||
|
} = {}) {
|
||||||
return await os.apiWithDialog(serverDraftId.value == null ? 'notes/drafts/create' : 'notes/drafts/update', {
|
return await os.apiWithDialog(serverDraftId.value == null ? 'notes/drafts/create' : 'notes/drafts/update', {
|
||||||
...(serverDraftId.value == null ? {} : { draftId: serverDraftId.value }),
|
...(serverDraftId.value == null ? {} : { draftId: serverDraftId.value }),
|
||||||
text: text.value,
|
text: text.value,
|
||||||
|
@ -827,19 +856,15 @@ async function saveServerDraft(clearLocal = false) {
|
||||||
visibility: visibility.value,
|
visibility: visibility.value,
|
||||||
localOnly: localOnly.value,
|
localOnly: localOnly.value,
|
||||||
hashtag: hashtags.value,
|
hashtag: hashtags.value,
|
||||||
...(files.value.length > 0 ? { fileIds: files.value.map(f => f.id) } : {}),
|
fileIds: files.value.map(f => f.id),
|
||||||
poll: poll.value,
|
poll: poll.value,
|
||||||
...(visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
|
visibleUserIds: visibleUsers.value.map(x => x.id),
|
||||||
renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : undefined,
|
renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : null,
|
||||||
replyId: replyTargetNote.value ? replyTargetNote.value.id : undefined,
|
replyId: replyTargetNote.value ? replyTargetNote.value.id : null,
|
||||||
channelId: targetChannel.value ? targetChannel.value.id : undefined,
|
channelId: targetChannel.value ? targetChannel.value.id : null,
|
||||||
reactionAcceptance: reactionAcceptance.value,
|
reactionAcceptance: reactionAcceptance.value,
|
||||||
}).then(() => {
|
scheduledAt: scheduledAt.value,
|
||||||
if (clearLocal) {
|
isActuallyScheduled: options.isActuallyScheduled ?? false,
|
||||||
clear();
|
|
||||||
deleteDraft();
|
|
||||||
}
|
|
||||||
}).catch((err) => {
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -874,6 +899,21 @@ async function post(ev?: MouseEvent) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (scheduledAt.value != null) {
|
||||||
|
if (uploader.items.value.some(x => x.uploaded == null)) {
|
||||||
|
await uploadFiles();
|
||||||
|
|
||||||
|
// アップロード失敗したものがあったら中止
|
||||||
|
if (uploader.items.value.some(x => x.uploaded == null)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await postAsScheduled();
|
||||||
|
clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (props.mock) return;
|
if (props.mock) return;
|
||||||
|
|
||||||
if (visibility.value === 'public' && (
|
if (visibility.value === 'public' && (
|
||||||
|
@ -1045,6 +1085,14 @@ async function post(ev?: MouseEvent) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function postAsScheduled() {
|
||||||
|
if (props.mock) return;
|
||||||
|
|
||||||
|
await saveServerDraft({
|
||||||
|
isActuallyScheduled: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function cancel() {
|
function cancel() {
|
||||||
emit('cancel');
|
emit('cancel');
|
||||||
}
|
}
|
||||||
|
@ -1139,8 +1187,10 @@ function showPerUploadItemMenuViaContextmenu(item: UploaderItem, ev: MouseEvent)
|
||||||
}
|
}
|
||||||
|
|
||||||
function showDraftMenu(ev: MouseEvent) {
|
function showDraftMenu(ev: MouseEvent) {
|
||||||
function showDraftsDialog() {
|
function showDraftsDialog(scheduled: boolean) {
|
||||||
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNoteDraftsDialog.vue')), {}, {
|
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNoteDraftsDialog.vue')), {
|
||||||
|
scheduled,
|
||||||
|
}, {
|
||||||
restore: async (draft: Misskey.entities.NoteDraft) => {
|
restore: async (draft: Misskey.entities.NoteDraft) => {
|
||||||
text.value = draft.text ?? '';
|
text.value = draft.text ?? '';
|
||||||
useCw.value = draft.cw != null;
|
useCw.value = draft.cw != null;
|
||||||
|
@ -1171,6 +1221,7 @@ function showDraftMenu(ev: MouseEvent) {
|
||||||
renoteTargetNote.value = draft.renote;
|
renoteTargetNote.value = draft.renote;
|
||||||
replyTargetNote.value = draft.reply;
|
replyTargetNote.value = draft.reply;
|
||||||
reactionAcceptance.value = draft.reactionAcceptance;
|
reactionAcceptance.value = draft.reactionAcceptance;
|
||||||
|
scheduledAt.value = draft.scheduledAt ?? null;
|
||||||
if (draft.channel) targetChannel.value = draft.channel as unknown as Misskey.entities.Channel;
|
if (draft.channel) targetChannel.value = draft.channel as unknown as Misskey.entities.Channel;
|
||||||
|
|
||||||
visibleUsers.value = [];
|
visibleUsers.value = [];
|
||||||
|
@ -1211,11 +1262,32 @@ function showDraftMenu(ev: MouseEvent) {
|
||||||
text: i18n.ts._drafts.listDrafts,
|
text: i18n.ts._drafts.listDrafts,
|
||||||
icon: 'ti ti-cloud-download',
|
icon: 'ti ti-cloud-download',
|
||||||
action: () => {
|
action: () => {
|
||||||
showDraftsDialog();
|
showDraftsDialog(false);
|
||||||
|
},
|
||||||
|
}, { type: 'divider' }, {
|
||||||
|
type: 'button',
|
||||||
|
text: i18n.ts._drafts.listScheduledNotes,
|
||||||
|
icon: 'ti ti-clock-down',
|
||||||
|
action: () => {
|
||||||
|
showDraftsDialog(true);
|
||||||
},
|
},
|
||||||
}], (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
|
}], (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function schedule() {
|
||||||
|
const { canceled, result } = await os.inputDatetime({
|
||||||
|
title: i18n.ts.schedulePost,
|
||||||
|
});
|
||||||
|
if (canceled) return;
|
||||||
|
if (result.getTime() <= Date.now()) return;
|
||||||
|
|
||||||
|
scheduledAt.value = result.getTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancelSchedule() {
|
||||||
|
scheduledAt.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (props.autofocus) {
|
if (props.autofocus) {
|
||||||
focus();
|
focus();
|
||||||
|
@ -1251,6 +1323,7 @@ onMounted(() => {
|
||||||
}
|
}
|
||||||
quoteId.value = draft.data.quoteId;
|
quoteId.value = draft.data.quoteId;
|
||||||
reactionAcceptance.value = draft.data.reactionAcceptance;
|
reactionAcceptance.value = draft.data.reactionAcceptance;
|
||||||
|
scheduledAt.value = draft.data.scheduledAt ?? null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1300,6 +1373,7 @@ async function canClose() {
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
clear,
|
clear,
|
||||||
|
abortUploader: () => uploader.abortAll(),
|
||||||
canClose,
|
canClose,
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
@ -1514,6 +1588,10 @@ html[data-color-scheme=light] .preview {
|
||||||
margin: 0 20px 16px 20px;
|
margin: 0 20px 16px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scheduledAt {
|
||||||
|
margin: 0 20px 16px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
.cw,
|
.cw,
|
||||||
.hashtags,
|
.hashtags,
|
||||||
.text {
|
.text {
|
||||||
|
|
|
@ -54,6 +54,7 @@ function onPosted() {
|
||||||
async function _close() {
|
async function _close() {
|
||||||
const canClose = await form.value?.canClose();
|
const canClose = await form.value?.canClose();
|
||||||
if (!canClose) return;
|
if (!canClose) return;
|
||||||
|
form.value?.abortUploader();
|
||||||
modal.value?.close();
|
modal.value?.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,10 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
v-panel
|
v-panel
|
||||||
:class="[$style.item, { [$style.itemWaiting]: item.preprocessing, [$style.itemCompleted]: item.uploaded, [$style.itemFailed]: item.uploadFailed }]"
|
:class="[$style.item, { [$style.itemWaiting]: item.preprocessing, [$style.itemCompleted]: item.uploaded, [$style.itemFailed]: item.uploadFailed }]"
|
||||||
:style="{ '--p': item.progress != null ? `${item.progress.value / item.progress.max * 100}%` : '0%' }"
|
:style="{
|
||||||
|
'--p': item.progress != null ? `${item.progress.value / item.progress.max * 100}%` : '0%',
|
||||||
|
'--pp': item.preprocessProgress != null ? `${item.preprocessProgress * 100}%` : '100%',
|
||||||
|
}"
|
||||||
@contextmenu.prevent.stop="onContextmenu(item, $event)"
|
@contextmenu.prevent.stop="onContextmenu(item, $event)"
|
||||||
>
|
>
|
||||||
<div :class="$style.itemInner">
|
<div :class="$style.itemInner">
|
||||||
|
@ -19,11 +22,15 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</div>
|
</div>
|
||||||
<div :class="$style.itemThumbnail" :style="{ backgroundImage: `url(${ item.thumbnail })` }" @click="onThumbnailClick(item, $event)"></div>
|
<div :class="$style.itemThumbnail" :style="{ backgroundImage: `url(${ item.thumbnail })` }" @click="onThumbnailClick(item, $event)"></div>
|
||||||
<div :class="$style.itemBody">
|
<div :class="$style.itemBody">
|
||||||
<div><i v-if="item.isSensitive" style="color: var(--MI_THEME-warn); margin-right: 0.5em;" class="ti ti-eye-exclamation"></i><MkCondensedLine :minScale="2 / 3">{{ item.name }}</MkCondensedLine></div>
|
<div>
|
||||||
|
<i v-if="item.isSensitive" style="color: var(--MI_THEME-warn); margin-right: 0.5em;" class="ti ti-eye-exclamation"></i>
|
||||||
|
<MkCondensedLine :minScale="2 / 3">{{ item.name }}</MkCondensedLine>
|
||||||
|
</div>
|
||||||
<div :class="$style.itemInfo">
|
<div :class="$style.itemInfo">
|
||||||
<span>{{ item.file.type }}</span>
|
<span>{{ item.file.type }}</span>
|
||||||
<span v-if="item.compressedSize">({{ i18n.tsx._uploader.compressedToX({ x: bytes(item.compressedSize) }) }} = {{ i18n.tsx._uploader.savedXPercent({ x: Math.round((1 - item.compressedSize / item.file.size) * 100) }) }})</span>
|
<span v-if="item.compressedSize">({{ i18n.tsx._uploader.compressedToX({ x: bytes(item.compressedSize) }) }} = {{ i18n.tsx._uploader.savedXPercent({ x: Math.round((1 - item.compressedSize / item.file.size) * 100) }) }})</span>
|
||||||
<span v-else>{{ bytes(item.file.size) }}</span>
|
<span v-else>{{ bytes(item.file.size) }}</span>
|
||||||
|
<span v-if="item.preprocessing">{{ i18n.ts.preprocessing }}<MkLoading inline em style="margin-left: 0.5em;"/></span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -97,7 +104,7 @@ function onThumbnailClick(item: UploaderItem, ev: MouseEvent) {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: var(--pp, 100%);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: linear-gradient(-45deg, transparent 25%, var(--c) 25%,var(--c) 50%, transparent 50%, transparent 75%, var(--c) 75%, var(--c));
|
background: linear-gradient(-45deg, transparent 25%, var(--c) 25%,var(--c) 50%, transparent 50%, transparent 75%, var(--c) 75%, var(--c));
|
||||||
background-size: 25px 25px;
|
background-size: 25px 25px;
|
||||||
|
|
|
@ -6,7 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<template>
|
<template>
|
||||||
<div class="_panel" :class="$style.root">
|
<div class="_panel" :class="$style.root">
|
||||||
<div :class="$style.banner" :style="user.bannerUrl ? { backgroundImage: `url(${prefer.s.disableShowingAnimatedImages ? getStaticImageUrl(user.bannerUrl) : user.bannerUrl})` } : ''"></div>
|
<div :class="$style.banner" :style="user.bannerUrl ? { backgroundImage: `url(${prefer.s.disableShowingAnimatedImages ? getStaticImageUrl(user.bannerUrl) : user.bannerUrl})` } : ''"></div>
|
||||||
<MkAvatar :class="$style.avatar" :user="user" indicator/>
|
<MkA :to="userPage(user)">
|
||||||
|
<MkAvatar :class="$style.avatar" :user="user" indicator/>
|
||||||
|
</MkA>
|
||||||
<div :class="$style.title">
|
<div :class="$style.title">
|
||||||
<MkA :class="$style.name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
|
<MkA :class="$style.name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
|
||||||
<p :class="$style.username"><MkAcct :user="user"/></p>
|
<p :class="$style.username"><MkAcct :user="user"/></p>
|
||||||
|
@ -19,15 +21,15 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<span v-else style="opacity: 0.7;">{{ i18n.ts.noAccountDescription }}</span>
|
<span v-else style="opacity: 0.7;">{{ i18n.ts.noAccountDescription }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div :class="$style.status">
|
<div :class="$style.status">
|
||||||
<div :class="$style.statusItem">
|
<MkA :class="$style.statusItem" :to="userPage(user, 'notes')">
|
||||||
<p :class="$style.statusItemLabel">{{ i18n.ts.notes }}</p><span :class="$style.statusItemValue">{{ number(user.notesCount) }}</span>
|
<p :class="$style.statusItemLabel">{{ i18n.ts.notes }}</p><span :class="$style.statusItemValue">{{ number(user.notesCount) }}</span>
|
||||||
</div>
|
</MkA>
|
||||||
<div v-if="isFollowingVisibleForMe(user)" :class="$style.statusItem">
|
<MkA v-if="isFollowingVisibleForMe(user)" :class="$style.statusItem" :to="userPage(user, 'following')">
|
||||||
<p :class="$style.statusItemLabel">{{ i18n.ts.following }}</p><span :class="$style.statusItemValue">{{ number(user.followingCount) }}</span>
|
<p :class="$style.statusItemLabel">{{ i18n.ts.following }}</p><span :class="$style.statusItemValue">{{ number(user.followingCount) }}</span>
|
||||||
</div>
|
</MkA>
|
||||||
<div v-if="isFollowersVisibleForMe(user)" :class="$style.statusItem">
|
<MkA v-if="isFollowersVisibleForMe(user)" :class="$style.statusItem" :to="userPage(user, 'followers')">
|
||||||
<p :class="$style.statusItemLabel">{{ i18n.ts.followers }}</p><span :class="$style.statusItemValue">{{ number(user.followersCount) }}</span>
|
<p :class="$style.statusItemLabel">{{ i18n.ts.followers }}</p><span :class="$style.statusItemValue">{{ number(user.followersCount) }}</span>
|
||||||
</div>
|
</MkA>
|
||||||
</div>
|
</div>
|
||||||
<MkFollowButton v-if="user.id != $i?.id" :class="$style.follow" :user="user" mini/>
|
<MkFollowButton v-if="user.id != $i?.id" :class="$style.follow" :user="user" mini/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -22,7 +22,9 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<path d="M64,32C81.661,32 96,46.339 96,64C95.891,72.184 104,72 104,72C104,72 74.096,80 64,80C52.755,80 24,72 24,72C24,72 31.854,72.018 32,64C32,46.339 46.339,32 64,32Z" style="fill: var(--MI_THEME-popup);"/>
|
<path d="M64,32C81.661,32 96,46.339 96,64C95.891,72.184 104,72 104,72C104,72 74.096,80 64,80C52.755,80 24,72 24,72C24,72 31.854,72.018 32,64C32,46.339 46.339,32 64,32Z" style="fill: var(--MI_THEME-popup);"/>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
<MkAvatar :class="$style.avatar" :user="user" indicator/>
|
<MkA :to="userPage(user)">
|
||||||
|
<MkAvatar :class="$style.avatar" :user="user" indicator/>
|
||||||
|
</MkA>
|
||||||
<div :class="$style.title">
|
<div :class="$style.title">
|
||||||
<MkA :class="$style.name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
|
<MkA :class="$style.name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
|
||||||
<div :class="$style.username"><MkAcct :user="user"/></div>
|
<div :class="$style.username"><MkAcct :user="user"/></div>
|
||||||
|
@ -32,18 +34,18 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<div v-else style="opacity: 0.7;">{{ i18n.ts.noAccountDescription }}</div>
|
<div v-else style="opacity: 0.7;">{{ i18n.ts.noAccountDescription }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div :class="$style.status">
|
<div :class="$style.status">
|
||||||
<div :class="$style.statusItem">
|
<MkA :class="$style.statusItem" :to="userPage(user, 'notes')">
|
||||||
<div :class="$style.statusItemLabel">{{ i18n.ts.notes }}</div>
|
<div :class="$style.statusItemLabel">{{ i18n.ts.notes }}</div>
|
||||||
<div>{{ number(user.notesCount) }}</div>
|
<div>{{ number(user.notesCount) }}</div>
|
||||||
</div>
|
</MkA>
|
||||||
<div v-if="isFollowingVisibleForMe(user)" :class="$style.statusItem">
|
<MkA v-if="isFollowingVisibleForMe(user)" :class="$style.statusItem" :to="userPage(user, 'following')">
|
||||||
<div :class="$style.statusItemLabel">{{ i18n.ts.following }}</div>
|
<div :class="$style.statusItemLabel">{{ i18n.ts.following }}</div>
|
||||||
<div>{{ number(user.followingCount) }}</div>
|
<div>{{ number(user.followingCount) }}</div>
|
||||||
</div>
|
</MkA>
|
||||||
<div v-if="isFollowersVisibleForMe(user)" :class="$style.statusItem">
|
<MkA v-if="isFollowersVisibleForMe(user)" :class="$style.statusItem" :to="userPage(user, 'followers')">
|
||||||
<div :class="$style.statusItemLabel">{{ i18n.ts.followers }}</div>
|
<div :class="$style.statusItemLabel">{{ i18n.ts.followers }}</div>
|
||||||
<div>{{ number(user.followersCount) }}</div>
|
<div>{{ number(user.followersCount) }}</div>
|
||||||
</div>
|
</MkA>
|
||||||
</div>
|
</div>
|
||||||
<button class="_button" :class="$style.menu" @click="showMenu"><i class="ti ti-dots"></i></button>
|
<button class="_button" :class="$style.menu" @click="showMenu"><i class="ti ti-dots"></i></button>
|
||||||
<MkFollowButton v-if="$i && user.id != $i.id" v-model:user="user" :class="$style.follow" mini/>
|
<MkFollowButton v-if="$i && user.id != $i.id" v-model:user="user" :class="$style.follow" mini/>
|
||||||
|
|
|
@ -43,6 +43,12 @@ const IMAGE_EDITING_SUPPORTED_TYPES = [
|
||||||
'image/webp',
|
'image/webp',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const VIDEO_COMPRESSION_SUPPORTED_TYPES = [ // TODO
|
||||||
|
'video/mp4',
|
||||||
|
'video/quicktime',
|
||||||
|
'video/x-matroska',
|
||||||
|
];
|
||||||
|
|
||||||
const WATERMARK_SUPPORTED_TYPES = IMAGE_EDITING_SUPPORTED_TYPES;
|
const WATERMARK_SUPPORTED_TYPES = IMAGE_EDITING_SUPPORTED_TYPES;
|
||||||
|
|
||||||
const IMAGE_PREPROCESS_NEEDED_TYPES = [
|
const IMAGE_PREPROCESS_NEEDED_TYPES = [
|
||||||
|
@ -51,6 +57,10 @@ const IMAGE_PREPROCESS_NEEDED_TYPES = [
|
||||||
...IMAGE_EDITING_SUPPORTED_TYPES,
|
...IMAGE_EDITING_SUPPORTED_TYPES,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const VIDEO_PREPROCESS_NEEDED_TYPES = [
|
||||||
|
...VIDEO_COMPRESSION_SUPPORTED_TYPES,
|
||||||
|
];
|
||||||
|
|
||||||
const mimeTypeMap = {
|
const mimeTypeMap = {
|
||||||
'image/webp': 'webp',
|
'image/webp': 'webp',
|
||||||
'image/jpeg': 'jpg',
|
'image/jpeg': 'jpg',
|
||||||
|
@ -64,6 +74,7 @@ export type UploaderItem = {
|
||||||
progress: { max: number; value: number } | null;
|
progress: { max: number; value: number } | null;
|
||||||
thumbnail: string | null;
|
thumbnail: string | null;
|
||||||
preprocessing: boolean;
|
preprocessing: boolean;
|
||||||
|
preprocessProgress: number | null;
|
||||||
uploading: boolean;
|
uploading: boolean;
|
||||||
uploaded: Misskey.entities.DriveFile | null;
|
uploaded: Misskey.entities.DriveFile | null;
|
||||||
uploadFailed: boolean;
|
uploadFailed: boolean;
|
||||||
|
@ -76,6 +87,7 @@ export type UploaderItem = {
|
||||||
isSensitive?: boolean;
|
isSensitive?: boolean;
|
||||||
caption?: string | null;
|
caption?: string | null;
|
||||||
abort?: (() => void) | null;
|
abort?: (() => void) | null;
|
||||||
|
abortPreprocess?: (() => void) | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
function getCompressionSettings(level: 0 | 1 | 2 | 3) {
|
function getCompressionSettings(level: 0 | 1 | 2 | 3) {
|
||||||
|
@ -129,11 +141,12 @@ export function useUploader(options: {
|
||||||
progress: null,
|
progress: null,
|
||||||
thumbnail: THUMBNAIL_SUPPORTED_TYPES.includes(file.type) ? window.URL.createObjectURL(file) : null,
|
thumbnail: THUMBNAIL_SUPPORTED_TYPES.includes(file.type) ? window.URL.createObjectURL(file) : null,
|
||||||
preprocessing: false,
|
preprocessing: false,
|
||||||
|
preprocessProgress: null,
|
||||||
uploading: false,
|
uploading: false,
|
||||||
aborted: false,
|
aborted: false,
|
||||||
uploaded: null,
|
uploaded: null,
|
||||||
uploadFailed: false,
|
uploadFailed: false,
|
||||||
compressionLevel: prefer.s.defaultImageCompressionLevel,
|
compressionLevel: IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultImageCompressionLevel : VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultVideoCompressionLevel : 0,
|
||||||
watermarkPresetId: uploaderFeatures.value.watermark && $i.policies.watermarkAvailable ? prefer.s.defaultWatermarkPresetId : null,
|
watermarkPresetId: uploaderFeatures.value.watermark && $i.policies.watermarkAvailable ? prefer.s.defaultWatermarkPresetId : null,
|
||||||
file: markRaw(file),
|
file: markRaw(file),
|
||||||
});
|
});
|
||||||
|
@ -318,7 +331,7 @@ export function useUploader(options: {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type) &&
|
(IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type) || VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(item.file.type)) &&
|
||||||
!item.preprocessing &&
|
!item.preprocessing &&
|
||||||
!item.uploading &&
|
!item.uploading &&
|
||||||
!item.uploaded
|
!item.uploaded
|
||||||
|
@ -391,6 +404,19 @@ export function useUploader(options: {
|
||||||
removeItem(item);
|
removeItem(item);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
} else if (item.preprocessing && item.abortPreprocess != null) {
|
||||||
|
menu.push({
|
||||||
|
type: 'divider',
|
||||||
|
}, {
|
||||||
|
icon: 'ti ti-player-stop',
|
||||||
|
text: i18n.ts.abort,
|
||||||
|
danger: true,
|
||||||
|
action: () => {
|
||||||
|
if (item.abortPreprocess != null) {
|
||||||
|
item.abortPreprocess();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
} else if (item.uploading) {
|
} else if (item.uploading) {
|
||||||
menu.push({
|
menu.push({
|
||||||
type: 'divider',
|
type: 'divider',
|
||||||
|
@ -474,6 +500,10 @@ export function useUploader(options: {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.abortPreprocess != null) {
|
||||||
|
item.abortPreprocess();
|
||||||
|
}
|
||||||
|
|
||||||
if (item.abort != null) {
|
if (item.abort != null) {
|
||||||
item.abort();
|
item.abort();
|
||||||
}
|
}
|
||||||
|
@ -484,18 +514,30 @@ export function useUploader(options: {
|
||||||
|
|
||||||
async function preprocess(item: UploaderItem): Promise<void> {
|
async function preprocess(item: UploaderItem): Promise<void> {
|
||||||
item.preprocessing = true;
|
item.preprocessing = true;
|
||||||
|
item.preprocessProgress = null;
|
||||||
|
|
||||||
try {
|
if (IMAGE_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
|
||||||
if (IMAGE_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
|
try {
|
||||||
await preprocessForImage(item);
|
await preprocessForImage(item);
|
||||||
}
|
} catch (err) {
|
||||||
} catch (err) {
|
console.error('Failed to preprocess image', err);
|
||||||
console.error('Failed to preprocess image', err);
|
|
||||||
|
|
||||||
// nop
|
// nop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (VIDEO_PREPROCESS_NEEDED_TYPES.includes(item.file.type)) {
|
||||||
|
try {
|
||||||
|
await preprocessForVideo(item);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to preprocess video', err);
|
||||||
|
|
||||||
|
// nop
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item.preprocessing = false;
|
item.preprocessing = false;
|
||||||
|
item.preprocessProgress = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function preprocessForImage(item: UploaderItem): Promise<void> {
|
async function preprocessForImage(item: UploaderItem): Promise<void> {
|
||||||
|
@ -564,10 +606,74 @@ export function useUploader(options: {
|
||||||
item.preprocessedFile = markRaw(preprocessedFile);
|
item.preprocessedFile = markRaw(preprocessedFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
onUnmounted(() => {
|
async function preprocessForVideo(item: UploaderItem): Promise<void> {
|
||||||
|
let preprocessedFile: Blob | File = item.file;
|
||||||
|
|
||||||
|
const needsCompress = item.compressionLevel !== 0 && VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(preprocessedFile.type);
|
||||||
|
|
||||||
|
if (needsCompress) {
|
||||||
|
const mediabunny = await import('mediabunny');
|
||||||
|
|
||||||
|
const source = new mediabunny.BlobSource(preprocessedFile);
|
||||||
|
|
||||||
|
const input = new mediabunny.Input({
|
||||||
|
source,
|
||||||
|
formats: mediabunny.ALL_FORMATS,
|
||||||
|
});
|
||||||
|
|
||||||
|
const output = new mediabunny.Output({
|
||||||
|
target: new mediabunny.BufferTarget(),
|
||||||
|
format: new mediabunny.Mp4OutputFormat(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const currentConversion = await mediabunny.Conversion.init({
|
||||||
|
input,
|
||||||
|
output,
|
||||||
|
video: {
|
||||||
|
//width: 320, // Height will be deduced automatically to retain aspect ratio
|
||||||
|
bitrate: item.compressionLevel === 1 ? mediabunny.QUALITY_VERY_HIGH : item.compressionLevel === 2 ? mediabunny.QUALITY_MEDIUM : mediabunny.QUALITY_VERY_LOW,
|
||||||
|
},
|
||||||
|
audio: {
|
||||||
|
bitrate: item.compressionLevel === 1 ? mediabunny.QUALITY_VERY_HIGH : item.compressionLevel === 2 ? mediabunny.QUALITY_MEDIUM : mediabunny.QUALITY_VERY_LOW,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
currentConversion.onProgress = newProgress => item.preprocessProgress = newProgress;
|
||||||
|
|
||||||
|
item.abortPreprocess = () => {
|
||||||
|
item.abortPreprocess = null;
|
||||||
|
currentConversion.cancel();
|
||||||
|
item.preprocessing = false;
|
||||||
|
item.preprocessProgress = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
await currentConversion.execute();
|
||||||
|
|
||||||
|
item.abortPreprocess = null;
|
||||||
|
|
||||||
|
preprocessedFile = new Blob([output.target.buffer!], { type: output.format.mimeType });
|
||||||
|
item.compressedSize = output.target.buffer!.byteLength;
|
||||||
|
item.uploadName = `${item.name}.mp4`;
|
||||||
|
} else {
|
||||||
|
item.compressedSize = null;
|
||||||
|
item.uploadName = item.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
|
||||||
|
item.thumbnail = THUMBNAIL_SUPPORTED_TYPES.includes(preprocessedFile.type) ? window.URL.createObjectURL(preprocessedFile) : null;
|
||||||
|
item.preprocessedFile = markRaw(preprocessedFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dispose() {
|
||||||
for (const item of items.value) {
|
for (const item of items.value) {
|
||||||
if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
|
if (item.thumbnail != null) URL.revokeObjectURL(item.thumbnail);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abortAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
dispose();
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -575,6 +681,7 @@ export function useUploader(options: {
|
||||||
addFiles,
|
addFiles,
|
||||||
removeItem,
|
removeItem,
|
||||||
abortAll,
|
abortAll,
|
||||||
|
dispose,
|
||||||
upload,
|
upload,
|
||||||
getMenu,
|
getMenu,
|
||||||
uploading: computed(() => items.value.some(item => item.uploading)),
|
uploading: computed(() => items.value.some(item => item.uploading)),
|
||||||
|
|
|
@ -23,6 +23,15 @@ export function setDragData<T extends keyof DragDataMap>(
|
||||||
event.dataTransfer.setData(`misskey/${type}`.toLowerCase(), JSON.stringify(data));
|
event.dataTransfer.setData(`misskey/${type}`.toLowerCase(), JSON.stringify(data));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function setPlainDragData(
|
||||||
|
event: DragEvent,
|
||||||
|
data: string,
|
||||||
|
) {
|
||||||
|
if (event.dataTransfer == null) return;
|
||||||
|
|
||||||
|
event.dataTransfer.setData('text/plain', data);
|
||||||
|
}
|
||||||
|
|
||||||
export function getDragData<T extends keyof DragDataMap>(
|
export function getDragData<T extends keyof DragDataMap>(
|
||||||
event: DragEvent,
|
event: DragEvent,
|
||||||
type: T,
|
type: T,
|
||||||
|
@ -35,6 +44,17 @@ export function getDragData<T extends keyof DragDataMap>(
|
||||||
return JSON.parse(data);
|
return JSON.parse(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getPlainDragData(
|
||||||
|
event: DragEvent,
|
||||||
|
): string | null {
|
||||||
|
if (event.dataTransfer == null) return null;
|
||||||
|
|
||||||
|
const data = event.dataTransfer.getData('text/plain');
|
||||||
|
if (data == null || data === '') return null;
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
export function checkDragDataType(
|
export function checkDragDataType(
|
||||||
event: DragEvent,
|
event: DragEvent,
|
||||||
types: (keyof DragDataMap)[],
|
types: (keyof DragDataMap)[],
|
||||||
|
|
|
@ -76,7 +76,7 @@ export const apiWithDialog = (<E extends keyof Misskey.Endpoints>(
|
||||||
} else if (err.code === 'ROLE_PERMISSION_DENIED') {
|
} else if (err.code === 'ROLE_PERMISSION_DENIED') {
|
||||||
title = i18n.ts.permissionDeniedError;
|
title = i18n.ts.permissionDeniedError;
|
||||||
text = i18n.ts.permissionDeniedErrorDescription;
|
text = i18n.ts.permissionDeniedErrorDescription;
|
||||||
} else if (err.code.startsWith('TOO_MANY')) {
|
} else if (err.code.startsWith('TOO_MANY')) { // TODO: バックエンドに kind: client/contentsLimitExceeded みたいな感じで送るように統一してもらってそれで判定する
|
||||||
title = i18n.ts.youCannotCreateAnymore;
|
title = i18n.ts.youCannotCreateAnymore;
|
||||||
text = `${i18n.ts.error}: ${err.id}`;
|
text = `${i18n.ts.error}: ${err.id}`;
|
||||||
} else if (err.message.startsWith('Unexpected token')) {
|
} else if (err.message.startsWith('Unexpected token')) {
|
||||||
|
@ -460,7 +460,7 @@ export function inputNumber(props: {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function inputDate(props: {
|
export function inputDatetime(props: {
|
||||||
title?: string;
|
title?: string;
|
||||||
text?: string;
|
text?: string;
|
||||||
placeholder?: string | null;
|
placeholder?: string | null;
|
||||||
|
@ -475,13 +475,13 @@ export function inputDate(props: {
|
||||||
title: props.title,
|
title: props.title,
|
||||||
text: props.text,
|
text: props.text,
|
||||||
input: {
|
input: {
|
||||||
type: 'date',
|
type: 'datetime-local',
|
||||||
placeholder: props.placeholder,
|
placeholder: props.placeholder,
|
||||||
default: props.default ?? null,
|
default: props.default ?? null,
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
done: result => {
|
done: result => {
|
||||||
resolve(result ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
|
resolve(result != null && result.result != null ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
|
||||||
},
|
},
|
||||||
closed: () => dispose(),
|
closed: () => dispose(),
|
||||||
});
|
});
|
||||||
|
|
|
@ -802,6 +802,25 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</div>
|
</div>
|
||||||
</MkFolder>
|
</MkFolder>
|
||||||
|
|
||||||
|
<MkFolder v-if="matchQuery([i18n.ts._role._options.scheduledNoteLimit, 'scheduledNoteLimit'])">
|
||||||
|
<template #label>{{ i18n.ts._role._options.scheduledNoteLimit }}</template>
|
||||||
|
<template #suffix>
|
||||||
|
<span v-if="role.policies.scheduledNoteLimit.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
|
||||||
|
<span v-else>{{ role.policies.scheduledNoteLimit.value }}</span>
|
||||||
|
<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.scheduledNoteLimit)"></i></span>
|
||||||
|
</template>
|
||||||
|
<div class="_gaps">
|
||||||
|
<MkSwitch v-model="role.policies.scheduledNoteLimit.useDefault" :readonly="readonly">
|
||||||
|
<template #label>{{ i18n.ts._role.useBaseValue }}</template>
|
||||||
|
</MkSwitch>
|
||||||
|
<MkInput v-model="role.policies.scheduledNoteLimit.value" :disabled="role.policies.scheduledNoteLimit.useDefault" type="number" :readonly="readonly">
|
||||||
|
</MkInput>
|
||||||
|
<MkRange v-model="role.policies.scheduledNoteLimit.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
|
||||||
|
<template #label>{{ i18n.ts._role.priority }}</template>
|
||||||
|
</MkRange>
|
||||||
|
</div>
|
||||||
|
</MkFolder>
|
||||||
|
|
||||||
<MkFolder v-if="matchQuery([i18n.ts._role._options.watermarkAvailable, 'watermarkAvailable'])">
|
<MkFolder v-if="matchQuery([i18n.ts._role._options.watermarkAvailable, 'watermarkAvailable'])">
|
||||||
<template #label>{{ i18n.ts._role._options.watermarkAvailable }}</template>
|
<template #label>{{ i18n.ts._role._options.watermarkAvailable }}</template>
|
||||||
<template #suffix>
|
<template #suffix>
|
||||||
|
@ -831,6 +850,7 @@ import { watch, ref, computed } from 'vue';
|
||||||
import { throttle } from 'throttle-debounce';
|
import { throttle } from 'throttle-debounce';
|
||||||
import * as Misskey from 'misskey-js';
|
import * as Misskey from 'misskey-js';
|
||||||
import RolesEditorFormula from './RolesEditorFormula.vue';
|
import RolesEditorFormula from './RolesEditorFormula.vue';
|
||||||
|
import type { MkSelectItem, GetMkSelectValueTypesFromDef } from '@/components/MkSelect.vue';
|
||||||
import MkInput from '@/components/MkInput.vue';
|
import MkInput from '@/components/MkInput.vue';
|
||||||
import MkColorInput from '@/components/MkColorInput.vue';
|
import MkColorInput from '@/components/MkColorInput.vue';
|
||||||
import MkSelect from '@/components/MkSelect.vue';
|
import MkSelect from '@/components/MkSelect.vue';
|
||||||
|
@ -842,7 +862,6 @@ import FormSlot from '@/components/form/slot.vue';
|
||||||
import { i18n } from '@/i18n.js';
|
import { i18n } from '@/i18n.js';
|
||||||
import { instance } from '@/instance.js';
|
import { instance } from '@/instance.js';
|
||||||
import { deepClone } from '@/utility/clone.js';
|
import { deepClone } from '@/utility/clone.js';
|
||||||
import type { MkSelectItem, GetMkSelectValueTypesFromDef } from '@/components/MkSelect.vue';
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(ev: 'update:modelValue', v: any): void;
|
(ev: 'update:modelValue', v: any): void;
|
||||||
|
|
|
@ -304,6 +304,13 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</MkInput>
|
</MkInput>
|
||||||
</MkFolder>
|
</MkFolder>
|
||||||
|
|
||||||
|
<MkFolder v-if="matchQuery([i18n.ts._role._options.scheduledNoteLimit, 'scheduledNoteLimit'])">
|
||||||
|
<template #label>{{ i18n.ts._role._options.scheduledNoteLimit }}</template>
|
||||||
|
<template #suffix>{{ policies.scheduledNoteLimit }}</template>
|
||||||
|
<MkInput v-model="policies.scheduledNoteLimit" type="number" :min="0">
|
||||||
|
</MkInput>
|
||||||
|
</MkFolder>
|
||||||
|
|
||||||
<MkFolder v-if="matchQuery([i18n.ts._role._options.watermarkAvailable, 'watermarkAvailable'])">
|
<MkFolder v-if="matchQuery([i18n.ts._role._options.watermarkAvailable, 'watermarkAvailable'])">
|
||||||
<template #label>{{ i18n.ts._role._options.watermarkAvailable }}</template>
|
<template #label>{{ i18n.ts._role._options.watermarkAvailable }}</template>
|
||||||
<template #suffix>{{ policies.watermarkAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
|
<template #suffix>{{ policies.watermarkAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
|
||||||
|
|
|
@ -129,13 +129,37 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<MkSelect
|
<MkSelect
|
||||||
v-model="defaultImageCompressionLevel" :items="[
|
v-model="defaultImageCompressionLevel" :items="[
|
||||||
{ label: i18n.ts.none, value: 0 },
|
{ label: i18n.ts.none, value: 0 },
|
||||||
{ label: i18n.ts.low, value: 1 },
|
{ label: `${i18n.ts.low} (${i18n.ts._compression._quality.high}; ${i18n.ts._compression._size.large})`, value: 1 },
|
||||||
{ label: i18n.ts.medium, value: 2 },
|
{ label: `${i18n.ts.medium} (${i18n.ts._compression._quality.medium}; ${i18n.ts._compression._size.medium})`, value: 2 },
|
||||||
{ label: i18n.ts.high, value: 3 },
|
{ label: `${i18n.ts.high} (${i18n.ts._compression._quality.low}; ${i18n.ts._compression._size.small})`, value: 3 },
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
<template #label><SearchLabel>{{ i18n.ts.defaultImageCompressionLevel }}</SearchLabel></template>
|
<template #label><SearchLabel>{{ i18n.ts.defaultCompressionLevel }}</SearchLabel></template>
|
||||||
<template #caption><div v-html="i18n.ts.defaultImageCompressionLevel_description"></div></template>
|
<template #caption><div v-html="i18n.ts.defaultCompressionLevel_description"></div></template>
|
||||||
|
</MkSelect>
|
||||||
|
</MkPreferenceContainer>
|
||||||
|
</SearchMarker>
|
||||||
|
</div>
|
||||||
|
</FormSection>
|
||||||
|
</SearchMarker>
|
||||||
|
|
||||||
|
<SearchMarker :keywords="['video']">
|
||||||
|
<FormSection>
|
||||||
|
<template #label><SearchLabel>{{ i18n.ts.video }}</SearchLabel></template>
|
||||||
|
|
||||||
|
<div class="_gaps_m">
|
||||||
|
<SearchMarker :keywords="['default', 'video', 'compression']">
|
||||||
|
<MkPreferenceContainer k="defaultVideoCompressionLevel">
|
||||||
|
<MkSelect
|
||||||
|
v-model="defaultVideoCompressionLevel" :items="[
|
||||||
|
{ label: i18n.ts.none, value: 0 },
|
||||||
|
{ label: `${i18n.ts.low} (${i18n.ts._compression._quality.high}; ${i18n.ts._compression._size.large})`, value: 1 },
|
||||||
|
{ label: `${i18n.ts.medium} (${i18n.ts._compression._quality.medium}; ${i18n.ts._compression._size.medium})`, value: 2 },
|
||||||
|
{ label: `${i18n.ts.high} (${i18n.ts._compression._quality.low}; ${i18n.ts._compression._size.small})`, value: 3 },
|
||||||
|
]"
|
||||||
|
>
|
||||||
|
<template #label><SearchLabel>{{ i18n.ts.defaultCompressionLevel }}</SearchLabel></template>
|
||||||
|
<template #caption><div v-html="i18n.ts.defaultCompressionLevel_description"></div></template>
|
||||||
</MkSelect>
|
</MkSelect>
|
||||||
</MkPreferenceContainer>
|
</MkPreferenceContainer>
|
||||||
</SearchMarker>
|
</SearchMarker>
|
||||||
|
@ -196,6 +220,7 @@ const meterStyle = computed(() => {
|
||||||
const keepOriginalFilename = prefer.model('keepOriginalFilename');
|
const keepOriginalFilename = prefer.model('keepOriginalFilename');
|
||||||
const defaultWatermarkPresetId = prefer.model('defaultWatermarkPresetId');
|
const defaultWatermarkPresetId = prefer.model('defaultWatermarkPresetId');
|
||||||
const defaultImageCompressionLevel = prefer.model('defaultImageCompressionLevel');
|
const defaultImageCompressionLevel = prefer.model('defaultImageCompressionLevel');
|
||||||
|
const defaultVideoCompressionLevel = prefer.model('defaultVideoCompressionLevel');
|
||||||
|
|
||||||
const watermarkPresetsSyncEnabled = ref(prefer.isSyncEnabled('watermarkPresets'));
|
const watermarkPresetsSyncEnabled = ref(prefer.isSyncEnabled('watermarkPresets'));
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<SearchMarker path="/settings/theme" :label="i18n.ts.theme" :keywords="['theme']" icon="ti ti-palette">
|
<SearchMarker path="/settings/theme" :label="i18n.ts.theme" :keywords="['theme']" icon="ti ti-palette">
|
||||||
<div class="_gaps_m">
|
<div
|
||||||
|
class="_gaps_m"
|
||||||
|
@dragover.prevent.stop="onDragover"
|
||||||
|
@drop.prevent.stop="onDrop"
|
||||||
|
>
|
||||||
<div v-adaptive-border class="rfqxtzch _panel">
|
<div v-adaptive-border class="rfqxtzch _panel">
|
||||||
<div class="toggle">
|
<div class="toggle">
|
||||||
<div class="toggleWrapper">
|
<div class="toggleWrapper">
|
||||||
|
@ -58,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:class="$style.themeRadio"
|
:class="$style.themeRadio"
|
||||||
:value="instanceLightTheme.id"
|
:value="instanceLightTheme.id"
|
||||||
/>
|
/>
|
||||||
<label :for="`themeRadio_${instanceLightTheme.id}`" :class="$style.themeItemRoot" class="_button" @contextmenu.prevent.stop="onThemeContextmenu(instanceLightTheme, $event)">
|
<label :for="`themeRadio_${instanceLightTheme.id}`" :class="$style.themeItemRoot" class="_button" draggable="true" @dragstart="onThemeDragstart($event, instanceLightTheme)" @contextmenu.prevent.stop="onThemeContextmenu(instanceLightTheme, $event)">
|
||||||
<MkThemePreview :theme="instanceLightTheme" :class="$style.themeItemPreview"/>
|
<MkThemePreview :theme="instanceLightTheme" :class="$style.themeItemPreview"/>
|
||||||
<div :class="$style.themeItemCaption">{{ instanceLightTheme.name }}</div>
|
<div :class="$style.themeItemCaption">{{ instanceLightTheme.name }}</div>
|
||||||
</label>
|
</label>
|
||||||
|
@ -78,7 +82,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:class="$style.themeRadio"
|
:class="$style.themeRadio"
|
||||||
:value="theme.id"
|
:value="theme.id"
|
||||||
/>
|
/>
|
||||||
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" draggable="true" @dragstart="onThemeDragstart($event, theme)" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
||||||
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
||||||
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
||||||
</label>
|
</label>
|
||||||
|
@ -98,7 +102,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:class="$style.themeRadio"
|
:class="$style.themeRadio"
|
||||||
:value="theme.id"
|
:value="theme.id"
|
||||||
/>
|
/>
|
||||||
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" draggable="true" @dragstart="onThemeDragstart($event, theme)" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
||||||
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
||||||
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
||||||
</label>
|
</label>
|
||||||
|
@ -129,7 +133,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:class="$style.themeRadio"
|
:class="$style.themeRadio"
|
||||||
:value="instanceDarkTheme.id"
|
:value="instanceDarkTheme.id"
|
||||||
/>
|
/>
|
||||||
<label :for="`themeRadio_${instanceDarkTheme.id}`" :class="$style.themeItemRoot" class="_button" @contextmenu.prevent.stop="onThemeContextmenu(instanceDarkTheme, $event)">
|
<label :for="`themeRadio_${instanceDarkTheme.id}`" :class="$style.themeItemRoot" class="_button" draggable="true" @dragstart="onThemeDragstart($event, instanceDarkTheme)" @contextmenu.prevent.stop="onThemeContextmenu(instanceDarkTheme, $event)">
|
||||||
<MkThemePreview :theme="instanceDarkTheme" :class="$style.themeItemPreview"/>
|
<MkThemePreview :theme="instanceDarkTheme" :class="$style.themeItemPreview"/>
|
||||||
<div :class="$style.themeItemCaption">{{ instanceDarkTheme.name }}</div>
|
<div :class="$style.themeItemCaption">{{ instanceDarkTheme.name }}</div>
|
||||||
</label>
|
</label>
|
||||||
|
@ -149,7 +153,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:class="$style.themeRadio"
|
:class="$style.themeRadio"
|
||||||
:value="theme.id"
|
:value="theme.id"
|
||||||
/>
|
/>
|
||||||
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" draggable="true" @dragstart="onThemeDragstart($event, theme)" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
||||||
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
||||||
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
||||||
</label>
|
</label>
|
||||||
|
@ -169,7 +173,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:class="$style.themeRadio"
|
:class="$style.themeRadio"
|
||||||
:value="theme.id"
|
:value="theme.id"
|
||||||
/>
|
/>
|
||||||
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
<label :for="`themeRadio_${theme.id}`" :class="$style.themeItemRoot" class="_button" draggable="true" @dragstart="onThemeDragstart($event, theme)" @contextmenu.prevent.stop="onThemeContextmenu(theme, $event)">
|
||||||
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
<MkThemePreview :theme="theme" :class="$style.themeItemPreview"/>
|
||||||
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
<div :class="$style.themeItemCaption">{{ theme.name }}</div>
|
||||||
</label>
|
</label>
|
||||||
|
@ -214,7 +218,7 @@ import FormLink from '@/components/form/link.vue';
|
||||||
import MkFolder from '@/components/MkFolder.vue';
|
import MkFolder from '@/components/MkFolder.vue';
|
||||||
import MkThemePreview from '@/components/MkThemePreview.vue';
|
import MkThemePreview from '@/components/MkThemePreview.vue';
|
||||||
import MkInfo from '@/components/MkInfo.vue';
|
import MkInfo from '@/components/MkInfo.vue';
|
||||||
import { getBuiltinThemesRef, getThemesRef, removeTheme } from '@/theme.js';
|
import { getBuiltinThemesRef, getThemesRef, installTheme, parseThemeCode, removeTheme } from '@/theme.js';
|
||||||
import { isDeviceDarkmode } from '@/utility/is-device-darkmode.js';
|
import { isDeviceDarkmode } from '@/utility/is-device-darkmode.js';
|
||||||
import { store } from '@/store.js';
|
import { store } from '@/store.js';
|
||||||
import { i18n } from '@/i18n.js';
|
import { i18n } from '@/i18n.js';
|
||||||
|
@ -223,6 +227,7 @@ import { uniqueBy } from '@/utility/array.js';
|
||||||
import { definePage } from '@/page.js';
|
import { definePage } from '@/page.js';
|
||||||
import { prefer } from '@/preferences.js';
|
import { prefer } from '@/preferences.js';
|
||||||
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
|
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
|
||||||
|
import { checkDragDataType, getDragData, getPlainDragData, setDragData, setPlainDragData } from '@/drag-and-drop.js';
|
||||||
|
|
||||||
const installedThemes = getThemesRef();
|
const installedThemes = getThemesRef();
|
||||||
const builtinThemes = getBuiltinThemesRef();
|
const builtinThemes = getBuiltinThemesRef();
|
||||||
|
@ -321,6 +326,38 @@ function onThemeContextmenu(theme: Theme, ev: MouseEvent) {
|
||||||
}], ev);
|
}], ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onThemeDragstart(ev: DragEvent, theme: Theme) {
|
||||||
|
if (!ev.dataTransfer) return;
|
||||||
|
|
||||||
|
ev.dataTransfer.effectAllowed = 'copy';
|
||||||
|
setPlainDragData(ev, JSON5.stringify(theme, null, '\t'));
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDragover(ev: DragEvent) {
|
||||||
|
if (!ev.dataTransfer) return;
|
||||||
|
|
||||||
|
if (ev.dataTransfer.types[0] === 'text/plain') {
|
||||||
|
ev.dataTransfer.dropEffect = 'copy';
|
||||||
|
} else {
|
||||||
|
ev.dataTransfer.dropEffect = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onDrop(ev: DragEvent) {
|
||||||
|
if (!ev.dataTransfer) return;
|
||||||
|
|
||||||
|
const code = getPlainDragData(ev);
|
||||||
|
if (code != null) {
|
||||||
|
try {
|
||||||
|
await installTheme(code);
|
||||||
|
} catch (err) {
|
||||||
|
// nop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const headerActions = computed(() => []);
|
const headerActions = computed(() => []);
|
||||||
|
|
||||||
const headerTabs = computed(() => []);
|
const headerTabs = computed(() => []);
|
||||||
|
|
|
@ -113,7 +113,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
<div class="status">
|
<div class="status">
|
||||||
<MkA :to="userPage(user)">
|
<MkA :to="userPage(user, 'notes')">
|
||||||
<b>{{ number(user.notesCount) }}</b>
|
<b>{{ number(user.notesCount) }}</b>
|
||||||
<span>{{ i18n.ts.notes }}</span>
|
<span>{{ i18n.ts.notes }}</span>
|
||||||
</MkA>
|
</MkA>
|
||||||
|
|
|
@ -439,6 +439,9 @@ export const PREF_DEF = definePreferences({
|
||||||
defaultImageCompressionLevel: {
|
defaultImageCompressionLevel: {
|
||||||
default: 2 as 0 | 1 | 2 | 3,
|
default: 2 as 0 | 1 | 2 | 3,
|
||||||
},
|
},
|
||||||
|
defaultVideoCompressionLevel: {
|
||||||
|
default: 2 as 0 | 1 | 2 | 3,
|
||||||
|
},
|
||||||
|
|
||||||
'sound.masterVolume': {
|
'sound.masterVolume': {
|
||||||
default: 0.5,
|
default: 0.5,
|
||||||
|
|
|
@ -20,6 +20,7 @@ import { FX_zoomLines } from './fxs/zoomLines.js';
|
||||||
import { FX_blockNoise } from './fxs/blockNoise.js';
|
import { FX_blockNoise } from './fxs/blockNoise.js';
|
||||||
import { FX_fill } from './fxs/fill.js';
|
import { FX_fill } from './fxs/fill.js';
|
||||||
import { FX_blur } from './fxs/blur.js';
|
import { FX_blur } from './fxs/blur.js';
|
||||||
|
import { FX_pixelate } from './fxs/pixelate.js';
|
||||||
import type { ImageEffectorFx } from './ImageEffector.js';
|
import type { ImageEffectorFx } from './ImageEffector.js';
|
||||||
|
|
||||||
export const FXS = [
|
export const FXS = [
|
||||||
|
@ -40,4 +41,5 @@ export const FXS = [
|
||||||
FX_blockNoise,
|
FX_blockNoise,
|
||||||
FX_fill,
|
FX_fill,
|
||||||
FX_blur,
|
FX_blur,
|
||||||
|
FX_pixelate,
|
||||||
] as const satisfies ImageEffectorFx<string, any>[];
|
] as const satisfies ImageEffectorFx<string, any>[];
|
||||||
|
|
|
@ -0,0 +1,147 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { defineImageEffectorFx } from '../ImageEffector.js';
|
||||||
|
import { i18n } from '@/i18n.js';
|
||||||
|
|
||||||
|
const shader = `#version 300 es
|
||||||
|
precision mediump float;
|
||||||
|
|
||||||
|
const float PI = 3.141592653589793;
|
||||||
|
const float TWO_PI = 6.283185307179586;
|
||||||
|
const float HALF_PI = 1.5707963267948966;
|
||||||
|
|
||||||
|
in vec2 in_uv;
|
||||||
|
uniform sampler2D in_texture;
|
||||||
|
uniform vec2 in_resolution;
|
||||||
|
uniform vec2 u_offset;
|
||||||
|
uniform vec2 u_scale;
|
||||||
|
uniform bool u_ellipse;
|
||||||
|
uniform float u_angle;
|
||||||
|
uniform int u_samples;
|
||||||
|
uniform float u_strength;
|
||||||
|
out vec4 out_color;
|
||||||
|
|
||||||
|
// TODO: pixelateの中心を画像中心ではなく範囲の中心にする
|
||||||
|
// TODO: 画像のアスペクト比に関わらず各画素は正方形にする
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
if (u_strength <= 0.0) {
|
||||||
|
out_color = texture(in_texture, in_uv);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
float angle = -(u_angle * PI);
|
||||||
|
vec2 centeredUv = in_uv - vec2(0.5, 0.5) - u_offset;
|
||||||
|
vec2 rotatedUV = vec2(
|
||||||
|
centeredUv.x * cos(angle) - centeredUv.y * sin(angle),
|
||||||
|
centeredUv.x * sin(angle) + centeredUv.y * cos(angle)
|
||||||
|
) + u_offset;
|
||||||
|
|
||||||
|
bool isInside = false;
|
||||||
|
if (u_ellipse) {
|
||||||
|
vec2 norm = (rotatedUV - u_offset) / u_scale;
|
||||||
|
isInside = dot(norm, norm) <= 1.0;
|
||||||
|
} else {
|
||||||
|
isInside = rotatedUV.x > u_offset.x - u_scale.x && rotatedUV.x < u_offset.x + u_scale.x && rotatedUV.y > u_offset.y - u_scale.y && rotatedUV.y < u_offset.y + u_scale.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isInside) {
|
||||||
|
out_color = texture(in_texture, in_uv);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
float dx = u_strength / 1.0;
|
||||||
|
float dy = u_strength / 1.0;
|
||||||
|
vec2 new_uv = vec2(
|
||||||
|
(dx * (floor((in_uv.x - 0.5 - (dx / 2.0)) / dx) + 0.5)),
|
||||||
|
(dy * (floor((in_uv.y - 0.5 - (dy / 2.0)) / dy) + 0.5))
|
||||||
|
) + vec2(0.5 + (dx / 2.0), 0.5 + (dy / 2.0));
|
||||||
|
|
||||||
|
vec4 result = vec4(0.0);
|
||||||
|
float totalSamples = 0.0;
|
||||||
|
|
||||||
|
// TODO: より多くのサンプリング
|
||||||
|
result += texture(in_texture, new_uv);
|
||||||
|
totalSamples += 1.0;
|
||||||
|
|
||||||
|
out_color = totalSamples > 0.0 ? result / totalSamples : texture(in_texture, in_uv);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
export const FX_pixelate = defineImageEffectorFx({
|
||||||
|
id: 'pixelate',
|
||||||
|
name: i18n.ts._imageEffector._fxs.pixelate,
|
||||||
|
shader,
|
||||||
|
uniforms: ['offset', 'scale', 'ellipse', 'angle', 'strength', 'samples'] as const,
|
||||||
|
params: {
|
||||||
|
offsetX: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.offset + ' X',
|
||||||
|
type: 'number',
|
||||||
|
default: 0.0,
|
||||||
|
min: -1.0,
|
||||||
|
max: 1.0,
|
||||||
|
step: 0.01,
|
||||||
|
toViewValue: v => Math.round(v * 100) + '%',
|
||||||
|
},
|
||||||
|
offsetY: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.offset + ' Y',
|
||||||
|
type: 'number',
|
||||||
|
default: 0.0,
|
||||||
|
min: -1.0,
|
||||||
|
max: 1.0,
|
||||||
|
step: 0.01,
|
||||||
|
toViewValue: v => Math.round(v * 100) + '%',
|
||||||
|
},
|
||||||
|
scaleX: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.scale + ' W',
|
||||||
|
type: 'number',
|
||||||
|
default: 0.5,
|
||||||
|
min: 0.0,
|
||||||
|
max: 1.0,
|
||||||
|
step: 0.01,
|
||||||
|
toViewValue: v => Math.round(v * 100) + '%',
|
||||||
|
},
|
||||||
|
scaleY: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.scale + ' H',
|
||||||
|
type: 'number',
|
||||||
|
default: 0.5,
|
||||||
|
min: 0.0,
|
||||||
|
max: 1.0,
|
||||||
|
step: 0.01,
|
||||||
|
toViewValue: v => Math.round(v * 100) + '%',
|
||||||
|
},
|
||||||
|
ellipse: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.circle,
|
||||||
|
type: 'boolean',
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
angle: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.angle,
|
||||||
|
type: 'number',
|
||||||
|
default: 0,
|
||||||
|
min: -1.0,
|
||||||
|
max: 1.0,
|
||||||
|
step: 0.01,
|
||||||
|
toViewValue: v => Math.round(v * 90) + '°',
|
||||||
|
},
|
||||||
|
strength: {
|
||||||
|
label: i18n.ts._imageEffector._fxProps.strength,
|
||||||
|
type: 'number',
|
||||||
|
default: 0.2,
|
||||||
|
min: 0.0,
|
||||||
|
max: 0.5,
|
||||||
|
step: 0.01,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
main: ({ gl, u, params }) => {
|
||||||
|
gl.uniform2f(u.offset, params.offsetX / 2, params.offsetY / 2);
|
||||||
|
gl.uniform2f(u.scale, params.scaleX / 2, params.scaleY / 2);
|
||||||
|
gl.uniform1i(u.ellipse, params.ellipse ? 1 : 0);
|
||||||
|
gl.uniform1f(u.angle, params.angle / 2);
|
||||||
|
gl.uniform1f(u.strength, params.strength * params.strength);
|
||||||
|
gl.uniform1i(u.samples, 256);
|
||||||
|
},
|
||||||
|
});
|
|
@ -4,11 +4,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { defineImageEffectorFx } from '../ImageEffector.js';
|
import { defineImageEffectorFx } from '../ImageEffector.js';
|
||||||
|
import { GLSL_LIB_SNOISE } from '@/utility/webgl.js';
|
||||||
import { i18n } from '@/i18n.js';
|
import { i18n } from '@/i18n.js';
|
||||||
|
|
||||||
const shader = `#version 300 es
|
const shader = `#version 300 es
|
||||||
precision mediump float;
|
precision mediump float;
|
||||||
|
|
||||||
|
${GLSL_LIB_SNOISE}
|
||||||
|
|
||||||
in vec2 in_uv;
|
in vec2 in_uv;
|
||||||
uniform sampler2D in_texture;
|
uniform sampler2D in_texture;
|
||||||
uniform vec2 in_resolution;
|
uniform vec2 in_resolution;
|
||||||
|
@ -22,10 +25,22 @@ out vec4 out_color;
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
vec4 in_color = texture(in_texture, in_uv);
|
vec4 in_color = texture(in_texture, in_uv);
|
||||||
float angle = atan(-u_pos.y + (in_uv.y), -u_pos.x + (in_uv.x));
|
vec2 centeredUv = (in_uv - vec2(0.5, 0.5));
|
||||||
float t = (1.0 + sin(angle * u_frequency)) / 2.0;
|
vec2 uv = centeredUv;
|
||||||
|
|
||||||
|
float seed = 1.0;
|
||||||
|
float time = 0.0;
|
||||||
|
|
||||||
|
vec2 noiseUV = (uv - u_pos) / distance((uv - u_pos), vec2(0.0));
|
||||||
|
float noiseX = (noiseUV.x + seed) * u_frequency;
|
||||||
|
float noiseY = (noiseUV.y + seed) * u_frequency;
|
||||||
|
float noise = (1.0 + snoise(vec3(noiseX, noiseY, time))) / 2.0;
|
||||||
|
|
||||||
|
float t = noise;
|
||||||
if (u_thresholdEnabled) t = t < u_threshold ? 1.0 : 0.0;
|
if (u_thresholdEnabled) t = t < u_threshold ? 1.0 : 0.0;
|
||||||
float d = distance(in_uv * vec2(2.0, 2.0), u_pos * vec2(2.0, 2.0));
|
|
||||||
|
// TODO: マスクの形自体も揺らぎを与える
|
||||||
|
float d = distance(uv * vec2(2.0, 2.0), u_pos * vec2(2.0, 2.0));
|
||||||
float mask = d < u_maskSize ? 0.0 : ((d - u_maskSize) * (1.0 + (u_maskSize * 2.0)));
|
float mask = d < u_maskSize ? 0.0 : ((d - u_maskSize) * (1.0 + (u_maskSize * 2.0)));
|
||||||
out_color = vec4(
|
out_color = vec4(
|
||||||
mix(in_color.r, u_black ? 0.0 : 1.0, t * mask),
|
mix(in_color.r, u_black ? 0.0 : 1.0, t * mask),
|
||||||
|
@ -61,9 +76,9 @@ export const FX_zoomLines = defineImageEffectorFx({
|
||||||
frequency: {
|
frequency: {
|
||||||
label: i18n.ts._imageEffector._fxProps.frequency,
|
label: i18n.ts._imageEffector._fxProps.frequency,
|
||||||
type: 'number',
|
type: 'number',
|
||||||
default: 30.0,
|
default: 5.0,
|
||||||
min: 1.0,
|
min: 0.0,
|
||||||
max: 200.0,
|
max: 15.0,
|
||||||
step: 0.1,
|
step: 0.1,
|
||||||
},
|
},
|
||||||
smoothing: {
|
smoothing: {
|
||||||
|
@ -75,7 +90,7 @@ export const FX_zoomLines = defineImageEffectorFx({
|
||||||
threshold: {
|
threshold: {
|
||||||
label: i18n.ts._imageEffector._fxProps.zoomLinesThreshold,
|
label: i18n.ts._imageEffector._fxProps.zoomLinesThreshold,
|
||||||
type: 'number',
|
type: 'number',
|
||||||
default: 0.2,
|
default: 0.5,
|
||||||
min: 0.0,
|
min: 0.0,
|
||||||
max: 1.0,
|
max: 1.0,
|
||||||
step: 0.01,
|
step: 0.01,
|
||||||
|
@ -95,8 +110,8 @@ export const FX_zoomLines = defineImageEffectorFx({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
main: ({ gl, u, params }) => {
|
main: ({ gl, u, params }) => {
|
||||||
gl.uniform2f(u.pos, (1.0 + params.x) / 2.0, (1.0 + params.y) / 2.0);
|
gl.uniform2f(u.pos, params.x / 2, params.y / 2);
|
||||||
gl.uniform1f(u.frequency, params.frequency);
|
gl.uniform1f(u.frequency, params.frequency * params.frequency);
|
||||||
// thresholdの調整が有効な間はsmoothingが利用できない
|
// thresholdの調整が有効な間はsmoothingが利用できない
|
||||||
gl.uniform1i(u.thresholdEnabled, params.smoothing ? 0 : 1);
|
gl.uniform1i(u.thresholdEnabled, params.smoothing ? 0 : 1);
|
||||||
gl.uniform1f(u.threshold, params.threshold);
|
gl.uniform1f(u.threshold, params.threshold);
|
||||||
|
|
|
@ -38,3 +38,91 @@ export function initShaderProgram(gl: WebGL2RenderingContext, vsSource: string,
|
||||||
|
|
||||||
return shaderProgram;
|
return shaderProgram;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const GLSL_LIB_SNOISE = `
|
||||||
|
// Description : Array and textureless GLSL 2D/3D/4D simplex
|
||||||
|
// noise functions.
|
||||||
|
// Author : Ian McEwan, Ashima Arts.
|
||||||
|
// Maintainer : stegu
|
||||||
|
// Lastmod : 20201014 (stegu)
|
||||||
|
// License : Copyright (C) 2011 Ashima Arts. All rights reserved.
|
||||||
|
// Distributed under the MIT License. See LICENSE file.
|
||||||
|
// https://github.com/ashima/webgl-noise
|
||||||
|
// https://github.com/stegu/webgl-noise
|
||||||
|
|
||||||
|
vec3 mod289(vec3 x) {
|
||||||
|
return x - floor(x * (1.0 / 289.0)) * 289.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
vec4 mod289(vec4 x) {
|
||||||
|
return x - floor(x * (1.0 / 289.0)) * 289.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
vec4 permute(vec4 x) {
|
||||||
|
return mod289(((x * 34.0) + 10.0) * x);
|
||||||
|
}
|
||||||
|
|
||||||
|
vec4 taylorInvSqrt(vec4 r) {
|
||||||
|
return 1.79284291400159 - 0.85373472095314 * r;
|
||||||
|
}
|
||||||
|
|
||||||
|
float snoise(vec3 v) {
|
||||||
|
const vec2 C = vec2(1.0/6.0, 1.0/3.0);
|
||||||
|
const vec4 D = vec4(0.0, 0.5, 1.0, 2.0);
|
||||||
|
|
||||||
|
vec3 i = floor(v + dot(v, C.yyy));
|
||||||
|
vec3 x0 = v - i + dot(i, C.xxx);
|
||||||
|
|
||||||
|
vec3 g = step(x0.yzx, x0.xyz);
|
||||||
|
vec3 l = 1.0 - g;
|
||||||
|
vec3 i1 = min(g.xyz, l.zxy);
|
||||||
|
vec3 i2 = max(g.xyz, l.zxy);
|
||||||
|
|
||||||
|
vec3 x1 = x0 - i1 + C.xxx;
|
||||||
|
vec3 x2 = x0 - i2 + C.yyy;
|
||||||
|
vec3 x3 = x0 - D.yyy;
|
||||||
|
|
||||||
|
i = mod289(i);
|
||||||
|
vec4 p = permute(permute(permute(
|
||||||
|
i.z + vec4(0.0, i1.z, i2.z, 1.0))
|
||||||
|
+ i.y + vec4(0.0, i1.y, i2.y, 1.0))
|
||||||
|
+ i.x + vec4(0.0, i1.x, i2.x, 1.0));
|
||||||
|
|
||||||
|
float n_ = 0.142857142857;
|
||||||
|
vec3 ns = n_ * D.wyz - D.xzx;
|
||||||
|
|
||||||
|
vec4 j = p - 49.0 * floor(p * ns.z * ns.z);
|
||||||
|
|
||||||
|
vec4 x_ = floor(j * ns.z);
|
||||||
|
vec4 y_ = floor(j - 7.0 * x_);
|
||||||
|
|
||||||
|
vec4 x = x_ * ns.x + ns.yyyy;
|
||||||
|
vec4 y = y_ * ns.x + ns.yyyy;
|
||||||
|
vec4 h = 1.0 - abs(x) - abs(y);
|
||||||
|
|
||||||
|
vec4 b0 = vec4(x.xy, y.xy);
|
||||||
|
vec4 b1 = vec4(x.zw, y.zw);
|
||||||
|
|
||||||
|
vec4 s0 = floor(b0) * 2.0 + 1.0;
|
||||||
|
vec4 s1 = floor(b1) * 2.0 + 1.0;
|
||||||
|
vec4 sh = -step(h, vec4(0.0));
|
||||||
|
|
||||||
|
vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
|
||||||
|
vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
|
||||||
|
|
||||||
|
vec3 p0 = vec3(a0.xy, h.x);
|
||||||
|
vec3 p1 = vec3(a0.zw, h.y);
|
||||||
|
vec3 p2 = vec3(a1.xy, h.z);
|
||||||
|
vec3 p3 = vec3(a1.zw, h.w);
|
||||||
|
|
||||||
|
vec4 norm = taylorInvSqrt(vec4(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3)));
|
||||||
|
p0 *= norm.x;
|
||||||
|
p1 *= norm.y;
|
||||||
|
p2 *= norm.z;
|
||||||
|
p3 *= norm.w;
|
||||||
|
|
||||||
|
vec4 m = max(0.5 - vec4(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), 0.0);
|
||||||
|
m = m * m;
|
||||||
|
return 105.0 * dot(m * m, vec4(dot(p0, x0), dot(p1, x1), dot(p2, x2), dot(p3, x3)));
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
|
@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { ref } from 'vue';
|
import { onMounted, ref } from 'vue';
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
activity: {
|
activity: {
|
||||||
total: number;
|
total: number;
|
||||||
|
@ -94,6 +94,10 @@ function render() {
|
||||||
pointsTotal.value = activity.map((d, i) => `${(i * zoom.value) + pos.value},${(1 - (d.total / peak)) * viewBoxY.value}`).join(' ');
|
pointsTotal.value = activity.map((d, i) => `${(i * zoom.value) + pos.value},${(1 - (d.total / peak)) * viewBoxY.value}`).join(' ');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
render();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" module>
|
<style lang="scss" module>
|
||||||
|
|
|
@ -85,6 +85,8 @@ export function toBase62(n: number): string {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getConfig(): UserConfig {
|
export function getConfig(): UserConfig {
|
||||||
|
const localesHash = toBase62(hash(JSON.stringify(locales)));
|
||||||
|
|
||||||
return {
|
return {
|
||||||
base: '/vite/',
|
base: '/vite/',
|
||||||
|
|
||||||
|
@ -188,9 +190,9 @@ export function getConfig(): UserConfig {
|
||||||
// dependencies of i18n.ts
|
// dependencies of i18n.ts
|
||||||
'config': ['@@/js/config.js'],
|
'config': ['@@/js/config.js'],
|
||||||
},
|
},
|
||||||
entryFileNames: 'scripts/[hash:8].js',
|
entryFileNames: `scripts/${localesHash}-[hash:8].js`,
|
||||||
chunkFileNames: 'scripts/[hash:8].js',
|
chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
|
||||||
assetFileNames: 'assets/[hash:8][extname]',
|
assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
|
||||||
paths(id) {
|
paths(id) {
|
||||||
for (const p of externalPackages) {
|
for (const p of externalPackages) {
|
||||||
if (p.match.test(id)) {
|
if (p.match.test(id)) {
|
||||||
|
|
|
@ -3226,7 +3226,7 @@ type Notification_2 = components['schemas']['Notification'];
|
||||||
type NotificationsCreateRequest = operations['notifications___create']['requestBody']['content']['application/json'];
|
type NotificationsCreateRequest = operations['notifications___create']['requestBody']['content']['application/json'];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "chatRoomInvitationReceived", "achievementEarned", "exportCompleted", "test", "login", "createToken"];
|
export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollEnded", "scheduledNotePosted", "scheduledNotePostFailed", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "chatRoomInvitationReceived", "achievementEarned", "exportCompleted", "test", "login", "createToken"];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
export function nyaize(text: string): string;
|
export function nyaize(text: string): string;
|
||||||
|
@ -3339,7 +3339,7 @@ type QueueStats = {
|
||||||
type QueueStatsLog = QueueStats[];
|
type QueueStatsLog = QueueStats[];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
export const queueTypes: readonly ["system", "endedPollNotification", "deliver", "inbox", "db", "relationship", "objectStorage", "userWebhookDeliver", "systemWebhookDeliver"];
|
export const queueTypes: readonly ["system", "endedPollNotification", "postScheduledNote", "deliver", "inbox", "db", "relationship", "objectStorage", "userWebhookDeliver", "systemWebhookDeliver"];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
type RenoteMuteCreateRequest = operations['renote-mute___create']['requestBody']['content']['application/json'];
|
type RenoteMuteCreateRequest = operations['renote-mute___create']['requestBody']['content']['application/json'];
|
||||||
|
@ -3441,7 +3441,7 @@ type RoleLite = components['schemas']['RoleLite'];
|
||||||
type RolePolicies = components['schemas']['RolePolicies'];
|
type RolePolicies = components['schemas']['RolePolicies'];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
export const rolePolicies: readonly ["gtlAvailable", "ltlAvailable", "canPublicNote", "mentionLimit", "canInvite", "inviteLimit", "inviteLimitCycle", "inviteExpirationTime", "canManageCustomEmojis", "canManageAvatarDecorations", "canSearchNotes", "canSearchUsers", "canUseTranslator", "canHideAds", "driveCapacityMb", "maxFileSizeMb", "alwaysMarkNsfw", "canUpdateBioMedia", "pinLimit", "antennaLimit", "wordMuteLimit", "webhookLimit", "clipLimit", "noteEachClipsLimit", "userListLimit", "userEachUserListsLimit", "rateLimitFactor", "avatarDecorationLimit", "canImportAntennas", "canImportBlocking", "canImportFollowing", "canImportMuting", "canImportUserLists", "chatAvailability", "uploadableFileTypes", "noteDraftLimit", "watermarkAvailable"];
|
export const rolePolicies: readonly ["gtlAvailable", "ltlAvailable", "canPublicNote", "mentionLimit", "canInvite", "inviteLimit", "inviteLimitCycle", "inviteExpirationTime", "canManageCustomEmojis", "canManageAvatarDecorations", "canSearchNotes", "canSearchUsers", "canUseTranslator", "canHideAds", "driveCapacityMb", "maxFileSizeMb", "alwaysMarkNsfw", "canUpdateBioMedia", "pinLimit", "antennaLimit", "wordMuteLimit", "webhookLimit", "clipLimit", "noteEachClipsLimit", "userListLimit", "userEachUserListsLimit", "rateLimitFactor", "avatarDecorationLimit", "canImportAntennas", "canImportBlocking", "canImportFollowing", "canImportMuting", "canImportUserLists", "chatAvailability", "uploadableFileTypes", "noteDraftLimit", "scheduledNoteLimit", "watermarkAvailable"];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
type RolesListResponse = operations['roles___list']['responses']['200']['content']['application/json'];
|
type RolesListResponse = operations['roles___list']['responses']['200']['content']['application/json'];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"name": "misskey-js",
|
"name": "misskey-js",
|
||||||
"version": "2025.9.1-alpha.1",
|
"version": "2025.9.1-alpha.2",
|
||||||
"description": "Misskey SDK for JavaScript",
|
"description": "Misskey SDK for JavaScript",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"main": "./built/index.js",
|
"main": "./built/index.js",
|
||||||
|
|
|
@ -4159,6 +4159,24 @@ export type components = {
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
userListId: string;
|
userListId: string;
|
||||||
};
|
};
|
||||||
|
scheduledNotePosted?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
} | {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'list';
|
||||||
|
/** Format: misskey:id */
|
||||||
|
userListId: string;
|
||||||
|
};
|
||||||
|
scheduledNotePostFailed?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
} | {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'list';
|
||||||
|
/** Format: misskey:id */
|
||||||
|
userListId: string;
|
||||||
|
};
|
||||||
receiveFollowRequest?: {
|
receiveFollowRequest?: {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
@ -4406,42 +4424,31 @@ export type components = {
|
||||||
/** Format: date-time */
|
/** Format: date-time */
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
text: string | null;
|
text: string | null;
|
||||||
cw?: string | null;
|
cw: string | null;
|
||||||
/** Format: id */
|
/** Format: id */
|
||||||
userId: string;
|
userId: string;
|
||||||
user: components['schemas']['UserLite'];
|
user: components['schemas']['UserLite'];
|
||||||
/**
|
/** Format: id */
|
||||||
* Format: id
|
replyId: string | null;
|
||||||
* @example xxxxxxxxxx
|
/** Format: id */
|
||||||
*/
|
renoteId: string | null;
|
||||||
replyId?: string | null;
|
|
||||||
/**
|
|
||||||
* Format: id
|
|
||||||
* @example xxxxxxxxxx
|
|
||||||
*/
|
|
||||||
renoteId?: string | null;
|
|
||||||
/** @description The reply target note contents if exists. If the reply target has been deleted since the draft was created, this will be null while replyId is not null. */
|
|
||||||
reply?: components['schemas']['Note'] | null;
|
reply?: components['schemas']['Note'] | null;
|
||||||
/** @description The renote target note contents if exists. If the renote target has been deleted since the draft was created, this will be null while renoteId is not null. */
|
|
||||||
renote?: components['schemas']['Note'] | null;
|
renote?: components['schemas']['Note'] | null;
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
visibility: 'public' | 'home' | 'followers' | 'specified';
|
visibility: 'public' | 'home' | 'followers' | 'specified';
|
||||||
visibleUserIds?: string[];
|
visibleUserIds: string[];
|
||||||
fileIds?: string[];
|
fileIds: string[];
|
||||||
files?: components['schemas']['DriveFile'][];
|
files?: components['schemas']['DriveFile'][];
|
||||||
hashtag?: string;
|
hashtag: string | null;
|
||||||
poll?: {
|
poll: {
|
||||||
/** Format: date-time */
|
/** Format: date-time */
|
||||||
expiresAt?: string | null;
|
expiresAt?: string | null;
|
||||||
expiredAfter?: number | null;
|
expiredAfter?: number | null;
|
||||||
multiple: boolean;
|
multiple: boolean;
|
||||||
choices: string[];
|
choices: string[];
|
||||||
} | null;
|
} | null;
|
||||||
/**
|
/** Format: id */
|
||||||
* Format: id
|
channelId: string | null;
|
||||||
* @example xxxxxxxxxx
|
|
||||||
*/
|
|
||||||
channelId?: string | null;
|
|
||||||
channel?: {
|
channel?: {
|
||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
|
@ -4450,9 +4457,11 @@ export type components = {
|
||||||
allowRenoteToExternal: boolean;
|
allowRenoteToExternal: boolean;
|
||||||
userId: string | null;
|
userId: string | null;
|
||||||
} | null;
|
} | null;
|
||||||
localOnly?: boolean;
|
localOnly: boolean;
|
||||||
/** @enum {string|null} */
|
/** @enum {string|null} */
|
||||||
reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null;
|
reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null;
|
||||||
|
scheduledAt: number | null;
|
||||||
|
isActuallyScheduled: boolean;
|
||||||
};
|
};
|
||||||
NoteReaction: {
|
NoteReaction: {
|
||||||
/** Format: id */
|
/** Format: id */
|
||||||
|
@ -4561,6 +4570,22 @@ export type components = {
|
||||||
/** Format: id */
|
/** Format: id */
|
||||||
userId: string;
|
userId: string;
|
||||||
note: components['schemas']['Note'];
|
note: components['schemas']['Note'];
|
||||||
|
} | {
|
||||||
|
/** Format: id */
|
||||||
|
id: string;
|
||||||
|
/** Format: date-time */
|
||||||
|
createdAt: string;
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'scheduledNotePosted';
|
||||||
|
note: components['schemas']['Note'];
|
||||||
|
} | {
|
||||||
|
/** Format: id */
|
||||||
|
id: string;
|
||||||
|
/** Format: date-time */
|
||||||
|
createdAt: string;
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'scheduledNotePostFailed';
|
||||||
|
noteDraft: components['schemas']['NoteDraft'];
|
||||||
} | {
|
} | {
|
||||||
/** Format: id */
|
/** Format: id */
|
||||||
id: string;
|
id: string;
|
||||||
|
@ -5253,6 +5278,7 @@ export type components = {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
chatAvailability: 'available' | 'readonly' | 'unavailable';
|
chatAvailability: 'available' | 'readonly' | 'unavailable';
|
||||||
noteDraftLimit: number;
|
noteDraftLimit: number;
|
||||||
|
scheduledNoteLimit: number;
|
||||||
watermarkAvailable: boolean;
|
watermarkAvailable: boolean;
|
||||||
};
|
};
|
||||||
ReversiGameLite: {
|
ReversiGameLite: {
|
||||||
|
@ -9553,7 +9579,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
state: '*' | 'completed' | 'wait' | 'active' | 'paused' | 'prioritized' | 'delayed' | 'failed';
|
state: '*' | 'completed' | 'wait' | 'active' | 'paused' | 'prioritized' | 'delayed' | 'failed';
|
||||||
};
|
};
|
||||||
|
@ -9740,7 +9766,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
state: ('active' | 'wait' | 'delayed' | 'completed' | 'failed' | 'paused')[];
|
state: ('active' | 'wait' | 'delayed' | 'completed' | 'failed' | 'paused')[];
|
||||||
search?: string;
|
search?: string;
|
||||||
};
|
};
|
||||||
|
@ -9808,7 +9834,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -9871,7 +9897,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -9884,7 +9910,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
name: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
name: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
qualifiedName: string;
|
qualifiedName: string;
|
||||||
counts: {
|
counts: {
|
||||||
[key: string]: number;
|
[key: string]: number;
|
||||||
|
@ -9974,7 +10000,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
name: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
name: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
counts: {
|
counts: {
|
||||||
[key: string]: number;
|
[key: string]: number;
|
||||||
};
|
};
|
||||||
|
@ -10038,7 +10064,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
jobId: string;
|
jobId: string;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -10102,7 +10128,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
jobId: string;
|
jobId: string;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -10166,7 +10192,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
jobId: string;
|
jobId: string;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -10233,7 +10259,7 @@ export interface operations {
|
||||||
content: {
|
content: {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
queue: 'system' | 'endedPollNotification' | 'postScheduledNote' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
|
||||||
jobId: string;
|
jobId: string;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -11653,6 +11679,24 @@ export interface operations {
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
userListId: string;
|
userListId: string;
|
||||||
};
|
};
|
||||||
|
scheduledNotePosted?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
} | {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'list';
|
||||||
|
/** Format: misskey:id */
|
||||||
|
userListId: string;
|
||||||
|
};
|
||||||
|
scheduledNotePostFailed?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
} | {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'list';
|
||||||
|
/** Format: misskey:id */
|
||||||
|
userListId: string;
|
||||||
|
};
|
||||||
receiveFollowRequest?: {
|
receiveFollowRequest?: {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
@ -25954,8 +25998,8 @@ export interface operations {
|
||||||
untilDate?: number;
|
untilDate?: number;
|
||||||
/** @default true */
|
/** @default true */
|
||||||
markAsRead?: boolean;
|
markAsRead?: boolean;
|
||||||
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
||||||
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -26039,8 +26083,8 @@ export interface operations {
|
||||||
untilDate?: number;
|
untilDate?: number;
|
||||||
/** @default true */
|
/** @default true */
|
||||||
markAsRead?: boolean;
|
markAsRead?: boolean;
|
||||||
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
||||||
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -27314,6 +27358,24 @@ export interface operations {
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
userListId: string;
|
userListId: string;
|
||||||
};
|
};
|
||||||
|
scheduledNotePosted?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
} | {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'list';
|
||||||
|
/** Format: misskey:id */
|
||||||
|
userListId: string;
|
||||||
|
};
|
||||||
|
scheduledNotePostFailed?: {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
} | {
|
||||||
|
/** @enum {string} */
|
||||||
|
type: 'list';
|
||||||
|
/** Format: misskey:id */
|
||||||
|
userListId: string;
|
||||||
|
};
|
||||||
receiveFollowRequest?: {
|
receiveFollowRequest?: {
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
|
||||||
|
@ -29143,31 +29205,34 @@ export interface operations {
|
||||||
* @default public
|
* @default public
|
||||||
* @enum {string}
|
* @enum {string}
|
||||||
*/
|
*/
|
||||||
visibility?: 'public' | 'home' | 'followers' | 'specified';
|
visibility: 'public' | 'home' | 'followers' | 'specified';
|
||||||
visibleUserIds?: string[];
|
visibleUserIds: string[];
|
||||||
cw?: string | null;
|
cw: string | null;
|
||||||
hashtag?: string | null;
|
hashtag: string | null;
|
||||||
/** @default false */
|
/** @default false */
|
||||||
localOnly?: boolean;
|
localOnly: boolean;
|
||||||
/**
|
/**
|
||||||
* @default null
|
* @default null
|
||||||
* @enum {string|null}
|
* @enum {string|null}
|
||||||
*/
|
*/
|
||||||
reactionAcceptance?: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
|
reactionAcceptance: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
replyId?: string | null;
|
replyId: string | null;
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
renoteId?: string | null;
|
renoteId: string | null;
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
channelId?: string | null;
|
channelId: string | null;
|
||||||
text?: string | null;
|
text: string | null;
|
||||||
fileIds?: string[];
|
fileIds: string[];
|
||||||
poll?: {
|
poll: {
|
||||||
choices: string[];
|
choices: string[];
|
||||||
multiple?: boolean;
|
multiple?: boolean;
|
||||||
expiresAt?: number | null;
|
expiresAt?: number | null;
|
||||||
expiredAfter?: number | null;
|
expiredAfter?: number | null;
|
||||||
} | null;
|
} | null;
|
||||||
|
scheduledAt: number | null;
|
||||||
|
/** @default false */
|
||||||
|
isActuallyScheduled: boolean;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -29314,6 +29379,7 @@ export interface operations {
|
||||||
untilId?: string;
|
untilId?: string;
|
||||||
sinceDate?: number;
|
sinceDate?: number;
|
||||||
untilDate?: number;
|
untilDate?: number;
|
||||||
|
scheduled?: boolean | null;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -29380,20 +29446,13 @@ export interface operations {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
draftId: string;
|
draftId: string;
|
||||||
/**
|
/** @enum {string} */
|
||||||
* @default public
|
|
||||||
* @enum {string}
|
|
||||||
*/
|
|
||||||
visibility?: 'public' | 'home' | 'followers' | 'specified';
|
visibility?: 'public' | 'home' | 'followers' | 'specified';
|
||||||
visibleUserIds?: string[];
|
visibleUserIds?: string[];
|
||||||
cw?: string | null;
|
cw?: string | null;
|
||||||
hashtag?: string | null;
|
hashtag?: string | null;
|
||||||
/** @default false */
|
|
||||||
localOnly?: boolean;
|
localOnly?: boolean;
|
||||||
/**
|
/** @enum {string|null} */
|
||||||
* @default null
|
|
||||||
* @enum {string|null}
|
|
||||||
*/
|
|
||||||
reactionAcceptance?: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
|
reactionAcceptance?: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
replyId?: string | null;
|
replyId?: string | null;
|
||||||
|
@ -29409,6 +29468,8 @@ export interface operations {
|
||||||
expiresAt?: number | null;
|
expiresAt?: number | null;
|
||||||
expiredAfter?: number | null;
|
expiredAfter?: number | null;
|
||||||
} | null;
|
} | null;
|
||||||
|
scheduledAt?: number | null;
|
||||||
|
isActuallyScheduled?: boolean;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,6 +26,8 @@ export const notificationTypes = [
|
||||||
'quote',
|
'quote',
|
||||||
'reaction',
|
'reaction',
|
||||||
'pollEnded',
|
'pollEnded',
|
||||||
|
'scheduledNotePosted',
|
||||||
|
'scheduledNotePostFailed',
|
||||||
'receiveFollowRequest',
|
'receiveFollowRequest',
|
||||||
'followRequestAccepted',
|
'followRequestAccepted',
|
||||||
'groupInvited',
|
'groupInvited',
|
||||||
|
@ -227,12 +229,14 @@ export const rolePolicies = [
|
||||||
'chatAvailability',
|
'chatAvailability',
|
||||||
'uploadableFileTypes',
|
'uploadableFileTypes',
|
||||||
'noteDraftLimit',
|
'noteDraftLimit',
|
||||||
|
'scheduledNoteLimit',
|
||||||
'watermarkAvailable',
|
'watermarkAvailable',
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export const queueTypes = [
|
export const queueTypes = [
|
||||||
'system',
|
'system',
|
||||||
'endedPollNotification',
|
'endedPollNotification',
|
||||||
|
'postScheduledNote',
|
||||||
'deliver',
|
'deliver',
|
||||||
'inbox',
|
'inbox',
|
||||||
'db',
|
'db',
|
||||||
|
|
|
@ -829,6 +829,9 @@ importers:
|
||||||
matter-js:
|
matter-js:
|
||||||
specifier: 0.20.0
|
specifier: 0.20.0
|
||||||
version: 0.20.0
|
version: 0.20.0
|
||||||
|
mediabunny:
|
||||||
|
specifier: 1.15.1
|
||||||
|
version: 1.15.1
|
||||||
mfm-js:
|
mfm-js:
|
||||||
specifier: 0.25.0
|
specifier: 0.25.0
|
||||||
version: 0.25.0
|
version: 0.25.0
|
||||||
|
@ -2440,138 +2443,163 @@ packages:
|
||||||
resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
|
resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-arm64@1.1.0':
|
'@img/sharp-libvips-linux-arm64@1.1.0':
|
||||||
resolution: {integrity: sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==}
|
resolution: {integrity: sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-arm@1.0.5':
|
'@img/sharp-libvips-linux-arm@1.0.5':
|
||||||
resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
|
resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-arm@1.1.0':
|
'@img/sharp-libvips-linux-arm@1.1.0':
|
||||||
resolution: {integrity: sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==}
|
resolution: {integrity: sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-ppc64@1.1.0':
|
'@img/sharp-libvips-linux-ppc64@1.1.0':
|
||||||
resolution: {integrity: sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==}
|
resolution: {integrity: sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==}
|
||||||
cpu: [ppc64]
|
cpu: [ppc64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-s390x@1.0.4':
|
'@img/sharp-libvips-linux-s390x@1.0.4':
|
||||||
resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
|
resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-s390x@1.1.0':
|
'@img/sharp-libvips-linux-s390x@1.1.0':
|
||||||
resolution: {integrity: sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==}
|
resolution: {integrity: sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-x64@1.0.4':
|
'@img/sharp-libvips-linux-x64@1.0.4':
|
||||||
resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
|
resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linux-x64@1.1.0':
|
'@img/sharp-libvips-linux-x64@1.1.0':
|
||||||
resolution: {integrity: sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==}
|
resolution: {integrity: sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-libvips-linuxmusl-arm64@1.0.4':
|
'@img/sharp-libvips-linuxmusl-arm64@1.0.4':
|
||||||
resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
|
resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-libvips-linuxmusl-arm64@1.1.0':
|
'@img/sharp-libvips-linuxmusl-arm64@1.1.0':
|
||||||
resolution: {integrity: sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==}
|
resolution: {integrity: sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-libvips-linuxmusl-x64@1.0.4':
|
'@img/sharp-libvips-linuxmusl-x64@1.0.4':
|
||||||
resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
|
resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-libvips-linuxmusl-x64@1.1.0':
|
'@img/sharp-libvips-linuxmusl-x64@1.1.0':
|
||||||
resolution: {integrity: sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==}
|
resolution: {integrity: sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-linux-arm64@0.33.5':
|
'@img/sharp-linux-arm64@0.33.5':
|
||||||
resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
|
resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-arm64@0.34.2':
|
'@img/sharp-linux-arm64@0.34.2':
|
||||||
resolution: {integrity: sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==}
|
resolution: {integrity: sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-arm@0.33.5':
|
'@img/sharp-linux-arm@0.33.5':
|
||||||
resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
|
resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-arm@0.34.2':
|
'@img/sharp-linux-arm@0.34.2':
|
||||||
resolution: {integrity: sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==}
|
resolution: {integrity: sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-s390x@0.33.5':
|
'@img/sharp-linux-s390x@0.33.5':
|
||||||
resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
|
resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-s390x@0.34.2':
|
'@img/sharp-linux-s390x@0.34.2':
|
||||||
resolution: {integrity: sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==}
|
resolution: {integrity: sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-x64@0.33.5':
|
'@img/sharp-linux-x64@0.33.5':
|
||||||
resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
|
resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linux-x64@0.34.2':
|
'@img/sharp-linux-x64@0.34.2':
|
||||||
resolution: {integrity: sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==}
|
resolution: {integrity: sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@img/sharp-linuxmusl-arm64@0.33.5':
|
'@img/sharp-linuxmusl-arm64@0.33.5':
|
||||||
resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
|
resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-linuxmusl-arm64@0.34.2':
|
'@img/sharp-linuxmusl-arm64@0.34.2':
|
||||||
resolution: {integrity: sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==}
|
resolution: {integrity: sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-linuxmusl-x64@0.33.5':
|
'@img/sharp-linuxmusl-x64@0.33.5':
|
||||||
resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
|
resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-linuxmusl-x64@0.34.2':
|
'@img/sharp-linuxmusl-x64@0.34.2':
|
||||||
resolution: {integrity: sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==}
|
resolution: {integrity: sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==}
|
||||||
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@img/sharp-wasm32@0.33.5':
|
'@img/sharp-wasm32@0.33.5':
|
||||||
resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
|
resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
|
||||||
|
@ -3276,36 +3304,42 @@ packages:
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm-musl@2.5.0':
|
'@parcel/watcher-linux-arm-musl@2.5.0':
|
||||||
resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
|
resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm64-glibc@2.5.0':
|
'@parcel/watcher-linux-arm64-glibc@2.5.0':
|
||||||
resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
|
resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm64-musl@2.5.0':
|
'@parcel/watcher-linux-arm64-musl@2.5.0':
|
||||||
resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
|
resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@parcel/watcher-linux-x64-glibc@2.5.0':
|
'@parcel/watcher-linux-x64-glibc@2.5.0':
|
||||||
resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
|
resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@parcel/watcher-linux-x64-musl@2.5.0':
|
'@parcel/watcher-linux-x64-musl@2.5.0':
|
||||||
resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
|
resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
|
||||||
engines: {node: '>= 10.0.0'}
|
engines: {node: '>= 10.0.0'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@parcel/watcher-win32-arm64@2.5.0':
|
'@parcel/watcher-win32-arm64@2.5.0':
|
||||||
resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
|
resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
|
||||||
|
@ -3475,6 +3509,7 @@ packages:
|
||||||
resolution: {integrity: sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==}
|
resolution: {integrity: sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm-gnueabihf@4.50.1':
|
'@rollup/rollup-linux-arm-gnueabihf@4.50.1':
|
||||||
resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
|
resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
|
||||||
|
@ -3486,6 +3521,7 @@ packages:
|
||||||
resolution: {integrity: sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==}
|
resolution: {integrity: sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm-musleabihf@4.50.1':
|
'@rollup/rollup-linux-arm-musleabihf@4.50.1':
|
||||||
resolution: {integrity: sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw==}
|
resolution: {integrity: sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw==}
|
||||||
|
@ -3497,6 +3533,7 @@ packages:
|
||||||
resolution: {integrity: sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==}
|
resolution: {integrity: sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm64-gnu@4.50.1':
|
'@rollup/rollup-linux-arm64-gnu@4.50.1':
|
||||||
resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
|
resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
|
||||||
|
@ -3508,6 +3545,7 @@ packages:
|
||||||
resolution: {integrity: sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==}
|
resolution: {integrity: sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm64-musl@4.50.1':
|
'@rollup/rollup-linux-arm64-musl@4.50.1':
|
||||||
resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
|
resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
|
||||||
|
@ -3519,6 +3557,7 @@ packages:
|
||||||
resolution: {integrity: sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==}
|
resolution: {integrity: sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==}
|
||||||
cpu: [loong64]
|
cpu: [loong64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-loongarch64-gnu@4.50.1':
|
'@rollup/rollup-linux-loongarch64-gnu@4.50.1':
|
||||||
resolution: {integrity: sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==}
|
resolution: {integrity: sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==}
|
||||||
|
@ -3530,6 +3569,7 @@ packages:
|
||||||
resolution: {integrity: sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==}
|
resolution: {integrity: sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==}
|
||||||
cpu: [ppc64]
|
cpu: [ppc64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-ppc64-gnu@4.50.1':
|
'@rollup/rollup-linux-ppc64-gnu@4.50.1':
|
||||||
resolution: {integrity: sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q==}
|
resolution: {integrity: sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q==}
|
||||||
|
@ -3541,6 +3581,7 @@ packages:
|
||||||
resolution: {integrity: sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==}
|
resolution: {integrity: sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==}
|
||||||
cpu: [riscv64]
|
cpu: [riscv64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-riscv64-gnu@4.50.1':
|
'@rollup/rollup-linux-riscv64-gnu@4.50.1':
|
||||||
resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
|
resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
|
||||||
|
@ -3564,6 +3605,7 @@ packages:
|
||||||
resolution: {integrity: sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==}
|
resolution: {integrity: sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-s390x-gnu@4.50.1':
|
'@rollup/rollup-linux-s390x-gnu@4.50.1':
|
||||||
resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
|
resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
|
||||||
|
@ -3575,6 +3617,7 @@ packages:
|
||||||
resolution: {integrity: sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==}
|
resolution: {integrity: sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-x64-gnu@4.50.1':
|
'@rollup/rollup-linux-x64-gnu@4.50.1':
|
||||||
resolution: {integrity: sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA==}
|
resolution: {integrity: sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA==}
|
||||||
|
@ -3586,6 +3629,7 @@ packages:
|
||||||
resolution: {integrity: sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==}
|
resolution: {integrity: sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-linux-x64-musl@4.50.1':
|
'@rollup/rollup-linux-x64-musl@4.50.1':
|
||||||
resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
|
resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
|
||||||
|
@ -4325,24 +4369,28 @@ packages:
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@swc/core-linux-arm64-musl@1.13.5':
|
'@swc/core-linux-arm64-musl@1.13.5':
|
||||||
resolution: {integrity: sha512-9+ZxFN5GJag4CnYnq6apKTnnezpfJhCumyz0504/JbHLo+Ue+ZtJnf3RhyA9W9TINtLE0bC4hKpWi8ZKoETyOQ==}
|
resolution: {integrity: sha512-9+ZxFN5GJag4CnYnq6apKTnnezpfJhCumyz0504/JbHLo+Ue+ZtJnf3RhyA9W9TINtLE0bC4hKpWi8ZKoETyOQ==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@swc/core-linux-x64-gnu@1.13.5':
|
'@swc/core-linux-x64-gnu@1.13.5':
|
||||||
resolution: {integrity: sha512-WD530qvHrki8Ywt/PloKUjaRKgstQqNGvmZl54g06kA+hqtSE2FTG9gngXr3UJxYu/cNAjJYiBifm7+w4nbHbA==}
|
resolution: {integrity: sha512-WD530qvHrki8Ywt/PloKUjaRKgstQqNGvmZl54g06kA+hqtSE2FTG9gngXr3UJxYu/cNAjJYiBifm7+w4nbHbA==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@swc/core-linux-x64-musl@1.13.5':
|
'@swc/core-linux-x64-musl@1.13.5':
|
||||||
resolution: {integrity: sha512-Luj8y4OFYx4DHNQTWjdIuKTq2f5k6uSXICqx+FSabnXptaOBAbJHNbHT/06JZh6NRUouaf0mYXN0mcsqvkhd7Q==}
|
resolution: {integrity: sha512-Luj8y4OFYx4DHNQTWjdIuKTq2f5k6uSXICqx+FSabnXptaOBAbJHNbHT/06JZh6NRUouaf0mYXN0mcsqvkhd7Q==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@swc/core-win32-arm64-msvc@1.13.5':
|
'@swc/core-win32-arm64-msvc@1.13.5':
|
||||||
resolution: {integrity: sha512-cZ6UpumhF9SDJvv4DA2fo9WIzlNFuKSkZpZmPG1c+4PFSEMy5DFOjBSllCvnqihCabzXzpn6ykCwBmHpy31vQw==}
|
resolution: {integrity: sha512-cZ6UpumhF9SDJvv4DA2fo9WIzlNFuKSkZpZmPG1c+4PFSEMy5DFOjBSllCvnqihCabzXzpn6ykCwBmHpy31vQw==}
|
||||||
|
@ -4566,6 +4614,12 @@ packages:
|
||||||
'@types/doctrine@0.0.9':
|
'@types/doctrine@0.0.9':
|
||||||
resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}
|
resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}
|
||||||
|
|
||||||
|
'@types/dom-mediacapture-transform@0.1.11':
|
||||||
|
resolution: {integrity: sha512-Y2p+nGf1bF2XMttBnsVPHUWzRRZzqUoJAKmiP10b5umnO6DDrWI0BrGDJy1pOHoOULVmGSfFNkQrAlC5dcj6nQ==}
|
||||||
|
|
||||||
|
'@types/dom-webcodecs@0.1.13':
|
||||||
|
resolution: {integrity: sha512-O5hkiFIcjjszPIYyUSyvScyvrBoV3NOEEZx/pMlsu44TKzWNkLVBBxnxJz42in5n3QIolYOcBYFCPZZ0h8SkwQ==}
|
||||||
|
|
||||||
'@types/eslint@7.29.0':
|
'@types/eslint@7.29.0':
|
||||||
resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
|
resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
|
||||||
|
|
||||||
|
@ -8157,6 +8211,9 @@ packages:
|
||||||
resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
|
resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
|
||||||
engines: {node: '>= 0.6'}
|
engines: {node: '>= 0.6'}
|
||||||
|
|
||||||
|
mediabunny@1.15.1:
|
||||||
|
resolution: {integrity: sha512-+eRTVzd3E4LuGYZzPSQcPzuGdAIljohSlzYTX358XsfLM2qH1lQIBYa+erx7wzVcGQLRNjdV7x7ZS0EpK04DfA==}
|
||||||
|
|
||||||
meilisearch@0.52.0:
|
meilisearch@0.52.0:
|
||||||
resolution: {integrity: sha512-RqPsB4a78sXf/ATB7PIVvKCG7yf0y1M+uCj8Z9Wku44WmCy3iz0C1PHjVV5xphQolo09CdhdyFoRxHQSJkOdpg==}
|
resolution: {integrity: sha512-RqPsB4a78sXf/ATB7PIVvKCG7yf0y1M+uCj8Z9Wku44WmCy3iz0C1PHjVV5xphQolo09CdhdyFoRxHQSJkOdpg==}
|
||||||
|
|
||||||
|
@ -9931,24 +9988,28 @@ packages:
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
slacc-linux-arm64-musl@0.0.10:
|
slacc-linux-arm64-musl@0.0.10:
|
||||||
resolution: {integrity: sha512-3lUX7752f6Okn54aONioaA+9M5TvifqXBAart+u2lNXEdWmmh003cVSU2Vcwg7nJ9lLHtju2DkDmKKfJjFuShA==}
|
resolution: {integrity: sha512-3lUX7752f6Okn54aONioaA+9M5TvifqXBAart+u2lNXEdWmmh003cVSU2Vcwg7nJ9lLHtju2DkDmKKfJjFuShA==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
slacc-linux-x64-gnu@0.0.10:
|
slacc-linux-x64-gnu@0.0.10:
|
||||||
resolution: {integrity: sha512-BxxvylF9zlOLRLCpiyMvKTIUpdLlpetNBJ+DSMDh5+Ggq+AmQz2NUGawmcBJw58F8nMCj9TpWLlGNWc2AuY+JQ==}
|
resolution: {integrity: sha512-BxxvylF9zlOLRLCpiyMvKTIUpdLlpetNBJ+DSMDh5+Ggq+AmQz2NUGawmcBJw58F8nMCj9TpWLlGNWc2AuY+JQ==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
slacc-linux-x64-musl@0.0.10:
|
slacc-linux-x64-musl@0.0.10:
|
||||||
resolution: {integrity: sha512-TYJi8LOtJiTFcZvka4du7bMjF9Bz1RHRwyLnScr5E5yjjgoLRrsvgSu7bxp87xH+rgJ3CdEwE3w3Ux8EiewHpA==}
|
resolution: {integrity: sha512-TYJi8LOtJiTFcZvka4du7bMjF9Bz1RHRwyLnScr5E5yjjgoLRrsvgSu7bxp87xH+rgJ3CdEwE3w3Ux8EiewHpA==}
|
||||||
engines: {node: '>= 10'}
|
engines: {node: '>= 10'}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
slacc-win32-arm64-msvc@0.0.10:
|
slacc-win32-arm64-msvc@0.0.10:
|
||||||
resolution: {integrity: sha512-1CHPLiDB4exzFyT5ndtJDsRRhBxNg8mGz6I6eJEMjelGkJR2KZPT9LZuby/1bS/bcVOr7zuJvGNfbEGBeHRwPQ==}
|
resolution: {integrity: sha512-1CHPLiDB4exzFyT5ndtJDsRRhBxNg8mGz6I6eJEMjelGkJR2KZPT9LZuby/1bS/bcVOr7zuJvGNfbEGBeHRwPQ==}
|
||||||
|
@ -10976,8 +11037,8 @@ packages:
|
||||||
vue-component-type-helpers@3.0.6:
|
vue-component-type-helpers@3.0.6:
|
||||||
resolution: {integrity: sha512-6CRM8X7EJqWCJOiKPvSLQG+hJPb/Oy2gyJx3pLjUEhY7PuaCthQu3e0zAGI1lqUBobrrk9IT0K8sG2GsCluxoQ==}
|
resolution: {integrity: sha512-6CRM8X7EJqWCJOiKPvSLQG+hJPb/Oy2gyJx3pLjUEhY7PuaCthQu3e0zAGI1lqUBobrrk9IT0K8sG2GsCluxoQ==}
|
||||||
|
|
||||||
vue-component-type-helpers@3.0.7:
|
vue-component-type-helpers@3.1.0-alpha.0:
|
||||||
resolution: {integrity: sha512-TvyUcFXmjZcXUvU+r1MOyn4/vv4iF+tPwg5Ig33l/FJ3myZkxeQpzzQMLMFWcQAjr6Xs7BRwVy/TwbmNZUA/4w==}
|
resolution: {integrity: sha512-K1guwS1Oy0gNfBdIdIn8JMkUV+S38sriR1zf5dP+KkPS7/r5nHnPZUL74meY2CYlxYBH4qSQ+k7bpHfwiRvaMg==}
|
||||||
|
|
||||||
vue-demi@0.14.7:
|
vue-demi@0.14.7:
|
||||||
resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
|
resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
|
||||||
|
@ -14889,7 +14950,7 @@ snapshots:
|
||||||
storybook: 9.1.5(@testing-library/dom@10.4.0)(bufferutil@4.0.9)(msw@2.11.1(@types/node@22.18.1)(typescript@5.9.2))(prettier@3.6.2)(utf-8-validate@6.0.5)(vite@7.1.5(@types/node@22.18.1)(sass@1.92.1)(terser@5.44.0)(tsx@4.20.5))
|
storybook: 9.1.5(@testing-library/dom@10.4.0)(bufferutil@4.0.9)(msw@2.11.1(@types/node@22.18.1)(typescript@5.9.2))(prettier@3.6.2)(utf-8-validate@6.0.5)(vite@7.1.5(@types/node@22.18.1)(sass@1.92.1)(terser@5.44.0)(tsx@4.20.5))
|
||||||
type-fest: 2.19.0
|
type-fest: 2.19.0
|
||||||
vue: 3.5.21(typescript@5.9.2)
|
vue: 3.5.21(typescript@5.9.2)
|
||||||
vue-component-type-helpers: 3.0.7
|
vue-component-type-helpers: 3.1.0-alpha.0
|
||||||
|
|
||||||
'@stylistic/eslint-plugin@2.13.0(eslint@9.35.0)(typescript@5.9.2)':
|
'@stylistic/eslint-plugin@2.13.0(eslint@9.35.0)(typescript@5.9.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -15241,6 +15302,12 @@ snapshots:
|
||||||
|
|
||||||
'@types/doctrine@0.0.9': {}
|
'@types/doctrine@0.0.9': {}
|
||||||
|
|
||||||
|
'@types/dom-mediacapture-transform@0.1.11':
|
||||||
|
dependencies:
|
||||||
|
'@types/dom-webcodecs': 0.1.13
|
||||||
|
|
||||||
|
'@types/dom-webcodecs@0.1.13': {}
|
||||||
|
|
||||||
'@types/eslint@7.29.0':
|
'@types/eslint@7.29.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/estree': 1.0.8
|
'@types/estree': 1.0.8
|
||||||
|
@ -19688,6 +19755,11 @@ snapshots:
|
||||||
|
|
||||||
media-typer@0.3.0: {}
|
media-typer@0.3.0: {}
|
||||||
|
|
||||||
|
mediabunny@1.15.1:
|
||||||
|
dependencies:
|
||||||
|
'@types/dom-mediacapture-transform': 0.1.11
|
||||||
|
'@types/dom-webcodecs': 0.1.13
|
||||||
|
|
||||||
meilisearch@0.52.0: {}
|
meilisearch@0.52.0: {}
|
||||||
|
|
||||||
memoizerific@1.11.3:
|
memoizerific@1.11.3:
|
||||||
|
@ -22765,7 +22837,7 @@ snapshots:
|
||||||
|
|
||||||
vue-component-type-helpers@3.0.6: {}
|
vue-component-type-helpers@3.0.6: {}
|
||||||
|
|
||||||
vue-component-type-helpers@3.0.7: {}
|
vue-component-type-helpers@3.1.0-alpha.0: {}
|
||||||
|
|
||||||
vue-demi@0.14.7(vue@3.5.21(typescript@5.9.2)):
|
vue-demi@0.14.7(vue@3.5.21(typescript@5.9.2)):
|
||||||
dependencies:
|
dependencies:
|
||||||
|
|
Loading…
Reference in New Issue