Merge pull request #320 from OutiServer/develop

Release 3.3.4

Author: KenCir

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "outiserverbot",
-  "version": "3.2.1",
+  "version": "3.3.4",
   "engines": {
     "node": "16.16.0"
   },
@@ -16,6 +16,7 @@
   "dependencies": {
     "@discordjs/opus": "^0.8.0",
     "@discordjs/voice": "^0.11.0",
+    "@koozaki/romaji-conv": "^2.0.18",
     "axios": "^0.27.2",
     "better-sqlite3": "^7.6.2",
     "bufferutil": "^4.0.6",

package.json

@@ -29,6 +29,26 @@ module.exports = {
                 .setDescription('アクセント値(音が下がる場所を指す)')
                 .setRequired(true)),
         )
+        .addSubcommand(subCommand => subCommand
+            .setName('update')
+            .setDescription('辞書をアップデートする')
+            .addStringOption(option => option
+                .setName('uuid')
+                .setDescription('単語のUUID')
+                .setRequired(true))
+            .addStringOption(option => option
+                .setName('surface')
+                .setDescription('読み上げる単語')
+                .setRequired(true))
+            .addStringOption(option => option
+                .setName('pronunciation')
+                .setDescription('カタカナでの読み方')
+                .setRequired(true))
+            .addIntegerOption(option => option
+                .setName('accent_type')
+                .setDescription('アクセント値(音が下がる場所を指す)')
+                .setRequired(true)),
+        )
         .addSubcommand(subCommand => subCommand
             .setName('remove')
             .setDescription('辞書から削除する')
@@ -78,9 +98,42 @@ module.exports = {
                     }
                 }
                 break;
+            case 'update':
+                {
+                    const uuid = interaction.options.getString('uuid', false);
+                    if ((await SpeakerClient.wordList()).filter(word => word.key === uuid).length < 1) return await interaction.followUp('そのUUIDは登録されていません');
+
+                    const pronunciation = interaction.options.getString('pronunciation', true);
+                    // eslint-disable-next-line no-irregular-whitespace
+                    if (pronunciation.match(/^[ァ-ヶー　]*$/) === null) {
+                        await interaction.followUp('オプション、pronunciationは全角カタカナである必要があります');
+                    }
+                    else {
+                        const statusCode = await SpeakerClient.updateWord(interaction.options.getString('uuid', true), interaction.options.getString('surface', true), pronunciation, interaction.options.getInteger('accent_type', true));
+                        if (statusCode === 204) {
+                            await interaction.followUp({
+                                embeds: [
+                                    new EmbedBuilder()
+                                        .setTitle('単語登録を上書きしました')
+                                        .addFields([
+                                            { name: 'UUID', value: interaction.options.getString('uuid', true) },
+                                            { name: '読み上げ単語', value: interaction.options.getString('surface', true) },
+                                            { name: '読み上げ方', value: interaction.options.getString('pronunciation', true) },
+                                            { name: 'アクセント値(音が下がる場所を指す)', value: interaction.options.getInteger('accent_type', true).toString() },
+                                        ]),
+
+                                ],
+                            });
+                        }
+                        else {
+                            await interaction.followUp(`単語の登録に失敗しました、HTTPStatusCode: ${statusCode}`);
+                        }
+                    }
+                }
+                break;
             case 'remove':
                 {
-                    const uuid = interaction.options.getString('uuid', true);
+                    const uuid = interaction.options.getString('uuid', false);
                     if ((await SpeakerClient.wordList()).filter(word => word.key === uuid).length < 1) return await interaction.followUp('そのUUIDは登録されていません');
 
                     const statusCode = await SpeakerClient.removeWord(uuid);
@@ -129,7 +182,7 @@ module.exports = {
                                 new ButtonBuilder()
                                     .setCustomId('stop')
                                     .setLabel('⏹️')
-                                    .setStyle('DANGER'),
+                                    .setStyle(ButtonStyle.Danger),
                             ],
                         );
 

src/commands/main/word.js

@@ -1,6 +1,7 @@
 const { EmbedBuilder, MessageType } = require('discord.js');
 const { default: axios } = require('axios');
 const url = require('url');
+const romajiConv = require('@koozaki/romaji-conv');
 
 /**
  * @param {import('../../Bot')} client
@@ -112,7 +113,7 @@ module.exports = async (client, message) => {
   if (client.speakers.get(message.guildId)) {
     if (client.speakers.get(message.guildId).speakerChannelIds.includes(message.channelId)) {
       if (message.content.length < 1 && message.attachments.size >= 1) client.speakers.get(message.guildId).addSpearkQueue(`ファイルが${message.attachments.size}個送信されました`, message.id, speaker.speaker_id);
-      else client.speakers.get(message.guildId).addSpearkQueue(message.content, message.id, speaker.speaker_id);
+      else client.speakers.get(message.guildId).addSpearkQueue(romajiConv(message.content).toHiragana(), message.id, speaker.speaker_id);
     }
   }
 

src/events/discord/messageCreate.js

@@ -153,6 +153,21 @@ class SpeakerClient {
         return result.status;
     }
 
+    /**
+     *
+     * @param {string} uuid
+     * @param {string} surface
+     * @param {string} pronunciation
+     * @param {number} accentType
+     *
+     * @returns {number}
+     */
+    static async updateWord(uuid, surface, pronunciation, accentType) {
+        const result = await rpc.put(`user_dict_word/${uuid}?surface=${encodeURI(surface)}&pronunciation=${encodeURI(pronunciation)}&accent_type=${accentType}`);
+
+        return result.status;
+    }
+
     /**
      *
      * @param {string} wordUUID