Compare commits

...

71 Commits

Author SHA1 Message Date
Sheldan
6bd0f0eaa2 [maven-release-plugin] prepare release sissi-1.4.21 2023-11-14 23:41:49 +01:00
Sheldan
9b8a3bcc1e [SIS-xxx] preparing for release 2023-11-14 23:40:38 +01:00
Sheldan
7b11a88256 [SIS-xxx] enabling external configuration of db pool size 2023-11-14 23:39:52 +01:00
Sheldan
30289e1166 [SIS-xxx] fixing template content 2023-11-01 09:20:14 +01:00
Sheldan
0bab3bbe69 [SIS-xxx] fixing template keys 2023-10-29 21:26:50 +01:00
Sheldan
6f75c76fc4 [maven-release-plugin] prepare for next development iteration 2023-10-29 19:16:26 +01:00
Sheldan
0d9aa4ae64 [maven-release-plugin] prepare release sissi-1.4.20 2023-10-29 19:16:22 +01:00
Sheldan
c6b0bf582b [SIS-xxx] bump version 2023-10-29 19:15:58 +01:00
Sheldan
dcd94ba5c0 [maven-release-plugin] prepare for next development iteration 2023-10-29 19:01:54 +01:00
Sheldan
98ae8ada8b [maven-release-plugin] prepare release sissi-1.4.19 2023-10-29 19:01:48 +01:00
Sheldan
96d3918a4d [SIS-25] adding rss news module
updating abstracto version
2023-10-29 19:00:16 +01:00
Sheldan
0d6f71baac [maven-release-plugin] prepare for next development iteration 2023-09-26 23:16:39 +02:00
Sheldan
d3421a6f95 [maven-release-plugin] prepare release sissi-1.4.18 2023-09-26 23:16:35 +02:00
Sheldan
0722bd6320 [SIS-xxx] preparing for release 2023-09-26 23:12:54 +02:00
Sheldan
a910870259 [SIS-xxx] removing discriminator and adapting join/leave text 2023-09-26 23:12:34 +02:00
Sheldan
18cc97600f [maven-release-plugin] prepare for next development iteration 2023-09-07 23:52:52 +02:00
Sheldan
a1ea57a0f3 [maven-release-plugin] prepare release sissi-1.4.17 2023-09-07 23:52:48 +02:00
Sheldan
23b554c93f [SIS-xxx] preparing for new release and upgrade of abstracto 2023-09-07 23:49:24 +02:00
Sheldan
5671c5019a [maven-release-plugin] prepare for next development iteration 2023-09-07 21:35:48 +02:00
Sheldan
fbb0876c7f [maven-release-plugin] prepare release sissi-1.4.16 2023-09-07 21:35:44 +02:00
Sheldan
bbaee9a47a [SIS-xxx] preparing for new release and upgrade of abstracto 2023-09-07 21:16:17 +02:00
Sheldan
b9f2a06173 [maven-release-plugin] prepare for next development iteration 2023-09-03 14:05:45 +02:00
Sheldan
55ba69bb0f [maven-release-plugin] prepare release sissi-1.4.15 2023-09-03 14:05:42 +02:00
Sheldan
9ed71b8660 [SIS-xxx] preparing for new release and upgrade of abstracto 2023-09-03 14:04:54 +02:00
Sheldan
28cf141a02 [maven-release-plugin] prepare for next development iteration 2023-09-03 01:18:54 +02:00
Sheldan
03ca4d128d [maven-release-plugin] prepare release sissi-1.4.14 2023-09-03 01:18:47 +02:00
Sheldan
ff2029819d [SIS-xxx] preparing for new release 2023-09-03 01:15:18 +02:00
Sheldan
a26503650e [SIS-24] adding ability to only search quotes of a given parameter for a text
changing quote search to return a random matching quote
adding local function to tilt to update packages
2023-09-03 00:48:15 +02:00
Sheldan
7a37f7e040 [SIS-xxx] fixing tilt file caching
updating dashboards to filter for namespace
upgrading to new abstracto version -snapshot
2023-09-02 21:28:13 +02:00
Sheldan
0073d5b069 [maven-release-plugin] prepare for next development iteration 2023-08-30 01:23:11 +02:00
Sheldan
c210e34437 [maven-release-plugin] prepare release sissi-1.4.13 2023-08-30 01:23:06 +02:00
Sheldan
7a43b23d68 [SIS-xxx] fixing single core jdk 17 issue
preparing for new version
2023-08-30 01:22:28 +02:00
Sheldan
7c15648e75 [maven-release-plugin] prepare for next development iteration 2023-08-30 01:08:06 +02:00
Sheldan
d629bf633f [maven-release-plugin] prepare release sissi-1.4.12 2023-08-30 01:08:02 +02:00
Sheldan
4115037141 [SIS-xxx] prepare for release 2023-08-30 01:07:38 +02:00
Sheldan
5d02bb99d4 [SIS-xxx] corrected hook weight for db credentials 2023-08-30 01:07:08 +02:00
Sheldan
96bdc3d089 [maven-release-plugin] prepare for next development iteration 2023-08-30 00:50:04 +02:00
Sheldan
71546fcc89 [maven-release-plugin] prepare release sissi-1.4.11 2023-08-30 00:50:00 +02:00
Sheldan
22c330c7e4 [SIS-xxx] reducing hook weight for db credentials 2023-08-30 00:49:24 +02:00
Sheldan
fd402a966a [SIS-xxx] changing db secrets to be created before installation 2023-08-30 00:49:03 +02:00
Sheldan
b3029deea4 [maven-release-plugin] prepare for next development iteration 2023-08-30 00:34:50 +02:00
Sheldan
24b23c445f [maven-release-plugin] prepare release sissi-1.4.10 2023-08-30 00:34:46 +02:00
Sheldan
a9c44e24f1 prepare for release 2023-08-30 00:34:22 +02:00
Sheldan
7deee4008d correct config deployment job helm hooks 2023-08-30 00:33:37 +02:00
Sheldan
2ab922cc84 [maven-release-plugin] prepare for next development iteration 2023-08-30 00:12:31 +02:00
Sheldan
c6a7b60e41 [maven-release-plugin] prepare release sissi-1.4.9 2023-08-30 00:12:27 +02:00
Sheldan
49974648b6 making probes configurable 2023-08-30 00:11:48 +02:00
Sheldan
cd7580f45d [maven-release-plugin] prepare for next development iteration 2023-08-29 23:55:21 +02:00
Sheldan
076afb35b4 [maven-release-plugin] prepare release sissi-1.4.8 2023-08-29 23:55:17 +02:00
Sheldan
f901aeaefc [SIS-xxx] renaming sissi run image 2023-08-29 23:54:47 +02:00
Sheldan
6b37de3db5 [maven-release-plugin] prepare for next development iteration 2023-08-29 23:26:28 +02:00
Sheldan
0b80e351a5 [maven-release-plugin] prepare release sissi-1.4.7 2023-08-29 23:26:24 +02:00
Sheldan
3fe47ab682 [SIS-xxx] prepare for release 2023-08-29 23:25:56 +02:00
Sheldan
9b69fe5f2d [SIS-xxx] removing grafana credentials secret from helm chart 2023-08-29 23:25:03 +02:00
Sheldan
953eb1b4ff [maven-release-plugin] prepare for next development iteration 2023-08-28 00:06:52 +02:00
Sheldan
876dd82d87 [maven-release-plugin] prepare release sissi-1.4.6 2023-08-28 00:06:34 +02:00
Sheldan
454d66c71e [SIS-xxx] changing repository for bot deployment in k8s 2023-08-28 00:05:59 +02:00
Sheldan
87f72a077d [maven-release-plugin] prepare for next development iteration 2023-08-27 23:56:33 +02:00
Sheldan
62c27d1461 [maven-release-plugin] prepare release sissi-1.4.5 2023-08-27 23:56:29 +02:00
Sheldan
3b2bbb1dce [SIS-xxx] preparing for 1.4.5 release 2023-08-27 23:55:36 +02:00
Sheldan
8f40a95cbe [maven-release-plugin] prepare for next development iteration 2023-08-27 23:48:06 +02:00
Sheldan
5e9518de71 [maven-release-plugin] prepare release sissi-1.4.4 2023-08-27 23:48:02 +02:00
Sheldan
0ecab3b21b [SIS-xxx] preparing for 1.4.4 release 2023-08-27 23:42:57 +02:00
Sheldan
5e0e546eb4 [maven-release-plugin] prepare for next development iteration 2023-08-27 23:32:57 +02:00
Sheldan
ade0d4e57d [maven-release-plugin] prepare release sissi-1.4.3 2023-08-27 23:32:53 +02:00
Sheldan
26b08c593c [SIS-xxx] preparing for 1.4.2 release 2023-08-27 23:32:25 +02:00
Sheldan
888f2bd402 [SIS-xxx] fixing env file loading 2023-08-27 23:31:12 +02:00
Sheldan
eb369d9116 [maven-release-plugin] prepare for next development iteration 2023-08-27 23:17:25 +02:00
Sheldan
f2acdbdd81 [maven-release-plugin] prepare release sissi-1.4.2 2023-08-27 23:17:21 +02:00
Sheldan
d65f6d380f [SIS-xxx] introducing helm chart
restructuring
2023-08-27 23:12:01 +02:00
Sheldan
30d45952be [maven-release-plugin] prepare for next development iteration 2023-07-22 18:29:23 +02:00
237 changed files with 6692 additions and 3257 deletions

View File

@@ -23,17 +23,26 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
user: Sheldan
token: ${{ secrets.ABSTRACTO_PAT }}
- name: Login to GitHub Packages Docker Registry
uses: docker/login-action@v1
- name: Login to Harbor
uses: docker/login-action@v2
with:
registry: docker.pkg.github.com
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push deployment container
registry: harbor.sheldan.dev
username: ${{ secrets.HARBOR_USERNAME }}
password: ${{ secrets.HARBOR_TOKEN }}
- name: Load env files
id: dotenv
uses: falti/dotenv-action@v1.0.4
with:
path: ./deployment/image-packaging/src/main/docker/.env
- name: Push container
working-directory: ./deployment/image-packaging/src/main/docker
run: docker-compose build && docker-compose push
env:
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/
VERSION: ${{ env.version }}
ABSTRACTO_VERSION: 1.5.1
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
VERSION: ${{ steps.dotenv.outputs.version }}
- name: Helm push
working-directory: ./deployment/helm/
run: |-
helm registry login -u '${{ secrets.HARBOR_USERNAME }}' -p '${{ secrets.HARBOR_TOKEN }}' harbor.sheldan.dev
helm package sissi
helm push sissi*.tgz oci://harbor.sheldan.dev/sissi

40
Tiltfile Normal file
View File

