[maven-release-plugin] prepare release sissi-1.4.17

changing quote search to return a random matching quote
adding local function to tilt to update packages

.github/workflows/release.yml

@@ -43,6 +43,6 @@ jobs:
       - name: Helm push
         working-directory: ./deployment/helm/
         run: |-
-          helm registry login -u ${{ secrets.HARBOR_USERNAME }} -p ${{ secrets.HARBOR_TOKEN }} harbor.sheldan.dev
+          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

Tiltfile

@@ -5,19 +5,19 @@ 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 --inplace --checksum -r application/executable/target/jar-staging/ application/executable/target/jar && ' +
-  'mkdir application/executable/target/jar/snapshots && ' +
-  'rsync --delete --inplace --checksum -r application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar application/executable/target/jar/snapshots && ' +
-  'rm -f application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar ',
-  deps=['pom.xml'])
+  ' 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',
+  registry + 'sissi-bot',
   './application/executable/target/jar',
-  entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'],
+  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'),
@@ -32,6 +32,9 @@ docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/m
 
 
 k8s_yaml(helm('deployment/helm/sissi', values=
-['./../Sissi-environments/values/local/values.yaml',
-'secrets://./../Sissi-environments/values/local/values.secrets.yaml']
-))
+['./../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')

application/executable/pom.xml

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

application/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/sissi-customizations/moderation-custom/pom.xml

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

application/sissi-customizations/pom.xml

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

application/sissi-modules/debra/pom.xml

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

application/sissi-modules/meetup/pom.xml

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

application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java

@@ -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;

application/sissi-modules/pom.xml

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

application/sissi-modules/quotes/pom.xml

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

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/commands/QuoteSearch.java

@@ -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)

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/repository/QuoteRepository.java

@@ -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);

application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java

@@ -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) {

deployment/helm/sissi/Chart.yaml

@@ -15,10 +15,10 @@ 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: 0.1.0
+version: 1.4.17
 
 # 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.3"
+appVersion: "1.4.17"

deployment/helm/sissi/configuration/grafana/sissi-discord-dashboard.json

@@ -46,6 +46,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -105,7 +106,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(discord_api_interactions_total[1m]) /2",
+            "expr": "increase(discord_api_interactions_total{namespace=\"sissi\"}[1m]) /2",
             "instant": false,
             "legendFormat": "{{ "{{" }} action {{ "}}" }}",
             "range": true,
@@ -139,6 +140,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -198,7 +200,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(command_processed_total[1m]) / 2 ",
+            "expr": "increase(command_processed_total{namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "{{ "{{" }}type{{ "}}" }}-{{ "{{" }}status{{ "}}" }}",
             "range": true,
@@ -232,6 +234,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -291,7 +294,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(message_total[1m]) / 2",
+            "expr": "increase(message_total{namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "{{ "{{" }} action {{ "}}" }}",
             "range": true,
@@ -325,6 +328,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -384,7 +388,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(okhttp_request_total[1m]) / 2",
+            "expr": "increase(okhttp_request_total{namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "{{ "{{" }} http_code {{ "}}" }}",
             "range": true,
@@ -418,6 +422,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -477,7 +482,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\"}[1m]) / 2",
+            "expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "Cache evictions",
             "range": true,
@@ -489,7 +494,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\"}[1m]) / 2",
+            "expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
             "hide": false,
             "instant": false,
             "legendFormat": "Cache gets {{ "{{" }} result {{ "}}" }}",
@@ -502,7 +507,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\"}[1m]) / 2",
+            "expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
             "hide": false,
             "instant": false,
             "legendFormat": "Cache puts",
@@ -515,7 +520,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(cache_removals{application=\"$application\", cache=\"messages\"}[1m]) / 2",
+            "expr": "increase(cache_removals{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
             "hide": false,
             "instant": false,
             "legendFormat": "Cache  removals",
@@ -550,6 +555,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -609,7 +615,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "discord_gateway_ping",
+            "expr": "discord_gateway_ping{namespace=\"sissi\"}",
             "instant": false,
             "legendFormat": "Gateway ping",
             "range": true,
@@ -643,6 +649,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -702,7 +709,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(starboard_stars_total[1m]) / 2",
+            "expr": "increase(starboard_stars_total{namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "{{ "{{" }} action {{ "}}" }}",
             "range": true,
@@ -736,6 +743,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -795,7 +803,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(emote_usages_total[1m]) / 2",
+            "expr": "increase(emote_usages_total{namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "Used emotes",
             "range": true,
@@ -829,6 +837,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -850,7 +859,8 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green"
+                  "color": "green",
+                  "value": null
                 },
                 {
                   "color": "red",
@@ -887,7 +897,7 @@
               "uid": "prometheus"
             },
             "editorMode": "code",
-            "expr": "increase(jda_event_total[1m]) / 2",
+            "expr": "increase(jda_event_total{namespace=\"sissi\"}[1m]) / 2",
             "instant": false,
             "legendFormat": "{{ "{{" }} event_class {{ "}}" }}",
             "range": true,
@@ -922,7 +932,7 @@
     "timezone": "",
     "title": "Sissi Discord status",
     "uid": "a7b3297d-972e-4dbd-9223-88d589817d34",
-    "version": 1,
+    "version": 2,
     "weekStart": ""
   },
   "overwrite": true

deployment/helm/sissi/configuration/grafana/sissi-log-dashboard.json

@@ -53,7 +53,7 @@
               "uid": "loki"
             },
             "editorMode": "builder",
