Few Things #24
Few Things #24
Conversation
[Added] - config.update [Changed] - Config design optimized for readability
[Added] - ox_lib Update Check [Removed] - Previous Update Check method [Changed] - console print design
There was a problem hiding this comment.
Hey!
Glad to see the project is still alive :)
I took a look at your commits:
-
I love the new config file design, but I did see a couple of minor typos:
-
"8" instead of "("
-
I would change this to
Minimum required TS plugin versionsince right now, based on the comment alone, it makes it seem like you need to have that specific version (it seems stupid, I know, but some people don't exactly read).
-
I would also probably change this to
Uncomment to enable Theater Mode(also changed spelling since most users are American).
-
Since these three are in one block now, it's probably a good idea to clarify
TS channel password for the In-Game channel (Optional)or something like that (again, sounds stupid, but some people aren't entirely the smartest...)
TokoVoIP_v2/fivem_script/tokovoip_script/config.lua
Lines 45 to 47 in c513891
-
Maybe change to something like
Use with keySwitchChannels for dual-keypress, or set to false to disable
-
XxX.XxX.XxX.XxX.XXXXX-->XxX.XxX.XxX.XxX:XXXXX
-
-
For
ox_lib, since it's only being used for version checking, I don't think it should used for TokoVoIP. A lot of servers do have already ox_lib, but for those who don't have it and want to use TokoVoIP would need to add it, which is just adding unnecessary load.Wrapping the version check function in the original code in an if statement for the config option would be fine, or even a separate file like Badger_Discord_API has it.
Other than that, it looks good (although I haven't tested it or anything yet)
|
there you go |
|
i also felt like making the HTML a bit prettier |
Plactrix
left a comment
Plactrix
left a comment
There was a problem hiding this comment.
- What's the difference between ws_server in your other commit versus the one that's implemented within the FiveM script?
- Out of curiosity, what's the thought process for renaming fivem_script to tokovoip?
- The changes in master_server and ws_server: Are they the same as #27 ?
README.md
Outdated
| ## Terms & Conditions | ||
|
|
||
| Clone the repo and don't forget to initialize the submodules: | ||
| * A visible **TokoVOIP watermark** must be shown in-game |
There was a problem hiding this comment.
Per the new LICENSE, this is no longer required
.gitignore
Outdated
|
|
||
| # VSCode | ||
| .vscode | ||
| /master_server/node_modules |
| [submodule "ts3_plugin/deps/json"] | ||
| path = ts3_plugin/deps/json | ||
| url = https://github.com/nlohmann/json.git | ||
| [submodule "ts3_plugin/deps/teamspeak-plugin-radiofx"] |
tokovoip/html/index.html
Outdated
| TOKOVOIP SCRIPT | ||
| </div> | ||
| <center> | ||
| <font style="color: #ff0000;">TokoVOIP</font> is our in-game VOIP replacement for FiveM. We also require |
There was a problem hiding this comment.
Maybe change this and the ones below to TokoVoIP to match the rest of everything else
| const data = await response.json(); | ||
| return data.ip; | ||
| } catch { | ||
| return 'IP not found'; |
There was a problem hiding this comment.
Relying on only ipify.org makes it so that website NEEDS to be up in order for TokoVoIP to be able to function properly. Maybe instead of IP not found, try fetching the /getmyip endpoint since the ws_server will always be online if the game server is online
There was a problem hiding this comment.
ipify.org is one of the most used servers to get the public ip. it has a 100% uptime for the last 90 days
There was a problem hiding this comment.
i dont think that will present an issue
There was a problem hiding this comment.
Maybe instead of IP not found, try fetching the /getmyip endpoint since the ws_server will always be online if the game server is online
like this?
async function getPublicIP() {
try {
const response = await fetch('https://api.ipify.org?format=json');
const data = await response.json();
return data.ip;
} catch (e) {
// Ignore errors here and try fallback
try {
const res = await fetch(`http://${endpoint}/getmyip`);
if (res.ok) {
const ip = await res.text();
return ip;
}
} catch (e2) {
// Ignore errors here
}
return 'IP not found';
}
}
tokovoip/server/sv_main.lua
Outdated
| @@ -1,3 +1,14 @@ | |||
| --[[ | |||
| ^5| ^8 _____ _ __ __ ___ ____ __ ______ ^5| | |||
There was a problem hiding this comment.
You can get rid of the color coding since this is just a regular comment. The color codes were just for the console message
| @@ -1 +1 @@ | |||
| Subproject commit 88c961f37efb0205aae418a35b354935be3ff3ff | |||
| Subproject commit 145fc8b0215f5149ef4c1de6233951946294a9f3 | |||
There was a problem hiding this comment.
The latest version of cpp-httplib does not work due to OpenSSL version deprecation in later versions.
For submodule version updates, use my commit as I built the plugin and tested to make sure they worked
Updated dependencies and IPv6 Support for ws_server
Update ws and master
shouldnt break anything hopefully
|
have you found anything that i need to change? |
modified: hydra_voice/client/utils.lua modified: hydra_voice/fxmanifest.lua modified: hydra_voice/server/main.lua modified: hydra_voice/server/update.lua modified: hydra_voice/server/utils.lua
modified: hydra_voice/html/script.js deleted: ts3_package/package.ini deleted: ts3_package/plugins/tokovoip/walkie_talkie_16.png deleted: ts3_package/plugins/tokovoip_win64.dll
2 participants
Changelog
Following the glorious tradition of Keep a Changelog
Added
master_serverfrom Itokoyamato's GitHub. Thanks for the Upload again!Changed
ox_libfxmanifestto theceruleanFXv2 version. More details here.Hopefully didn't break anything... but if it did, feel free to yell at me.