@@ -0,0 +1,40 @@
allow_k8s_contexts('k8s-cluster')
load('ext://restart_process', 'docker_build_with_restart')
registry = 'harbor.sheldan.dev/sissi/'
local_resource(
'sissi-java-compile',
' mvn install && ' +
' rm -rf application/executable/target/jar-staging && ' +
' unzip -o application/executable/target/sissi-exec.jar -d application/executable/target/jar-staging && ' +
' rsync --delete --delete-excluded --inplace --checksum --exclude="*-SNAPSHOT.jar" -r application/executable/target/jar-staging/ application/executable/target/jar && ' +
' rm -rf application/executable/target/jar/snapshots && ' +
' mkdir application/executable/target/jar/snapshots && ' +
' rsync --delete --delete-excluded --inplace --checksum --include="*/" --include="*-SNAPSHOT.jar" --exclude="*" -r application/executable/target/jar-staging/BOOT-INF/lib/ application/executable/target/jar/snapshots',
deps=['pom.xml'], auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL)
docker_build_with_restart(
registry + 'sissi-bot',
'./application/executable/target/jar',
entrypoint=['java', '-noverify', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
dockerfile='./application/executable/Dockerfile',
live_update=[
sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),
sync('./application/executable/target/jar/META-INF', '/app/META-INF'),
sync('./application/executable/target/jar/BOOT-INF/classes', '/app'),
sync('./application/executable/target/jar/snapshots', '/app/lib')
],
)
docker_build(registry + 'sissi-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
k8s_yaml(helm('deployment/helm/sissi', values=
['./../Sissi-environments/argocd/apps/sissi/values/local/values.yaml',
'secrets://./../Sissi-environments/argocd/apps/sissi/values/local/values.secrets.yaml']
))
local_resource('fetch-packages', 'mvn install -f deployment/image-packaging/pom.xml', auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL)
k8s_resource('chart-sissi', port_forwards='5005:5005')

View File

@@ -0,0 +1,10 @@
FROM amazoncorretto:17.0.8-alpine3.18
RUN apk add entr
WORKDIR /app
ADD BOOT-INF/lib/ /app/lib
ADD snapshots/ /app/lib
ADD META-INF /app/META-INF
ADD BOOT-INF/classes /app
ENTRYPOINT java -cp .:./lib/* dev.sheldan.sissi.executable.Application

View File

@@ -3,17 +3,13 @@
<parent>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>application</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>executable</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<build>
<finalName>sissi</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -154,6 +150,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>dev.sheldan.sissi.application.module</groupId>
<artifactId>rss-news</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>dev.sheldan.sissi.application.module</groupId>
<artifactId>debra</artifactId>

View File

@@ -0,0 +1,18 @@
package dev.sheldan.sissi.executable;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.web.SecurityFilterChain;
@Configuration
public class SecurityConfig {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http.authorizeHttpRequests((authorize) -> authorize
.anyRequest().permitAll());
return http.build();
}
}

View File

@@ -1,23 +0,0 @@
spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto
spring.datasource.username=abstracto
spring.datasource.password=abstracto
spring.jpa.properties.hibernate.default_schema=abstracto
spring.quartz.jdbc.initialize-schema=never
spring.jpa.hibernate.ddl-auto = none
spring.jpa.show-sql = false
spring.jpa.properties.hibernate.format_sql = true
log4j.logger.org.hibernate.SQL=trace
log4j.logger.org.hibernate.type.descriptor.sql=trace
log4j.logger.org.hibernate.type=trace
management.metrics.tags.application=sissi
spring.security.user.name=abstracto
spring.security.user.password=password
spring.security.user.roles=USER
spring.application.name=Sissi
spring.main.allow-circular-references=true

View File

@@ -1,13 +1,14 @@
spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
spring.datasource.username= ${DB_USER}
spring.datasource.password= ${DB_PASS}
spring.jpa.hibernate.default_schema=${DB_NAME}
spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
spring.jpa.hibernate.default_schema=abstracto
spring.jpa.properties.hibernate.default_schema=abstracto
spring.quartz.jdbc.initialize-schema=never
management.metrics.tags.application=Sissi
spring.security.user.name= ${REST_USER_NAME}
spring.security.user.password= ${REST_PASSWORD}
spring.security.user.roles=USER
management.endpoint.health.probes.enabled=true
management.health.livenessState.enabled=true
management.health.readinessState.enabled=true
spring.application.name=Sissi
spring.main.allow-circular-references=true

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>sissi</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,6 +22,18 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<version>${apache-jena.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.apptasticsoftware</groupId>
<artifactId>rssreader</artifactId>
<version>${rssreader.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.sissi.application.module.custom</groupId>
<artifactId>sissi-customizations</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>application</artifactId>
<groupId>dev.sheldan.sissi.application</groupId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>sissi-modules</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>sissi-modules</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -5,6 +5,7 @@ import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.config.validator.MaxStringLengthValidator;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;

View File

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Component;
@PersistJobDataAfterExecution
public class MeetupCleanupJob extends QuartzJobBean {
@Autowired
private MeetupServiceBean meetupServiceBean;

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>application</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,6 +14,7 @@
<module>quotes</module>
<module>meetup</module>
<module>debra</module>
<module>rss-news</module>
</modules>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>sissi-modules</artifactId>
<version>1.4.1</version>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -21,6 +21,7 @@ import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.sissi.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.InteractionHook;
@@ -28,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -38,6 +39,7 @@ public class QuoteSearch extends AbstractConditionableCommand {
private static final String QUOTE_SEARCH_COMMAND = "quoteSearch";
private static final String QUERY_PARAMETER = "query";
private static final String MEMBER_PARAMETER = "member";
@Autowired
private QuoteServiceBean quoteServiceBean;
@@ -80,7 +82,14 @@ public class QuoteSearch extends AbstractConditionableCommand {
String query = slashCommandParameterService.getCommandOption(QUERY_PARAMETER, event, String.class);
AServer server = serverManagementService.loadServer(event.getGuild().getIdLong());
Optional<Quote> possibleQuote = quoteServiceBean.searchQuote(query, server);
Optional<Quote> possibleQuote;
if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
Member targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, Member.class);
possibleQuote = quoteServiceBean.searchQuote(query, server, targetMember);
} else {
possibleQuote = quoteServiceBean.searchQuote(query, server);
}
Quote quoteToDisplay = possibleQuote.orElseThrow(QuoteNotFoundException::new);
return quoteServiceBean.renderQuoteToMessageToSend(quoteToDisplay)
.thenCompose(messageToSend -> self.replyMessage(event, messageToSend))
@@ -100,7 +109,17 @@ public class QuoteSearch extends AbstractConditionableCommand {
.name(QUERY_PARAMETER)
.type(String.class)
.build();
List<Parameter> parameters = Collections.singletonList(searchParameter);
Parameter memberParameter = Parameter
.builder()
.templated(true)
.name(MEMBER_PARAMETER)
.slashCommandOnly(true)
.optional(true)
.type(Member.class)
.build();
List<Parameter> parameters = Arrays.asList(searchParameter, memberParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)

View File

@@ -12,6 +12,7 @@ import java.util.List;
@Repository
public interface QuoteRepository extends JpaRepository<Quote, ServerSpecificId> {
List<Quote> findByTextContainingAndServer(String text, AServer server);
List<Quote> findByTextContainingAndServerAndAuthor(String text, AServer server, AUserInAServer author);
List<Quote> findByServer(AServer server);
List<Quote> findByAuthor(AUserInAServer author);
Long countByAuthor(AUserInAServer author);

View File

@@ -214,9 +214,27 @@ public class QuoteServiceBean {
return Optional.empty();
}
if(foundQuotes.size() > 1) {
log.info("Found multiple quotes in server {}, returning first one.", server.getId());
log.info("Found multiple quotes in server {}, returning random one.", server.getId());
int randomIndex = secureRandom.nextInt(foundQuotes.size());
return Optional.of(foundQuotes.get(randomIndex));
} else {
return Optional.of(foundQuotes.get(0));
}
}
public Optional<Quote> searchQuote(String query, AServer server, Member targetMember) {
AUserInAServer author = userInServerManagementService.loadOrCreateUser(targetMember);
List<Quote> foundQuotes = quoteRepository.findByTextContainingAndServerAndAuthor(query, server, author);
if(foundQuotes.isEmpty()) {
return Optional.empty();
}
if(foundQuotes.size() > 1) {
log.info("Found multiple quotes in server {}, returning random one.", server.getId());
int randomIndex = secureRandom.nextInt(foundQuotes.size());
return Optional.of(foundQuotes.get(randomIndex));
} else {
return Optional.of(foundQuotes.get(0));
}
return Optional.of(foundQuotes.get(0));
}
public QuoteStatsModel getQuoteStats(Member member) {

View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>sissi-modules</artifactId>
<groupId>dev.sheldan.sissi.application</groupId>
<version>1.4.21</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sheldan.sissi.application.module</groupId>
<artifactId>rss-news</artifactId>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/liquibase.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>dev.sheldan.abstracto.scheduling</groupId>
<artifactId>scheduling-int</artifactId>
<version>${abstracto.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>${apache-jena.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>${apache-jena.version}</version>
</dependency>
<dependency>
<groupId>com.apptasticsoftware</groupId>
<artifactId>rssreader</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -1,19 +1,18 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>docker-compose</id>
<id>liquibase</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<outputDirectory>./docker-compose</outputDirectory>
<directory>${project.basedir}/src/main/resources/</directory>
<outputDirectory>.</outputDirectory>
<directory>${project.basedir}/src/main/resources/migrations</directory>
<includes>
<include>**/*</include>
</includes>
<filtered>true</filtered>
</fileSet>
</fileSets>
</assembly>

View File

@@ -0,0 +1,95 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@Component
public class CreateNewsCategory extends AbstractConditionableCommand {
private static final String CATEGORY_KEY_NAME_PARAMETER = "categoryName";
private static final String CREATE_SERVER_NEWS_CATEGORY_RESPONSE_TEMPLATE_KEY = "createNewsCategory_response";
@Autowired
private SlashCommandParameterService slashCommandParameterService;
@Autowired
private InteractionService interactionService;
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private ServerManagementService serverManagementService;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
String categoryName = slashCommandParameterService.getCommandOption(CATEGORY_KEY_NAME_PARAMETER, event, String.class);
AServer server = serverManagementService.loadOrCreate(event.getGuild().getIdLong());
newsCategoryServiceBean.createCategory(categoryName, server);
return interactionService.replyEmbed(CREATE_SERVER_NEWS_CATEGORY_RESPONSE_TEMPLATE_KEY, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public CommandConfiguration getConfiguration() {
Parameter nameParameter = Parameter
.builder()
.templated(true)
.name(CATEGORY_KEY_NAME_PARAMETER)
.type(String.class)
.build();
List<Parameter> parameters = Arrays.asList(nameParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("category")
.commandName("create")
.build();
return CommandConfiguration.builder()
.name("createNewsCategory")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.slashCommandOnly(true)
.supportsEmbedException(true)
.causesReaction(false)
.parameters(parameters)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,122 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryChannelMappingServiceBean;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@Component
public class CreateNewsCategoryChannelMapping extends AbstractConditionableCommand {
private static final String CATEGORY_KEY_NAME_PARAMETER = "categoryName";
private static final String CHANNEL_PARAMETER = "channel";
private static final String CREATE_NEWS_CATEGORY_CHANNEL_MAPPING_RESPONSE_TEMPLATE_KEY = "createNewsCategoryChannelMapping_response";
@Autowired
private SlashCommandParameterService slashCommandParameterService;
@Autowired
private InteractionService interactionService;
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
@Autowired
private NewsCategoryChannelMappingServiceBean newsCategoryMappingServiceBean;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
String categoryName = slashCommandParameterService.getCommandOption(CATEGORY_KEY_NAME_PARAMETER, event, String.class);
GuildChannel channel = slashCommandParameterService.getCommandOption(CHANNEL_PARAMETER, event, TextChannel.class, GuildChannel.class);
newsCategoryMappingServiceBean.createNewsCategoryChannelMapping(categoryName, channel);
return interactionService.replyEmbed(CREATE_NEWS_CATEGORY_CHANNEL_MAPPING_RESPONSE_TEMPLATE_KEY, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), CATEGORY_KEY_NAME_PARAMETER)) {
return newsCategoryServiceBean.getNamesOfNewsCategoriesStartingWith(event.getFocusedOption().getValue(), event.getGuild());
} else {
return new ArrayList<>();
}
}
@Override
public CommandConfiguration getConfiguration() {
Parameter categoryParameter = Parameter
.builder()
.templated(true)
.name(CATEGORY_KEY_NAME_PARAMETER)
.supportsAutoComplete(true)
.type(String.class)
.build();
Parameter channelParameter = Parameter
.builder()
.name(CHANNEL_PARAMETER)
.type(TextChannel.class)
.templated(true)
.build();
List<Parameter> parameters = Arrays.asList(categoryParameter, channelParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("categorychannelmapping")
.commandName("create")
.build();
return CommandConfiguration.builder()
.name("createNewsCategoryChannelMapping")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.slashCommandOnly(true)
.supportsEmbedException(true)
.parameters(parameters)
.causesReaction(false)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,152 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import dev.sheldan.sissi.module.rssnews.service.NewsFeedSourceCategoryServiceBean;
import dev.sheldan.sissi.module.rssnews.service.NewsFeedSourceCategorySubscriptionServiceBean;
import dev.sheldan.sissi.module.rssnews.service.management.NewsFeedSourceManagementServiceBean;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@Component
public class CreateNewsCategorySubscription extends AbstractConditionableCommand {
private static final String CATEGORY_KEY_NAME_PARAMETER = "categoryName";
private static final String SOURCE_CATEGORY_PARAMETER = "sourceCategory";
private static final String NEWS_FEED_SOURCE_KEY_PARAMETER = "newsFeed";
private static final String CREATE_NEWS_CATEGORY_SUBSCRIPTION_RESPONSE_TEMPLATE_KEY = "createNewsCategorySubscription_response";
@Autowired
private SlashCommandParameterService slashCommandParameterService;
@Autowired
private InteractionService interactionService;
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
@Autowired
private NewsFeedSourceCategorySubscriptionServiceBean newsFeedSourceCategorySubscriptionServiceBean;
@Autowired
private NewsFeedSourceCategoryServiceBean newsFeedSourceCategoryServiceBean;
@Autowired
private NewsFeedSourceManagementServiceBean newsFeedSourceManagementServiceBean;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
String categoryName = slashCommandParameterService.getCommandOption(CATEGORY_KEY_NAME_PARAMETER, event, String.class);
String sourceCategoryName = slashCommandParameterService.getCommandOption(SOURCE_CATEGORY_PARAMETER, event, String.class);
String newsFeedSourceName = slashCommandParameterService.getCommandOption(NEWS_FEED_SOURCE_KEY_PARAMETER, event, String.class);
Guild guild = event.getGuild();
newsFeedSourceCategorySubscriptionServiceBean.createNewsFeedSourceCategorySubscription(categoryName, sourceCategoryName, newsFeedSourceName, guild);
return interactionService.replyEmbed(CREATE_NEWS_CATEGORY_SUBSCRIPTION_RESPONSE_TEMPLATE_KEY, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), CATEGORY_KEY_NAME_PARAMETER)) {
return newsCategoryServiceBean.getNamesOfNewsCategoriesStartingWith(event.getFocusedOption().getValue(), event.getGuild());
} if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), SOURCE_CATEGORY_PARAMETER)) {
String newsFeedSourceName = slashCommandParameterService.getCommandOption(NEWS_FEED_SOURCE_KEY_PARAMETER, event, String.class);
Optional<NewsFeedSource> newsFeedSourceOptional = newsFeedSourceManagementServiceBean.getNewsFeedSourceWithNameOptional(newsFeedSourceName);
if(newsFeedSourceOptional.isEmpty()) {
return new ArrayList<>();
}
return newsFeedSourceCategoryServiceBean.getNamesOfNewsSourceCategoriesInNewsFeedStartingWith(event.getFocusedOption().getValue(), newsFeedSourceOptional.get());
} if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), NEWS_FEED_SOURCE_KEY_PARAMETER)) {
return newsFeedSourceManagementServiceBean.getNewsFeedSourceNamesStartingWithName(event.getFocusedOption().getValue());
} else {
return new ArrayList<>();
}
}
@Override
public CommandConfiguration getConfiguration() {
Parameter categoryParameter = Parameter
.builder()
.templated(true)
.name(CATEGORY_KEY_NAME_PARAMETER)
.supportsAutoComplete(true)
.type(String.class)
.build();
Parameter sourceCategoryParameter = Parameter
.builder()
.name(SOURCE_CATEGORY_PARAMETER)
.type(String.class)
.supportsAutoComplete(true)
.templated(true)
.build();
Parameter newsFeedKeyParameter = Parameter
.builder()
.name(NEWS_FEED_SOURCE_KEY_PARAMETER)
.type(String.class)
.supportsAutoComplete(true)
.templated(true)
.build();
List<Parameter> parameters = Arrays.asList(categoryParameter, newsFeedKeyParameter, sourceCategoryParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("categorysubscription")
.commandName("create")
.build();
return CommandConfiguration.builder()
.name("createNewsCategorySubscription")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.slashCommandOnly(true)
.supportsEmbedException(true)
.parameters(parameters)
.causesReaction(false)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,95 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@Component
public class DeleteNewsCategory extends AbstractConditionableCommand {
private static final String CATEGORY_KEY_NAME_PARAMETER = "categoryName";
private static final String DELETE_NEWS_CATEGORY_RESPONSE_TEMPLATE_KEY = "deleteNewsCategory_response";
@Autowired
private SlashCommandParameterService slashCommandParameterService;
@Autowired
private InteractionService interactionService;
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private ServerManagementService serverManagementService;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
String categoryName = slashCommandParameterService.getCommandOption(CATEGORY_KEY_NAME_PARAMETER, event, String.class);
AServer server = serverManagementService.loadOrCreate(event.getGuild().getIdLong());
newsCategoryServiceBean.deleteNewsCategoryByName(categoryName, server);
return interactionService.replyEmbed(DELETE_NEWS_CATEGORY_RESPONSE_TEMPLATE_KEY, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public CommandConfiguration getConfiguration() {
Parameter nameParameter = Parameter
.builder()
.templated(true)
.name(CATEGORY_KEY_NAME_PARAMETER)
.type(String.class)
.build();
List<Parameter> parameters = Arrays.asList(nameParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("category")
.commandName("delete")
.build();
return CommandConfiguration.builder()
.name("deleteNewsCategory")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.slashCommandOnly(true)
.supportsEmbedException(true)
.causesReaction(false)
.parameters(parameters)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,122 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryChannelMappingServiceBean;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@Component
public class DeleteNewsCategoryChannelMapping extends AbstractConditionableCommand {
private static final String CATEGORY_KEY_NAME_PARAMETER = "categoryName";
private static final String CHANNEL_PARAMETER = "channel";
private static final String DELETE_NEWS_CATEGORY_CHANNEL_MAPPING_RESPONSE_TEMPLATE_KEY = "deleteNewsCategoryChannelMapping_response";
@Autowired
private SlashCommandParameterService slashCommandParameterService;
@Autowired
private InteractionService interactionService;
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
@Autowired
private NewsCategoryChannelMappingServiceBean newsCategoryMappingServiceBean;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
String categoryName = slashCommandParameterService.getCommandOption(CATEGORY_KEY_NAME_PARAMETER, event, String.class);
GuildChannel channel = slashCommandParameterService.getCommandOption(CHANNEL_PARAMETER, event, TextChannel.class, GuildChannel.class);
newsCategoryMappingServiceBean.deleteNewsCategoryChannelMapping(categoryName, channel);
return interactionService.replyEmbed(DELETE_NEWS_CATEGORY_CHANNEL_MAPPING_RESPONSE_TEMPLATE_KEY, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), CATEGORY_KEY_NAME_PARAMETER)) {
return newsCategoryServiceBean.getNamesOfNewsCategoriesStartingWith(event.getFocusedOption().getValue(), event.getGuild());
} else {
return new ArrayList<>();
}
}
@Override
public CommandConfiguration getConfiguration() {
Parameter categoryParameter = Parameter
.builder()
.templated(true)
.name(CATEGORY_KEY_NAME_PARAMETER)
.supportsAutoComplete(true)
.type(String.class)
.build();
Parameter channelParameter = Parameter
.builder()
.name(CHANNEL_PARAMETER)
.type(TextChannel.class)
.templated(true)
.build();
List<Parameter> parameters = Arrays.asList(categoryParameter, channelParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("categorychannelmapping")
.commandName("delete")
.build();
return CommandConfiguration.builder()
.name("deleteNewsCategoryChannelMapping")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.parameters(parameters)
.slashCommandOnly(true)
.supportsEmbedException(true)
.causesReaction(false)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,152 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandAutoCompleteService;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import dev.sheldan.sissi.module.rssnews.service.NewsFeedSourceCategoryServiceBean;
import dev.sheldan.sissi.module.rssnews.service.NewsFeedSourceCategorySubscriptionServiceBean;
import dev.sheldan.sissi.module.rssnews.service.management.NewsFeedSourceManagementServiceBean;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@Component
public class DeleteNewsCategorySubscription extends AbstractConditionableCommand {
private static final String CATEGORY_KEY_NAME_PARAMETER = "categoryName";
private static final String SOURCE_CATEGORY_PARAMETER = "sourceCategory";
private static final String NEWS_FEED_SOURCE_KEY_PARAMETER = "newsFeed";
private static final String CREATE_NEWS_CATEGORY_SUBSCRIPTION_RESPONSE_TEMPLATE_KEY = "deleteNewsCategorySubscription_response";
@Autowired
private SlashCommandParameterService slashCommandParameterService;
@Autowired
private InteractionService interactionService;
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private SlashCommandAutoCompleteService slashCommandAutoCompleteService;
@Autowired
private NewsFeedSourceCategorySubscriptionServiceBean newsFeedSourceCategorySubscriptionServiceBean;
@Autowired
private NewsFeedSourceCategoryServiceBean newsFeedSourceCategoryServiceBean;
@Autowired
private NewsFeedSourceManagementServiceBean newsFeedSourceManagementServiceBean;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
String categoryName = slashCommandParameterService.getCommandOption(CATEGORY_KEY_NAME_PARAMETER, event, String.class);
String sourceCategoryName = slashCommandParameterService.getCommandOption(SOURCE_CATEGORY_PARAMETER, event, String.class);
String newsFeedSourceName = slashCommandParameterService.getCommandOption(NEWS_FEED_SOURCE_KEY_PARAMETER, event, String.class);
Guild guild = event.getGuild();
newsFeedSourceCategorySubscriptionServiceBean.deleteNewsFeedSourceCategorySubscription(categoryName, sourceCategoryName, newsFeedSourceName, guild);
return interactionService.replyEmbed(CREATE_NEWS_CATEGORY_SUBSCRIPTION_RESPONSE_TEMPLATE_KEY, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public List<String> performAutoComplete(CommandAutoCompleteInteractionEvent event) {
if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), CATEGORY_KEY_NAME_PARAMETER)) {
return newsCategoryServiceBean.getNamesOfNewsCategoriesStartingWith(event.getFocusedOption().getValue(), event.getGuild());
} if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), SOURCE_CATEGORY_PARAMETER)) {
String newsFeedSourceName = slashCommandParameterService.getCommandOption(NEWS_FEED_SOURCE_KEY_PARAMETER, event, String.class);
Optional<NewsFeedSource> newsFeedSourceOptional = newsFeedSourceManagementServiceBean.getNewsFeedSourceWithNameOptional(newsFeedSourceName);
if(newsFeedSourceOptional.isEmpty()) {
return new ArrayList<>();
}
return newsFeedSourceCategoryServiceBean.getNamesOfNewsSourceCategoriesInNewsFeedStartingWith(event.getFocusedOption().getValue(), newsFeedSourceOptional.get());
} if(slashCommandAutoCompleteService.matchesParameter(event.getFocusedOption(), NEWS_FEED_SOURCE_KEY_PARAMETER)) {
return newsFeedSourceManagementServiceBean.getNewsFeedSourceNamesStartingWithName(event.getFocusedOption().getValue());
} else {
return new ArrayList<>();
}
}
@Override
public CommandConfiguration getConfiguration() {
Parameter categoryParameter = Parameter
.builder()
.templated(true)
.name(CATEGORY_KEY_NAME_PARAMETER)
.supportsAutoComplete(true)
.type(String.class)
.build();
Parameter sourceCategoryParameter = Parameter
.builder()
.name(SOURCE_CATEGORY_PARAMETER)
.type(String.class)
.supportsAutoComplete(true)
.templated(true)
.build();
Parameter newsFeedKeyParameter = Parameter
.builder()
.name(NEWS_FEED_SOURCE_KEY_PARAMETER)
.type(String.class)
.supportsAutoComplete(true)
.templated(true)
.build();
List<Parameter> parameters = Arrays.asList(categoryParameter, newsFeedKeyParameter, sourceCategoryParameter);
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("categorysubscription")
.commandName("delete")
.build();
return CommandConfiguration.builder()
.name("deleteNewsCategorySubscription")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.slashCommandOnly(true)
.supportsEmbedException(true)
.parameters(parameters)
.causesReaction(false)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,78 @@
package dev.sheldan.sissi.module.rssnews.commands;
import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RssNewsSlashCommandNames;
import dev.sheldan.sissi.module.rssnews.model.template.NewsCategoryInfo;
import dev.sheldan.sissi.module.rssnews.model.template.ShowNewsCategoriesResponse;
import dev.sheldan.sissi.module.rssnews.service.NewsCategoryServiceBean;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@Component
public class ShowNewsCategories extends AbstractConditionableCommand {
private static final String SHOW_NEWS_CATEGORIES_TEMPLATE_KEY = "showNewsCategories_response";
@Autowired
private NewsCategoryServiceBean newsCategoryServiceBean;
@Autowired
private InteractionService interactionService;
@Override
public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
List<NewsCategoryInfo> categoryInfos = newsCategoryServiceBean.getCategoryInfos(event.getGuild());
ShowNewsCategoriesResponse responseModel = ShowNewsCategoriesResponse
.builder()
.newsCategories(categoryInfos)
.build();
return interactionService.replyEmbed(SHOW_NEWS_CATEGORIES_TEMPLATE_KEY, responseModel, event)
.thenApply(interactionHook -> CommandResult.fromSuccess());
}
@Override
public CommandConfiguration getConfiguration() {
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
SlashCommandConfig slashCommandConfig = SlashCommandConfig
.builder()
.enabled(true)
.rootCommandName(RssNewsSlashCommandNames.RSS_NEWS)
.groupName("category")
.commandName("show")
.build();
return CommandConfiguration.builder()
.name("showNewsCategories")
.module(UtilityModuleDefinition.UTILITY)
.templated(true)
.slashCommandConfig(slashCommandConfig)
.async(true)
.slashCommandOnly(true)
.supportsEmbedException(true)
.causesReaction(false)
.help(helpInfo)
.build();
}
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
}

View File

@@ -0,0 +1,28 @@
package dev.sheldan.sissi.module.rssnews.config;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.sissi.module.rssnews.orf.config.OrfNewsFeatureConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
@Component
public class RSSNewsFeatureConfig implements FeatureConfig {
@Autowired
private OrfNewsFeatureConfig orfNewsFeatureConfig;
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.RSS_NEWS;
}
@Override
public List<FeatureConfig> getDependantFeatures() {
return Arrays.asList(orfNewsFeatureConfig);
}
}

View File

@@ -0,0 +1,15 @@
package dev.sheldan.sissi.module.rssnews.config;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import lombok.Getter;
@Getter
public enum RssNewsFeatureDefinition implements FeatureDefinition {
RSS_NEWS("rssNews"), ORF_NEWS("orfNews");
private String key;
RssNewsFeatureDefinition(String key) {
this.key = key;
}
}

View File

@@ -0,0 +1,9 @@
package dev.sheldan.sissi.module.rssnews.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
@Configuration
@PropertySource("classpath:rss-news.properties")
public class RssNewsProperties {
}

View File

@@ -0,0 +1,5 @@
package dev.sheldan.sissi.module.rssnews.config;
public class RssNewsSlashCommandNames {
public static final String RSS_NEWS = "rssnews";
}

View File

@@ -0,0 +1,21 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsCategoryAlreadyExistsException extends AbstractoTemplatableException {
public NewsCategoryAlreadyExistsException() {
super("News Category already exists.");
}
@Override
public String getTemplateName() {
return "news_category_already_exists_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,21 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsCategoryChannelMappingAlreadyExistsException extends AbstractoTemplatableException {
public NewsCategoryChannelMappingAlreadyExistsException() {
super("News Category channel mapping already exists.");
}
@Override
public String getTemplateName() {
return "news_category_channel_mapping_already_exists_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,20 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsCategoryChannelMappingNotFoundException extends AbstractoTemplatableException {
public NewsCategoryChannelMappingNotFoundException() {
super("News Category channel mapping not found.");
}
@Override
public String getTemplateName() {
return "news_category_channel_mapping_not_found_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,20 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsCategoryNotFoundException extends AbstractoTemplatableException {
public NewsCategoryNotFoundException() {
super("News Category not found.");
}
@Override
public String getTemplateName() {
return "news_category_not_found_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,21 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsFeedSourceCategoryNotFoundException extends AbstractoTemplatableException {
public NewsFeedSourceCategoryNotFoundException() {
super("News feed source category not found.");
}
@Override
public String getTemplateName() {
return "news_feed_source_category_not_found_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,21 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsFeedSourceCategorySubscriptionAlreadyExistsException extends AbstractoTemplatableException {
public NewsFeedSourceCategorySubscriptionAlreadyExistsException() {
super("News feed source category subscription already exists.");
}
@Override
public String getTemplateName() {
return "news_feed_source_category_subscription_already_exists_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,21 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsFeedSourceCategorySubscriptionNotFoundException extends AbstractoTemplatableException {
public NewsFeedSourceCategorySubscriptionNotFoundException() {
super("News feed source category subscription not found.");
}
@Override
public String getTemplateName() {
return "news_feed_source_category_subscription_not_found_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,21 @@
package dev.sheldan.sissi.module.rssnews.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
public class NewsFeedSourceNotFoundException extends AbstractoTemplatableException {
public NewsFeedSourceNotFoundException() {
super("News feed source not found.");
}
@Override
public String getTemplateName() {
return "news_feed_source_not_found_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

View File

@@ -0,0 +1,55 @@
package dev.sheldan.sissi.module.rssnews.model.database;
import dev.sheldan.abstracto.core.models.database.AServer;
import jakarta.persistence.*;
import lombok.*;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@Builder
@Entity
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "news_category")
@Getter
@Setter
@EqualsAndHashCode
public class NewsCategory {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", nullable = false)
private Long id;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", referencedColumnName = "id", nullable = false)
private AServer server;
@ManyToMany
@JoinTable(
name = "news_category_in_news_feed_source_category",
joinColumns = @JoinColumn(name = "server_category_id"),
inverseJoinColumns = @JoinColumn(name = "source_category_id"))
private List<NewsFeedSourceCategory> sourceCategories;
@OneToMany(
fetch = FetchType.LAZY,
cascade = {CascadeType.PERSIST, CascadeType.MERGE},
mappedBy = "newsCategory")
@Builder.Default
private List<NewsCategoryChannelMapping> mappings = new ArrayList<>();
@Column(name = "key", nullable = false)
private String key;
@Column(name = "enabled", nullable = false)
private Boolean enabled;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

View File

@@ -0,0 +1,54 @@
package dev.sheldan.sissi.module.rssnews.model.database;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AServer;
import jakarta.persistence.*;
import lombok.*;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@Builder
@Entity
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "news_category_channel_mapping")
@Getter
@Setter
@EqualsAndHashCode
public class NewsCategoryChannelMapping {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", nullable = false)
private Long id;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", referencedColumnName = "id", nullable = false)
private AServer server;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "channel_id", referencedColumnName = "id", nullable = false)
private AChannel channel;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "category_id", referencedColumnName = "id", nullable = false)
private NewsCategory newsCategory;
@OneToMany(
fetch = FetchType.LAZY,
cascade = {CascadeType.PERSIST, CascadeType.MERGE},
mappedBy = "mapping")
@Builder.Default
private List<NewsPost> posts = new ArrayList<>();
@Column(name = "enabled", nullable = false)
private Boolean enabled;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

View File

@@ -0,0 +1,34 @@
package dev.sheldan.sissi.module.rssnews.model.database;
import jakarta.persistence.*;
import lombok.*;
import java.time.Instant;
@Builder
@Entity
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "news_feed_record")
@Getter
@Setter
@EqualsAndHashCode
public class NewsFeedRecord {
@Id
@Column(name = "id", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "source_id", referencedColumnName = "id")
private NewsFeedSource source;
@Column(name = "url")
private String url;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

View File

@@ -0,0 +1,55 @@
package dev.sheldan.sissi.module.rssnews.model.database;
import jakarta.persistence.*;
import lombok.*;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@Builder
@Entity
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "news_feed_source")
@Getter
@Setter
@EqualsAndHashCode
public class NewsFeedSource {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", nullable = false)
private Long id;
@Column(name = "url", nullable = false)
private String url;
@Column(name = "name", nullable = false)
private String name;
@Enumerated(EnumType.STRING)
@Column(name = "feed_type", nullable = false)
private NewsFeedSourceCategoryType type;
@OneToMany(
fetch = FetchType.LAZY,
cascade = {CascadeType.PERSIST, CascadeType.MERGE},
mappedBy = "source")
@Builder.Default
private List<NewsFeedSourceCategory> categories = new ArrayList<>();
@OneToMany(
fetch = FetchType.LAZY,
cascade = {CascadeType.PERSIST, CascadeType.MERGE},
mappedBy = "source")
@Builder.Default
private List<NewsFeedRecord> records = new ArrayList<>();
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

View File

@@ -0,0 +1,41 @@
package dev.sheldan.sissi.module.rssnews.model.database;
import jakarta.persistence.*;
import lombok.*;
import java.time.Instant;
import java.util.List;
@Builder
@Entity
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "news_feed_source_category")
@Getter
@Setter
@EqualsAndHashCode
public class NewsFeedSourceCategory {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", nullable = false)
private Long id;
@Column(name = "name", nullable = false)
private String name;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "source_id", referencedColumnName = "id")
private NewsFeedSource source;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
@Getter
@ManyToMany(mappedBy = "sourceCategories")
private List<NewsCategory> categories;
}

View File

@@ -0,0 +1,5 @@
package dev.sheldan.sissi.module.rssnews.model.database;
public enum NewsFeedSourceCategoryType {
RFD, RSS
}

View File

@@ -0,0 +1,44 @@
package dev.sheldan.sissi.module.rssnews.model.database;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AServer;
import jakarta.persistence.*;
import lombok.*;
import java.time.Instant;
@Builder
@Entity
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "news_post")
@Getter
@Setter
@EqualsAndHashCode
public class NewsPost {
@Id
@Column(name = "id", nullable = false)
private Long id;
@Column(name = "url")
private String url;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "channel_id", referencedColumnName = "id", nullable = false)
private AChannel postChannel;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", referencedColumnName = "id", nullable = false)
private AServer server;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "news_category_channel_mapping_id", referencedColumnName = "id", nullable = false)
private NewsCategoryChannelMapping mapping;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

View File

@@ -0,0 +1,54 @@
package dev.sheldan.sissi.module.rssnews.model.feed;
import com.apptasticsoftware.rssreader.Item;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSourceCategoryType;
import dev.sheldan.sissi.module.rssnews.model.feed.rfd.RFDItem;
import lombok.*;
@Getter
@Builder
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class NewsResponseItem {
private String title;
private String link;
private String mainCategory;
private String date;
private String secondCategory;
private String description;
private String imageURL;
private NewsFeedSourceCategoryType type;
private NewsFeedSource newsFeedSource;
public static NewsResponseItem fromRFDItem(RFDItem item) {
return NewsResponseItem
.builder()
.title(item.getTitle())
.date(item.getDate())
.description(item.getDescription())
.mainCategory(item.getSubject())
.secondCategory(item.getOewaCategory())
.type(NewsFeedSourceCategoryType.RFD)
.link(item.getLink())
.build();
}
public static NewsResponseItem fromRSSItem(Item item) {
String imageUrl = null;
if(item.getEnclosure().isPresent()) {
imageUrl = item.getEnclosure().get().getUrl();
}
return NewsResponseItem
.builder()
.title(item.getTitle().orElse(null))
.date(item.getPubDate().orElse(null))
.description(item.getDescription().orElse(null))
.mainCategory(item.getCategory().orElse(null))
.type(NewsFeedSourceCategoryType.RSS)
.link(item.getLink().orElse(null))
.imageURL(imageUrl)
.build();
}
}

View File

@@ -0,0 +1,17 @@
package dev.sheldan.sissi.module.rssnews.model.feed.rfd;
import lombok.*;
@Getter
@Builder
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class RFDItem {
private String title;
private String link;
private String subject;
private String date;
private String oewaCategory;
private String description;
}

View File

@@ -0,0 +1,12 @@
package dev.sheldan.sissi.module.rssnews.model.template;
import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class NewsCategoryChannelMappingInfo {
private ChannelDisplay channel;
private Boolean enabled;
}

View File

@@ -0,0 +1,14 @@
package dev.sheldan.sissi.module.rssnews.model.template;
import lombok.Builder;
import lombok.Getter;
import java.util.List;
@Getter
@Builder
public class NewsCategoryInfo {
private String name;
private List<NewsCategorySubscriptionInfo> subscriptions;
private List<NewsCategoryChannelMappingInfo> mappings;
}

View File

@@ -0,0 +1,13 @@
package dev.sheldan.sissi.module.rssnews.model.template;
import lombok.Builder;
import lombok.Getter;
import java.util.List;
@Getter
@Builder
public class NewsCategorySubscriptionInfo {
private String newsFeedName;
private List<String> newsFeedCategories;
}

View File

@@ -0,0 +1,12 @@
package dev.sheldan.sissi.module.rssnews.model.template;
import lombok.Builder;
import lombok.Getter;
import java.util.List;
@Builder
@Getter
public class ShowNewsCategoriesResponse {
private List<NewsCategoryInfo> newsCategories;
}

View File

@@ -0,0 +1,28 @@
package dev.sheldan.sissi.module.rssnews.orf.config;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.sissi.module.rssnews.config.RSSNewsFeatureConfig;
import dev.sheldan.sissi.module.rssnews.config.RssNewsFeatureDefinition;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
@Component
public class OrfNewsFeatureConfig implements FeatureConfig {
@Autowired
private RSSNewsFeatureConfig rssNewsFeatureConfig;
@Override
public FeatureDefinition getFeature() {
return RssNewsFeatureDefinition.ORF_NEWS;
}
@Override
public List<FeatureConfig> getRequiredFeatures() {
return Arrays.asList(rssNewsFeatureConfig);
}
}

View File

@@ -0,0 +1,31 @@
package dev.sheldan.sissi.module.rssnews.orf.job;
import dev.sheldan.sissi.module.rssnews.orf.service.OrfNewsService;
import lombok.extern.slf4j.Slf4j;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.PersistJobDataAfterExecution;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.quartz.QuartzJobBean;
import org.springframework.stereotype.Component;
@Slf4j
@DisallowConcurrentExecution
@Component
@PersistJobDataAfterExecution
public class NewsPostGatherJob extends QuartzJobBean {
@Autowired
private OrfNewsService orfNewsRFDService;
@Override
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
try {
log.info("Executing news retrieval job.");
orfNewsRFDService.checkNewsPosts();
} catch (Exception e) {
log.error("News retrieval job failed.", e);
}
}
}

View File

@@ -0,0 +1,26 @@
package dev.sheldan.sissi.module.rssnews.orf.model;
import dev.sheldan.sissi.module.rssnews.model.feed.NewsResponseItem;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class OrfNewsMessagePost {
private String title;
private String url;
private String category;
private String description;
private String imageURL;
public static OrfNewsMessagePost fromNewsResponseItem(NewsResponseItem newsResponseItem) {
return OrfNewsMessagePost
.builder()
.category(newsResponseItem.getMainCategory())
.description(newsResponseItem.getDescription())
.imageURL(newsResponseItem.getImageURL())
.title(newsResponseItem.getTitle())
.url(newsResponseItem.getLink())
.build();
}
}

View File

@@ -0,0 +1,263 @@
package dev.sheldan.sissi.module.rssnews.orf.service;
import com.apptasticsoftware.rssreader.Item;
import com.apptasticsoftware.rssreader.RssReader;
import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.FeatureFlagService;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.templating.service.TemplateService;
import dev.sheldan.abstracto.core.utils.CompletableFutureList;
import dev.sheldan.sissi.module.rssnews.model.database.*;
import dev.sheldan.sissi.module.rssnews.orf.config.OrfNewsFeatureConfig;
import dev.sheldan.sissi.module.rssnews.model.feed.NewsResponseItem;
import dev.sheldan.sissi.module.rssnews.model.feed.rfd.RFDItem;
import dev.sheldan.sissi.module.rssnews.orf.model.OrfNewsMessagePost;
import dev.sheldan.sissi.module.rssnews.service.management.*;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.Message;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.apache.jena.rdf.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Component
@Slf4j
public class OrfNewsService {
@Autowired
private OkHttpClient okHttpClient;
@Autowired
private NewsFeedSourceManagementServiceBean newsFeedSourceManagementBean;
@Autowired
private ServerManagementService serverManagementService;
@Autowired
private FeatureFlagService featureFlagService;
@Autowired
private OrfNewsFeatureConfig orfNewsFeatureConfig;
@Autowired
private NewsFeedRecordManagementServiceBean newsFeedRecordManagementBean;
@Autowired
private NewsCategoryManagementServiceBean newsCategoryManagementBean;
@Autowired
private NewsFeedSourceCategoryManagementServiceBean newsFeedSourceCategoryManagementBean;
@Autowired
private NewsFeedRecordManagementServiceBean newsFeedRecordManagementServiceBean;
@Autowired
private NewsCategoryChannelMappingManagementServiceBean newsCategoryChannelMappingManagementServiceBean;
@Autowired
private NewsPostManagementServiceBean newsPostManagementServiceBean;
@Autowired
private ChannelService channelService;
@Autowired
private TemplateService templateService;
@Autowired
private OrfNewsService self;
private static final String ORF_NEWS_POST_TEMPLATE_KEY = "orf_news_post";
@Transactional
public void checkNewsPosts() {
List<AServer> servers = serverManagementService.getAllServers();
List<AServer> serversWithEnabledFeature = servers
.stream()
.filter(server -> featureFlagService.isFeatureEnabled(orfNewsFeatureConfig, server))
.toList();
if(serversWithEnabledFeature.isEmpty()) {
log.info("No servers have orf news enabled - skipping execution.");
return;
}
List<NewsFeedSource> sources = newsFeedSourceManagementBean.getAllSources();
List<NewsResponseItem> newsItems = new ArrayList<>();
sources.forEach(source -> newsItems.addAll(loadItemsFromNewsSource(source)));
Set<String> existingRecordUrls = newsFeedRecordManagementBean.getAllRecords()
.stream()
.map(NewsFeedRecord::getUrl)
.collect(Collectors.toSet());
List<NewsResponseItem> newItems = newsItems
.stream()
.filter(newsResponseItem -> !existingRecordUrls.contains(newsResponseItem.getLink()))
.toList();
List<NewsCategory> categoriesToCover = newsCategoryManagementBean.getNewsCategoriesOfServers(serversWithEnabledFeature);
categoriesToCover.forEach(category -> sendNewsItemsToNewsCategory(newItems, category));
createNewCategories(newsItems);
saveNewsRecords(newItems);
}
private void saveNewsRecords(List<NewsResponseItem> newItems) {
newItems.forEach(newsResponseItem -> newsFeedRecordManagementServiceBean.createRecord(newsResponseItem));
}
private void createNewCategories(List<NewsResponseItem> newsItems) {
Set<String> allExistingCategories = newsFeedSourceCategoryManagementBean.getAllCategories()
.stream()
.map(NewsFeedSourceCategory::getName)
.collect(Collectors.toSet());
Set<String> incomingCategories = newsItems
.stream()
.map(NewsResponseItem::getMainCategory)
.collect(Collectors.toSet());
HashSet<Object> seenCategories = new HashSet<>();
newsItems.removeIf(e -> !seenCategories.add(e.getMainCategory()));
Map<String, NewsResponseItem> categoryToNewsItem = newsItems
.stream()
.collect(Collectors.toMap(NewsResponseItem::getMainCategory, Function.identity()));
incomingCategories.removeAll(allExistingCategories);
incomingCategories.removeIf(Objects::isNull);
if(!incomingCategories.isEmpty()) {
incomingCategories.forEach(categoryName ->
newsFeedSourceCategoryManagementBean.createCategory(categoryName, categoryToNewsItem.get(categoryName).getNewsFeedSource()));
}
}
private void sendNewsItemsToNewsCategory(List<NewsResponseItem> newsItems, NewsCategory category) {
if(!category.getEnabled()) {
return;
}
Set<String> categoriesToSend = category
.getSourceCategories()
.stream()
.map(NewsFeedSourceCategory::getName)
.collect(Collectors.toSet());
List<NewsResponseItem> itemsToSend = newsItems
.stream()
.filter(newsResponseItem -> categoriesToSend.contains(newsResponseItem.getMainCategory()))
.toList();
category.getMappings().forEach(newsCategoryChannelMapping -> sendNewsItemToChannel(itemsToSend, newsCategoryChannelMapping));
}
private void sendNewsItemToChannel(List<NewsResponseItem> items, NewsCategoryChannelMapping mapping) {
items.forEach(item -> {
Long channelId = mapping.getChannel().getId();
Long serverId = mapping.getServer().getId();
Long mappingId = mapping.getId();
OrfNewsMessagePost orfNewsMessagePostModel = OrfNewsMessagePost.fromNewsResponseItem(item);
MessageToSend messageToSend = templateService.renderEmbedTemplate(ORF_NEWS_POST_TEMPLATE_KEY, orfNewsMessagePostModel, serverId);
CompletableFutureList<Message> futureList = new CompletableFutureList<>(channelService.sendMessageEmbedToSendToAChannel(messageToSend, mapping.getChannel()));
futureList.getMainFuture().thenAccept(unused -> {
log.info("Sent news post {} to channel {}.", item.getTitle(), channelId);
Long messageId = futureList.getObjects().get(0).getIdLong();
self.persistNewsPost(messageId, mappingId, item);
}).exceptionally(throwable -> {
log.warn("Failed to send news post {} to channel {}.", item.getTitle(), channelId);
return null;
});
});
}
@Transactional
public void persistNewsPost(Long messageId, Long mappingId, NewsResponseItem item) {
NewsCategoryChannelMapping channelMapping = newsCategoryChannelMappingManagementServiceBean.getChannelMappingById(mappingId);
newsPostManagementServiceBean.createNewsPost(messageId, item, channelMapping);
}
public List<NewsResponseItem> loadItemsFromNewsSource(NewsFeedSource source) {
Request request = new Request.Builder()
.url(source.getUrl())
.get()
.build();
try {
Response response = okHttpClient.newCall(request).execute();
return switch (source.getType()) {
case RFD -> loadNewsSourceRFD(response, source);
case RSS -> loadNewsSourceRSS(response, source);
};
} catch (IOException ex) {
throw new AbstractoRunTimeException(String.format("Failed to gather news from %s", source.getName()), ex);
}
}
private List<NewsResponseItem> loadNewsSourceRSS(Response response, NewsFeedSource source) {
RssReader reader = new RssReader();
try (response) {
InputStream is = response.body().byteStream();
Stream<Item> rssFeed = reader.read(is);
return rssFeed.map(NewsResponseItem::fromRSSItem)
.peek(newsResponseItem -> newsResponseItem.setNewsFeedSource(source))
.toList();
}
}
private List<NewsResponseItem> loadNewsSourceRFD(Response response, NewsFeedSource source) throws IOException {
Map<String, RFDItem> items = new HashMap<>();
final Model model = ModelFactory.createDefaultModel();
model.read(new ByteArrayInputStream(response.body().bytes()), null);
StmtIterator statements = model.listStatements();
while(statements.hasNext()) {
Statement x = statements.nextStatement();
String article = x.getSubject().toString();
RFDItem item;
if(!items.containsKey(article)) {
item = new RFDItem();
} else {
item = items.get(article);
}
String predicate = x.getPredicate().toString();
String objectValue = x.getObject().toString();
switch (predicate) {
case "http://rss.orf.at/1.0/oewaCategory":
item.setOewaCategory(objectValue);
break;
case "http://purl.org/rss/1.0/link":
item.setLink(objectValue);
break;
case "http://purl.org/dc/elements/1.1/subject":
item.setSubject(objectValue);
break;
case "http://purl.org/dc/elements/1.1/date":
item.setDate(objectValue);
break;
case "http://purl.org/rss/1.0/description":
item.setDescription(objectValue);
break;
case "http://purl.org/rss/1.0/title":
item.setTitle(objectValue);
break;
}
items.putIfAbsent(article, item);
}
Set<String> uselessEntries = new HashSet<>();
items.forEach((s, rfdItem) -> {
if(rfdItem.getLink() == null) {
uselessEntries.add(s);
}
});
uselessEntries.forEach(items::remove);
return items
.values()
.stream()
.map(NewsResponseItem::fromRFDItem)
.peek(newsResponseItem -> newsResponseItem.setNewsFeedSource(source))
.toList();
}
}

View File

@@ -0,0 +1,14 @@
package dev.sheldan.sissi.module.rssnews.repository;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategoryChannelMapping;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface NewsCategoryChannelMappingRepository extends JpaRepository<NewsCategoryChannelMapping, Long> {
boolean existsByChannelAndNewsCategory(AChannel channel, NewsCategory newsCategory);
void deleteByNewsCategory(NewsCategory newsCategory);
void deleteByNewsCategoryAndChannel(NewsCategory newsCategory, AChannel channel);
}

View File

@@ -0,0 +1,18 @@
package dev.sheldan.sissi.module.rssnews.repository;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Repository
public interface NewsCategoryRepository extends JpaRepository<NewsCategory, Long> {
List<NewsCategory> getByServerIn(List<AServer> servers);
List<NewsCategory> getByServer(AServer server);
Optional<NewsCategory> findByKeyAndServer(String name, AServer server);
boolean existsByKeyAndServer(String name, AServer server);
List<NewsCategory> findByKeyStartsWithAndServer(String name, AServer server);
}

View File

@@ -0,0 +1,9 @@
package dev.sheldan.sissi.module.rssnews.repository;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedRecord;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface NewsFeedRecordRepository extends JpaRepository<NewsFeedRecord, Long> {
}

View File

@@ -0,0 +1,16 @@
package dev.sheldan.sissi.module.rssnews.repository;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSourceCategory;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Repository
public interface NewsFeedSourceCategoryRepository extends JpaRepository<NewsFeedSourceCategory, Long> {
List<NewsFeedSourceCategory> findByNameStartsWith(String name);
List<NewsFeedSourceCategory> findByNameStartsWithAndSource(String name, NewsFeedSource newsFeedSource);
Optional<NewsFeedSourceCategory> findByNameAndSource(String name, NewsFeedSource newsFeedSource);
}

View File

@@ -0,0 +1,14 @@
package dev.sheldan.sissi.module.rssnews.repository;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Repository
public interface NewsFeedSourceRepository extends JpaRepository<NewsFeedSource, Long> {
Optional<NewsFeedSource> findByName(String name);
List<NewsFeedSource> findByNameStartsWith(String name);
}

View File

@@ -0,0 +1,9 @@
package dev.sheldan.sissi.module.rssnews.repository;
import dev.sheldan.sissi.module.rssnews.model.database.NewsPost;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface NewsPostRepository extends JpaRepository<NewsPost, Long> {
}

View File

@@ -0,0 +1,44 @@
package dev.sheldan.sissi.module.rssnews.service;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
import dev.sheldan.sissi.module.rssnews.exception.NewsCategoryChannelMappingAlreadyExistsException;
import dev.sheldan.sissi.module.rssnews.exception.NewsCategoryChannelMappingNotFoundException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategoryChannelMapping;
import dev.sheldan.sissi.module.rssnews.service.management.NewsCategoryChannelMappingManagementServiceBean;
import dev.sheldan.sissi.module.rssnews.service.management.NewsCategoryManagementServiceBean;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class NewsCategoryChannelMappingServiceBean {
@Autowired
private NewsCategoryManagementServiceBean newsCategoryManagementServiceBean;
@Autowired
private NewsCategoryChannelMappingManagementServiceBean newsCategoryChannelMappingManagementServiceBean;
@Autowired
private ChannelManagementService channelManagementService;
public NewsCategoryChannelMapping createNewsCategoryChannelMapping(String categoryName, GuildChannel channel) {
AChannel aChannel = channelManagementService.loadChannel(channel.getIdLong());
NewsCategory newsCategory = newsCategoryManagementServiceBean.findNewsCategoryByNameInServer(categoryName, aChannel.getServer());
if(newsCategoryChannelMappingManagementServiceBean.newsCategoryChannelMappingExists(newsCategory, aChannel)) {
throw new NewsCategoryChannelMappingAlreadyExistsException();
}
return newsCategoryChannelMappingManagementServiceBean.createNewsCategoryChannelMapping(newsCategory, aChannel);
}
public void deleteNewsCategoryChannelMapping(String categoryName, GuildChannel channel) {
AChannel aChannel = channelManagementService.loadChannel(channel.getIdLong());
NewsCategory newsCategory = newsCategoryManagementServiceBean.findNewsCategoryByNameInServer(categoryName, aChannel.getServer());
if(!newsCategoryChannelMappingManagementServiceBean.newsCategoryChannelMappingExists(newsCategory, aChannel)) {
throw new NewsCategoryChannelMappingNotFoundException();
}
newsCategoryChannelMappingManagementServiceBean.deleteNewsCategoryChannelMapping(newsCategory, aChannel);
}
}

View File

@@ -0,0 +1,103 @@
package dev.sheldan.sissi.module.rssnews.service;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.utils.ChannelUtils;
import dev.sheldan.sissi.module.rssnews.exception.NewsCategoryAlreadyExistsException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import dev.sheldan.sissi.module.rssnews.model.template.NewsCategoryChannelMappingInfo;
import dev.sheldan.sissi.module.rssnews.model.template.NewsCategoryInfo;
import dev.sheldan.sissi.module.rssnews.model.template.NewsCategorySubscriptionInfo;
import dev.sheldan.sissi.module.rssnews.service.management.NewsCategoryChannelMappingManagementServiceBean;
import dev.sheldan.sissi.module.rssnews.service.management.NewsCategoryManagementServiceBean;
import net.dv8tion.jda.api.entities.Guild;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
public class NewsCategoryServiceBean {
@Autowired
private NewsCategoryManagementServiceBean newsCategoryManagementServiceBean;
@Autowired
private ServerManagementService serverManagementService;
@Autowired
private NewsCategoryChannelMappingManagementServiceBean newsCategoryChannelMappingManagementServiceBean;
public void createCategory(String name, AServer server) {
if(newsCategoryManagementServiceBean.newsCategoryExistsByNameInServer(name, server)) {
throw new NewsCategoryAlreadyExistsException();
}
newsCategoryManagementServiceBean.createCategory(name, server);
}
public void deleteNewsCategoryByName(String name, AServer server) {
NewsCategory newsCategory = newsCategoryManagementServiceBean.findNewsCategoryByNameInServer(name, server);
newsCategoryChannelMappingManagementServiceBean.deleteChannelMappingsOfNewsCategory(newsCategory);
newsCategoryManagementServiceBean.deleteNewsCategory(newsCategory);
}
public List<NewsCategory> findNewsCategoriesStartingWith(String name, Guild guild) {
AServer server = serverManagementService.loadServer(guild.getIdLong());
return newsCategoryManagementServiceBean.findNewsCategoriesStartingWith(name, server);
}
public List<String> getNamesOfNewsCategoriesStartingWith(String name, Guild guild) {
return findNewsCategoriesStartingWith(name, guild)
.stream()
.map(NewsCategory::getKey)
.toList();
}
public List<NewsCategoryInfo> getCategoryInfos(Guild guild) {
AServer server = serverManagementService.loadServer(guild);
List<NewsCategory> newsCategories = newsCategoryManagementServiceBean.getNewsCategoriesOfServers(server);
return newsCategories.stream().map(newsCategory -> {
List<NewsCategorySubscriptionInfo> subscriptionInfos = new ArrayList<>();
Map<String, List<String>> sourceCategories = new HashMap<>();
newsCategory
.getSourceCategories()
.forEach(sourceCategory -> {
if(!sourceCategories.containsKey(sourceCategory.getSource().getName())) {
sourceCategories.put(sourceCategory.getSource().getName(), new ArrayList<>());
}
sourceCategories.get(sourceCategory.getSource().getName()).add(sourceCategory.getName());
});
sourceCategories.forEach((sourceName, categoryList) ->
subscriptionInfos.add(NewsCategorySubscriptionInfo
.builder()
.newsFeedName(sourceName)
.newsFeedCategories(categoryList)
.build()));
List<NewsCategoryChannelMappingInfo> mappings = new ArrayList<>();
newsCategory.getMappings().forEach(newsCategoryChannelMapping -> {
ChannelDisplay channelDisplay = ChannelDisplay
.builder()
.channelMention(ChannelUtils.getAsMention(newsCategoryChannelMapping.getChannel().getId()))
.build();
mappings.add(NewsCategoryChannelMappingInfo
.builder()
.enabled(newsCategoryChannelMapping.getEnabled())
.channel(channelDisplay)
.build());
});
return NewsCategoryInfo
.builder()
.name(newsCategory.getKey())
.subscriptions(subscriptionInfos)
.mappings(mappings)
.build();
}).toList();
}
}

View File

@@ -0,0 +1,40 @@
package dev.sheldan.sissi.module.rssnews.service;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSourceCategory;
import dev.sheldan.sissi.module.rssnews.service.management.NewsFeedSourceCategoryManagementServiceBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class NewsFeedSourceCategoryServiceBean {
@Autowired
private NewsFeedSourceCategoryManagementServiceBean newsFeedSourceCategoryManagementServiceBean;
public List<NewsFeedSourceCategory> findNewsFeedSourceCategoriesStartingWith(String name) {
return newsFeedSourceCategoryManagementServiceBean.findNewsFeedSourceCategoriesNameStartingWith(name);
}
public List<NewsFeedSourceCategory> getNewsSourceCategoriesInNewsFeedStartingWith(String name, NewsFeedSource newsFeedSource) {
return newsFeedSourceCategoryManagementServiceBean.findNewsFeedSourceCategoriesNameStartingWith(name, newsFeedSource);
}
public List<String> getNamesOfNewsCategoriesStartingWith(String name) {
return findNewsFeedSourceCategoriesStartingWith(name)
.stream()
.map(NewsFeedSourceCategory::getName)
.toList();
}
public List<String> getNamesOfNewsSourceCategoriesInNewsFeedStartingWith(String name, NewsFeedSource newsFeedSource) {
return getNewsSourceCategoriesInNewsFeedStartingWith(name, newsFeedSource)
.stream()
.map(NewsFeedSourceCategory::getName)
.toList();
}
}

View File

@@ -0,0 +1,55 @@
package dev.sheldan.sissi.module.rssnews.service;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.sissi.module.rssnews.exception.NewsFeedSourceCategorySubscriptionAlreadyExistsException;
import dev.sheldan.sissi.module.rssnews.exception.NewsFeedSourceCategorySubscriptionNotFoundException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSourceCategory;
import dev.sheldan.sissi.module.rssnews.service.management.NewsCategoryManagementServiceBean;
import dev.sheldan.sissi.module.rssnews.service.management.NewsFeedSourceCategoryManagementServiceBean;
import dev.sheldan.sissi.module.rssnews.service.management.NewsFeedSourceManagementServiceBean;
import net.dv8tion.jda.api.entities.Guild;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class NewsFeedSourceCategorySubscriptionServiceBean {
@Autowired
private NewsCategoryManagementServiceBean newsCategoryManagementServiceBean;
@Autowired
private NewsFeedSourceCategoryManagementServiceBean newsFeedSourceCategoryManagementServiceBean;
@Autowired
private NewsFeedSourceManagementServiceBean newsFeedSourceManagementServiceBean;
@Autowired
private ServerManagementService serverManagementService;
public void createNewsFeedSourceCategorySubscription(String categoryName, String sourceCategoryName, String newsFeedSourceName, Guild guild) {
AServer server = serverManagementService.loadServer(guild.getIdLong());
NewsCategory newsCategory = newsCategoryManagementServiceBean.findNewsCategoryByNameInServer(categoryName, server);
NewsFeedSource newsFeedSource = newsFeedSourceManagementServiceBean.getNewsFeedSourceWithName(newsFeedSourceName);
NewsFeedSourceCategory sourceCategory = newsFeedSourceCategoryManagementServiceBean.findNewsFeedSourceCategoryByNameAndNewsFeedSource(sourceCategoryName, newsFeedSource);
if(newsCategory.getSourceCategories().contains(sourceCategory)) {
throw new NewsFeedSourceCategorySubscriptionAlreadyExistsException();
}
newsCategory.getSourceCategories().add(sourceCategory);
sourceCategory.getCategories().add(newsCategory);
}
public void deleteNewsFeedSourceCategorySubscription(String categoryName, String sourceCategoryName, String newsFeedSourceName, Guild guild) {
AServer server = serverManagementService.loadServer(guild.getIdLong());
NewsCategory newsCategory = newsCategoryManagementServiceBean.findNewsCategoryByNameInServer(categoryName, server);
NewsFeedSource newsFeedSource = newsFeedSourceManagementServiceBean.getNewsFeedSourceWithName(newsFeedSourceName);
NewsFeedSourceCategory sourceCategory = newsFeedSourceCategoryManagementServiceBean.findNewsFeedSourceCategoryByNameAndNewsFeedSource(sourceCategoryName, newsFeedSource);
if(!newsCategory.getSourceCategories().contains(sourceCategory)) {
throw new NewsFeedSourceCategorySubscriptionNotFoundException();
}
newsCategory.getSourceCategories().remove(sourceCategory);
sourceCategory.getCategories().remove(newsCategory);
}
}

View File

@@ -0,0 +1,14 @@
package dev.sheldan.sissi.module.rssnews.service;
import dev.sheldan.sissi.module.rssnews.service.management.NewsFeedSourceManagementServiceBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class NewsFeedSourceServiceBean {
@Autowired
private NewsFeedSourceManagementServiceBean newsFeedSourceManagementServiceBean;
}

View File

@@ -0,0 +1,48 @@
package dev.sheldan.sissi.module.rssnews.service.management;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.sissi.module.rssnews.exception.NewsCategoryChannelMappingNotFoundException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategoryChannelMapping;
import dev.sheldan.sissi.module.rssnews.repository.NewsCategoryChannelMappingRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class NewsCategoryChannelMappingManagementServiceBean {
@Autowired
private NewsCategoryChannelMappingRepository repository;
public NewsCategoryChannelMapping createNewsCategoryChannelMapping(NewsCategory newsCategory, AChannel channel) {
NewsCategoryChannelMapping category = NewsCategoryChannelMapping
.builder()
.channel(channel)
.server(channel.getServer())
.newsCategory(newsCategory)
.enabled(true)
.build();
return repository.save(category);
}
public NewsCategoryChannelMapping getChannelMappingById(Long id) {
return repository.findById(id).orElseThrow(NewsCategoryChannelMappingNotFoundException::new);
}
public boolean newsCategoryChannelMappingExists(NewsCategory newsCategory, AChannel channel) {
return repository.existsByChannelAndNewsCategory(channel, newsCategory);
}
public void deleteChannelMappingsOfNewsCategory(NewsCategory newsCategory) {
repository.deleteByNewsCategory(newsCategory);
}
public void deleteNewsCategoryChannelMapping(NewsCategory newsCategory, AChannel channel) {
repository.deleteByNewsCategoryAndChannel(newsCategory, channel);
}
public void deleteNewsCategoryChannelMapping(NewsCategoryChannelMapping mapping) {
repository.delete(mapping);
}
}

View File

@@ -0,0 +1,57 @@
package dev.sheldan.sissi.module.rssnews.service.management;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.sissi.module.rssnews.exception.NewsCategoryNotFoundException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategory;
import dev.sheldan.sissi.module.rssnews.repository.NewsCategoryRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional;
@Component
public class NewsCategoryManagementServiceBean {
@Autowired
private NewsCategoryRepository repository;
public List<NewsCategory> getNewsCategoriesOfServers(List<AServer> servers) {
return repository.getByServerIn(servers);
}
public List<NewsCategory> getNewsCategoriesOfServers(AServer server) {
return repository.getByServer(server);
}
public NewsCategory createCategory(String name, AServer server) {
NewsCategory category = NewsCategory
.builder()
.key(name)
.server(server)
.enabled(true)
.build();
return repository.save(category);
}
public Optional<NewsCategory> findNewsCategoryByNameInServerOptional(String name, AServer server) {
return repository.findByKeyAndServer(name, server);
}
public NewsCategory findNewsCategoryByNameInServer(String name, AServer server) {
return findNewsCategoryByNameInServerOptional(name, server).orElseThrow(NewsCategoryNotFoundException::new);
}
public boolean newsCategoryExistsByNameInServer(String name, AServer server) {
return repository.existsByKeyAndServer(name, server);
}
public void deleteNewsCategory(NewsCategory newsCategory) {
repository.delete(newsCategory);
}
public List<NewsCategory> findNewsCategoriesStartingWith(String name, AServer server) {
return repository.findByKeyStartsWithAndServer(name, server);
}
}

View File

@@ -0,0 +1,29 @@
package dev.sheldan.sissi.module.rssnews.service.management;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedRecord;
import dev.sheldan.sissi.module.rssnews.model.feed.NewsResponseItem;
import dev.sheldan.sissi.module.rssnews.repository.NewsFeedRecordRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class NewsFeedRecordManagementServiceBean {
@Autowired
private NewsFeedRecordRepository repository;
public List<NewsFeedRecord> getAllRecords() {
return repository.findAll();
}
public NewsFeedRecord createRecord(NewsResponseItem newsResponseItem) {
NewsFeedRecord newsFeedRecord = NewsFeedRecord
.builder()
.source(newsResponseItem.getNewsFeedSource())
.url(newsResponseItem.getLink())
.build();
return repository.save(newsFeedRecord);
}
}

View File

@@ -0,0 +1,47 @@
package dev.sheldan.sissi.module.rssnews.service.management;
import dev.sheldan.sissi.module.rssnews.exception.NewsFeedSourceCategoryNotFoundException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSourceCategory;
import dev.sheldan.sissi.module.rssnews.repository.NewsFeedSourceCategoryRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional;
@Component
public class NewsFeedSourceCategoryManagementServiceBean {
@Autowired
private NewsFeedSourceCategoryRepository repository;
public List<NewsFeedSourceCategory> getAllCategories(){
return repository.findAll();
}
public NewsFeedSourceCategory createCategory(String name, NewsFeedSource newsFeedSource) {
NewsFeedSourceCategory category = NewsFeedSourceCategory
.builder()
.source(newsFeedSource)
.name(name)
.build();
return repository.save(category);
}
public List<NewsFeedSourceCategory> findNewsFeedSourceCategoriesNameStartingWith(String name) {
return repository.findByNameStartsWith(name);
}
public List<NewsFeedSourceCategory> findNewsFeedSourceCategoriesNameStartingWith(String name, NewsFeedSource newsFeedSource) {
return repository.findByNameStartsWithAndSource(name, newsFeedSource);
}
public Optional<NewsFeedSourceCategory> findNewsFeedSourceCategoryByNameAndNewsFeedSourceOptional(String name, NewsFeedSource newsFeedSource) {
return repository.findByNameAndSource(name, newsFeedSource);
}
public NewsFeedSourceCategory findNewsFeedSourceCategoryByNameAndNewsFeedSource(String name, NewsFeedSource newsFeedSource) {
return findNewsFeedSourceCategoryByNameAndNewsFeedSourceOptional(name, newsFeedSource).orElseThrow(NewsFeedSourceCategoryNotFoundException::new);
}
}

View File

@@ -0,0 +1,41 @@
package dev.sheldan.sissi.module.rssnews.service.management;
import dev.sheldan.sissi.module.rssnews.exception.NewsFeedSourceNotFoundException;
import dev.sheldan.sissi.module.rssnews.model.database.NewsFeedSource;
import dev.sheldan.sissi.module.rssnews.repository.NewsFeedSourceRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional;
@Component
public class NewsFeedSourceManagementServiceBean {
@Autowired
private NewsFeedSourceRepository newsFeedSourceRepository;
public List<NewsFeedSource> getAllSources() {
return newsFeedSourceRepository.findAll();
}
public Optional<NewsFeedSource> getNewsFeedSourceWithNameOptional(String name) {
return newsFeedSourceRepository.findByName(name);
}
public NewsFeedSource getNewsFeedSourceWithName(String name) {
return getNewsFeedSourceWithNameOptional(name).orElseThrow(NewsFeedSourceNotFoundException::new);
}
public List<NewsFeedSource> getNewsFeedSourcesStartingWithName(String name) {
return newsFeedSourceRepository.findByNameStartsWith(name);
}
public List<String> getNewsFeedSourceNamesStartingWithName(String name) {
return getNewsFeedSourcesStartingWithName(name)
.stream()
.map(NewsFeedSource::getName)
.toList();
}
}

View File

@@ -0,0 +1,27 @@
package dev.sheldan.sissi.module.rssnews.service.management;
import dev.sheldan.sissi.module.rssnews.model.database.NewsCategoryChannelMapping;
import dev.sheldan.sissi.module.rssnews.model.database.NewsPost;
import dev.sheldan.sissi.module.rssnews.model.feed.NewsResponseItem;
import dev.sheldan.sissi.module.rssnews.repository.NewsPostRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class NewsPostManagementServiceBean {
@Autowired
private NewsPostRepository newsPostRepository;
public NewsPost createNewsPost(Long id, NewsResponseItem newsResponseItem, NewsCategoryChannelMapping newsCategoryChannelMapping) {
NewsPost post = NewsPost
.builder()
.url(newsResponseItem.getLink())
.postChannel(newsCategoryChannelMapping.getChannel())
.mapping(newsCategoryChannelMapping)
.server(newsCategoryChannelMapping.getServer())
.id(id)
.build();
return newsPostRepository.save(post);
}
}

View File

@@ -0,0 +1,11 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<include file="tables/tables.xml" relativeToChangelogFile="true"/>
<include file="seedData/data.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -0,0 +1,49 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
<property name="rssNewsFeature" value="(SELECT id FROM feature WHERE key = 'rssNews')"/>
<changeSet author="Sheldan" id="rssNewsFeature-commands">
<insert tableName="command">
<column name="name" value="createNewsCategory"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
<insert tableName="command">
<column name="name" value="deleteNewsCategory"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
<insert tableName="command">
<column name="name" value="showNewsCategories"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
<insert tableName="command">
<column name="name" value="createNewsCategoryChannelMapping"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
<insert tableName="command">
<column name="name" value="deleteNewsCategoryChannelMapping"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
<insert tableName="command">
<column name="name" value="createNewsCategorySubscription"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
<insert tableName="command">
<column name="name" value="deleteNewsCategorySubscription"/>
<column name="module_id" valueComputed="${utilityModule}"/>
<column name="feature_id" valueComputed="${rssNewsFeature}"/>
</insert>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,13 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<include file="feature.xml" relativeToChangelogFile="true"/>
<include file="command.xml" relativeToChangelogFile="true"/>
<include file="news_feed_source.xml" relativeToChangelogFile="true"/>
<include file="news_gathering_job.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -0,0 +1,17 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_feature-insertion">
<insert tableName="feature">
<column name="key" value="orfNews"/>
</insert>
<insert tableName="feature">
<column name="key" value="rssNews"/>
</insert>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,92 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_feed_source-initial_sources">
<insert tableName="news_feed_source">
<column name="name" value="news"/>
<column name="url" value="https://rss.orf.at/news.xml"/>
<column name="feed_type" value="RFD"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="sport"/>
<column name="url" value="https://rss.orf.at/sport.xml"/>
<column name="feed_type" value="RFD"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="help"/>
<column name="url" value="https://rss.orf.at/help.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="science"/>
<column name="url" value="https://rss.orf.at/science.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="oe3"/>
<column name="url" value="https://rss.orf.at/oe3.xml"/>
<column name="feed_type" value="RFD"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="fm4"/>
<column name="url" value="https://rss.orf.at/fm4.xml"/>
<column name="feed_type" value="RFD"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="oesterreich"/>
<column name="url" value="https://rss.orf.at/oesterreich.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="burgenland"/>
<column name="url" value="https://rss.orf.at/burgenland.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="wien"/>
<column name="url" value="https://rss.orf.at/wien.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="niederoesterreich"/>
<column name="url" value="https://rss.orf.at/noe.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="oberoesterreich"/>
<column name="url" value="https://rss.orf.at/ooe.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="salzburg"/>
<column name="url" value="https://rss.orf.at/salzburg.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="steiermark"/>
<column name="url" value="https://rss.orf.at/steiermark.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="kaernten"/>
<column name="url" value="https://rss.orf.at/kaernten.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="tirol"/>
<column name="url" value="https://rss.orf.at/tirol.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
<insert tableName="news_feed_source">
<column name="name" value="vorarlberg"/>
<column name="url" value="https://rss.orf.at/vorarlberg.xml"/>
<column name="feed_type" value="RSS"/>
</insert>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,19 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_gathering_job-insert">
<insert tableName="scheduler_job">
<column name="name" value="newsGatheringJob"/>
<column name="group_name" value="rssNews"/>
<column name="clazz" value="dev.sheldan.sissi.module.rssnews.orf.job.NewsPostGatherJob"/>
<column name="active" value="true"/>
<column name="cron_expression" value="0 */10 * * * ?"/>
<column name="recovery" value="false"/>
</insert>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,62 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_category-table">
<createTable tableName="news_category">
<column name="id" type="BIGINT" autoIncrement="true">
<constraints nullable="false"/>
</column>
<column name="key" type="VARCHAR(128)">
<constraints nullable="false"/>
</column>
<column name="enabled" type="BOOLEAN">
<constraints nullable="false"/>
</column>
<column name="server_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addUniqueConstraint columnNames="key, server_id"
constraintName="uc_news_category"
disabled="false"
tableName="news_category"/>
<addPrimaryKey columnNames="id" tableName="news_category" constraintName="pk_news_category" validate="true"/>
<addForeignKeyConstraint baseColumnNames="server_id" baseTableName="news_category" constraintName="fk_news_category_server"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="server" validate="true"/>
<sql>
DROP TRIGGER IF EXISTS news_category_update_trigger ON news_category;
CREATE TRIGGER news_category_update_trigger BEFORE UPDATE ON news_category FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
</sql>
<sql>
DROP TRIGGER IF EXISTS news_category_insert_trigger ON news_category;
CREATE TRIGGER news_category_insert_trigger BEFORE INSERT ON news_category FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
</sql>
</changeSet>
<changeSet author="Sheldan" id="news_category_in_news_feed_source_category-table">
<createTable tableName="news_category_in_news_feed_source_category">
<column name="server_category_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="source_category_id" type="BIGINT">
<constraints nullable="false"/>
</column>
</createTable>
<addForeignKeyConstraint baseColumnNames="server_category_id" baseTableName="news_category_in_news_feed_source_category"
constraintName="fk_news_category_in_news_feed_source_category_server_category" deferrable="false"
initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION" referencedColumnNames="id" referencedTableName="news_category"
validate="true"/>
<addForeignKeyConstraint baseColumnNames="source_category_id" baseTableName="news_category_in_news_feed_source_category"
constraintName="fk_news_category_in_news_feed_source_category_server_category_source_category" deferrable="false"
initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION" referencedColumnNames="id"
referencedTableName="news_feed_source_category" validate="true"/>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,53 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_category_channel_mapping-table">
<createTable tableName="news_category_channel_mapping">
<column name="id" type="BIGINT" autoIncrement="true">
<constraints nullable="false"/>
</column>
<column name="enabled" type="BOOLEAN">
<constraints nullable="false"/>
</column>
<column name="server_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="channel_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="category_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addUniqueConstraint columnNames="server_id, channel_id, category_id"
constraintName="uc_news_category_channel_mapping"
disabled="false"
tableName="news_category_channel_mapping"/>
<addPrimaryKey columnNames="id" tableName="news_category_channel_mapping" constraintName="pk_news_category_channel_mapping" validate="true"/>
<addForeignKeyConstraint baseColumnNames="server_id" baseTableName="news_category_channel_mapping" constraintName="fk_news_category_channel_mapping_server"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="server" validate="true"/>
<addForeignKeyConstraint baseColumnNames="channel_id" baseTableName="news_category_channel_mapping" constraintName="fk_news_category_channel_mapping_channel"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="channel" validate="true"/>
<addForeignKeyConstraint baseColumnNames="category_id" baseTableName="news_category_channel_mapping" constraintName="fk_news_category_channel_mapping_news_category"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="news_category" validate="true"/>
<sql>
DROP TRIGGER IF EXISTS news_category_channel_mapping_update_trigger ON news_category_channel_mapping;
CREATE TRIGGER news_category_channel_mapping_update_trigger BEFORE UPDATE ON news_category_channel_mapping FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
</sql>
<sql>
DROP TRIGGER IF EXISTS news_category_channel_mapping_insert_trigger ON news_category_channel_mapping;
CREATE TRIGGER news_category_channel_mapping_insert_trigger BEFORE INSERT ON news_category_channel_mapping FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
</sql>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,42 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_feed_record-table">
<createTable tableName="news_feed_record">
<column name="id" type="BIGINT" autoIncrement="true">
<constraints nullable="false"/>
</column>
<column name="url" type="VARCHAR(128)">
<constraints nullable="false"/>
</column>
<column name="source_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addUniqueConstraint columnNames="url, source_id"
constraintName="uc_news_feed_record"
disabled="false"
tableName="news_feed_record"/>
<addPrimaryKey columnNames="id" tableName="news_feed_record" constraintName="pk_news_feed_record" validate="true"/>
<addForeignKeyConstraint baseColumnNames="source_id" baseTableName="news_feed_record" constraintName="fk_news_feed_record_source"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="news_feed_source" validate="true"/>
<sql>
DROP TRIGGER IF EXISTS news_feed_record_update_trigger ON news_feed_record;
CREATE TRIGGER news_feed_record_update_trigger BEFORE UPDATE ON news_feed_record FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
</sql>
<sql>
DROP TRIGGER IF EXISTS news_feed_record_insert_trigger ON news_feed_record;
CREATE TRIGGER news_feed_record_insert_trigger BEFORE INSERT ON news_feed_record FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
</sql>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,40 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_feed_source-table">
<createTable tableName="news_feed_source">
<column name="id" type="BIGINT" autoIncrement="true">
<constraints nullable="false"/>
</column>
<column name="url" type="VARCHAR(255)">
<constraints nullable="false" unique="true"/>
</column>
<column name="name" type="VARCHAR(128)">
<constraints nullable="false" unique="true"/>
</column>
<column name="feed_type" type="VARCHAR(256)">
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addPrimaryKey columnNames="id" tableName="news_feed_source" constraintName="pk_news_feed_source" validate="true"/>
<sql>
DROP TRIGGER IF EXISTS news_feed_source_update_trigger ON news_feed_source;
CREATE TRIGGER news_feed_source_update_trigger BEFORE UPDATE ON news_feed_source FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
</sql>
<sql>
DROP TRIGGER IF EXISTS news_feed_source_insert_trigger ON news_feed_source;
CREATE TRIGGER news_feed_source_insert_trigger BEFORE INSERT ON news_feed_source FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
</sql>
<sql>
ALTER TABLE news_feed_source ADD CONSTRAINT check_news_feed_source_feed_type CHECK (feed_type IN ('RFD', 'RSS'));
</sql>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,41 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_feed_source_category-table">
<createTable tableName="news_feed_source_category">
<column name="id" type="BIGINT" autoIncrement="true">
<constraints nullable="false"/>
</column>
<column name="name" type="VARCHAR(128)">
<constraints nullable="false"/>
</column>
<column name="source_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addUniqueConstraint columnNames="name, source_id"
constraintName="uc_news_feed_category"
disabled="false"
tableName="news_feed_source_category"/>
<addPrimaryKey columnNames="id" tableName="news_feed_source_category" constraintName="pk_news_feed_source_category" validate="true"/>
<addForeignKeyConstraint baseColumnNames="source_id" baseTableName="news_feed_source_category" constraintName="fk_news_feed_source_category_news_feed_source"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="news_feed_source" validate="true"/>
<sql>
DROP TRIGGER IF EXISTS news_feed_source_category_update_trigger ON news_feed_source_category;
CREATE TRIGGER news_feed_source_category_update_trigger BEFORE UPDATE ON news_feed_source_category FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
</sql>
<sql>
DROP TRIGGER IF EXISTS news_feed_source_category_insert_trigger ON news_feed_source_category;
CREATE TRIGGER news_feed_source_category_insert_trigger BEFORE INSERT ON news_feed_source_category FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
</sql>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,49 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<changeSet author="Sheldan" id="news_post-table">
<createTable tableName="news_post">
<column name="id" type="BIGINT" autoIncrement="true">
<constraints nullable="false"/>
</column>
<column name="url" type="VARCHAR(255)">
<constraints nullable="false"/>
</column>
<column name="channel_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="server_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="news_category_channel_mapping_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addPrimaryKey columnNames="id" tableName="news_post" constraintName="pk_news_post" validate="true"/>
<addForeignKeyConstraint baseColumnNames="channel_id" baseTableName="news_post" constraintName="fk_news_post_channel"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="channel" validate="true"/>
<addForeignKeyConstraint baseColumnNames="server_id" baseTableName="news_post" constraintName="fk_news_post_server"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="server" validate="true"/>
<addForeignKeyConstraint baseColumnNames="news_category_channel_mapping_id" baseTableName="news_post" constraintName="fk_news_post_news_category_channel_mapping"
deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
referencedColumnNames="id" referencedTableName="news_category_channel_mapping" validate="true"/>
<sql>
DROP TRIGGER IF EXISTS news_post_update_trigger ON news_post;
CREATE TRIGGER news_post_update_trigger BEFORE UPDATE ON news_post FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
</sql>
<sql>
DROP TRIGGER IF EXISTS news_post_insert_trigger ON news_post;
CREATE TRIGGER news_post_insert_trigger BEFORE INSERT ON news_post FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
</sql>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,15 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<include file="news_feed_source.xml" relativeToChangelogFile="true"/>
<include file="news_feed_source_category.xml" relativeToChangelogFile="true"/>
<include file="news_feed_record.xml" relativeToChangelogFile="true"/>
<include file="news_category.xml" relativeToChangelogFile="true"/>
<include file="news_category_channel_mapping.xml" relativeToChangelogFile="true"/>
<include file="news_post.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,10 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:pro="http://www.liquibase.org/xml/ns/pro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
<include file="1.4.19/collection.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -0,0 +1,5 @@
abstracto.featureFlags.orfNews.featureName=orfNews
abstracto.featureFlags.orfNews.enabled=false
abstracto.featureFlags.rssNews.featureName=rssNews
abstracto.featureFlags.rssNews.enabled=false

View File

@@ -1,37 +0,0 @@
COMPOSE_PROJECT_NAME=sissi
# database configuration
DATABASE_HOST=database
DATABASE_PORT=5432
DATABASE_USER=abstracto
DATABASE_NAME=abstracto
DATABASE_PASSWORD=abstracto
GRAFANA_DATABASE_PASSWORD=grafana
GRAFANA_DATABASE_USER=grafana
# deployment configuration, whether or not the container should execute the parts on startup
EXECUTE_DEPLOYMENT=true
EXECUTE_LIQUIBASE=true
EXECUTE_TEMPLATES=true
# whether or not remote debug should be enabled on the application
REMOTE_DEBUG=false
DEBUG_PORT=5005
TOMCAT_PORT=8080
# authentication for actuator endpoints
REST_USER_NAME=abstracto
REST_PASSWORD=password
# port grafana will be reachable
GRAFANA_PORT=3000
# port prometheus will be reachable
LOKI_PORT=3100
PROMETHEUS_PORT=9090
# port pg admin will be reachable
PGADMIN_PORT=5050
# default authentication for pg admin
PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
DEBRA_DONATION_NOTIFICATION_SERVER_ID=0
PGADMIN_DEFAULT_PASSWORD=admin
TOKEN=<INSERT_TOKEN>
YOUTUBE_API_KEY=<INSERT_KEY>
OPEN_WEATHER_MAP_API_KEY=<INSERT_KEY>
TWITCH_CLIENT_ID=<INSERT_CLIENT_ID>
TWITCH_SECRET=<INSERT_SECRET>
SISSI_VERSION=1.4.1

View File

@@ -1,10 +0,0 @@
# Setup for local docker-compose deployment
* Install docker [here](https://docs.docker.com/get-docker/)
* Install docker-compose [here](https://docs.docker.com/compose/install/).
* Execute `docker-compose build` in `image-packaging`.
* Fill out values in `.env` for token and database password. There are some default values, but token is required to be changed.
* Execute `fill-prometheus-file-sh` in order to populate the prometheus config with the correct password (https://github.com/prometheus/prometheus/issues/2357)
* Execute `docker-compose up` in this directory and wait for completion.
* Per default pgAdmin is available on `localhost:5050` with the configured user and password. It will contain a configuration in the servers list.

View File

@@ -1,149 +0,0 @@
version: '3.7'
services:
db:
image: ${REGISTRY_PREFIX}sissi_database:${SISSI_VERSION}
container_name: ${COMPOSE_PROJECT_NAME}_database
restart: always
environment:
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
POSTGRES_USER: ${DATABASE_USER}
ports:
- "127.0.0.1:${DATABASE_PORT}:5432"
networks:
- sissi
volumes:
- db-data:/var/lib/postgresql/data
deployment_container:
container_name: ${COMPOSE_PROJECT_NAME}_deployment
image: ${REGISTRY_PREFIX}sissi_deployment:${SISSI_VERSION}
depends_on:
- db
environment:
DB_PASS: ${DATABASE_PASSWORD}
DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}
DB_PORT: ${DATABASE_PORT}
DB_USER: ${DATABASE_USER}
DB_NAME: ${DATABASE_NAME}
ABSTRACTO_GRAFANA_DB_PASS: ${GRAFANA_DATABASE_PASSWORD}
ABSTRACTO_GRAFANA_DB_USER: ${GRAFANA_DATABASE_USER}
EXECUTE_DEPLOYMENT: ${EXECUTE_DEPLOYMENT}
EXECUTE_LIQUIBASE: ${EXECUTE_LIQUIBASE}
EXECUTE_TEMPLATES: ${EXECUTE_TEMPLATES}
LIQUIBASE_PATH: ${LIQUIBASE_PATH:-/liquibase}
POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar}
WAIT_HOSTS: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}:${DATABASE_PORT}
networks:
- sissi
bot:
image: ${REGISTRY_PREFIX}sissi:${SISSI_VERSION}
depends_on:
- db
- deployment_container
restart: on-failure
container_name: ${COMPOSE_PROJECT_NAME}bot
environment:
TOKEN: ${TOKEN}
REMOTE_DEBUG: ${REMOTE_DEBUG}
DB_PASS: ${DATABASE_PASSWORD}
DEBRA_DONATION_NOTIFICATION_SERVER_ID: ${DEBRA_DONATION_NOTIFICATION_SERVER_ID}
DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}
DB_PORT: ${DATABASE_PORT}
DB_USER: ${DATABASE_USER}
DB_NAME: ${DATABASE_NAME}
REST_USER_NAME: ${REST_USER_NAME}
TZ: "UTC"
REST_PASSWORD: ${REST_PASSWORD}
YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
OPEN_WEATHER_MAP_API_KEY: ${OPEN_WEATHER_MAP_API_KEY}
command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
ports:
- "127.0.0.1:${DEBUG_PORT}:5005"
- "127.0.0.1:${TOMCAT_PORT}:8080"
networks:
- sissi
volumes:
- bot-logs:/logs
- ./config:/config
pgadmin:
container_name: ${COMPOSE_PROJECT_NAME}_pgadmin
image: ${REGISTRY_PREFIX}sissi_pg_admin:${SISSI_VERSION}
depends_on:
- db
environment:
PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
ports:
- "127.0.0.1:${PGADMIN_PORT}:80"
restart: unless-stopped
networks:
- sissi
prometheus:
container_name: ${COMPOSE_PROJECT_NAME}_prometheus
image: ${REGISTRY_PREFIX}sissi_prometheus:${SISSI_VERSION}
depends_on:
- bot
ports:
- "127.0.0.1:${PROMETHEUS_PORT}:9090"
restart: unless-stopped
networks:
- sissi
volumes:
- ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
- prometheus-data:/prometheus
grafana:
container_name: ${COMPOSE_PROJECT_NAME}_grafana
image: ${REGISTRY_PREFIX}sissi_grafana:${SISSI_VERSION}
depends_on:
- prometheus
- bot
ports:
- "127.0.0.1:${GRAFANA_PORT}:3000"
restart: unless-stopped
environment:
DB_PASS: ${GRAFANA_DATABASE_PASSWORD}
DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}
DB_PORT: ${DATABASE_PORT}
DB_USER: ${GRAFANA_DATABASE_USER}
DB_NAME: ${DATABASE_NAME}
PROMETHEUS_HOST: '${COMPOSE_PROJECT_NAME}_prometheus'
PROMETHEUS_PORT: 9090
LOKI_HOST: '${COMPOSE_PROJECT_NAME}_loki'
LOKI_PORT: ${LOKI_PORT}
volumes:
- grafana-user-data:/var/lib/grafana
networks:
- sissi
promtail:
container_name: ${COMPOSE_PROJECT_NAME}_promtail
image: ${REGISTRY_PREFIX}sissi_promtail:${SISSI_VERSION}
depends_on:
- bot
restart: unless-stopped
command: -config.file=/mnt/config/promtail-config.yaml
volumes:
- bot-logs:/logs
networks:
- sissi
loki:
container_name: ${COMPOSE_PROJECT_NAME}_loki
image: ${REGISTRY_PREFIX}sissi_loki:${SISSI_VERSION}
depends_on:
- promtail
command: -config.file=/mnt/config/loki-config.yaml
ports:
- "127.0.0.1:${LOKI_PORT}:3100"
restart: unless-stopped
networks:
- sissi
networks:
sissi:
driver: bridge
name: sissi-network
volumes:
db-data:
grafana-user-data:
prometheus-data:
bot-logs:

View File

@@ -1,5 +0,0 @@
#!/bin/bash
set -o allexport
source .env
set +o allexport
envsubst < res/prometheus-scrapper-password > res/prometheus-scrapper-password-filled

View File

@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/

View File

@@ -0,0 +1,24 @@
apiVersion: v2
name: sissi
description: A Helm chart for Kubernetes
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.4.21
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.4.21"

View File

@@ -0,0 +1,4 @@
base_url: {{ $.Values.grafanaDeployment.grafana.host }}
username: {{ $.Values.grafanaDeployment.grafana.basicAuth.username }}
password: {{ $.Values.grafanaDeployment.grafana.basicAuth.password }}
folder_name: Sissi

View File

@@ -0,0 +1,939 @@
{
"dashboard": {
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": {
"type": "grafana",
"uid": "-- Grafana --"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"links": [],
"liveNow": false,
"panels": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 0
},
"id": 1,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(discord_api_interactions_total{namespace=\"sissi\"}[1m]) /2",
"instant": false,
"legendFormat": "{{ "{{" }} action {{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "Discord API Interaction",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 0
},
"id": 2,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(command_processed_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "{{ "{{" }}type{{ "}}" }}-{{ "{{" }}status{{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "Commands processed",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 8
},
"id": 3,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(message_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "{{ "{{" }} action {{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "Message events",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 8
},
"id": 4,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(okhttp_request_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "{{ "{{" }} http_code {{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "HTTP Reponse codes",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 16
},
"id": 5,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "Cache evictions",
"range": true,
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"hide": false,
"instant": false,
"legendFormat": "Cache gets {{ "{{" }} result {{ "}}" }}",
"range": true,
"refId": "B"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"hide": false,
"instant": false,
"legendFormat": "Cache puts",
"range": true,
"refId": "C"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(cache_removals{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"hide": false,
"instant": false,
"legendFormat": "Cache removals",
"range": true,
"refId": "D"
}
],
"title": "Message cache statistic",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 16
},
"id": 6,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "discord_gateway_ping{namespace=\"sissi\"}",
"instant": false,
"legendFormat": "Gateway ping",
"range": true,
"refId": "A"
}
],
"title": "Gateway ping",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 24
},
"id": 7,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(starboard_stars_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "{{ "{{" }} action {{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "Starboard reactions",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 24
},
"id": 8,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(emote_usages_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "Used emotes",
"range": true,
"refId": "A"
}
],
"title": "Used tracked emotes",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 16,
"w": 24,
"x": 0,
"y": 32
},
"id": 9,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "code",
"expr": "increase(jda_event_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false,
"legendFormat": "{{ "{{" }} event_class {{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "JDA Events",
"type": "timeseries"
}
],
"refresh": "",
"schemaVersion": 38,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"hide": 2,
"label": "",
"name": "application",
"query": "Sissi",
"skipUrlSync": false,
"type": "constant"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "Sissi Discord status",
"uid": "a7b3297d-972e-4dbd-9223-88d589817d34",
"version": 2,
"weekStart": ""
},
"overwrite": true
}

View File

@@ -0,0 +1,238 @@
{
"dashboard": {
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": {
"type": "grafana",
"uid": "-- Grafana --"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"description": "Overview over logging outputs of Sissi bot",
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"links": [],
"liveNow": false,
"panels": [
{
"datasource": {
"type": "loki",
"uid": "loki"
},
"description": "Display logs and search for logs",
"gridPos": {
"h": 13,
"w": 24,
"x": 0,
"y": 0
},
"id": 4,
"options": {
"dedupStrategy": "none",
"enableLogDetails": true,
"prettifyLogMessage": false,
"showCommonLabels": false,
"showLabels": false,
"showTime": false,
"sortOrder": "Ascending",
"wrapLogMessage": true
},
"targets": [
{
"datasource": {
"type": "loki",
"uid": "loki"
},
"editorMode": "builder",
"expr": "{app=\"sissi\", namespace=\"sissi\"} |= `$logFilter`",
"maxLines": 5000,
"queryType": "range",
"refId": "A"
}
],
"title": "Sissi Logs",
"type": "logs"
},
{
"datasource": {
"type": "loki",
"uid": "loki"
},
"description": "Any line on level ERROR",
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 13
},
"id": 2,
"options": {
"dedupStrategy": "none",
"enableLogDetails": true,
"prettifyLogMessage": false,
"showCommonLabels": false,
"showLabels": false,
"showTime": false,
"sortOrder": "Ascending",
"wrapLogMessage": true
},
"targets": [
{
"datasource": {
"type": "loki",
"uid": "loki"
},
"editorMode": "code",
"expr": "{app=\"sissi\", namespace=\"sissi\"} |= \"ERROR\"",
"maxLines": 5000,
"queryType": "range",
"refId": "A"
}
],
"title": "Sissi Error Logs",
"type": "logs"
},
{
"datasource": {
"type": "loki",
"uid": "loki"
},
"description": "Number of log events",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 13
},
"id": 3,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "loki",
"uid": "loki"
},
"editorMode": "code",
"expr": "rate({app=\"sissi\", namespace=\"sissi\"}[$__interval])",
"queryType": "range",
"refId": "A"
}
],
"title": "Log Rate",
"type": "timeseries"
}
],
"refresh": "",
"schemaVersion": 38,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"current": {
"selected": false,
"text": "",
"value": ""
},
"description": "What to search in the logs",
"hide": 0,
"name": "logFilter",
"options": [
{
"selected": true,
"text": "",
"value": ""
}
],
"query": "",
"skipUrlSync": false,
"type": "textbox"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "Sissi Logs",
"uid": "a5b429af-860c-4438-a575-24bed6dcba09",
"version": 2,
"weekStart": ""
},
"overwrite": true
}

Some files were not shown because too many files have changed in this diff Show More