Merge pull request #337 from TheSharks/experimental

v6.1.0

.circleci/config.yml

@@ -1,5 +1,41 @@
 version: 2
+
 jobs:
+  sentry-association:
+    docker:
+      - image: getsentry/sentry-cli
+    steps:
+      - checkout
+      - run:
+          name: Assosiate commits with Sentry
+          command: |
+            VERSION=$(sentry-cli releases propose-version)
+            sentry-cli releases new -p wildbeast $VERSION
+            sentry-cli releases set-commits --auto $VERSION
+
+  crowdin-download:
+    working_directory: /tmp/project
+    docker:
+      - image: dougley/crowdin
+    steps:
+      - checkout
+      - run:
+          name: Request fresh build
+          command: crowdin download -b WildBeast
+      - persist_to_workspace:
+          root: /tmp/project
+          paths:
+            - src/languages
+
+  crowdin-upload:
+    docker:
+      - image: dougley/crowdin
+    steps:
+      - checkout
+      - run:
+          name: Upload new strings
+          command: crowdin upload sources -b WildBeast
+
   test:
     docker:
       - image: node:latest
@@ -17,18 +53,18 @@ jobs:
       - run:
           name: Test
           command: npm test
+
   build:
     docker:
       - image: docker:latest
     steps:
-      - run:
-          name: Git
-          command: apk add --update git
       - checkout
-      - setup_remote_docker
+      - attach_workspace:
+          at: /tmp/workspace
       - run:
-          name: Initialize submodule
-          command: git submodule update --init --remote
+          name: Merge translations
+          command: cp -rf /tmp/workspace/src/languages/ ~/project/src/
+      - setup_remote_docker
       - run:
           name: Build Docker image
           command: if [ "$CIRCLE_BRANCH" = "master" ]; then docker build -t dougley/wildbeast:latest --build-arg buildno=$CIRCLE_BUILD_NUM --build-arg commitsha=$CIRCLE_SHA1 .; else docker build -t dougley/wildbeast:$CIRCLE_BRANCH --build-arg buildno=$CIRCLE_BUILD_NUM --build-arg commitsha=$CIRCLE_SHA1 .; fi
@@ -37,19 +73,18 @@ jobs:
           command: |
             echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
             if [ "$CIRCLE_BRANCH" = "master" ]; then docker push dougley/wildbeast:latest; else docker push dougley/wildbeast:$CIRCLE_BRANCH; fi
+
   tagged-build:
     docker:
       - image: docker:latest
     steps:
-      - run:
-          name: Git
-          command: apk add --update git
       - checkout
-      - setup_remote_docker:
-          docker_layer_caching: true
+      - attach_workspace:
+          at: /tmp/workspace
       - run:
-          name: Initialize submodule
-          command: git submodule update --init --remote
+          name: Merge translations
+          command: cp -rf /tmp/workspace/src/languages/ ~/project/src/
+      - setup_remote_docker
       - run:
           name: Build Docker image
           command: docker build -t dougley/wildbeast:$(git describe --abbrev=0 --tags) --build-arg buildno=$CIRCLE_BUILD_NUM --build-arg commitsha=$CIRCLE_SHA1 .
@@ -58,6 +93,7 @@ jobs:
           command: |
             echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
             docker push dougley/wildbeast:$(git describe --abbrev=0 --tags)
+
   docs-build-test:
     docker:
       - image: anthonyz/python3-node8:latest
@@ -75,6 +111,7 @@ jobs:
       - run:
           name: Build docs
           command: npm run build
+
   docs-deploy:
     docker:
       - image: anthonyz/python3-node8:latest
@@ -100,6 +137,7 @@ jobs:
           command: |
             git config user.email 9768134+Dougley@users.noreply.github.com
             python3 -m mkdocs gh-deploy
+
 workflows:
   version: 2
   docs:
@@ -111,20 +149,41 @@ workflows:
           filters:
             branches:
               only: master
-  test_n_build:
+  docker-image:
     jobs:
-      - test
+      - test:
+          filters:
+            tags:
+              only: /v.+/
+      - crowdin-download:
+          filters:
+            branches:
+              only: /master|experimental/
+      - sentry-association:
+          requires:
+            - test
+          filters:
+            branches:
+              only: /master|experimental/
       - build:
           requires:
             - test
+            - crowdin-download
           filters:
             branches:
               only: /master|experimental/
       - tagged-build:
           requires:
             - test