-            "expr": "{app=\"sissi\"} |= `$logFilter`",
+            "expr": "{app=\"sissi\", namespace=\"sissi\"} |= `$logFilter`",
             "maxLines": 5000,
             "queryType": "range",
             "refId": "A"
@@ -92,7 +92,7 @@
               "uid": "loki"
             },
             "editorMode": "code",
-            "expr": "{app=\"sissi\"} |= \"ERROR\"",
+            "expr": "{app=\"sissi\", namespace=\"sissi\"} |= \"ERROR\"",
             "maxLines": 5000,
             "queryType": "range",
             "refId": "A"
@@ -126,6 +126,7 @@
                 "tooltip": false,
                 "viz": false
               },
+              "insertNulls": false,
               "lineInterpolation": "linear",
               "lineWidth": 1,
               "pointSize": 5,
@@ -185,7 +186,7 @@
               "uid": "loki"
             },
             "editorMode": "code",
-            "expr": "rate({app=\"sissi\"}[$__interval])",
+            "expr": "rate({app=\"sissi\", namespace=\"sissi\"}[$__interval])",
             "queryType": "range",
             "refId": "A"
           }

deployment/helm/sissi/templates/db-config-deployment-job.yaml

@@ -5,7 +5,7 @@ metadata:
 {{- $deploymentJobName := print ((include "sissi.fullname" .) | trunc 39) "-db-config-deployment-job" }}
   name: {{ $deploymentJobName | trunc 63 }}
   annotations:
-    "helm.sh/hook": post-install
+    "helm.sh/hook": pre-upgrade,pre-install
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:

deployment/helm/sissi/templates/db-credentials.yaml

