コードのクリーンアップ

Cosgy-Dev · Jul 9, 2023 · 8d96051 · 8d96051
1 parent fd86636
commit 8d96051
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -64,7 +64,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         val botMember = event.guild.selfMember
         val settings = bot.settingsManager.getSettings(event.guild)
         if (event.channelLeft != null) {
-            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
+            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,

diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -44,7 +44,7 @@ class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
         val handler: AudioHandler?
         if (guild.audioManager.sendingHandler == null) {
             val player = createPlayer()
-            player.volume = bot.settingsManager.getSettings(guild)!!.volume
+            player.volume = bot.settingsManager.getSettings(guild).volume
             handler = AudioHandler(guild, player)
             player.addListener(handler)
             guild.audioManager.sendingHandler = handler

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -39,7 +39,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
         var text = "null"
-        if (settings!!.getTextChannel(event.guild) != null) {
+        if (settings.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
@@ -59,7 +59,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
         var text = "null"
-        if (settings!!.getTextChannel(event.guild) != null) {
+        if (settings.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -36,7 +36,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings!!.isJoinAndLeaveRead()) {
+        if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings!!.isJoinAndLeaveRead()) {
+        if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
         } else {

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -36,7 +36,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings!!.isReadName()) {
+        if (settings.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings!!.isReadName()) {
+        if (settings.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。")
         } else {

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -95,6 +95,7 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
 
     companion object {
         private val SUCCESS_COLOR = Color(0, 163, 129)
+
         //private val ERROR_COLOR = Color.RED
         //private const val INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。"
         //private const val USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>"

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -88,7 +88,8 @@ class AboutCommand(private val color: Color, private val description: String, va
                 "ステータス", """${jda.guilds.size} サーバー
                     |1シャード""".trimMargin(), true
             )
-            builder.addField("ユーザー", """${jda.users.size} ユニーク
+            builder.addField(
+                "ユーザー", """${jda.users.size} ユニーク
                 |${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""".trimMargin(), true
             )
             builder.addField(

diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
@@ -47,7 +47,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             if (isBot) return
             val guild = event.guild
             val textChannel = event.guildChannel.asTextChannel()
-            var settingText = bot.settingsManager.getSettings(event.guild)!!.getTextChannel(event.guild)
+            var settingText = bot.settingsManager.getSettings(event.guild).getTextChannel(event.guild)
             if (!guild.audioManager.isConnected) {
                 return
             }
@@ -64,7 +64,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             // URLを置き換え
             msg = msg.replace("(http://|https://)[\\w.\\-/:#?=&;%~+]+".toRegex(), "ゆーあーるえる")
             if (textChannel === settingText) {
-                if (bot.settingsManager.getSettings(guild)!!.isReadName()) {
+                if (bot.settingsManager.getSettings(guild).isReadName()) {
                     msg = author.name + "  " + msg
                 }
                 val vc = bot.voiceCreation

diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -64,7 +64,7 @@ class UserSettingsManager {
     }
 
     fun getSettings(userId: Long): UserSettings {
-        return settings.computeIfAbsent(userId) { _ : Long -> createDefaultSettings(userId) }
+        return settings.computeIfAbsent(userId) { _: Long -> createDefaultSettings(userId) }
     }
 
     private fun createDefaultSettings(userId: Long): UserSettings {