removed some unused autowired services

changed place to use the starboard post source channel instead of the message channel
This commit is contained in:
Sheldan
2020-04-25 14:41:31 +02:00
parent 7ac2f2ce08
commit bd554537cc
31 changed files with 10 additions and 129 deletions

View File

@@ -23,6 +23,7 @@ import java.util.List;
public class StarStats extends AbstractConditionableCommand {
public static final String STARSTATS_RESPONSE_TEMPLATE = "starStats_response";
@Autowired
private StarboardService starboardService;

View File

@@ -8,7 +8,6 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.service.BotService;
import dev.sheldan.abstracto.core.service.EmoteService;
import dev.sheldan.abstracto.core.service.MessageService;
import dev.sheldan.abstracto.core.service.management.EmoteManagementService;
import dev.sheldan.abstracto.core.utils.EmoteUtils;
import dev.sheldan.abstracto.utility.config.UtilityFeatures;
import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage;
@@ -27,9 +26,6 @@ public class MessageEmbedRemovalReactionListener implements ReactedAddedListener
public static final String REMOVAL_EMOTE = "removeEmbed";
@Autowired
private EmoteManagementService emoteManagementService;
@Autowired
private BotService botService;

View File

@@ -9,9 +9,7 @@ import dev.sheldan.abstracto.core.models.database.AUser;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.service.BotService;
import dev.sheldan.abstracto.core.service.EmoteService;
import dev.sheldan.abstracto.core.service.MessageCache;
import dev.sheldan.abstracto.core.service.management.ConfigManagementService;
import dev.sheldan.abstracto.core.service.management.EmoteManagementService;
import dev.sheldan.abstracto.core.service.management.UserManagementService;
import dev.sheldan.abstracto.core.utils.EmoteUtils;
import dev.sheldan.abstracto.utility.config.UtilityFeatures;
@@ -36,15 +34,9 @@ public class StarboardListener implements ReactedAddedListener, ReactedRemovedLi
public static final String STAR_EMOTE = "star";
@Autowired
private EmoteManagementService emoteManagementService;
@Autowired
private BotService botService;
@Autowired
private MessageCache messageCache;
@Autowired
private ConfigManagementService configManagementService;

View File

@@ -23,8 +23,7 @@ public class StarboardPostDeletedListener implements MessageDeletedListener {
Optional<StarboardPost> byStarboardPostId = starboardPostManagementService.findByStarboardPostId(messageBefore.getMessageId());
if(byStarboardPostId.isPresent()) {
StarboardPost post = byStarboardPostId.get();
// TODO channel missing
log.info("Removing starboard post: message {}, channel {}, server {}, because the message was deleted", post.getPostMessageId(), messageBefore.getChannelId(), post.getAuthor().getId());
log.info("Removing starboard post: message {}, channel {}, server {}, because the message was deleted", post.getPostMessageId(), post.getSourceChanel().getId(), post.getAuthor().getId());
starboardPostManagementService.setStarboardPostIgnored(messageBefore.getMessageId(), true);
}
}

View File

@@ -1,6 +1,5 @@
package dev.sheldan.abstracto.utility.repository.converter;
import dev.sheldan.abstracto.core.service.management.UserManagementService;
import dev.sheldan.abstracto.core.models.database.AUser;
import dev.sheldan.abstracto.core.service.BotService;
import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser;
@@ -14,9 +13,6 @@ import java.util.List;
@Component
public class StarStatsUserConverter {
@Autowired
private UserManagementService userManagementService;
@Autowired
private BotService botService;

View File

@@ -1,8 +1,6 @@
package dev.sheldan.abstracto.utility.service;
import dev.sheldan.abstracto.core.service.management.EmoteManagementService;
import dev.sheldan.abstracto.core.service.management.PostTargetManagement;
import dev.sheldan.abstracto.core.service.management.UserManagementService;
import dev.sheldan.abstracto.core.models.AServerAChannelMessage;
import dev.sheldan.abstracto.core.models.cache.CachedMessage;
import dev.sheldan.abstracto.core.models.database.*;
@@ -39,6 +37,7 @@ public class StarboardServiceBean implements StarboardService {
public static final String STARBOARD_POSTTARGET = "starboard";
public static final String STARBOARD_POST_TEMPLATE = "starboard_post";
@Autowired
private BotService botService;
@@ -48,9 +47,6 @@ public class StarboardServiceBean implements StarboardService {
@Autowired
private TemplateService templateService;
@Autowired
private EmoteManagementService emoteManagementService;
@Autowired
private ConfigService configService;
@@ -60,9 +56,6 @@ public class StarboardServiceBean implements StarboardService {
@Autowired
private StarboardConfig starboardConfig;
@Autowired
private UserManagementService userManagementService;
@Autowired
private StarboardPostReactorManagementService starboardPostReactorManagementService;

View File

@@ -1,7 +1,5 @@
package dev.sheldan.abstracto.utility.service;
import dev.sheldan.abstracto.core.service.EmoteService;
import dev.sheldan.abstracto.core.service.management.EmoteManagementService;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.service.BotService;
@@ -34,6 +32,7 @@ public class SuggestionServiceBean implements SuggestionService {
private static final String SUGGESTION_YES_EMOTE = "suggestionYes";
private static final String SUGGESTION_NO_EMOTE = "suggestionNo";
public static final String SUGGESTIONS_TARGET = "suggestions";
@Autowired
private SuggestionManagementService suggestionManagementService;
@@ -46,12 +45,6 @@ public class SuggestionServiceBean implements SuggestionService {
@Autowired
private BotService botService;
@Autowired
private EmoteManagementService emoteManagementService;
@Autowired
private EmoteService emoteService;
@Autowired
private MessageService messageService;

View File

@@ -4,7 +4,6 @@ import dev.sheldan.abstracto.core.models.cache.CachedMessage;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.service.MessageService;
import dev.sheldan.abstracto.core.service.management.UserManagementService;
import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage;
import dev.sheldan.abstracto.utility.repository.EmbeddedMessageRepository;
@@ -26,9 +25,6 @@ public class MessageEmbedPostManagementServiceBean implements MessageEmbedPostMa
@Autowired
private UserManagementService userManagementService;
@Autowired
private MessageService messageService;
@Override
@Transactional
public void createMessageEmbed(CachedMessage embeddedMessage, Message messageContainingEmbed, AUserInAServer cause) {

View File

@@ -6,7 +6,6 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.utility.models.database.StarboardPost;
import dev.sheldan.abstracto.utility.repository.StarboardPostRepository;
import dev.sheldan.abstracto.utility.repository.converter.StarStatsUserConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,9 +21,6 @@ public class StarboardPostManagementServiceBean implements StarboardPostManageme
@Autowired
private StarboardPostRepository repository;
@Autowired
private StarStatsUserConverter converter;
@Override
public StarboardPost createStarboardPost(CachedMessage starredMessage, AUserInAServer starredUser, AUserInAServer starringUser, AServerAChannelMessage starboardPost) {
StarboardPost post = StarboardPost