Skip to content

denyコマンドの対象ユーザー取得バグを修正 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MORIMORI0317 merged 2 commits into from
Jan 29, 2026
Merged

denyコマンドの対象ユーザー取得バグを修正 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a1b98
denyコマンドの対象ユーザー取得バグを修正
yuu1111 Jan 29, 2026
83a322c
存在しないキーIDでの例外スローを修正
yuu1111 Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/dev/felnull/itts/core/discord/command/DenyCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void remove(SlashCommandInteractionEvent event) {
}

LegacySaveDataLayer legacySaveDataLayer = SaveDataManager.getInstance().getLegacySaveDataLayer();
LegacyServerUserData sud = legacySaveDataLayer.getServerUserData(guild.getIdLong(), event.getUser().getIdLong());
LegacyServerUserData sud = legacySaveDataLayer.getServerUserData(guild.getIdLong(), user.getIdLong());
if (!sud.isDeny()) {
event.reply("読み上げ拒否をされていないユーザです。").setEphemeral(true).queue();
return;
Expand Down Expand Up @@ -111,7 +111,7 @@ private void add(SlashCommandInteractionEvent event) {
}

LegacySaveDataLayer legacySaveDataLayer = SaveDataManager.getInstance().getLegacySaveDataLayer();
LegacyServerUserData sud = legacySaveDataLayer.getServerUserData(guild.getIdLong(), event.getUser().getIdLong());
LegacyServerUserData sud = legacySaveDataLayer.getServerUserData(guild.getIdLong(), user.getIdLong());
if (sud.isDeny()) {
event.reply("すでに読み上げ拒否をされているユーザです。").setEphemeral(true).queue();
return;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/dev/felnull/itts/core/savedata/repository/impl/KeyData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private int getIdFromDB(Connection connection, T key) throws SQLException {
private T getKeyFromDB(Connection connection, int keyId) throws SQLException {
DAO.KeyTable<T> keyTable = keyTableProvider.apply(dao());
Optional<T> key = keyTable.selectKey(connection, keyId);
return key.orElseThrow();
return key.orElse(null);
}

}
4 changes: 4 additions & 0 deletions core/src/main/java/dev/felnull/itts/core/tts/TTSManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ public void sayGuildMemberText(@NotNull Guild guild, @NotNull MessageChannel mes

long userId = user.getIdLong();

if (legacySaveDataLayer.getServerUserData(guildId, userId).isDeny()) {
return;
}

TTSInstance ti = getTTSInstance(guildId);
if (ti == null || ti.getTextChannel() != textChannelId) {
return;
Expand Down
Loading