Merge branch 'dev' into 'master'

v4.0.14

See merge request crafty-controller/crafty-4!468
This commit is contained in:
Iain Powrie 2022-09-23 02:26:32 +00:00
commit 47a06d2706
4 changed files with 9 additions and 7 deletions

View File

@ -1,4 +1,9 @@
# Changelog
## --- [4.0.14] - 2022/09/23
### Bug fixes
- HOTFIX - Rollback breaking websockets change !461 (self.clients was already a set and we tried to subscript a set of a set) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/467))
<br><br>
## --- [4.0.13] - 2022/09/20
### Bug fixes
- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/460))

View File

@ -2,11 +2,11 @@
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Supported Python Versions](https://shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20-blue)](https://www.python.org)
[![Version(temp-hardcoded)](https://img.shields.io/badge/release-v4.0.13--beta-orange)](https://gitlab.com/crafty-controller/crafty-4/-/releases)
[![Version(temp-hardcoded)](https://img.shields.io/badge/release-v4.0.14--beta-orange)](https://gitlab.com/crafty-controller/crafty-4/-/releases)
[![Code Quality(temp-hardcoded)](https://img.shields.io/badge/code%20quality-10-brightgreen)](https://gitlab.com/crafty-controller/crafty-4)
[![Build Status](https://gitlab.com/crafty-controller/crafty-4/badges/master/pipeline.svg)](https://gitlab.com/crafty-controller/crafty-4/-/commits/master)
# Crafty Controller 4.0.13-beta
# Crafty Controller 4.0.14-beta
> Python based Control Panel for your Minecraft Server
## What is Crafty Controller?

View File

@ -27,7 +27,7 @@ class WebSocketHelper:
f"Sending to {len(self.clients)} clients: "
f"{json.dumps({'event': event_type, 'data': data})}"
)
for client in self.clients[:]: # pylint: disable=unsubscriptable-object
for client in self.clients:
try:
self.send_message(client, event_type, data)
except Exception as e:
@ -36,9 +36,6 @@ class WebSocketHelper:
f"{client.get_remote_ip()} {e}"
)
# Excempting 'unsubscriptable-object' warning as false positive from 'self' use
# Code has been tested by Andrew and functions as intended.
def broadcast_page(self, page: str, event_type: str, data):
def filter_fn(client):
return client.page == page

View File

@ -1,6 +1,6 @@
{
"major": 4,
"minor": 0,
"sub": 13,
"sub": 14,
"meta": "beta"
}