Fix radio nui not updating and restricted channels #47

Cocodrulo · 2024-04-18T17:54:30Z

Describe Pull request
Fixed the problem where restricted channels where not checked when connecting through NUI and radio HUD not updating the channel number when increasing, decreasing or changin channel. Also fix issue [BUG] #46

Questions (please complete the following information):

Have you personally loaded this code into an updated qbcore project and checked all it's functionality? No
Does your code fit the style guidelines? Yes
Does your PR fit the contribution guidelines? Yes

… channel

danichim · 2024-10-12T13:08:21Z

Is not updating the channel when you increase from UI buttons

mbiddle

Good changes overall. Broken until the access typo is fixed but I suggested a few other changes.

mbiddle · 2024-11-09T20:43:36Z

html/js/script.js

@@ -57,15 +65,23 @@ $(document).on('click', '#decreaseradiochannel', function(e){

    $.post('https://qb-radio/decreaseradiochannel', JSON.stringify({
        channel: $("#channel").val()
-    }));
+    })).then((data) => {
+        if (data.canacces) {


This needs to be data.canaccess

mbiddle · 2024-11-09T20:43:44Z

html/js/script.js

 });

 $(document).on('click', '#increaseradiochannel', function(e){
    e.preventDefault();

    $.post('https://qb-radio/increaseradiochannel', JSON.stringify({
        channel: $("#channel").val()
-    }));
+    })).then((data) => {
+        if (data.canacces) {


This needs to be data.canaccess

mbiddle · 2024-11-09T20:43:50Z

html/js/script.js

@@ -27,7 +31,11 @@ $(document).on('click', '#submit', function(e){

    $.post('https://qb-radio/joinRadio', JSON.stringify({
        channel: $("#channel").val()
-    }));
+    })).then((data) => {
+        if (data.canacces) {


This needs to be data.canaccess

mbiddle · 2024-11-09T20:43:54Z

html/js/script.js

@@ -15,7 +15,11 @@ $(function() {
        } else if (data.key == "Enter") { // Enter key
            $.post('https://qb-radio/joinRadio', JSON.stringify({
                channel: $("#channel").val()
-            }));
+            })).then((data) => {
+                if (data.canacces) {


This needs to be data.canaccess

mbiddle · 2024-11-09T20:48:08Z

client.lua

@@ -29,6 +29,12 @@ local function SplitStr(inputstr, sep)
 end

 local function connecttoradio(channel)
+    if Config.RestrictedChannels[channel] ~= nil then


The up and down channel functions don't respect the min/max. We should also move the min/max channel check here and remove it from joinRadio.

if channel > Config.MaxFrequency or channel <= 0 then QBCore.Functions.Notify(Lang:t('restricted_channel_error'), 'error') return false end

mbiddle · 2024-11-09T20:52:04Z

client.lua

-    QBCore.Functions.Notify(Lang:t("increase_decrease_radio_channel", {value = newChannel}), "success")
-    cb("ok")
+    local canaccess = connecttoradio(newChannel)
+    if canaccess then QBCore.Functions.Notify(Lang:t("increase_decrease_radio_channel", {value = newChannel}), "success") end


We should remove this double notification as it's already handled in the connecttoradio function.

mbiddle · 2024-11-09T20:52:10Z

client.lua

-        QBCore.Functions.Notify(Lang:t("increase_decrease_radio_channel", {value = newChannel}), "success")
-        cb("ok")
+        local canaccess = connecttoradio(newChannel)
+        if canaccess then QBCore.Functions.Notify(Lang:t("increase_decrease_radio_channel", {value = newChannel}), "success") end


We should remove this double notification as it's already handled in the connecttoradio function.

Cocodrulo · 2024-11-10T13:09:50Z

Thanks for the suggestions, all done

mbiddle

Changes look good on my end. I have a few final pieces of feedback.

One unrelated piece is I was working on a similar PR that I will close now that I see you are back and active, but one remaining change to qb-radio would be to update the fxmamnifest.lua file to include both radio images. Please see my changes here and bring them into this branch. Thanks!

mbiddle · 2024-11-10T20:42:53Z

client.lua

@@ -151,15 +159,11 @@ RegisterNUICallback('joinRadio', function(data, cb)
    if rchannel ~= nil then
        if rchannel <= Config.MaxFrequency and rchannel ~= 0 then


Sorry for not getting this the first time around, but I think we should force rchannel to to be greater than 0 here. Do we really want negative channels?

if rchannel <= Config.MaxFrequency and rchannel > 0 then

mbiddle · 2024-11-10T20:43:48Z

client.lua

 end)

 RegisterNUICallback("decreaseradiochannel", function(_, cb)
    if not onRadio then return end
    local newChannel = RadioChannel - 1
    if newChannel >= 1 then
-        connecttoradio(newChannel)
-        QBCore.Functions.Notify(Lang:t("increase_decrease_radio_channel", {value = newChannel}), "success")


This is a good change, but please remove the old increase_decrease_radio_channe phrase in the locales files.

…ger use

Cocodrulo · 2024-11-10T21:49:16Z

Done all changes, thanks for your input

mbiddle

Not that I really matter here, but the code looks good from my end!

Qwerty1Verified · 2024-11-12T17:12:54Z

client.lua

@@ -29,6 +29,13 @@ local function SplitStr(inputstr, sep)
 end

 local function connecttoradio(channel)
+    if channel > Config.MaxFrequency or channel <= 0 then QBCore.Functions.Notify(Lang:t('restricted_channel_error'), 'error') return false end
+    if Config.RestrictedChannels[channel] ~= nil then
+        if not Config.RestrictedChannels[channel][PlayerData.job.name] and PlayerData.job.onduty then


Line 34 opens up a vulnerability for connecting to restricted channels because the logic is looking for whether the players job is not in the access list, and if they're on duty.

This means that if the players job is not in the access list, the first fail condition becomes true, but if they're off duty then the second fail condition is false which would allow them to connect to the radio because they don't meet the fail conditions.

Good point!! I used the same function it was before without questioning if it was right. I've just uploaded a fix.

Thank you for the changes. I think those conditions can be simplified though, more closer to the original code by just changing the comparison from and to or, and flipping the second condition.

I believe this would suffice and offer the same functionality:

if not Config.RestrictedChannels[channel][PlayerData.job.name] or not PlayerData.job.onduty then

It reads as, if job is not whitelisted for the channel, it's a true fail condition, or if not on duty, it's a true fail condition.
This would mean if their job is not on the whitelist, it won't check the second comparison, and if their job is on the whitelist, it'll check the second comparison for whether they're on duty.

Qwerty1Verified · 2024-11-12T21:32:34Z

client.lua

+    if channel > Config.MaxFrequency or channel <= 0 then QBCore.Functions.Notify(Lang:t('restricted_channel_error'), 'error') return false end
+    if Config.RestrictedChannels[channel] ~= nil then
+        local isJobWhitelisted = Config.RestrictedChannels[channel][PlayerData.job.name]
+        if (not isJobWhitelisted) or (isJobWhitelisted and not PlayerData.job.onduty) then


Refer to my comment on the previous thread about changing these conditions on now line 35.

You're tottally correct, what an stupid condition I did jajaja, being corrected right now

No worries lol, easily done. Thank you for your changes once again.

mbiddle · 2024-11-12T21:49:17Z

@Cocodrulo it looks like PR 52 was merged, so you may want to remove the duplicated phrase in this language as well.

Cocodrulo · 2024-11-12T21:59:12Z

Done!!

Cocodrulo added 3 commits April 18, 2024 18:10

📻 Moved radio checks to the connect function

ae639c9

💻 Fix radio channel not updating after increasing or decreasing radio…

99be7f2

… channel

🔁 Done same changes when join in radio

f352477

auto-assign bot assigned Cocodrulo Apr 18, 2024

mbiddle suggested changes Nov 9, 2024

View reviewed changes

Cocodrulo added 2 commits November 10, 2024 13:08

Fixed typo error

ea5a2ab

Removed double notifications and checked min/max frequencies

80b314e

mbiddle suggested changes Nov 10, 2024

View reviewed changes

Cocodrulo added 4 commits November 10, 2024 21:45

Add all radio images

b3e7d1f

Removed increase_decrease_radio_channed locale entry since is not lon…

86ff76c

…ger use

Force channel to be greater than 0

3611b0e

Change number values to boolean values to match better the natives docs

fc12620

mbiddle approved these changes Nov 10, 2024

View reviewed changes

mbiddle mentioned this pull request Nov 10, 2024

Multiple security, QOL fixes, and some clean-up to qb-radio. #53

Closed

Qwerty1Verified suggested changes Nov 12, 2024

View reviewed changes

Solved vulnerability of offduty not whitelisted connection

4198ef8

Qwerty1Verified suggested changes Nov 12, 2024

View reviewed changes

Cocodrulo added 2 commits November 12, 2024 21:41

Fixed stupid conditional

2d859c8

Merge branch 'main' into main

c1197e9

Removed unused translation in de.lua

7e0dee3

Qwerty1Verified approved these changes Nov 12, 2024

View reviewed changes

GhzGarage merged commit 94de37e into qbcore-framework:main Nov 12, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix radio nui not updating and restricted channels #47

Fix radio nui not updating and restricted channels #47

Cocodrulo commented Apr 18, 2024

danichim commented Oct 12, 2024

mbiddle left a comment

mbiddle Nov 9, 2024

mbiddle Nov 9, 2024

mbiddle Nov 9, 2024

mbiddle Nov 9, 2024

mbiddle Nov 9, 2024

mbiddle Nov 9, 2024

mbiddle Nov 9, 2024

Cocodrulo commented Nov 10, 2024

mbiddle left a comment

mbiddle Nov 10, 2024

mbiddle Nov 10, 2024

Cocodrulo commented Nov 10, 2024

mbiddle left a comment

Qwerty1Verified Nov 12, 2024 •

edited

Loading

Cocodrulo Nov 12, 2024

Qwerty1Verified Nov 12, 2024

Qwerty1Verified Nov 12, 2024 •

edited

Loading

Cocodrulo Nov 12, 2024

Qwerty1Verified Nov 12, 2024

mbiddle commented Nov 12, 2024

Cocodrulo commented Nov 12, 2024

		@@ -151,15 +159,11 @@ RegisterNUICallback('joinRadio', function(data, cb)
		if rchannel ~= nil then
		if rchannel <= Config.MaxFrequency and rchannel ~= 0 then

Fix radio nui not updating and restricted channels #47

Fix radio nui not updating and restricted channels #47

Conversation

Cocodrulo commented Apr 18, 2024

danichim commented Oct 12, 2024

mbiddle left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cocodrulo commented Nov 10, 2024

mbiddle left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cocodrulo commented Nov 10, 2024

mbiddle left a comment

Choose a reason for hiding this comment

Qwerty1Verified Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Qwerty1Verified Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbiddle commented Nov 12, 2024

Cocodrulo commented Nov 12, 2024

Qwerty1Verified Nov 12, 2024 •

edited

Loading

Qwerty1Verified Nov 12, 2024 •

edited

Loading