[no ci] release 1.1.5

Reviewed-on: #32

.github/workflows/ci.yaml

@@ -43,7 +43,14 @@ jobs:
         name: Version
         run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> ${GITHUB_OUTPUT}
 
-      - name: Build Container
+      - name: Build unstable Container
+        if: github.ref_name != 'main'
+        run: |
+          echo ${{secrets.PACKAGES_TOKEN}} | docker login --username ${{ secrets.PACKAGES_USER }} --password-stdin git.arindy.de
+          docker build -f src/main/docker/Dockerfile.native-micro -t git.arindy.de/arindy/dice-tower:unstable -t git.arindy.de/arindy/dice-tower:${{ steps.version.outputs.VERSION }} .
+          docker push git.arindy.de/arindy/dice-tower:unstable
+
+      - name: Build stable Container
         if: github.ref_name == 'main'
         run: |
           echo ${{secrets.PACKAGES_TOKEN}} | docker login --username ${{ secrets.PACKAGES_USER }} --password-stdin git.arindy.de
@@ -51,10 +58,28 @@ jobs:
           docker push git.arindy.de/arindy/dice-tower:${{ steps.version.outputs.VERSION }}
           docker push git.arindy.de/arindy/dice-tower:latest
 
+      - name: Prepare deploy
+        run: |
+          echo ${{secrets.SSH_KNOWN_HOSTS}} >> ~/.ssh/known_hosts
+          base64 -d <<< ${{secrets.SSH_KEY}} > ./.key
+          chmod 600 ./.key
+
+      - name: Deploy unstable
+        if: github.ref_name != 'main'
+        run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.unstable.yml pull && docker compose -f compose.unstable.yml up -d'  "
+
       - name: Deploy
+        if: github.ref_name == 'main'
+        run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.yml pull && docker compose -f compose.yml up -d'  "
+
+      - name: Deploy local
         if: github.ref_name == 'main'
         run: "docker compose up -d"
 
+      - name: clean up
+        run: |
+          rm ./.key
+
       - name: create tag
         if: github.ref_name == 'main'
         run: |

.gitignore

@@ -124,3 +124,5 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
+.key
+.key/

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.arindy</groupId>
     <artifactId>dice-tower</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.5</version>
 
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>

src/main/resources/META-INF/resources/app.js

@@ -181,12 +181,6 @@ document.addEventListener("DOMContentLoaded", async () => {
 
     document.getElementById('chatOverlayLink').href = url() + '/chatoverlay'
 
-    document.addEventListener("DOMContentLoaded", async () => {
-        if (!localStorage.getItem("userId")) {
-            localStorage.setItem("userId", self.crypto.randomUUID());
-        }
-    })
-
     configurePopover();
 })
 

src/main/resources/templates/chatoverlay.html

@@ -38,7 +38,7 @@
                     result.rolls.forEach(roll => {
                         values.push(roll.value);
                     })
-                    document.getElementById('results').innerHTML = '<strong>' + message + '</strong>: [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
+                    document.getElementById('results').innerHTML = '<strong>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
                 })
                 document.getElementById('results').showPopover()
                 setTimeout(() => {

src/main/resources/templates/chatoverlayconfig.html

@@ -38,8 +38,8 @@
         <div>
             <label for="channel">Channel </label>
             <input type="text" id="channel" style="width: 400px; margin-top: 20px" value="arindy"/>
-            <label for="cmd">Command </label>
-            <input type="text" id="cmd" style="width: 100px; margin-top: 20px" value="roll"/>
+            <label for="cmd">Command !</label>
+            <input type="text" id="cmd" style="width: 100px; margin-top: 20px; margin-left: 0" value="roll"/>
         </div>
         <div>
             <label class="checkbox" id="modsAllowed-container">Allow mods to roll
@@ -57,7 +57,7 @@
         </div>
         <div>
             <label for="scale">Dice-Scale </label>
-            <input type="number" id="scale" style="width: 50px; margin-top: 20px" value="7"/>
+            <input type="number" id="scale" style="width: 50px; margin-top: 20px" value="9"/>
             <label for="maxDice">Max number of dice </label>
             <input type="number" id="maxDice" style="width: 50px; margin-top: 20px" value="20"/>
         </div>
@@ -65,7 +65,7 @@
             <label for="clearAfter">Clear dice after (in seconds)</label>
             <input type="number" id="clearAfter" style="width: 50px; margin-top: 20px" value="10"/>
             <label for="timeout">Command-timeout (in seconds)</label>
-            <input type="number" id="timeout" style="width: 50px; margin-top: 20px" value="10"/>
+            <input type="number" id="timeout" style="width: 50px; margin-top: 20px" value="60"/>
         </div>
         <div id="dice-box" style="height: 400px"></div>
         <button style="margin: 10px" id="preview">Preview <i class="fa-solid fa-magnifying-glass"></i></button>

src/main/resources/templates/index.html

@@ -3,6 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <title>Dice-Tower</title>
+    <meta name="version" content="{version}">
+
     <link rel="stylesheet" href="/vendor/w3css/4/w3.css">
     <link rel="stylesheet" href="/vendor/font-awesome/css/fontawesome.css">
     <link rel="stylesheet" href="/vendor/font-awesome/css/all.css">
@@ -11,12 +13,32 @@
     <script src="/vendor/color-picker.js"></script>
     <script type="module" src="/dice-preview.js"></script>
     <script type="text/javascript" src="/app.js"></script>
+
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:title" content="Dice-Tower">
+    <meta name="twitter:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
+    <meta name="description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta name="twitter:description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta property="og:url" content="{http:request.absoluteURI}">
+    <meta property="og:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
+    <meta property="og:description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta property="og:title" content="Dice-Tower">
+    <meta property="og:site_name" content="Dice-Tower">
+    <meta property="og:type" content="website">
+    <meta property="twitter:url" content="{http:request.absoluteURI}">
+    <meta property="twitter:domain" content="{http:request.authority}">
 </head>
 <body class="w3-theme-l1">
+<script>
+    if (!localStorage.getItem("userId")) {
+        localStorage.setItem("userId", self.crypto.randomUUID());
+    }
+</script>
 <div class="w3-container w3-content"
      style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
     <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>
     </h1>
+
     <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
          style="padding: 25px; text-align: center; margin-bottom: auto;">
         <h2 id="nameH" popovertarget="room-hint" data-trigger="hover" style="margin: 0" hidden>Name</h2>