Skip to content

Commit 1d35560

Browse files
committed
fixed minor issues
1 parent bf2f4fe commit 1d35560

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

src/main/java/net/discordjug/javabot/data/h2db/message_cache/dao/MessageCacheRepository.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ public class MessageCacheRepository {
3131
* @throws SQLException If an error occurs.
3232
*/
3333
public void insertList(@NotNull List<CachedMessage> messages) throws DataAccessException {
34-
jdbcTemplate.batchUpdate("MERGE INTO message_cache (message_id, author_id, message_content) VALUES (?, ?, ?)",
34+
jdbcTemplate.batchUpdate("MERGE INTO message_cache (message_id, author_id, channel_id, message_content) VALUES (?, ?, ?, ?)",
3535
new BatchPreparedStatementSetter() {
3636
@Override
3737
public void setValues(PreparedStatement stmt, int i) throws SQLException {
3838
CachedMessage msg = messages.get(i);
3939
stmt.setLong(1, msg.getMessageId());
4040
stmt.setLong(2, msg.getAuthorId());
41-
stmt.setString(3, msg.getMessageContent());
41+
stmt.setLong(3,msg.getChannelId());
42+
stmt.setString(4, msg.getMessageContent());
4243
stmt.executeUpdate();
4344
}
4445

src/main/java/net/discordjug/javabot/systems/moderation/AutoMod.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,17 @@ private void doAutomodActions(Message message, String reason) {
186186
* @param msg the (last) spam message
187187
*/
188188
private void handleSpam(@Nonnull Message msg) {
189-
markSpam(msg);
189+
timeoutForSpam(msg);
190190
msg.delete().queue();
191191
}
192192

193193
private void handleSpam(@Nonnull List<CachedMessage> cachedMessages, Message message) {
194-
markSpam(message);
194+
timeoutForSpam(message);
195195
cachedMessages.forEach(cachedMessage -> message.getGuild().getTextChannelById(cachedMessage.getChannelId())
196196
.deleteMessageById(cachedMessage.getMessageId()).queue());
197197
}
198198

199-
private void markSpam(@Nonnull Message message) {
199+
private void timeoutForSpam(@Nonnull Message message) {
200200
moderationService
201201
.timeout(
202202
message.getAuthor(),
@@ -252,7 +252,7 @@ public boolean hasSuspiciousLink(@NotNull Message message) {
252252
* Checks whether the given message contains a discord invite link.
253253
*
254254
* @param message The Message to check.
255-
* @return True if an invites is found and False if not.
255+
* @return True if an invite is found and False if not.
256256
*/
257257
public boolean hasAdvertisingLink(@NotNull Message message) {
258258
// Advertising
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ALTER TABLE message_cache ADD COLUMN channel_id BIGINT DEFAULT -1;
1+
ALTER TABLE message_cache ADD COLUMN channel_id BIGINT DEFAULT -1;

0 commit comments

Comments
 (0)