+            - crowdin-download
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /v.+/
+  crowdin:
+    jobs:
+      - crowdin-upload:
+          filters:
+            branches:
+              only: /master|experimental/

.gitignore

@@ -69,3 +69,6 @@ site
 # Command info dump
 commandInfo.json
 docs/js/dist/commands.js*
+
+# lokijs database
+wildbeast.db

CHANGELOG.md

@@ -1,5 +1,19 @@
 # 6.0.0
 ## Release phase
+### 6.1.0
+Removed translation submodule, we now include the standard file by default. Translations are able to be downloaded from our crowdin project     
+CircleCI will now automatically include translations into new Docker images   
+For Docker images, uws is locked to v10.148.1    
+Commands that call external APIs will now indicate errors    
+Music command have been updated to support lavalink v3   
+Added optional embedded database powered by LokiJS   
+Added new ffmpeg based voice encoder     
+`++meme` will no longer use imgflip, memegen is used instead   
+`++settings` will error out if an unknown language is being set    
+Encoders and drivers are loaded on-demand instead of requiring them all   
+Elasticsearch logging will now log command arguments instead of the full message    
+Version checking will check for git commits instead of versions only, this falls back to original version check if git is not available    
+
 ### 6.0.0
 **This is a breaking release, nothing is backwards compatible.**
 

Dockerfile

@@ -16,7 +16,7 @@ COPY . /opt/wildbeast
 WORKDIR /opt/wildbeast
 RUN npm i --production
 # Install optional native modules
-RUN npm i zlib-sync uws https://github.com/discordapp/erlpack.git bufferutil sodium-native node-opus
+RUN npm i zlib-sync uws@10.148.1 https://github.com/discordapp/erlpack.git bufferutil sodium-native node-opus
 
 # Switch to wildbeast user and run entrypoint
 USER wildbeast

README.md

@@ -2,14 +2,14 @@
   <div style="margin-left:auto;margin-right:auto;">
     <img src="https://i.imgur.com/4wYz7Y2.png"><br><br>
     <p align="center" style="margin:0;">
-      <a href="https://github.com/TheSharks/WildBeast/blob/master/LICENSE.md"><img src="https://shields.dougley.com/github/license/thesharks/wildbeast.svg?style=for-the-badge&maxAge=300" alt="License"></a>
-      <a href="https://github.com/TheSharks/WildBeast/releases"><img src="https://shields.dougley.com/github/package-json/v/thesharks/wildbeast.svg?label=version&style=for-the-badge&maxAge=300" alt="Version"></a>
-      <a href="https://discord.gg/wildbot"><img src="https://shields.dougley.com/discord/110462143152803840.svg?logo=discord&style=for-the-badge&maxAge=300" alt="Discord server"></a>
+      <a href="https://github.com/TheSharks/WildBeast/blob/master/LICENSE.md"><img src="https://img.shields.io/github/license/thesharks/wildbeast.svg?style=for-the-badge&maxAge=300" alt="License"></a>
+      <a href="https://github.com/TheSharks/WildBeast/releases"><img src="https://img.shields.io/github/package-json/v/thesharks/wildbeast.svg?label=version&style=for-the-badge&maxAge=300" alt="Version"></a>
+      <a href="https://discord.gg/wildbot"><img src="https://img.shields.io/discord/110462143152803840.svg?logo=discord&style=for-the-badge&maxAge=300" alt="Discord server"></a>
     </p>
     <p align="center" style="margin:0;">
-      <a href="https://hub.docker.com/r/dougley/wildbeast"><img src="https://shields.dougley.com/docker/pulls/dougley/wildbeast.svg?style=for-the-badge&maxAge=300"></a>
-      <a href="https://circleci.com/gh/TheSharks/WildBeast"><img src="https://shields.dougley.com/circleci/project/github/TheSharks/WildBeast/master.svg?label=stable&style=for-the-badge&maxAge=300&logo=circleci" alt="CircleCI"></a>
-      <a href="https://circleci.com/gh/TheSharks/WildBeast/tree/experimental"><img src="https://shields.dougley.com/circleci/project/github/TheSharks/WildBeast/experimental.svg?label=experimental&style=for-the-badge&maxAge=300&logo=circleci" alt="CircleCI"></a>
+      <a href="https://hub.docker.com/r/dougley/wildbeast"><img src="https://img.shields.io/docker/pulls/dougley/wildbeast.svg?style=for-the-badge&maxAge=300"></a>
+      <a href="https://circleci.com/gh/TheSharks/WildBeast"><img src="https://img.shields.io/circleci/project/github/TheSharks/WildBeast/master.svg?label=stable&style=for-the-badge&maxAge=300&logo=circleci" alt="CircleCI"></a>
+      <a href="https://circleci.com/gh/TheSharks/WildBeast/tree/experimental"><img src="https://img.shields.io/circleci/project/github/TheSharks/WildBeast/experimental.svg?label=experimental&style=for-the-badge&maxAge=300&logo=circleci" alt="CircleCI"></a>
     </p>
   </div>
 </div>

