Merge branch 'release-1.13'

.github/ISSUE_TEMPLATE/config.yml

@@ -8,3 +8,6 @@ contact_links:
 - name: 💬 Spunky Bot Mailing List / Users Forum
  url: https://groups.google.com/forum/#!forum/spunkybot
  about: Ask and discuss questions with community members
+- name: 💭 Ask a question
+ url: https://github.com/SpunkyBot/spunkybot/discussions/new
+ about: Start a discussion to connect with other members

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v2
  - name: Set up Python 2.7
- uses: actions/setup-python@v2.1.1
+ uses: actions/setup-python@v2
  with:
  python-version: 2.7
 
@@ -46,7 +46,7 @@ jobs:
  # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
  - name: Checkout
  uses: actions/checkout@v2
- - uses: actions/setup-node@v2.1.1
+ - uses: actions/setup-node@v2
  with:
  node-version: '12.x'
 
@@ -76,7 +76,7 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v2
  - name: Set up Python 2.7
- uses: actions/setup-python@v2.1.1
+ uses: actions/setup-python@v2
  with:
  python-version: 2.7
 
@@ -97,7 +97,7 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v2
  - name: Set up Python 2.7
- uses: actions/setup-python@v2.1.1
+ uses: actions/setup-python@v2
  with:
  python-version: 2.7
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# 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: [ develop, master ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ develop ]
+ schedule:
+ - cron: '41 23 * * 5'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'python' ]
+ # 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/create-release.yml

@@ -23,7 +23,7 @@ jobs:
  tag_name: ${{ github.ref }}
  release_name: v${{ github.ref }}
  body: |
- Changes in this Release
- - to be done
+ Spunky Bot v${{ github.ref }} has been released.
+ This release addresses new features and several bug fixes.
  draft: false
  prerelease: false

.github/workflows/greetings.yml

@@ -6,7 +6,7 @@ jobs:
  greeting:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/first-interaction@v1
+ - uses: actions/first-interaction@v1.1.0
  with:
  repo-token: ${{ secrets.GITHUB_TOKEN }}
  issue-message: 'Hi, thanks for your contribution! Great first issue!'

.github/workflows/pypi-publish.yml

@@ -18,7 +18,7 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v2
  - name: Set up Python 2.7
- uses: actions/setup-python@v2.1.1
+ uses: actions/setup-python@v2
  with:
  python-version: 2.7
 

.github/workflows/stale.yml

@@ -11,14 +11,19 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/stale@v3
+ - uses: actions/stale@v4
  with:
  repo-token: ${{ secrets.GITHUB_TOKEN }}
  stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+ close-issue-message: 'This issue was closed because it has been stalled for several days with no activity.'
+ stale-pr-message: 'This PR is stale because it has been open for weeks with no activity.'
  days-before-stale: 60
  days-before-close: 7
+ days-before-pr-close: -1
  stale-issue-label: 'wontfix'
  exempt-issue-labels: 'backlog,confirmed,enhancement,security'
- #stale-pr-message: 'Stale pull request message'
+ exempt-issue-milestones: 'future,backlog'
+ exempt-pr-milestones: 'bugfix,improvement'
+ exempt-all-pr-milestones: true
  #stale-pr-label: 'no-pr-activity'
  #exempt-pr-labels: 'awaiting-approval,work-in-progress'

.gitignore

@@ -28,6 +28,9 @@ MD5SUMS
 .idea
 .iml
 
+# Visual Studio Code
+.vscode/
+
 # OSX
 .DS_Store
 

CHANGELOG.md

