Re-added ACTWebSocket support #77
Conversation
|
NOTE: This has been tested with both plugins on my end through github pages |
|
(Currently doing a bug fix as I noticed an issue) |
|
testing it now, should be fixed though. |
|
Awesome, can't wait to test it too! Will give it a try tonight to push this ASAP. |
package.json
Outdated
| }, | ||
| "homepage": "https://bsides.github.io/horizoverlay", | ||
| "homepage": "https://rawrington.github.io/horizoverlay", |
There was a problem hiding this comment.
The reference from the original repo should still be the same. Could you make this change?
There was a problem hiding this comment.
yeah I'll sort it
There was a problem hiding this comment.
oh it was sorted
| ">0.2%", | ||
| "not dead", | ||
| "not op_mini all" | ||
| ] |
There was a problem hiding this comment.
I believe we should check which version the Overlay plugin uses so we can deploy with that target in mind. I'll let you know in my tests tonight which version is it. It'd be better to other developers to not be confused with API changes.
There was a problem hiding this comment.
yeah true, this specific combination of requirements DOES work with overlayplugin which is why i chose it
| @@ -12,7 +12,12 @@ class Combatants extends Component { | |||
| render() { | |||
| const maxRows = this.props.config.maxCombatants | |||
| const dataArray = Object.keys(this.props.data) | |||
| const battler = dataArray.slice(0, maxRows) | |||
| const regexp = /[a-zA-Z]+\s+[a-zA-Z]+/g; | |||
| const battler = dataArray.filter(player => ( | |||
There was a problem hiding this comment.
Just one little thing here: do you have prettier installed in your IDE? If not, I'll set a thing later to make this better indented once we push our files (ie. a post-commit hook).
There was a problem hiding this comment.
...and you've done it here. Reviews should begin with the last ones, heh!
There was a problem hiding this comment.
i actually fixed spacing in a later thing :P
package.json
Outdated
| }, | ||
| "homepage": "https://rawrington.github.io/horizoverlay", | ||
| "homepage": "https://bsides.github.io/horizoverlay", |
There was a problem hiding this comment.
Oh well forget about my last comment about this 😅
|
I've changed how the slicing works in my personal build and cut out jobless/outputless party members to help with party filter settings in ACT, I'm thinking of implementing multiple rows so people can show the full 24 people if they want on 24 mans (i.e. a rows setting in config) |
|
I can push this to my be merged branch if you want me to :P |
|
my latest commit should sort out all the issues, i added in my 2 filters, you can change the show jobless combatants option in config to put the behaviour back to how it originally behaved :P |
Looks nice, did you make it as an option? These days have been crazy to test it though 😭 |
|
Although I cannot test it, I'll just accept this. If anything goes wrong we can fix or just throw back the older version. |
I have re-added ACTWebSocket support while maintaining OverlayPlugin compatibility, this build works with both ACTWS and OverlayPlugin from github pages, and does not have any underlying issues, I also fixed an issue wherein limit breaks and other strange things would cause a combatant to get cut off at the end of the list. Additionally I have updated package.json to work under the latest NPM with a bunch of updated dependancies.