updated build script

Updated night order for all roles

.eslintrc.js

@@ -9,6 +9,8 @@ module.exports = {
   },
   rules: {
     "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off"
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "vue/multi-word-component-names": "off",
+    "vue/no-reserved-component-names": "off",
   }
 };

.github/workflows/changelog-check.yml

@@ -0,0 +1,21 @@
+name: Enforce Changelog Update
+on:
+  pull_request:
+    types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
+    branches:
+      - main
+      - develop
+jobs:
+  build:
+    name: Check Actions
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Changelog check
+        uses: Zomzog/changelog-checker@v1.2.0
+        with:
+          fileName: CHANGELOG.md
+          noChangelogLabel: no changelog
+          checkNotification: Simple
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -1,67 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
-  schedule:
-    - cron: '27 22 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/deploy.yml

@@ -5,19 +5,23 @@ on:
       - main
 jobs:
   build-and-deploy:
+    concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v1
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
 
-    - name: Build
-      run: |
-        npm install
-        npm run-script build
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '18'
 
-    - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@releases/v3
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        BRANCH: gh-pages
-        FOLDER: dist
+      - name: Install and Build 🔧
+        run: |
+          npm ci
+          npm run build
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4.2.5
+        with:
+          branch: gh-pages
+          folder: dist

.github/workflows/linter.yml

@@ -1,53 +1,20 @@
----
-###########################
-###########################
-## Linter GitHub Actions ##
-###########################
-###########################
 name: Lint Code Base
 
-#
-# Documentation:
-# https://help.github.com/en/articles/workflow-syntax-for-github-actions
-#
-
-#############################
-# Start the job on all push #
-#############################
 on:
   push:
-    branches-ignore:
-      - 'gh-pages'
+    branches: [ main, develop ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ main, develop ]
 
-###############
-# Set the Job #
-###############
 jobs:
   build:
-    # Name the Job
     name: Lint Code Base
-    # Set the agent to run on
     runs-on: ubuntu-latest
-
-    ##################
-    # Load all steps #
-    ##################
     steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
-      - name: Checkout Code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: npm install
+      - run: npm run lint-ci
 
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: docker://github/super-linter:v2.2.0
-        env:
-          VALIDATE_ALL_CODEBASE: false
-          VALIDATE_ANSIBLE: false
-          DEFAULT_BRANCH: "main"

CHANGELOG.md

@@ -1,5 +1,93 @@
 # Release Notes
 
