Sheldan/OnePlusBot
1
0
Fork 0
mirror of https://github.com/Sheldan/OnePlusBot.git synced 2026-01-01 07:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPB-xxx] adding feature mode to fully automate news posts

Browse Source
This commit is contained in:
Sheldan
2025-08-16 13:07:56 +02:00
parent bdcfccf5ad
commit 96d5ca06e7
8 changed files with 172 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/command/UpdateNews.java
View File

@@ -36,10 +36,24 @@ public class UpdateNews extends AbstractConditionableCommand {
@Override
public CommandConfiguration getConfiguration() {
Parameter newsPostId = Parameter.builder().name("newsPostId").type(Long.class).templated(true).build();
Parameter newsText = Parameter.builder().name("text").type(String.class).remainder(true).templated(true).build();
Parameter newsPostId = Parameter
.builder()
.name("newsPostId")
.type(Long.class)
.templated(true)
.build();
Parameter newsText = Parameter
.builder()
.name("text")
.type(String.class)
.remainder(true)
.templated(true)
.build();
List<Parameter> parameters = Arrays.asList(newsPostId, newsText);
HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
return CommandConfiguration.builder()
.name("updateNews")
.module(NewsModuleDefinition.NEWS)

6
application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/config/NewsFeature.java
View File

@@ -2,6 +2,7 @@ package dev.sheldan.oneplus.bot.modules.news.config;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.config.FeatureMode;
import dev.sheldan.abstracto.core.config.PostTargetEnum;
import org.springframework.stereotype.Component;
@@ -22,4 +23,9 @@ public class NewsFeature implements FeatureConfig {
public List<PostTargetEnum> getRequiredPostTargets() {
return Arrays.asList(NewsPostTarget.NEWS_TARGET, NewsPostTarget.FORUM_POST_NOTIFICATION);
}
@Override
public List<FeatureMode> getAvailableModes() {
return Arrays.asList(NewsFeatureMode.AUTOMATIC_POST, NewsFeatureMode.AUTOMATIC_PUBLISH);
}
}

16
application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/config/NewsFeatureMode.java Normal file
View File

@@ -0,0 +1,16 @@
package dev.sheldan.oneplus.bot.modules.news.config;
import dev.sheldan.abstracto.core.config.FeatureMode;
import lombok.Getter;
@Getter
public enum NewsFeatureMode implements FeatureMode {
AUTOMATIC_POST("automaticPost"),
AUTOMATIC_PUBLISH("automaticPublish");
private final String key;
NewsFeatureMode(String key) {
this.key = key;
}
}

24
application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/ForumPostEntry.java Normal file
View File

@@ -0,0 +1,24 @@
package dev.sheldan.oneplus.bot.modules.news.model;
import dev.sheldan.oneplus.bot.modules.news.model.forum.ForumPost;
import lombok.Builder;
import lombok.Getter;
@Builder
@Getter
public class ForumPostEntry {
private Long postId;
private String subject;
private String content;
private Long creatorId;
public static ForumPostEntry fromPost(ForumPost forumPost) {
return ForumPostEntry
.builder()
.postId(forumPost.getId())
.subject(forumPost.getSubject())
.content(forumPost.getContent())
.creatorId(forumPost.getSource().getUserId())
.build();
}
}

12
application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/ForumPostModel.java Normal file
View File

@@ -0,0 +1,12 @@
package dev.sheldan.oneplus.bot.modules.news.model;
import lombok.Builder;
import lombok.Getter;
import java.util.List;
@Getter
@Builder
public class ForumPostModel {
private List<ForumPostEntry> entries;
}

91
application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/NewsSourceServiceBean.java
View File

@@ -1,10 +1,15 @@
package dev.sheldan.oneplus.bot.modules.news.service;
import dev.sheldan.abstracto.core.service.FeatureModeService;
import dev.sheldan.abstracto.core.service.PostTargetService;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.templating.service.TemplateService;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.oneplus.bot.modules.news.config.NewsFeatureDefinition;
import dev.sheldan.oneplus.bot.modules.news.config.NewsFeatureMode;
import dev.sheldan.oneplus.bot.modules.news.config.NewsPostTarget;
import dev.sheldan.oneplus.bot.modules.news.model.ForumPostEntry;
import dev.sheldan.oneplus.bot.modules.news.model.ForumPostModel;
import dev.sheldan.oneplus.bot.modules.news.model.ForumPostNotificationEntry;
import dev.sheldan.oneplus.bot.modules.news.model.ForumPostNotificationModel;
import dev.sheldan.oneplus.bot.modules.news.model.database.NewsForumPost;
@@ -13,11 +18,14 @@ import dev.sheldan.oneplus.bot.modules.news.model.forum.ForumPost;
import dev.sheldan.oneplus.bot.modules.news.service.management.NewsForumPostManagementServiceBean;
import dev.sheldan.oneplus.bot.modules.news.service.management.NewsSourceManagementServiceBean;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.Message;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -45,7 +53,11 @@ public class NewsSourceServiceBean {
@Autowired
private NewsSourceServiceBean self;
@Autowired
private FeatureModeService featureModeService;
private static final String NEWS_FORUM_POST_NOTIFICATION_TEMPLATE_KEY = "newsForumPost_notification";
private static final String NEWS_FORUM_POST_TEMPLATE_KEY = "newsForumPost";
public void checkForNewThreads() {
Long targetServerId = Long.parseLong(System.getenv(NEWS_FORUM_POST_NOTIFICATION_SERVER_ID_ENV_NAME));
@@ -54,34 +66,75 @@ public class NewsSourceServiceBean {
if(newForumPosts.isEmpty()) {
return;
}
List<ForumPostNotificationEntry> entries = new ArrayList<>();
newForumPosts.forEach(forumPost -> entries.add(ForumPostNotificationEntry.fromPost(forumPost)));
ForumPostNotificationModel model = ForumPostNotificationModel
.builder()
.entries(entries)
.build();
if(featureModeService.featureModeActive(NewsFeatureDefinition.NEWS, targetServerId, NewsFeatureMode.AUTOMATIC_POST)) {
List<ForumPostEntry> entries = new ArrayList<>();
newForumPosts.forEach(forumPost -> entries.add(ForumPostEntry.fromPost(forumPost)));
ForumPostModel model = ForumPostModel
.builder()
.entries(entries)
.build();
MessageToSend messageToSend = templateService.renderEmbedTemplate(NEWS_FORUM_POST_TEMPLATE_KEY, model, targetServerId);
List<CompletableFuture<Message>> messageFutures = postTargetService.sendEmbedInPostTarget(messageToSend, NewsPostTarget.NEWS_TARGET, targetServerId);
FutureUtils.toSingleFutureGeneric(messageFutures)
.thenAccept(unused -> {
log.info("Sent news forum post notification.");
List<Pair<Long, Long>> posts = entries
.stream()
.map(forumPostNotificationEntry -> Pair.of(forumPostNotificationEntry.getCreatorId(), forumPostNotificationEntry.getPostId()))
.toList();
self.persistForumPostsAndThreadCount(posts);
self.handleAutomaticPublish(messageFutures, targetServerId);
});
} else {
List<ForumPostNotificationEntry> entries = new ArrayList<>();
newForumPosts.forEach(forumPost -> entries.add(ForumPostNotificationEntry.fromPost(forumPost)));
ForumPostNotificationModel model = ForumPostNotificationModel
.builder()
.entries(entries)
.build();
MessageToSend messageToSend = templateService.renderEmbedTemplate(NEWS_FORUM_POST_NOTIFICATION_TEMPLATE_KEY, model, targetServerId);
FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, NewsPostTarget.FORUM_POST_NOTIFICATION, targetServerId))
.thenAccept(unused -> {
log.info("Sent news forum post notification.");
List<Pair<Long, Long>> posts = entries
.stream()
.map(forumPostNotificationEntry -> Pair.of(forumPostNotificationEntry.getCreatorId(), forumPostNotificationEntry.getPostId()))
.toList();
self.persistForumPostsAndThreadCount(posts);
}).exceptionally(throwable -> {
log.error("Failed to send news forum post notification.", throwable);
return null;
});
}
MessageToSend messageToSend = templateService.renderEmbedTemplate(NEWS_FORUM_POST_NOTIFICATION_TEMPLATE_KEY, model, targetServerId);
FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, NewsPostTarget.FORUM_POST_NOTIFICATION, targetServerId))
.thenAccept(unused -> {
log.info("Sent news forum post notification.");
self.persistForumPostsAndThreadCount(entries);
}).exceptionally(throwable -> {
log.error("Failed to send news forum post notification.", throwable);
return null;
});
}
@Transactional
public void persistForumPostsAndThreadCount(List<ForumPostNotificationEntry> entries) {
public CompletableFuture<Message> handleAutomaticPublish(List<CompletableFuture<Message>> messageFutures, Long serverId) {
if(featureModeService.featureModeActive(NewsFeatureDefinition.NEWS, serverId, NewsFeatureMode.AUTOMATIC_PUBLISH)) {
if(messageFutures != null && !messageFutures.isEmpty() && messageFutures.get(0) != null) {
Message newsMessage = messageFutures.get(0).join();
log.info("Publishing message {} in server {}.", newsMessage.getId(), serverId);
return newsMessage.crosspost().submit();
} else {
log.info("No message found - not cross posting.");
return CompletableFuture.completedFuture(null);
}
} else {
log.info("Automatic publishing disabled in server {}.", serverId);
return CompletableFuture.completedFuture(null);
}
}
@Transactional
public void persistForumPostsAndThreadCount(List<Pair<Long, Long>> posts) {
Map<Long, NewsSource> sourceMap = newsSourceManagementServiceBean.loadNewsSources()
.stream()
.collect(Collectors.toMap(NewsSource::getUserId, Function.identity()));
entries.forEach(forumPostNotificationEntry ->
newsForumPostManagementServiceBean.createPost(sourceMap.get(forumPostNotificationEntry.getCreatorId()), forumPostNotificationEntry.getPostId()));
posts.forEach(forumPostNotificationEntry ->
newsForumPostManagementServiceBean.createPost(sourceMap.get(forumPostNotificationEntry.getLeft()), forumPostNotificationEntry.getRight()));
sourceMap.values().forEach(newsSource -> {
Long currentThreadCount = forumApiClient.getCurrentThreadCount(newsSource);

8
application/oneplus-bot-modules/news/src/main/resources/news.properties
View File

@@ -7,6 +7,14 @@ abstracto.featureFlags.news.enabled=false
abstracto.feature.news.removalDays=4
abstracto.feature.news.postLockSeconds=3600
abstracto.featureModes.automaticPublish.featureName=news
abstracto.featureModes.automaticPublish.mode=automaticPublish
abstracto.featureModes.automaticPublish.enabled=false
abstracto.featureModes.automaticPost.featureName=news
abstracto.featureModes.automaticPost.mode=automaticPost
abstracto.featureModes.automaticPost.enabled=false
abstracto.feature.news.userURL=https://community.oneplus.com/ajax/user/frontend/user/info?uid=%s
# TODO support pagination.. eventually
abstracto.feature.news.threadURL=https://community.oneplus.com/ajax/user/frontend/thread/page?page=1&limit=100&uid=%s

17
templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/job/newsForumPost_embed.ftl Normal file
View File

@@ -0,0 +1,17 @@
{
<#assign roleMention="<@&479202891358535681>"/>
"additionalMessage": "${roleMention}",
"embeds": [
{
<#macro postDisplay post>
${post.subject?json_string}
https://community.oneplus.com/thread/${post.postId?c}
</#macro>
"description": "<#list entries as entry><@postDisplay post=entry /></#list>"
}
],
"messageConfig": {
"allowsRoleMention": true
}
}