mirror of
https://github.com/Sheldan/Sissi.git
synced 2026-01-07 09:47:52 +00:00
[SIS-xxx] adding starboard customization to change color based on disk (semi hardcoded)
upgrading abstracto version adding avatar to quote response
This commit is contained in:
2
.env
2
.env
@@ -1,4 +1,4 @@
|
|||||||
REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
|
REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
|
||||||
ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
|
ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
|
||||||
VERSION=1.5.7
|
VERSION=1.5.7
|
||||||
ABSTRACTO_VERSION=1.6.10
|
ABSTRACTO_VERSION=1.6.11
|
||||||
@@ -93,7 +93,7 @@ templateDeployment:
|
|||||||
repository: harbor.sheldan.dev/abstracto
|
repository: harbor.sheldan.dev/abstracto
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
image: abstracto-template-deployment
|
image: abstracto-template-deployment
|
||||||
tag: 1.6.10
|
tag: 1.6.11
|
||||||
templateDeploymentData:
|
templateDeploymentData:
|
||||||
repository: harbor.sheldan.dev/sissi
|
repository: harbor.sheldan.dev/sissi
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
@@ -104,7 +104,7 @@ dbConfigDeployment:
|
|||||||
repository: harbor.sheldan.dev/abstracto
|
repository: harbor.sheldan.dev/abstracto
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
image: abstracto-db-deployment
|
image: abstracto-db-deployment
|
||||||
tag: 1.6.10
|
tag: 1.6.11
|
||||||
dbConfigDeploymentData:
|
dbConfigDeploymentData:
|
||||||
repository: harbor.sheldan.dev/sissi
|
repository: harbor.sheldan.dev/sissi
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
|
|||||||
@@ -885,6 +885,16 @@
|
|||||||
<destFileName>logging-template-overrides.zip</destFileName>
|
<destFileName>logging-template-overrides.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.sissi.templates</groupId>
|
||||||
|
<artifactId>starboard-template-overrides</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
|
||||||
|
<destFileName>starboard-template-overrides.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<!-- overrides translations -->
|
<!-- overrides translations -->
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"image-generation",
|
"image-generation",
|
||||||
"quotes", "meetup", "debra", "rss-news", "miepscord",
|
"quotes", "meetup", "debra", "rss-news", "miepscord",
|
||||||
"moderation-custom", "image-generation-custom",
|
"moderation-custom", "image-generation-custom",
|
||||||
"moderation-template-overrides", "experience-template-overrides", "logging-template-overrides"
|
"moderation-template-overrides", "experience-template-overrides", "logging-template-overrides", "starboard-template-overrides"
|
||||||
],
|
],
|
||||||
"translation_artifacts": [
|
"translation_artifacts": [
|
||||||
"core",
|
"core",
|
||||||
|
|||||||
4
pom.xml
4
pom.xml
@@ -18,8 +18,8 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<abstracto.version>1.6.10</abstracto.version>
|
<abstracto.version>1.6.11</abstracto.version>
|
||||||
<abstracto.templates.version>1.4.58</abstracto.templates.version>
|
<abstracto.templates.version>1.4.59</abstracto.templates.version>
|
||||||
<apache-jena.version>4.9.0</apache-jena.version>
|
<apache-jena.version>4.9.0</apache-jena.version>
|
||||||
<rssreader.version>3.5.0</rssreader.version>
|
<rssreader.version>3.5.0</rssreader.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -2,12 +2,29 @@
|
|||||||
{
|
{
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
|
<#assign userFound=authorUserDisplay?has_content>
|
||||||
<#assign authorName><#if authorMemberDisplay?has_content>${authorMemberDisplay.name}<#elseif authorUserDisplay?has_content>${authorUserDisplay.name}<#else><@safe_include "quote_response_default_author_name"/></#if></#assign>
|
<#assign authorName><#if authorMemberDisplay?has_content>${authorMemberDisplay.name}<#elseif authorUserDisplay?has_content>${authorUserDisplay.name}<#else><@safe_include "quote_response_default_author_name"/></#if></#assign>
|
||||||
<#assign adderUserName><#if adderMemberDisplay?has_content>${adderMemberDisplay.name}<#elseif adderUserDisplay?has_content>${adderMemberDisplay.name}<#else><@safe_include "quote_response_default_adder_name"/></#if></#assign>
|
<#assign adderUserName><#if adderMemberDisplay?has_content>${adderMemberDisplay.name}<#elseif adderUserDisplay?has_content>${adderUserDisplay.name}<#else><@safe_include "quote_response_default_adder_name"/></#if></#assign>
|
||||||
<#assign channelName><@default_template_if_null sourceChannelName "quote_response_default_channel_name"/></#assign>
|
<#assign channelName><@default_template_if_null sourceChannelName "quote_response_default_channel_name"/></#assign>
|
||||||
<#assign creationDate><@format_instant_date_time instant=creationDate/></#assign>
|
<#assign creationDate><@format_instant_date_time instant=creationDate/></#assign>
|
||||||
"type": "textDisplay",
|
<#if userFound>
|
||||||
"content": "<@safe_include "quote_response_header_author_name"/>"
|
<#assign authorAvatar><#if userFound>${authorUserDisplay.avatarUrl}</#if></#assign>
|
||||||
|
"type": "section",
|
||||||
|
"components": [
|
||||||
|
{
|
||||||
|
"type": "textDisplay",
|
||||||
|
"content": "<@safe_include "quote_response_header_author_name"/>"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"accessory": {
|
||||||
|
"type": "thumbnail",
|
||||||
|
"url": "${authorAvatar}"
|
||||||
|
}
|
||||||
|
<#else>
|
||||||
|
"type": "textDisplay",
|
||||||
|
"content": "<@safe_include "quote_response_header_author_name"/>"
|
||||||
|
</#if>
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "section",
|
"type": "section",
|
||||||
@@ -34,7 +51,7 @@
|
|||||||
<#assign hasContent=true>
|
<#assign hasContent=true>
|
||||||
{
|
{
|
||||||
"type": "textDisplay",
|
"type": "textDisplay",
|
||||||
<#assign quoteDescription=quoteContent>
|
<#assign quoteDescription=quoteContent?json_string>
|
||||||
"content": "${quoteDescription}"
|
"content": "${quoteDescription}"
|
||||||
}
|
}
|
||||||
</#if>
|
</#if>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<module>moderation-template-overrides</module>
|
<module>moderation-template-overrides</module>
|
||||||
<module>experience-template-overrides</module>
|
<module>experience-template-overrides</module>
|
||||||
<module>logging-template-overrides</module>
|
<module>logging-template-overrides</module>
|
||||||
|
<module>starboard-template-overrides</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<?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>
|
||||||
|
<groupId>dev.sheldan.sissi.templates</groupId>
|
||||||
|
<artifactId>template-overrides</artifactId>
|
||||||
|
<version>1.5.7-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<artifactId>starboard-template-overrides</artifactId>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>single</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<finalName>moderation-template-overrides-${project.version}</finalName>
|
||||||
|
<appendAssemblyId>false</appendAssemblyId>
|
||||||
|
<descriptors>
|
||||||
|
<descriptor>src/main/assembly/assembly.xml</descriptor>
|
||||||
|
</descriptors>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
|
||||||
|
<id>zip</id>
|
||||||
|
<includeBaseDirectory>false</includeBaseDirectory>
|
||||||
|
<formats>
|
||||||
|
<format>zip</format>
|
||||||
|
</formats>
|
||||||
|
<fileSets>
|
||||||
|
<fileSet>
|
||||||
|
<outputDirectory>.</outputDirectory>
|
||||||
|
<directory>${project.basedir}/src/main/resources</directory>
|
||||||
|
</fileSet>
|
||||||
|
</fileSets>
|
||||||
|
</assembly>
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
"color" : {
|
||||||
|
<#if starCount gte 15>
|
||||||
|
"r": 192,
|
||||||
|
"g": 31,
|
||||||
|
"b": 1
|
||||||
|
<#elseif starCount gte 10>
|
||||||
|
"r": 67,
|
||||||
|
"g": 150,
|
||||||
|
"b": 154
|
||||||
|
<#elseif starCount gte 5>
|
||||||
|
"r": 212,
|
||||||
|
"g": 175,
|
||||||
|
"b": 55
|
||||||
|
<#elseif starCount gte 3>
|
||||||
|
"r": 49,
|
||||||
|
"g": 55,
|
||||||
|
"b": 61
|
||||||
|
<#else>
|
||||||
|
"r": 0,
|
||||||
|
"g": 0,
|
||||||
|
"b": 0
|
||||||
|
</#if>
|
||||||
|
},
|
||||||
Reference in New Issue
Block a user