From 45594e81c53a0e93f2c7eff06b9f731f8cb2d43c Mon Sep 17 00:00:00 2001
From: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Date: Tue, 23 Jul 2024 05:35:37 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E3=82=B5=E3=82=A4=E3=82=B3?=
 =?UTF-8?q?=E3=83=AD=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/frontend/src/widgets/index.ts

Co-authored-by: Esurio/1673beta <60435625+1673beta@users.noreply.github.com>
---
 locales/index.d.ts                           |  14 ++
 locales/ja-JP.yml                            |   5 +
 packages/frontend/package.json               |   1 +
 packages/frontend/src/components/MkDice.vue  |  87 +++++++++++
 packages/frontend/src/widgets/WidgetDice.vue |  67 +++++++++
 packages/frontend/src/widgets/index.ts       |   2 +
 pnpm-lock.yaml                               | 145 ++++++++++++++-----
 7 files changed, 281 insertions(+), 40 deletions(-)
 create mode 100644 packages/frontend/src/components/MkDice.vue
 create mode 100644 packages/frontend/src/widgets/WidgetDice.vue

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 7b98f1ea48..3d541a3ca4 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -11660,6 +11660,20 @@ export interface Locale extends ILocale {
          */
         "quesion": string;
     };
+    "_dice": {
+        /**
+         * サイコロを振る
+         */
+        "rollDice": string;
+        /**
+         * サイコロの数
+         */
+        "diceCount": string;
+        /**
+         * サイコロの面数
+         */
+        "diceFaces": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5f29d9bba4..d72deafb31 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -3115,3 +3115,8 @@ _reIndexOpenSearch:
 _reCreateOpenSearchIndex:
   title: "現在のインデックスを破棄して再インデックスする"
   quesion: "現在のインデックスを破棄して全てのノートを再インデックスしますか？"
+
+_dice:
+  rollDice: "サイコロを振る"
+  diceCount: "サイコロの数"
+  diceFaces: "サイコロの面数"
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 6cbb32e519..62daed93fa 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -17,6 +17,7 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
+		"@dice-roller/rpg-dice-roller": "^5.5.0",
 		"@discordapp/twemoji": "15.0.3",
 		"@github/webauthn-json": "2.1.1",
 		"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
diff --git a/packages/frontend/src/components/MkDice.vue b/packages/frontend/src/components/MkDice.vue
new file mode 100644
index 0000000000..2785a61a6a
--- /dev/null
+++ b/packages/frontend/src/components/MkDice.vue
@@ -0,0 +1,87 @@
+<template>
+	<div class="zmdxowus">
+		<div>
+			<MkInput v-model="diceCount" small type="text" class="input">
+				<template #label>{{ i18n.ts._dice.diceCount }}</template>
+			</MkInput>
+		</div>
+		<div>
+			<MkInput v-model="diceFaces" small type="text" class="input">
+				<template #label>{{ i18n.ts._dice.diceFaces }}</template>
+			</MkInput>
+		</div>
+		<div>
+			<MkButton large primary style="margin: 0 auto;" @click="rollDice">
+				<i class="ti ti-dice-2"></i>
+				{{ i18n.ts._dice.rollDice }}
+			</MkButton>
+		</div>
+		<div v-if="diceResult" class="result">{{ diceResult }}</div>
+		<div v-if="showMinTotal" class="option">{{ diceMinTotal }}</div>
+		<div v-if="showMaxTotal" class="option">{{ diceMaxTotal }}</div>
+		<dic v-if="showAverageTotal" class="option">{{ diceAverageTotal }}</dic>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { Ref, ref } from 'vue';
+import { DiceRoll } from '@dice-roller/rpg-dice-roller';
+import MkInput from '@/components/MkInput.vue';
+import MkButton from '@/components/MkButton.vue';
+import { i18n } from '@/i18n';
+
+const props = withDefaults(defineProps<{
+	showMinTotal?: boolean;
+	showMaxTotal?: boolean;
+	showAverageTotal?: boolean;
+}>(), {
+	showMinTotal: false,
+	showMaxTotal: false,
+	showAverageTotal: false,
+});
+
+const diceCount = ref(1);
+const diceFaces = ref(6);
+const diceResult: Ref<number | null> = ref(null);
+const diceMinTotal: Ref<number | null> = ref(null);
+const diceMaxTotal: Ref<number | null> = ref(null);
+const diceAverageTotal: Ref<number | null> = ref(null);
+
+const rollDice = () => {
+	let roll = new DiceRoll(`${diceCount.value}d${diceFaces.value}`);
+	if (diceCount.value > 999) {
+		return;
+	}
+
+	diceResult.value = roll.total;
+	diceMinTotal.value = roll.minTotal;
+	diceMaxTotal.value = roll.maxTotal;
+	diceAverageTotal.value = roll.averageTotal;
+}
+
+</script>
+
+<style lang="scss" scoped>
+.zmdxowus {
+	padding: 8px 16px;
+
+	> div {
+		margin: 8px 0;
+	}
+
+	> .input {
+		flex: 1 1 auto;
+		padding: 8px;
+	}
+
+	> .result {
+		text-align: center;
+		margin: auto;
+	}
+
+	> .option {
+		padding: 8px 0;
+		text-align: left;
+	}
+}
+</style>
diff --git a/packages/frontend/src/widgets/WidgetDice.vue b/packages/frontend/src/widgets/WidgetDice.vue
new file mode 100644
index 0000000000..c076921788
--- /dev/null
+++ b/packages/frontend/src/widgets/WidgetDice.vue
@@ -0,0 +1,67 @@
+<template>
+	<div class="_monospace" :class="[$style.root, {_panel: !widgetProps.transparent}]">
+		<MkDice
+			:showMinTotal="widgetProps.showMinTotal"
+			:showMaxTotal="widgetProps.showMaxTotal"
+			:showAverageTotal="widgetProps.showAverageTotal"
+		/>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { Ref, ref } from 'vue';
+import { GetFormResultType } from '@/scripts/form.js';
+import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
+import MkDice from '@/components/MkDice.vue';
+import { i18n }	from '@/i18n.js';
+
+const name = 'dice';
+
+const widgetPropsDef = {
+	transparent: {
+		type: 'boolean' as const,
+		default: false,
+	},
+	showMinTotal: {
+		type: 'boolean' as const,
+		default: false,
+	},
+	showMaxTotal: {
+		type: 'boolean' as const,
+		default: false,
+	},
+	showAverageTotal: {
+		type: 'boolean' as const,
+		default: false,
+	},
+}
+
+type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
+
+const props = defineProps<WidgetComponentProps<WidgetProps>>();
+const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
+
+const { widgetProps, configure } = useWidgetPropsManager(name,
+	widgetPropsDef,
+	props,
+	emit,
+);
+
+defineExpose<WidgetComponentExpose>({
+	name,
+	configure,
+	id: props.widget ? props.widget.id : null,
+});
+
+</script>
+
+<style lang="scss" module>
+.root {
+	position: relative;
+	padding: 16px 0;
+
+	> .input {
+		flex: 1 1 auto;
+	}
+}
+</style>
diff --git a/packages/frontend/src/widgets/index.ts b/packages/frontend/src/widgets/index.ts
index eb131fbb19..e7ba9ef662 100644
--- a/packages/frontend/src/widgets/index.ts
+++ b/packages/frontend/src/widgets/index.ts
@@ -35,6 +35,7 @@ export default function(app: App) {
 	app.component('WidgetClicker', defineAsyncComponent(() => import('./WidgetClicker.vue')));
 	app.component('WidgetBirthdayFollowings', defineAsyncComponent(() => import('./WidgetBirthdayFollowings.vue')));
 	app.component('WidgetMascot', defineAsyncComponent(() => import('./WidgetMascot.vue')));
+	app.component('WidgetDice', defineAsyncComponent(() => import('./WidgetDice.vue')));
 }
 
 export const widgets = [
@@ -67,4 +68,5 @@ export const widgets = [
 	'clicker',
 	'birthdayFollowings',
 	'mascot',
+	'dice',
 ];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1f777aa306..1f5ffd8333 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -809,6 +809,9 @@ importers:
 
   packages/frontend:
     dependencies:
+      '@dice-roller/rpg-dice-roller':
+        specifier: ^5.5.0
+        version: 5.5.0
       '@discordapp/twemoji':
         specifier: 15.0.3
         version: 15.0.3
@@ -2200,6 +2203,10 @@ packages:
   '@cypress/xvfb@1.2.4':
     resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
 
+  '@dice-roller/rpg-dice-roller@5.5.0':
+    resolution: {integrity: sha512-ip318MKhfRvqzpXNQaMyqJkOWbeOlaiIopfyluantEVF706fRP4Jy0WsTZrnKhRvhJTZTJa5dTTWqcoPmt1Xww==}
+    engines: {node: '>=18.0'}
+
   '@digitalbazaar/http-client@3.4.1':
     resolution: {integrity: sha512-Ahk1N+s7urkgj7WvvUND5f8GiWEPfUw0D41hdElaqLgu8wZScI8gdI0q+qWw5N1d35x7GCRH2uk9mi+Uzo9M3g==}
     engines: {node: '>=14.0'}
@@ -6088,6 +6095,9 @@ packages:
   compare-versions@6.1.0:
     resolution: {integrity: sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==}
 
+  complex.js@2.1.1:
+    resolution: {integrity: sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==}
+
   compress-commons@6.0.2:
     resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
     engines: {node: '>= 14'}
@@ -6704,6 +6714,9 @@ packages:
   escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
+  escape-latex@1.2.0:
+    resolution: {integrity: sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==}
+
   escape-regexp@0.0.1:
     resolution: {integrity: sha512-jVgdsYRa7RKxTT6MKNC3gdT+BF0Gfhpel19+HMRZJC2L0PufB0XOBuXBoXj29NKHwuktnAXd1Z1lyiH/8vOTpw==}
 
@@ -7143,6 +7156,9 @@ packages:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
 
+  fraction.js@4.3.4:
+    resolution: {integrity: sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q==}
+
   fresh@0.5.2:
     resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
     engines: {node: '>= 0.6'}
@@ -8010,6 +8026,9 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  javascript-natural-sort@0.7.1:
+    resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}
+
   jest-changed-files@29.7.0:
     resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -8560,6 +8579,11 @@ packages:
     engines: {node: '>= 12'}
     hasBin: true
 
+  mathjs@11.12.0:
+    resolution: {integrity: sha512-UGhVw8rS1AyedyI55DGz9q1qZ0p98kyKPyc9vherBkoueLntPfKtPBh14x+V4cdUWK0NZV2TBwqRFlvadscSuw==}
+    engines: {node: '>= 14'}
+    hasBin: true
+
   matter-js@0.19.0:
     resolution: {integrity: sha512-v2huwvQGOHTGOkMqtHd2hercCG3f6QAObTisPPHg8TZqq2lz7eIY/5i/5YUV8Ibf3mEioFEmwibcPUF2/fnKKQ==}
 
@@ -10015,6 +10039,9 @@ packages:
   ramda@0.29.0:
     resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
 
+  random-js@2.1.0:
+    resolution: {integrity: sha512-CRUyWmnzmZBA7RZSVGq0xMqmgCyPPxbiKNLFA5ud7KenojVX2s7Gv+V7eB52beKTPGxWRnVZ7D/tCIgYJJ8vNQ==}
+
   random-seed@0.3.0:
     resolution: {integrity: sha512-y13xtn3kcTlLub3HKWXxJNeC2qK4mB59evwZ5EkeRlolx+Bp2ztF7LbcZmyCnOqlHQrLnfuNbi1sVmm9lPDlDA==}
     engines: {node: '>= 0.6.0'}
@@ -10974,6 +11001,9 @@ packages:
   through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
+  tiny-emitter@2.1.0:
+    resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
+
   tiny-invariant@1.3.3:
     resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
@@ -11188,6 +11218,10 @@ packages:
     resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
     engines: {node: '>= 0.4'}
 
+  typed-function@4.2.1:
+    resolution: {integrity: sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==}
+    engines: {node: '>= 18'}
+
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
@@ -12360,7 +12394,7 @@ snapshots:
       '@babel/traverse': 7.24.7
       '@babel/types': 7.24.7
       convert-source-map: 2.0.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -12420,7 +12454,7 @@ snapshots:
       '@babel/core': 7.24.7
       '@babel/helper-compilation-targets': 7.24.7
       '@babel/helper-plugin-utils': 7.24.7
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -13164,7 +13198,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.24.7
       '@babel/parser': 7.24.7
       '@babel/types': 7.24.7
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -13303,6 +13337,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@dice-roller/rpg-dice-roller@5.5.0':
+    dependencies:
+      mathjs: 11.12.0
+      random-js: 2.1.0
+
   '@digitalbazaar/http-client@3.4.1(web-streams-polyfill@3.3.3)':
     dependencies:
       ky: 0.33.3
@@ -13548,7 +13587,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.1
@@ -13772,7 +13811,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -14422,7 +14461,7 @@ snapshots:
   '@opensearch-project/opensearch@2.10.0':
     dependencies:
       aws4: 1.13.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       hpagent: 1.2.0
       json11: 1.1.2
       ms: 2.1.3
@@ -16716,7 +16755,7 @@ snapshots:
       '@typescript-eslint/type-utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.53.0
       graphemer: 1.4.0
       ignore: 5.3.1
@@ -16736,7 +16775,7 @@ snapshots:
       '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
       graphemer: 1.4.0
       ignore: 5.3.1
@@ -16756,7 +16795,7 @@ snapshots:
       '@typescript-eslint/type-utils': 7.7.1(eslint@8.57.0)(typescript@5.4.5)
       '@typescript-eslint/utils': 7.7.1(eslint@8.57.0)(typescript@5.4.5)
       '@typescript-eslint/visitor-keys': 7.7.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
       graphemer: 1.4.0
       ignore: 5.3.1
@@ -16774,7 +16813,7 @@ snapshots:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.53.0
     optionalDependencies:
       typescript: 5.3.3
@@ -16787,7 +16826,7 @@ snapshots:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
     optionalDependencies:
       typescript: 5.3.3
@@ -16800,7 +16839,7 @@ snapshots:
       '@typescript-eslint/types': 7.7.1
       '@typescript-eslint/typescript-estree': 7.7.1(typescript@5.4.5)
       '@typescript-eslint/visitor-keys': 7.7.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
     optionalDependencies:
       typescript: 5.4.5
@@ -16831,7 +16870,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.53.0
       ts-api-utils: 1.3.0(typescript@5.3.3)
     optionalDependencies:
@@ -16843,7 +16882,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
       ts-api-utils: 1.3.0(typescript@5.3.3)
     optionalDependencies:
@@ -16855,7 +16894,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.7.1(typescript@5.4.5)
       '@typescript-eslint/utils': 7.7.1(eslint@8.57.0)(typescript@5.4.5)
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
       ts-api-utils: 1.3.0(typescript@5.4.5)
     optionalDependencies:
@@ -16875,7 +16914,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/visitor-keys': 5.62.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.2
@@ -16889,7 +16928,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.2
@@ -16903,7 +16942,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -16918,7 +16957,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.7.1
       '@typescript-eslint/visitor-keys': 7.7.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.4
@@ -17291,13 +17330,13 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -18151,6 +18190,8 @@ snapshots:
 
   compare-versions@6.1.0: {}
 
+  complex.js@2.1.1: {}
+
   compress-commons@6.0.2:
     dependencies:
       crc-32: 1.2.2
@@ -18670,7 +18711,7 @@ snapshots:
   detect-port@1.6.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -18917,7 +18958,7 @@ snapshots:
 
   esbuild-register@3.5.0(esbuild@0.20.2):
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       esbuild: 0.20.2
     transitivePeerDependencies:
       - supports-color
@@ -19003,6 +19044,8 @@ snapshots:
 
   escape-html@1.0.3: {}
 
+  escape-latex@1.2.0: {}
+
   escape-regexp@0.0.1: {}
 
   escape-string-regexp@1.0.5: {}
@@ -19212,7 +19255,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -19255,7 +19298,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -19726,6 +19769,8 @@ snapshots:
 
   forwarded@0.2.0: {}
 
+  fraction.js@4.3.4: {}
+
   fresh@0.5.2: {}
 
   from@0.1.7: {}
@@ -20233,14 +20278,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -20279,14 +20324,14 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.4:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -20394,7 +20439,7 @@ snapshots:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -20659,7 +20704,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -20685,6 +20730,8 @@ snapshots:
       filelist: 1.0.4
       minimatch: 3.1.2
 
+  javascript-natural-sort@0.7.1: {}
+
   jest-changed-files@29.7.0:
     dependencies:
       execa: 5.1.1
@@ -21462,6 +21509,18 @@ snapshots:
 
   marked@4.3.0: {}
 
+  mathjs@11.12.0:
+    dependencies:
+      '@babel/runtime': 7.24.7
+      complex.js: 2.1.1
+      decimal.js: 10.4.3
+      escape-latex: 1.2.0
+      fraction.js: 4.3.4
+      javascript-natural-sort: 0.7.1
+      seedrandom: 3.0.5
+      tiny-emitter: 2.1.0
+      typed-function: 4.2.1
+
   matter-js@0.19.0: {}
 
   mdast-util-find-and-replace@3.0.1:
@@ -21782,7 +21841,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.1
@@ -23121,6 +23180,8 @@ snapshots:
 
   ramda@0.29.0: {}
 
+  random-js@2.1.0: {}
+
   random-seed@0.3.0:
     dependencies:
       json-stringify-safe: 5.0.1
@@ -23401,7 +23462,7 @@ snapshots:
 
   require-in-the-middle@7.3.0:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -23459,7 +23520,7 @@ snapshots:
 
   retry-request@5.0.2:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       extend: 3.0.2
     transitivePeerDependencies:
       - supports-color
@@ -23711,7 +23772,7 @@ snapshots:
     dependencies:
       '@hapi/hoek': 10.0.1
       '@hapi/wreck': 18.1.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       joi: 17.13.3
     transitivePeerDependencies:
       - supports-color
@@ -23809,7 +23870,7 @@ snapshots:
   socks-proxy-agent@8.0.3:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -24246,6 +24307,8 @@ snapshots:
 
   through@2.3.8: {}
 
+  tiny-emitter@2.1.0: {}
+
   tiny-invariant@1.3.3: {}
 
   tinybench@2.8.0: {}
@@ -24446,6 +24509,8 @@ snapshots:
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
 
+  typed-function@4.2.1: {}
+
   typedarray@0.0.6: {}
 
   typeorm@0.3.20(ioredis@5.4.1)(pg@8.11.5):
@@ -24456,7 +24521,7 @@ snapshots:
       chalk: 4.1.2
       cli-highlight: 2.1.11
       dayjs: 1.11.11
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       dotenv: 16.4.5
       glob: 10.3.12
       mkdirp: 2.1.6
@@ -24663,7 +24728,7 @@ snapshots:
   vite-node@0.34.6(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       mlly: 1.7.1
       pathe: 1.1.2
       picocolors: 1.0.1
@@ -24712,7 +24777,7 @@ snapshots:
       acorn-walk: 8.3.3
       cac: 6.7.14
       chai: 4.4.1
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       local-pkg: 0.4.3
       magic-string: 0.30.10
       pathe: 1.1.2
@@ -24796,7 +24861,7 @@ snapshots:
 
   vue-eslint-parser@9.4.2(eslint@8.57.0):
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@5.5.0)
       eslint: 8.57.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3

From d3a7c95311fb77527b474314b059b62426e7951f Mon Sep 17 00:00:00 2001
From: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Date: Tue, 23 Jul 2024 06:01:17 +0900
Subject: [PATCH 2/3] Update CHANGELOG_yojo.md

---
 CHANGELOG_yojo.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_yojo.md b/CHANGELOG_yojo.md
index b0fdb9407c..3f81429125 100644
--- a/CHANGELOG_yojo.md
+++ b/CHANGELOG_yojo.md
@@ -24,7 +24,8 @@
 -
 
 ### Client
--
+- feat: サイコロウィジェット  
+(Cherry-picked from https://github.com/1673beta/cherrypick/pull/73)
 
 ### Server
 -

From 83a57887df7470a8f5711f94f1659a52031341fd Mon Sep 17 00:00:00 2001
From: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:47:54 +0900
Subject: [PATCH 3/3] SPDX

---
 packages/frontend/src/components/MkDice.vue  | 48 +++++++++++---------
 packages/frontend/src/widgets/WidgetDice.vue | 22 +++++----
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/packages/frontend/src/components/MkDice.vue b/packages/frontend/src/components/MkDice.vue
index 2785a61a6a..43db23d5d1 100644
--- a/packages/frontend/src/components/MkDice.vue
+++ b/packages/frontend/src/components/MkDice.vue
@@ -1,26 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project, noridev, cherrypick-project, esurio
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 <template>
-	<div class="zmdxowus">
-		<div>
-			<MkInput v-model="diceCount" small type="text" class="input">
-				<template #label>{{ i18n.ts._dice.diceCount }}</template>
-			</MkInput>
-		</div>
-		<div>
-			<MkInput v-model="diceFaces" small type="text" class="input">
-				<template #label>{{ i18n.ts._dice.diceFaces }}</template>
-			</MkInput>
-		</div>
-		<div>
-			<MkButton large primary style="margin: 0 auto;" @click="rollDice">
-				<i class="ti ti-dice-2"></i>
-				{{ i18n.ts._dice.rollDice }}
-			</MkButton>
-		</div>
-		<div v-if="diceResult" class="result">{{ diceResult }}</div>
-		<div v-if="showMinTotal" class="option">{{ diceMinTotal }}</div>
-		<div v-if="showMaxTotal" class="option">{{ diceMaxTotal }}</div>
-		<dic v-if="showAverageTotal" class="option">{{ diceAverageTotal }}</dic>
+<div class="zmdxowus">
+	<div>
+		<MkInput v-model="diceCount" small type="text" class="input">
+			<template #label>{{ i18n.ts._dice.diceCount }}</template>
+		</MkInput>
 	</div>
+	<div>
+		<MkInput v-model="diceFaces" small type="text" class="input">
+			<template #label>{{ i18n.ts._dice.diceFaces }}</template>
+		</MkInput>
+	</div>
+	<div>
+		<MkButton large primary style="margin: 0 auto;" @click="rollDice">
+			<i class="ti ti-dice-2"></i>
+			{{ i18n.ts._dice.rollDice }}
+		</MkButton>
+	</div>
+	<div v-if="diceResult" class="result">{{ diceResult }}</div>
+	<div v-if="showMinTotal" class="option">{{ diceMinTotal }}</div>
+	<div v-if="showMaxTotal" class="option">{{ diceMaxTotal }}</div>
+	<dic v-if="showAverageTotal" class="option">{{ diceAverageTotal }}</dic>
+</div>
 </template>
 
 <script lang="ts" setup>
@@ -57,7 +61,7 @@ const rollDice = () => {
 	diceMinTotal.value = roll.minTotal;
 	diceMaxTotal.value = roll.maxTotal;
 	diceAverageTotal.value = roll.averageTotal;
-}
+};
 
 </script>
 
diff --git a/packages/frontend/src/widgets/WidgetDice.vue b/packages/frontend/src/widgets/WidgetDice.vue
index c076921788..5801be3181 100644
--- a/packages/frontend/src/widgets/WidgetDice.vue
+++ b/packages/frontend/src/widgets/WidgetDice.vue
@@ -1,17 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project, noridev, cherrypick-project, esurio
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 <template>
-	<div class="_monospace" :class="[$style.root, {_panel: !widgetProps.transparent}]">
-		<MkDice
-			:showMinTotal="widgetProps.showMinTotal"
-			:showMaxTotal="widgetProps.showMaxTotal"
-			:showAverageTotal="widgetProps.showAverageTotal"
-		/>
-	</div>
+<div class="_monospace" :class="[$style.root, {_panel: !widgetProps.transparent}]">
+	<MkDice
+		:showMinTotal="widgetProps.showMinTotal"
+		:showMaxTotal="widgetProps.showMaxTotal"
+		:showAverageTotal="widgetProps.showAverageTotal"
+	/>
+</div>
 </template>
 
 <script lang="ts" setup>
 import { Ref, ref } from 'vue';
-import { GetFormResultType } from '@/scripts/form.js';
 import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
+import { GetFormResultType } from '@/scripts/form.js';
 import MkDice from '@/components/MkDice.vue';
 import { i18n }	from '@/i18n.js';
 
@@ -34,7 +38,7 @@ const widgetPropsDef = {
 		type: 'boolean' as const,
 		default: false,
 	},
-}
+};
 
 type WidgetProps = GetFormResultType<typeof widgetPropsDef>;