+### Version 2.16.2
+- fixed custom script format to support new script tool JSON
+- updated packages to be compatible with Node >= 18 again
+
+---
+
+### Version 2.16.1
+- Updated character night order to be consistent with script tool
+
+---
+
+### Version 2.16.0
+- Add ability to use json from clipboard to upload script (by @alexanderfletcher)
+
+---
+
+### Version 2.15.4
+- fixed flickering of add reminder token
+- added redirect to Chinese version
+
+---
+
+### Version 2.15.3
+- add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger, Puzzlemaster, Alchemist, Engineer, Riot, Psychopath, Atheist, Nightwatchman to list of available characters
+- fixed game state JSON not handling custom Fabled correctly
+
+---
+
+### Version 2.15.2
+- added mobile web application support
+- show correct number of leaves on roles with global reminders
+- fixed a bug with traveler list showing up when assigning demon bluffs
+- fixed a bug with homebrew scripts that contained negative night order positions
+
+---
+
+### Version 2.15.1
+- fix Mephit not showing up on scripts, futureproof Mephit name change
+- add Boomdandy to list of available characters
+
+---
+
+### Version 2.15.0
+- clean up transparent portions of icons
+- add Magician & LLeech to list of available characters
+
+---
+
+### Version 2.14.0
+- added Farmer to list of available characters
+
+---
+
+### Version 2.13.0
+- fix players being moved or removed during nomination
+- add vue linter
+- use "Exile" rather than "Banishment" for exiles
+- added global animation toggle for better performance
+- added record vote history toggle to session menu, and clear vote history button
+- add support for custom Fabled characters
+- show Jinxed interactions on character reference list
+- add 'marked for execution' indicator
+
+---
+
+### Version 2.12.0
+- tweak reference sheet to better fit screen in single column layout
+- add warning icon overlay for setup roles on character assignment modal
+- added Heretic and Marionette plus King/Choirboy and the Gangster to list of available characters
+
+---
+
+### Version 2.11.0
+- new design for character reference sheet
+- automatically switch to grimoire view when joining a session through a link
+- fixed demon bluffs showing on public town square
+- fixed a bug that prevented connecting to a session when previously being connected and joining through a link
+
+---
+
+### Version 2.10.0
+- added [nomination log indicator](https://fontawesome.com/icons/book-dead).  When a nomination log [v] is available, the number of currently visible entries is displayed. Clicking the indicator can reveal/hide the nomination log.
+- fix issue where a player and storyteller updating the same players pronouns at around the same time causes an infinite loop disconnecting the session.
+- fix bug with shifting roles when the storyteller deletes a player
+- added Poppygrower to list of available characters
+
+---
+
 ### Version 2.9.1
 - fix gamestate JSON not showing (custom) roles and failing to load states with custom scripts properly
 - fix gamestate not stripping out special characters from role.id on load

CONTRIBUTING.md

@@ -19,6 +19,9 @@ Before submitting your contribution, please make sure to take a moment and read
 
 - The `main` branch is what is currently deployed to the website. All development should be done in dedicated branches.
 
+- The `develop` branch contains the changes that will be deployed to main next. In order to prepare a release, development
+  branches should have their Pull Request against `develop` and only releases should be merged from `develop` into `main`. 
+
 - Work in the `src` folder and **DO NOT** checkin `dist` in the commits.
 
 - It's OK to have multiple small commits as you work on the PR - GitHub will automatically squash it before merging.
@@ -30,6 +33,9 @@ Before submitting your contribution, please make sure to take a moment and read
 - If fixing a bug:
   - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`.
   - Provide a detailed description of the bug in the PR. Live demo preferred.
+  
+- You'll need to update the `CHANGELOG.md` with a description of your changes before you open a pull request and your code
+  should pass the lint check.
 
 ## Development Setup
 

README.md

@@ -1,5 +1,7 @@
 # Blood on the Clocktower Grimoire & Town Square
 
+> :warning: **This project is no longer actively maintained** and will only receive critical bug fixes. :warning:
+
 ![social](https://user-images.githubusercontent.com/325521/102897760-d1147b00-4468-11eb-9d7b-63a204bc9fc1.png)
 
 This is an unofficial online tool to run Blood on the Clocktower games through Discord or other digital means.
@@ -27,7 +29,7 @@ If you want to learn more about how to use the app as a player, [JayBotC](https:
 
 ### Custom Script Support
 
-Any custom script generated by the official [Script Tool](https://bloodontheclocktower.com/script) is supported out of
+Any custom script generated by the official [Script Tool](https://script.bloodontheclocktower.com/) is supported out of
 the box and you only need to upload it to get the selected set of characters into your grimoire. If you want to customize
 your script further, there is an additional `"_meta"` object that you can add to the script like you would add a normal
 character:
@@ -90,13 +92,15 @@ For base game characters, it is sufficient to only provide the ID, similar to wh
   _Note_: custom images will only be visible after enabling them in the Grimoire menu!
 - **edition**: the ID of the edition for this character. can be left blank or "custom"
 - **firstNight** / **otherNight**: the position that this character acts on the first / other nights, compared to all
-  other characters
+  other characters<br>
+  _Note_: must be a positive number or zero, with zero being treated as "does not act during the night"
 - **firstNightReminder** / **otherNightReminder**: reminder text for first / other nights
 - **reminders**: reminder tokens, should be an empty array `[]` if none
 - **remindersGlobal**: global reminder tokens that will always be available, no matter if the character is assigned to a player or not
 - **setup**: whether this token affects setup (orange leaf), like the Drunk or Baron
 - **name**: the displayed name of this character
-- **team**: the team of the character, has to be one of `townsfolk`, `outsider`, `minion`, `demon` or `traveler`
+- **team**: the team of the character, has to be one of `townsfolk`, `outsider`, `minion`, `demon`, `traveler` or `fabled`<br>
+  _Note_: if you create a custom Fabled character, it will be automatically added to the game when the custom script is loaded
 - **ability**: the displayed ability text of the character
 
 ## [Code of Conduct](CODE_OF_CONDUCT.md)
@@ -108,7 +112,7 @@ For base game characters, it is sufficient to only provide the ID, similar to wh
 * [Blood on the Clocktower](https://bloodontheclocktower.com/) is a trademark of Steven Medway and [The Pandemonium Institute](https://www.thepandemoniuminstitute.com/)
 * Night reminders and other auxiliary text written by [Ben Finney](http://bignose.whitetree.org/projects/botc/diy/)
 * Iconography by [Font Awesome](https://fontawesome.com/)
-* Background image by [Ryan Maloney](https://www.artstation.com/maloney94)
+* Background image copyright and permission granted by [Ryan Maloney](https://www.artstation.com/maloney94)
 * Webfonts by [Google Fonts](https://fonts.google.com/) and [Online Web Fonts](https://www.onlinewebfonts.com/)
 * All other images and icons are copyright to their respective owners
 

package.json

@@ -1,12 +1,13 @@
 {
   "name": "townsquare",
-  "version": "2.9.1",
+  "version": "2.16.2",
   "description": "Blood on the Clocktower Town Square",
   "author": "Steffen Baumgart",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build ./src/main.js",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "lint-ci": "vue-cli-service lint --no-fix --max-warnings=0"
   },
   "main": "App.vue",
   "dependencies": {
@@ -14,22 +15,22 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
     "@fortawesome/vue-fontawesome": "^0.1.10",
-    "@vue/cli-service": "^4.5.9",
+    "@vue/cli-service": "^5.0.8",
     "prom-client": "^13.0.0",
     "sass": "^1.30.0",
     "sass-loader": "^8.0.2",
     "vue": "^2.6.12",
-    "vue-template-compiler": "^2.6.12",
+    "vue-template-compiler": "^2.7.15",
     "vuex": "^3.6.0",
-    "ws": "^7.4.1"
+    "ws": "^7.4.6"
   },
   "devDependencies": {
-    "@vue/cli-plugin-eslint": "^4.5.9",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.2.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^1.19.1"
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/eslint-config-prettier": "^8.0.0",
+    "eslint": "^8.53.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-vue": "^9.18.1",
+    "prettier": "^3.0.3"
   },
   "keywords": [
     "botc",

public/index.html

@@ -5,6 +5,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-capable" content="yes">
   <title>Blood on the Clocktower Town Square</title>
   <link rel="apple-touch-icon" sizes="57x57" href="static/apple-icon-57x57.png">
   <link rel="apple-touch-icon" sizes="60x60" href="static/apple-icon-60x60.png">

server/index.js

@@ -12,10 +12,14 @@ register.setDefaultLabels({
 
 const PING_INTERVAL = 30000; // 30 seconds
 
-const server = https.createServer({
-  cert: fs.readFileSync("cert.pem"),
-  key: fs.readFileSync("key.pem")
-});
+const options = {};
+
+if (process.env.NODE_ENV !== "development") {
+  options.cert = fs.readFileSync("cert.pem");
+  options.key = fs.readFileSync("key.pem");
+}
+
+const server = https.createServer(options);
 const wss = new WebSocket.Server({
   ...(process.env.NODE_ENV === "development" ? { port: 8081 } : { server }),
   verifyClient: info =>
@@ -234,7 +238,7 @@ const interval = setInterval(function ping() {
             ws.readyState === WebSocket.CONNECTING)
       )
     ) {
-      metrics.channels_list.remove([channel]);
+      metrics.channels_list.remove({ name: channel });
       delete channels[channel];
     }
   }

src/App.vue

@@ -3,7 +3,10 @@
     id="app"
     @keyup="keyup"
     tabindex="-1"
-    :class="{ night: grimoire.isNight }"
+    :class="{
+      night: grimoire.isNight,
+      static: grimoire.isStatic
+    }"
     :style="{
       backgroundImage: grimoire.background
         ? `url('${grimoire.background}')`
@@ -110,13 +113,13 @@ export default {
           this.$store.commit("toggleModal", "roles");
           break;
         case "v":
-          if (this.session.voteHistory.length) {
+          if (this.session.voteHistory.length || !this.session.isSpectator) {
             this.$store.commit("toggleModal", "voteHistory");
           }
           break;
         case "s":
           if (this.session.isSpectator) return;
-          this.$store.commit("toggleNight");
+          this.$refs.menu.toggleNight();
           break;
         case "escape":
           this.$store.commit("toggleModal");
@@ -202,6 +205,14 @@ ul {
   align-items: center;
   align-content: center;
   justify-content: center;
+
+  // disable all animations
+  &.static *,
+  &.static *:after,
+  &.static *:before {
+    transition: none !important;
+    animation: none !important;
+  }
 }
 
 #version {