crowdin.yml

@@ -0,0 +1,10 @@
+"project_identifier" : "wildbeast"
+"api_key_env": CROWDIN_API_KEY
+"preserve_hierarchy": true
+
+files: [
+  {
+    "source" : "/src/languages/en-EN.json",
+    "translation" : "/src/languages/%locale%.json",
+  }
+]

docs/commands.md

@@ -21,7 +21,6 @@ Additional command information:
 [Addendums](#addendums)<br>
 [Tag subcommands](#tag-subcommands)<br>
 [Settings subcommands](#settings-subcommands)<br>
-[Available meme types](#available-meme-types)
 
 ## Commands
 
@@ -30,8 +29,9 @@ Additional command information:
 ## Addendums
 
 1. For the **colorrole** command, a hexadecimal value can be submitted in either **#FFFFFF** or **FFFFFF** format.
-2. The **softban** command bans a user and then immediately unbans them, deleting their messages without barring future access to the server.
-3. The **request** command supports playing from the following resources: YouTube, SoundCloud, Bandcamp, Twitch, Vimeo, Mixer and raw HTML audio.
+2. You can get all the available meme types for the **meme** command by using the command **meme templates**.
+3. The **softban** command bans a user and then immediately unbans them, deleting their messages without barring future access to the server.
+4. The **request** command supports playing from the following resources: YouTube, SoundCloud, Bandcamp, Twitch, Vimeo, Mixer and raw HTML audio.
 
 ## Tag subcommands
 
@@ -54,7 +54,7 @@ The tag command has the following subcommands. All subcommands inherit the permi
 The following settings can be edited with this command. All settings are server-specific and all subcommands inherit the permission level of the main command.
 
 !!! note
-    Languages are still WIP. Only the "en" language is supported at the moment.
+    Translation support is in beta, please see the [translation directory](https://github.com/TheSharks/WildBeast/tree/master/src/languages) for supported languages.
 
 | Name | Description | Usage |
 | ---- | ----------- | ----- |
@@ -63,48 +63,3 @@ The following settings can be edited with this command. All settings are server-
 | welcome | Change the welcome message target. | settings welcome **<#channel/dm\>** |
 | welcomeMessage | Change the welcome message that is sent when a new member joins. | settings welcomeMessage **<message\>** |
 | reset | Reset a setting to its default value. | settings reset **<setting\>** |
-
-## Available meme types
-
-The values in the **Name** column of the table below correspond to the relevant meme ID on https://api.imgflip.com/popular_meme_ids.
-
-| Name | ID |
-| ---- | -- |
-| brace | 61546 |
-| mostinteresting | 61532 |
-| fry | 61520 |
-| onedoesnot | 61579 |
-| yuno | 61527 |
-| success | 61544
-| allthethings | 61533 |
-| doge | 8072285 |
-| drevil | 40945639 |
-| skeptical | 101711 |
-| notime | 442575 |
-| yodawg | 101716 |
-| ermahgerd | 101462 |
-| hipsterariel | 86601 |
-| imagination | 163573 |
-| grumpycat | 405658 |
-| morpheus | 100947 |
-| 1stworldproblems | 61539 |
-| facepalm | 1509839 |
-| wtf | 245898 |
-| batmanslaprobin | 438680 |
-| takemymoney | 176908 |
-| gollum | 681831 |
-| grindmygears | 356615 |
-| consuela | 160583 |
-| ineedyouto | 89655 |
-| chucknorrisapproves | 241304 |
-| asianfather | 61559 |
-| foreveralone | 61528 |
-| grandmainternet | 61556 |
-| zoidberg | 61573 |
-| troll | 101484 |
-| familyguybrian | 674967 |
-| obama | 185239 |
-| badluckbrian | 61585 |
-| philosoraptor | 61516 |
-| 3rdworldsuccess | 101287 |
-| ancientaliens | 101470 |