@@ -2,6 +2,9 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: db-credentials
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-install
+    "helm.sh/hook-weight": "-6"
 data:
   dbPassword: {{ $.Values.dbCredentials.password | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values
   dbUser: {{ $.Values.dbCredentials.userName | b64enc }}

deployment/helm/sissi/templates/deployment.yaml

@@ -88,18 +88,23 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+            - name: debug
+              containerPort: 5005
+              protocol: TCP
           livenessProbe:
             httpGet:
               path: /actuator/health/liveness
               port: 8080
-            initialDelaySeconds: 60
-            periodSeconds: 3
+            initialDelaySeconds: {{ $.Values.bot.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.bot.livenessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.bot.livenessProbe.failureThreshold }}
           readinessProbe:
             httpGet:
               path: /actuator/health/readiness
               port: 8080
-            initialDelaySeconds: 60
-            periodSeconds: 3
+            initialDelaySeconds: {{ $.Values.bot.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.bot.readinessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.bot.readinessProbe.failureThreshold }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

deployment/helm/sissi/templates/grafana-credentials.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: grafana-credentials
-data:
-  dbPassword: {{ $.Values.dbCredentials.password | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values
-  dbUser: {{ $.Values.dbCredentials.userName | b64enc }}
-  dbHost: {{ $.Values.dbCredentials.host | b64enc }}
-  dbPort: {{ $.Values.dbCredentials.port | b64enc }}
-  dbName: {{ $.Values.dbCredentials.name | b64enc }}

deployment/helm/sissi/templates/template-deployment-job.yaml

@@ -5,7 +5,7 @@ metadata:
 {{- $deploymentJobName := print ((include "sissi.fullname" .) | trunc 39) "-template-deployment-job" }}
   name: {{ $deploymentJobName | trunc 63 }}
   annotations:
-    "helm.sh/hook": post-install
+    "helm.sh/hook": pre-upgrade,pre-install
     "helm.sh/hook-weight": "-4"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:

deployment/helm/sissi/values.yaml

@@ -5,36 +5,44 @@
 replicaCount: 1
 
 bot:
-  repository: harbor.sheldan.dev/testing
+  repository: harbor.sheldan.dev/sissi
   pullPolicy: IfNotPresent
-  image: sissi
-  tag: 1.4.3
+  image: sissi-bot
+  tag: 1.4.17
+  livenessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 5
+    failureThreshold: 3
 
 templateDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.5
+  tag: 1.5.9
 
 templateDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-template-data
-  tag: 1.4.3
+  tag: 1.4.17
 
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.5
+  tag: 1.5.9
 
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
   image: sissi-db-data
-  tag: 1.4.3
+  tag: 1.4.17
 
 dbCredentials:
   host:

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/image-packaging/src/main/docker/.env

@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
-VERSION=1.4.3
+VERSION=1.4.17

deployment/image-packaging/src/main/docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   bot:
     build:
       context: sissi
-    image: ${REGISTRY_PREFIX}sissi:${VERSION:-latest}
+    image: ${REGISTRY_PREFIX}sissi-bot:${VERSION:-latest}
   db-data:
     build:
       context: db-data

deployment/image-packaging/src/main/docker/sissi/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-alpine
+FROM amazoncorretto:17.0.8-alpine3.18
 MAINTAINER Sheldan
 VOLUME /tmp
 ADD config/* /config/

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -13,15 +13,15 @@
     <groupId>dev.sheldan.sissi</groupId>
     <artifactId>sissi</artifactId>
     <name>Sissi</name>
-    <version>1.4.3</version>
+    <version>1.4.17</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
         <!-- edit in release.yml as well -->
         <!-- when releasing a new bot version, update the .env as well-->
-        <abstracto.version>1.5.5</abstracto.version>
-        <abstracto.templates.version>1.4.18</abstracto.templates.version>
+        <abstracto.version>1.5.9</abstracto.version>
+        <abstracto.templates.version>1.4.21</abstracto.templates.version>
     </properties>
 
     <modules>
@@ -57,7 +57,7 @@
     <scm>
         <url>https://maven.pkg.github.com/Sheldan/Sissi</url>
         <developerConnection>scm:git:git@github.com:Sheldan/Sissi.git</developerConnection>
-        <tag>sissi-1.4.3</tag>
+        <tag>sissi-1.4.17</tag>
     </scm>
 
 </project>

templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi</groupId>
         <artifactId>sissi</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/debra-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/meetup-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>sissi-templates</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/module-templates/quotes-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>module-templates</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-templates/template-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-templates</artifactId>
         <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>customization-translations</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sissi-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/debra-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>module-translations</artifactId>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/meetup-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>sissi-translations</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/quote-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>module-translations</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl

@@ -1,3 +1,3 @@
 This command can be used to search through all quotes by a text query.
 It will return quotes in which the text of the quote contains the given query.
-If there are more quotes found, the first one is returned.
+If there are more quotes found, a random one is returned.

templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_member_en_US.ftl

@@ -0,0 +1 @@
+The member to search quotes for

templates/sissi-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/sissi-translations/translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.sissi.templates.translations</groupId>
         <artifactId>sissi-translations</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>