Release 1.34.0

.github/workflows/docker-cd.yml

@@ -62,7 +62,7 @@ jobs:
         uses: appleboy/ssh-action@master
         with:
           host: zekro.de
-          port: 2201
+          port: 22
           username: ${{ secrets.SSH_USERNAME }}
           password: ${{ secrets.SSH_PASSWORD }}
           script: |

.github/workflows/tests-ci.yml

@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - '*'
-    paths-ignore:
-      - '**.md'
+    paths:
+      - "pkg/**"
 
 jobs:
   tests:

.github/workflows/web-ci.yml

@@ -0,0 +1,32 @@
+name: Web CI
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "*"
+    paths:
+      - "web.new/**"
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+    paths:
+      - "web.new/**"
+
+jobs:
+  lint:
+    name: Lint Checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Node
+        uses: actions/setup-node@v2
+      - name: Check out Code
+        uses: actions/checkout@v2
+      - name: Install Dependencies
+        working-directory: 'web.new'
+        run: yarn
+      - name: ESLint
+        working-directory: 'web.new'
+        run: yarn lint

.gitignore

@@ -15,3 +15,4 @@ cmd/test/*
 web/.angular/
 internal/util/embedded/webdist/*
 !internal/util/embedded/webdist/keep
+web_old/

.vscode/launch.json

@@ -1,18 +1,26 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "${workspaceFolder}/cmd/shinpuru",
-      "cwd": "${workspaceFolder}",
-      "env": {},
-      "args": ["-c", "config/private.config.yml"]
-    }
-  ]
-}
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "firefox",
+      "request": "launch",
+      "name": "Debug Webapp",
+      "webRoot": "${workspaceFolder}",
+      "url": "http://localhost:8081",
+      "preLaunchTask": "run-vite-server"
+    },
+    {
+      "name": "Debug Backend",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/cmd/shinpuru",
+      "cwd": "${workspaceFolder}",
+      "env": {},
+      "args": ["-c", "config/private.config.yml"]
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "run-vite-server",
+      "type": "shell",
+      "command": "yarn",
+      "args": ["start"],
+      "options": {
+        "cwd": "web/"
+      },
+      "isBackground": true
+    }
+  ]
+}

.vscode/web.code-snippets

@@ -0,0 +1,49 @@
+{
+  // Place your shinpuru workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
+  // description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
+  // is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
+  // used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
+  // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
+  // Placeholders with the same ids are connected.
+  // Example:
+  // "Print to console": {
+  // 	"scope": "javascript,typescript",
+  // 	"prefix": "log",
+  // 	"body": [
+  // 		"console.log('$1');",
+  // 		"$2"
+  // 	],
+  // 	"description": "Log output to console"
+  // }
+
+  "Create React Route": {
+    "scope": "typescriptreact",
+    "prefix": "route",
+    "description": "Create a React Route",
+    "body": [
+      "import React, { useEffect } from 'react';",
+      "import { useTranslation } from 'react-i18next';",
+      "import { useParams } from 'react-router';",
+      "import styled from 'styled-components';",
+      "import { useApi } from '../../../hooks/useApi';",
+      "import { useNotifications } from '../../../hooks/useNotifications';",
+      "",
+      "type Props = {}",
+      "",
+      "const $1Route: React.FC<Props> = ({}) => {",
+      "  const { t } = useTranslation('routes.$2');",
+      "  const { pushNotification } = useNotifications();",
+      "  const { guildid } = useParams();",
+      "  const fetch = useApi();",
+      "",
+      "  useEffect(() => {",
+      "    if (!guildid) return;",
+      "  }, [guildid]);",
+      "",
+      "  return <></>;",
+      "}",
+      "",
+      "export default $1Route;"
+    ]
+  }
+}

CHANGELOG.md

@@ -3,47 +3,15 @@
 <!-- > **Attention**  
 > This is a hotfix patch. If you want to see the changelog for release 1.30.0, please look [**here**](https://github.com/zekroTJA/shinpuru/releases/tag/1.30.0). -->
 
-# Interactive Setup
+# New Web Interface Beta
 
-Recently, a lot of questions about the setup of shinpuru received me. shinpuru has a lot of configuration values and ways to configure it, so I decided to create a small tool where you can enter all your settings and credentials and which creates a pre-configured `docker-compose.yml` which you can simply use to set up shinpuru on your server. 
+Currently, I am in the process of re-implementing the whole web interface of shinpuru. If you want to know why and how far it already has been processed yet, please take a look at issue #370. With this release, you can check out the new interface by going to the `/beta` route in the web interface. But please, keep in mind that this is a very early state of development. A lot of features are still missing or only partly implemented and the user experience might be impaired.
 
-https://user-images.githubusercontent.com/16734205/158845896-50eb4869-fa2a-42f0-887c-0b946ddcecd0.mp4
+![](https://user-images.githubusercontent.com/16734205/178149927-2b100aa8-f33e-403c-8b38-2d2d4afdca18.gif)
 
-Simply download the tool from the releases below, execute it in your terminal, enter your settings and credentials and then you will have a ready to go Docker Compose set up to be deployed to your server.
+# Duration UX Improvements
 
-# Report QoL Changes
-
-Previosuly, you were able to report, kick and ban users using the `type` parameter of the report command. On the one side, this is highly unintuitive because people more likely expect a ban and kick command for each action separately. Also, this is very inconsistent with the `mute` command, which is actually also just a report type with extra actions like banning an kicking as well at it has its own command.
-
-So, with report you can now only create, list and revoke reports and banning as well as kicking members is done with both separate commands `ban` and `kick`.
-
-This change also results in some changes to the permissions.
-- `sp.guild.mod.report.kick` is now `sp.guild.mod.kick`
-- `sp.guild.mod.report.ban` is now `sp.guild.mod.ban`
-
-# Starboard Changes [#369 <small>*nice*</small>]
-
-When posing message with links to images or videos, these are extracted from the message and put into the embed itself when voted into the starboard.
-
-Also, videos are now properly displayed in the web interface. And yes, autoplay is disabled and the volume is muted by default. 😉
-
-![](https://user-images.githubusercontent.com/16734205/158994685-eae81863-77c0-4e82-b05e-a01b273a1577.gif)
-
-# Minor Changes
-
-- The guild log order in the web inetrface is now descending starting with the latest entries. This is way more intuitive and easier to look for recent issues. [#366]
-
-- shinpuru now reads a `.env` file in the directory of the executable and applies it to the environment vaiables.
-
-# Bug Fixes
-
-- Fixed a bug which results in a `nil` author on a message retrieved from the cache which lead to a panic when voting such a message into the starboard. [#366]
-
-- Not available or deleted starboard channels are now properly cleared from the settings when voting messages into it.
-
-# Code Base
-
-So that go 1.18 has now officially being released, you can now compile shinpuru with the latest version of the Go toolchain instead of using a pre-release build.
+All duration parsing of commands has now been exchanged from the [default Go Implementation](https://pkg.go.dev/time#ParseDuration) to a [custom implementation](https://github.com/zekroTJA/shinpuru/blob/dev/pkg/timeutil/timeutil.go#L49-L117) which allows more time units like days (`d`) or weeks (`w`). Also, it makes the parsing more flexible. For example, you can use spaces between units (example `1d 3h`) or you can even subtract values (example `1d-2h` == `22h`). This affects all commands which take a duration parameter like `/ban` or `/mute`.
 
 # Docker
 

Dockerfile

@@ -15,7 +15,7 @@ RUN go mod download
 RUN go build -o ./bin/shinpuru ./cmd/shinpuru/main.go
 
 # ------------------------------------------------------------
-# --- STAGE 2: Build Web App Package
+# --- STAGE 2.1: Build Web App Package
 FROM node:16-alpine AS build-fe
 WORKDIR /build
 
@@ -27,6 +27,18 @@ RUN yarn
 RUN npx ng build --configuration production \
   --output-path dist
 
+# ------------------------------------------------------------
+# --- STAGE 2.2: Build Web App Package
+FROM node:16-alpine AS build-fenew
+WORKDIR /build
+
+# Copy web source files
+COPY web.new .
+# Get dependencies
+RUN yarn
+# Build static web app files
+RUN yarn build --base=/beta/ --outDir=dist
+
 # ------------------------------------------------------------
 # --- STAGE 3: Final runtime environment
 FROM alpine:3 AS final
@@ -35,6 +47,7 @@ WORKDIR /app
 # Copy build artifacts from previous stages
 COPY --from=build-be /build/bin .
 COPY --from=build-fe /build/dist web/dist/web
+COPY --from=build-fenew /build/dist web.new/dist/web
 # Add CA certificates
 RUN apk add ca-certificates
 # Prepare directories

Makefile

@@ -15,9 +15,9 @@ GOLINT 	      = golint
 GREP   	      = grep
 NPM    	      = npm
 PRETTIER      = prettier
-NG       	  = npx ng
+YARN					= yarn
 DOCKERCOMPOSE = docker-compose
-SWAGGO		  = swag
+SWAGGO		    = swag
 SWAGGER2MD    = swagger-markdown
 ###############################################
 
@@ -99,16 +99,15 @@ cleanup:
 PHONY += fe
 fe:
 	cd $(CURDIR)/web && \
-		$(NG) build --configuration production
+		$(YARN) run build
 
 PHONY += copyfe
 copyfe:
 	cp -R web/dist/web/* internal/util/embedded/webdist
 
 PHONY += runfe
 runfe:
-	cd ./web && \
-		$(NG) serve --port=8081
+	cd ./web && $(YARN) start
 
 PHONY += prettify
 prettify: