From e8935512761bf43bbda55da76babe3d7cddc3b92 Mon Sep 17 00:00:00 2001 From: Kosugi_kun <33971692+kosugikun@users.noreply.github.com> Date: Tue, 27 Jun 2023 21:35:51 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9C=E3=83=83=E3=83=88=E3=81=8CVC=E3=81=AB?= =?UTF-8?q?=E5=8F=82=E5=8A=A0=E6=99=82=E3=81=AB=E7=8F=BE=E5=9C=A8=E3=81=AE?= =?UTF-8?q?=E3=82=AE=E3=83=AB=E3=83=89=E8=A8=AD=E5=AE=9A=E3=82=92=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... 648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml} | 1299 ++++++++--------- .../entities/entities.dat | Bin 4096 -> 0 bytes .../entities/entities.dat.len | Bin 8 -> 0 bytes .../entities/entities.dat.values | Bin 5741 -> 0 bytes .../entities/entities.dat.values.at | Bin 9111 -> 0 bytes .../entities/entities.dat.values.s | 1 - .../entities/entities.dat_i | Bin 32768 -> 0 bytes .../entities/entities.dat_i.len | Bin 8 -> 0 bytes .../textToSpeak/commands/general/JoinCmd.kt | 4 + 9 files changed, 622 insertions(+), 682 deletions(-) rename .idea/dataSources/{bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml => 648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml} (57%) delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.len delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.at delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i.len diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml similarity index 57% rename from .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml rename to .idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml index acb4919..e07f1dd 100644 --- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml +++ b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml @@ -1,433 +1,435 @@ - - + + 3.40.1 + + - - - - - - - + + + + + + + - - + + - - + + 1 - - 1 + + window - + 1 - + 1 + 1 - - 1 + + window - + 1 - + + 1 - + 1 - + 1 - + 1 - - - window - - + + 1 1 - + + 1 - + + 1 + 1 - - + 1 1 - - - + 1 1 - + 1 - + 1 - - - + window - - window + + 1 - - - - + 1 1 - + + 1 + + 1 1 - + 1 + 1 - + window - - + + window + + 1 - - window + + 1 - + 1 - + 1 - 1 - - - - - + 1 - + + 1 + + window - + 1 - - 1 + + + 1 - + 1 + 1 - + 1 - + 1 - + + window + + 1 - + 1 - 1 - + 1 - + 1 - 1 - + 1 - window - + + 1 window - - 1 - 1 + + window - + 1 - 1 - + 1 + window - + 1 - + 1 1 - + 1 - 1 - + 1 - 1 - + 1 - + 1 - + + 1 - 1 - - - window - - - window - - - - window - + window - + window - - + 1 - + 1 - + 1 - + 1 - + 1 - - - 1 - - + + 1 - + 1 - + 1 - - aggregate - - + 1 - - - - + 1 1 - - window - - - aggregate - - + 1 1 - - window - - + 1 - - aggregate - - - window - - + window - + 1 + 1 - - - - - - - window - - + 1 - + + + + 1 - + 1 - + 1 1 - - + 1 - + 1 - - - - window + + 1 - - 1 + + 1 - + + 1 + 1 - - - - + 1 + 1 - + window - - 1 + + 1 - - - + 1 - + 1 - + + window + + 1 - + 1 - - 1 + + + + window - - - + + window + + 1 - - - + 1 - - - aggregate + + 1 - - + 1 1 - - 1 + + window - + 1 + 1 - - 1 + + window + + + window - + window - + 1 - + 1 - + 1 - 1 - + window - - - 1 - - + 1 - + 1 - + 1 - + 1 1 - - 1 + + aggregate - - 1 + + aggregate - + aggregate - + + + aggregate - - 1 + + + + + 1 + + + + + aggregate + + + + + + + 1 + + + + + + + aggregate + + + + + + + 1 + + + + 1 + + + 1 + + + + + + + 1 @@ -455,11 +457,11 @@ 1 - - R + + 2 - 1 + R R @@ -473,26 +475,26 @@ 1 - - R + + 2 - 1 - - R - + 1 - + R - + 1 + + R + - 2 + 1 R @@ -500,20 +502,20 @@ 1 - - R + + 2 - 1 + R - 2 + 1 - - R + + 2 - 1 + R R @@ -524,380 +526,380 @@ 1 - - R + + 2 - 1 - - R - + + 1 + + R - + R - 1 - - - 2 + R - + R - + 1 - + 2 - - 3 - - + R - - R - - + 1 - + R - + 1 - + R - + 1 - + R - - 1 - - + R - + 1 - - R + + 2 - + R - + R - + R - - R + + 1 - + R - + R - + 1 - - R - - + R - + 1 - - 2 - - + R - + 1 - + R - + 1 - + R - + 1 - - R + + 2 - + R - + 1 - + + 2 + + R - + 1 - + 2 - + R - + 1 - + R - + R - + 1 - + 2 - + R - - 1 + + R - - 2 + + 1 - + R - + 1 - + R - + + 1 + + R - + 1 - + 2 - + + 3 + + R - + 1 - + 2 - + 3 - + R - + 1 - - 2 - - + R - + 1 - + R - + + 1 + + R - + 1 - + 2 - - R - - + R - + 1 - + R - + 1 - - 2 - - + R - - R + + 1 - + R - + 1 - + 2 - + R - + 1 - - R - - - R + + 2 - + R - + R - + 1 - - 2 - - + R - + 1 - + R - + + 1 + + R - + 1 - + 2 - + + 3 + + R - + 1 - - 2 + + R - - 3 + + 1 + + + R - + R - + R - + 1 - + R - + 1 - - 2 + + R - + + 1 + + R - + 1 - + + R + + + 1 + + 2 - - 3 + + R - + R - + 1 - + 2 - + R - + 1 - + R - + 1 - - 2 + + R - - 3 + + 1 + + + R - + R - 1 + R - 2 + 1 R @@ -908,506 +910,506 @@ R - - 1 - - + R - + 1 - - 2 - - + R - - 1 - - - 2 - - + R - - 1 + + R - + R - + 1 - + R - + 1 - + R - - 1 - - + R - + 1 - + 2 - + R - + 1 - - 2 - - + R - + 1 - + R - + 1 - + 2 - - R + + 3 - + R - - 1 - - + R - - 1 + + R - + R - + R - + 1 - + R - + 1 - + 2 - + R - + 1 - + R - - 1 - - - 2 - - + R - + 1 - + + 2 + + R - + 1 - + 2 - + R - - 1 - - + R - - 1 - - + R - + 1 - + 2 - + R - + 1 - + 2 - + + 3 + + R - + 1 - + 2 - + R - - R + + 1 - + R - + 1 - + 2 - + + 3 + + R - - 1 + + R - - 2 + + 1 - + R - + R - + 1 - + R - + 1 - + + 2 + + R - + 1 - - R + + 2 + + + 3 - + R - + 1 - + R - - R + + 1 - + R - + 1 - + 2 - - 3 - - + R - + 1 - - 2 + + R - + R - + 1 - + R - + 1 - - 2 + + R - + R - + 1 - - 2 - - + R - - R + + 1 - + R - + 1 - + R - + 1 - + 2 - + R - + 1 - + 2 - + R - + 1 - + R - + 1 - + + 2 + + R - + 1 - - R + + 2 - + R - + 1 - + + R + + R - + 1 - + + 2 + + R - + 1 - + 2 - + R - - R + + 1 - + R - + 1 - + + 2 + + R - + 1 - + R - + 1 - + + 2 + + R - + 1 - + 2 - + R - + R - + 1 - - 2 + + R - - 3 + + R + + + 1 - + R - + 1 - + 2 - - 3 - - + R - + 1 - + R - + 1 - + R - + 1 - + R - + 1 - + + 2 + + R - + + 1 + + R - + 1 - + R - + R - + 1 - + 2 - + R - - 1 + + R - + R - + 1 - - R + + 2 - - 1 + + 3 - + R + + 1 + + 2 + + R - + 1 - + R - - 1 - - R + 1 - 1 + 2 R @@ -1421,70 +1423,5 @@ 1 - -
-
- 1 -
- - integer|0s - 1 - - - text|0s - 2 - - - 3 - - - integer|0s - 1 - 1 - - - TEXT|0s - 2 - - - real|0s - 3 - - - real|0s - 4 - - - real|0s - 5 - - - real|0s - 6 - - - id - 1 - - - TEXT|0s - 1 - - - TEXT|0s - 2 - - - TEXT|0s - 3 - - - INT|0s - 4 - - - TEXT|0s - 5 - \ No newline at end of file diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat deleted file mode 100644 index 4381c2c8e58dbcfb53472238f0384c00a37f0a1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmbR3vzzZXBLl-fAclbkAmcv}fcPL91VC(L095`TNejbYAm2pv zbaLz_)L|eG3MGUBZZfpVP=-z^rKADEqdXFlOiH0Jg&{yg3rzzr8WIFv5 z|JND#!@u=@_x*PFd+zG5o8FmI2OX-CRjsPEYR0s(Rc)qKwOY0ETHaO-yFZ!(8M54fixqkJ8lRw#<(ED z7~_IQ#uyhw8Dm@!V~lY@6Jv}E;*2paNHE5i1hT_JBSE1qT;Gh`_ zbXfGks~NpF0qFprZyrW_oO#u@spt`K^T^+20mq{t_bKq#Il4@{tDx&wAvjkfIgr0~ zHE<5pg9lA5qdp0%)-V6&dM6@n;N+ZWBhC+~Y8Oh;E%Y|JXXg#zZR|quEUKq=zKg_t zKvsa)zmh_f{>f)x@0x<5YxeNcE|}_H)dk*I7fdeeg1WX`3a0v&UO*M@3uquc(C=(9 z^*H}rp3}09)s~i{etQH7-F&|~46zpYSd{Zy=t^ojr_jf{C9WH$LoN>PBDWNhl$om@_ zf%_Go;;B*uB;LSV#bupcOV@6y0bvxcanac6TX^9B9ud1zElbxe4}se^|6?%m+VyKY zSJlv2vXgk2nL&W!Xzf1yA#UsPMF;H3Xok? z9^X}zV>e3XHDf2#1QR9AF$uLY7@ow*v$%#ONc3~T`F>6yH2_#fb+#fSiR^}QKJ1`_ zSFQm}P|8+}@U6&2_RtR>3Uu&Ng5=x-jORQ8 z{ucJtoIvHSt&pbMsYBhUCK%p~{d57hYa(A(1LPn9tmI6bF$;!$qnHea3m6=K@;Y{u4wJkc z4!SZlXVO_Me+ZV!4`Sbf0?hPeF09#@&MLP06CiWB8S;;@Ckyj!%~?jWP!)*Wg?*9J zP~kldkcD*KR&oP(PXO`(H#rdDu<(`$^AUMLXbVJM5QHuaTLI1j*#_X7VESo3HsidP2&oMqW)@iqZcRpA1AE6)Hl5uv+WsQLWF*$$Bm%-zE^g z7%<6okAw1rk8zzkg!x+XlHjLvzMkLV?$NBgogN(6KpsHN^2-8QS90j9a=J%1P3!k4 zB!9xvkGaiP-^cx1Lu|Q)`^j%zyCdxV`*cp8Qn&dOsbrw=Rrk>U5 z>@mzg>h*fg!ibhvbfb_nsqnkl*R%q8B@Vy+u#+bGTo)`n29Yo&MP>9}7gMVPE`tG$Lv}2EAA?)t-(CE`?G$ z#j093g_4@qa|{;ACML&9-j+Q-uok$ z7Ou>j#(i}8R*@Vp1-M<}%cW7!(~4y&!#@PFn{SdwL|@BQFv)urY)|W|(QEfz3*;QC z3B+y|$qZBs{GD(KIVeibx2Mzid0e}>G8(_mJo0+-Xgj@MEhS?ch`fhlf!H?Dw_yal zohFcQZRosk+kw5IVqCUMQ^yyp|qvu%t11>JrL^`UH=s5d_Y%joZ2CbR*SDy36D-f zoB6uDdMV#7xU0o&;9K|_=XGrZm^{z3i6<3YO`z$|n2tp+-43hdUt@CnSa}Swym1Zj z=|OtIXR|aC_u{d=E82iF3%aHl**9Drfu=KZdbb8-QPVPD%nNM@UCknr*L>iDuQ(6N}l1Q#7W#XBNw4l?c z&m9sXUfQnXqn=W`{x_oQkW;Wy&UlD|O6~eoX^&$Z*#L+;Kikw*TIKeV%1|)=x>zJi zuNSla`#yrm(m?!|BDu5FT^=r9tZV&;T?A2o-y@RIv2$O_x~(KFWPuf)cEH~ut!sUz z`LttEAU?}M-XGI@pQSMF;#O(>s{VqP9Hm`qrh}X)hD}%ojY9HM z;ulRxx};b^tE!T^*?X9Nay!W367grjG?g{f@1fH7#IdF)+%hqxn_JaeCN2slDjmhn z`MU~l*$-fUdP_mEY)x06aE!Q=UfQX9-;^SOO$eGzG z;tb07%9U&xryK%)Ethf`cHe?|v&bFv!$l$;oRlLu>xxwV{DfL;>~Rne*C?OIH&vJ3 H^0xLLu+DCH diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.at b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.at deleted file mode 100644 index 9f0d9e8ce0af7406e2f5a1013ec19c196c211694..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9111 zcmcJV-E-qK6vb1TwrQuk18?xoHw@H{y&u3ZEG+QGFbue- zPX`Dg+1_pfyCu5t75!|0Xp-%T26jud@)iAjfM}BKi3av(dps^nrqaeFR3es_ztv)W zoBw`YveO4+7xKY#K|yOCZ++)uJMnuZ_Z>Ru$LcdX^hqfnnD0&mVSn`f4o0)xoj~>% ztNOH5Txc-j**}TmNj8Ef2ap0j-^?t{G4S0E(#E@%9{~Hb-MYJ4YBq8*3U(OvzGQ@~ zOEAi8LLz(_8D%GO?i~+Y2Gdc3+&Rp-l_tcFA0f?Yj|J zJ+W$%?X8+*d#eVv?JXQv^{R7w$7!=hWd7(j-;i|`oKAebJc5)##2#4Z`$mUv1s6e5 zA%p`TI!@Yz%hvjq#$I!wNZJrR<}rR6Ol9DerOCi=ZTB`_>Z%g zOcUK(LbF|GK-Ss1HXl+X^z=P5V+>hj|Jg>?H92d+Q}b#cIpxG;YUqU+*!DRyt3|<= ztav@PIB;bmaKO5@L2Vv&V`u7kfPW+VyS*}x*UA=6t*Xr{u;U-26^SvpHW5Q$TVtKw zHy^b`dMJ%x=!8aK-64F#lx)6%jC}~f^$Bsnx)gb%tL=(o)BY=ybeZIA@{K(bmkp=o zl8HV4j^OyMaid-Kxd8Uza$-LtPnDE<@*i-|rt1Iz diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s deleted file mode 100644 index 1d6fe36..0000000 --- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s +++ /dev/null @@ -1 +0,0 @@ -íY \ No newline at end of file diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i deleted file mode 100644 index 075d1eecbdc543558def7fd8f1bbbb5224c0726e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIziN8-}9>DSMEhJ5gtyGLc5~+->5m_Qzh}13%QdQaa^N_ zi&?U9#3dZh{LFucW3mqm@<$fp+$KJg*-axZ}kvb?){W z|6o~;X&q6Hx3-D6p1-p^yWbOW1Ha^rtlKu?CN5_MUezw*Z_HsuHn=yU5-)8ZQJG6w zg+)3wySM8rigjQSZSBOBj`V zM_9U;OG_6u`$Sl>$lW)>QpE{cnpn~=!jeSY{t=cUDh!CQ6mgoCAf^tqc5FH*Lh{%~ z$)oK<5mLu-N*uEXdyVZMj*v78JQ5*k%%zl(IV7S3H&VjrIy6GU$UQ7Vx)?&~;<88m zj4LTwj2Z4)Su)$2@*pLOK_eohiE~FrND^;Rl6YX0FP0b`Aw@hx3E~7Lh^1p9TzZtw ziE!z$j4nMIKNjJVV<%m5R2l0STu+x6RmMfQ#3(yH!X?H&y0qvs!MXFgi4iU-j?kq< zw@DE$A-2&aMCZxYh{YcFEO9TLa`bv4!YRjbI>i_^#WnK)omz~U>RDjPCnKCn9Hvu= zR!@1xxQ0$4>Q8g;a0?wW`akU%W%=n54i$^(5HWj(dy-RU`r-||t?93fp!JRzFFWI8GwP6mw;=j3@ zSuO05T*Yr#@-A&Ti{G(u%ZNQ3z<=^Zet-7$OwR%z;yy0n58T21ER$t6u`Lg91ApQl zJjfQUA`UT!KXWht#mnw?FLD5n@J0T@tvt%ot(`mD@EG6VaUS4*Sg?&fgZ+4ti+GBg zd772(iTITZ`5P~3YxZzB&+upd!4~bT3D+<(9FrL=cCY!*i9DC@GZzmrH=DF~?{fst z<38qPiw@>LbC{3IcmWG`H2+zj7qTBO;v8Pgj84vxm6@L%Sb*zTkSAG)Jv&}H!LHriE1bzv{E*kM z{QcI59eFKxunaSM*lYO(%d&P)GnE5*J-=aj=I>>1V|Cuh=Xn!%u>$XS!2IVstjHs* z#48@uh}o>dH&~V5@n+`hZT_b#UZT0S9vSHVolcWYyNW}YjZy9a3gQy z)&0z1X0jf$c{_h#eO}(*GtZ%H$k*72yV;m|2Dm2nW)nWgrrgA4tT@p8=Y4F>57~mJ zco$0!vWIgZGr5>qJi}J3@Q}Te)7YAyvJGntHvid|ZMmK8c>croI#yzPj%5d~W=HiwH(Nk9K?3n_9jl{V6NfAEIh*eXCn^bvmDBu9L91Z&3|^_a86`4 z_izLYk23#Ro1-|5qq%`&c!D|XHro8>2OP`dW6XcHundU#M@e6k2W`52sJZF}f$V_hIcy8yn+`)p+xTiUiU-CG2@w(Zb zIp%OTkMV1knPU%TOMc5${EkPshgoyYe@@`{JjT5&GtbQ7B>up)+|R1>?G^0B1KiD@ zc*z3yHV5+%U*^wTSkwIHFFef3wH%u-@E4xsQP!w!7IPGjaTAZTXdUyPJ$Zurd6MOB zvuCgmPxEd5%8a_^KZo;oF6SAhKdC?}kP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbM zkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K z0;xbMkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5qynix zDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5 NqynixD)9do_%D|u-n#$* diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i.len b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i.len deleted file mode 100644 index 131e265740f37d77b7c4a3676d2a7704ca3e4a29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 McmZQz0D%Su009U9fdBvi diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt index 8093646..853b79c 100644 --- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt +++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt @@ -53,9 +53,13 @@ class JoinCmd(private var bot: Bot) : SlashCommand() { builder.addField("読ã¿ä¸Šã’対象", channel.name, true) } try { + // ボイスãƒãƒ£ãƒ³ãƒãƒ«æŽ¥ç¶šå®Œäº†ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ç¾åœ¨ã®è¨­å®šã‚’表示 event.guild!!.audioManager.openAudioConnection(userState.channel) builder.addField("ボイスãƒãƒ£ãƒ³ãƒãƒ«", String.format("**%s**", userState.channel!!.name), false) builder.setDescription("ボイスãƒãƒ£ãƒ³ãƒãƒ«ã¸ã®æŽ¥ç¶šã«æˆåŠŸã—ã¾ã—ãŸã€‚") + builder.addField("設定", + "ユーザーå読ã¿ä¸Šã’:${if (settings.isReadName()) "有効" else "無効"}\n" + + "å‚加ã€é€€å‡ºèª­ã¿ä¸Šã’:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true) event.hook.sendMessageEmbeds(builder.build()).queue() ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong) } catch (ex: PermissionException) {