@@ -5,7 +5,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.2...develop)
+## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.13.0...develop)
+
+## [1.13.0](https://github.com/SpunkyBot/spunkybot/compare/1.12.2...1.13.0) - 2022-01-16
+
+### Added
+
+* Added command `!lastvote` to display the last called vote
+* Added command `!lastadmin` to display the last disconnected admin
+* Added option to show number of admins online in rotating messages
+* Added Magnum and MAC11 option to command `!gear`
+* Added banpoints for racism and camp warning types
+
+### Changed
+
+* Show hint to register for saving player stats
+* Show more messages for higher headshot counts
+* Show additional hints for command `!exit`
+* Show message if no one is listed in the banlist
+
+### Fixed
+
+* Fixed #70: Additional warning types lead to automated temp-ban
+* Fixed #75: Warn in logfile if g_logsync is not set correctly
+* Fixed #85: Add command `!lastadmin` to display the last disconnected admin
+* Fixed #93: Add config item to set which adminlevel is punished for spawn/teamkills
+* Fixed #110: Command `!nextmap` supports >52 maps on Windows server
+* Fixed #127: Add support for recording serverside demos
+* Various minor bug fixes
 
 ## [1.12.2](https://github.com/SpunkyBot/spunkybot/compare/1.12.0...1.12.2) - 2020-07-24
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Spunky Bot contributors
+Copyright (c) 2013-2022 Spunky Bot contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -37,7 +37,7 @@ If you want to know more, this is a list of selected starting points:
 * Urban Terror 4.1.1 / 4.2.023 / 4.3.4
 * Python 2.6 / 2.7
 * SQLite 3 database
-* Cross-platform (tested on Debian 6 / 7 / 8 / 9, Ubuntu 12 / 14 / 16 / 18, CentOS 6 / 7, macOS 10.13, Windows 7 / 10)
+* Cross-platform (tested on Debian 6 - 10, Ubuntu 10.04 - 20.04, CentOS 6 / 7, macOS 10.13, Windows 7 / 10)
 * Supporting 32-bit and 64-bit operating systems
 
 ## Quickstart

VERSION

@@ -1 +1 @@
-1.12.2
+1.13.0

conf/rules.conf

@@ -4,5 +4,6 @@ Rule #2: No racism of any kind
 Rule #3: ^5Don't be a ^3douchebag
 Powered by ^7Spunky Bot
 @admins
+@admincount
 @nextmap
-@bigtext This ^2message ^7is ^1bigtext ^7and not ^3console
+@bigtext This ^2message ^7is ^1bigtext ^7and not ^3console

conf/settings.conf

@@ -21,6 +21,7 @@ noob_autokick = 0 ; Enable (1) or disable (0)
 spawnkill_autokick = 0 ; Enable (1) or disable (0) autokick for spawn killing. Admins or higher levels will not get kicked. Default: 0
 instant_kill_spawnkiller = 0 ; Enable (1) or disable (0) instant kill for player doing spawn kill. Admins or higher levels will not get killed. Default: 0
 spawnkill_warn_time = 3 ; Spawnkill timer in seconds between player respawn and death to issue a warning. Recommended value: 2-5. Default: 3
+admin_immunity = 40 ; Admin level and higher, which is not punished for spawn/team kills (Levels: Regular=2, Moderator=20, Admin=40, Full Admin=60). Default: 40
 bad_words_autokick = 0 ; Enable (1) or disable (0) autokick for using bad words. Admins or higher levels will not get kicked. Default: 0
 show_country_on_connect = 1 ; Enable (1) or disable (0) displaying message "Player connected from...". Default: 1
 show_first_kill = 1 ; Enable (1) or disable (0) displaying message "firstblood" / "first nade kill". Default: 1

debian/changelog

@@ -1,3 +1,10 @@
+spunkybot (1.13.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Full changelog on https://github.com/spunkybot/spunkybot/releases
+
+ -- Spunky Bot Release Manager <releases@spunkybot.de> Sun, 16 Jan 2022 22:12:00 +0100
+
 spunkybot (1.12.2-1) unstable; urgency=medium
 
  * New upstream release.

debian/control

@@ -3,9 +3,9 @@ Section: utils
 Priority: optional
 Maintainer: Spunky Bot Release Manager <releases@spunkybot.de>
 Uploaders: Alexander Kress <hello@alexanderkress.de>
-Build-Depends: debhelper (>= 10), dh-python, python
+Build-Depends: debhelper (>= 9), dh-python, python
 X-Python-Version: >= 2.6
-Standards-Version: 4.0.0
+Standards-Version: 3.9.6
 Homepage: https://www.spunkybot.de/
 Vcs-Git: https://github.com/SpunkyBot/spunkybot.git
 Vcs-Browser: https://github.com/SpunkyBot/spunkybot