Merge branch 'canary'

Sonoran-Software · Jul 22, 2021 · 8bba1a8 · 8bba1a8
2 parents df4ac7f + cf8d1b1
commit 8bba1a8
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .vscode
 *.zip
-wk_wars2x/config.lua
+wk_wars2x/config.lua
+sonorancad/stream/*.ydr
+sonorancad/stream/data/*.ytyp
diff --git a/sonorancad/core/client.lua b/sonorancad/core/client.lua
@@ -17,6 +17,8 @@ Config.GetPluginConfig = function(pluginName)
             Config.plugins[pluginName].disableReason = "startup aborted"
         elseif Config.plugins[pluginName].enabled == nil then
             Config.plugins[pluginName].enabled = true
+        elseif Config.plugins[pluginName].enabled == false then
+            Config.plugins[pluginName].disableReason = "Disabled"
         end
         return Config.plugins[pluginName]
     else
@@ -41,6 +43,8 @@ Config.LoadPlugin = function(pluginName, cb)
             Config.plugins[pluginName].disableReason = "startup aborted"
         elseif Config.plugins[pluginName].enabled == nil then
             Config.plugins[pluginName].enabled = true
+        elseif Config.plugins[pluginName].enabled == false then
+            Config.plugins[pluginName].disableReason = "Disabled"
         end
         return cb(Config.plugins[pluginName])
     else

diff --git a/sonorancad/core/commands.lua b/sonorancad/core/commands.lua
@@ -35,8 +35,12 @@ function dumpInfo()
     for k, v in pairs(Config) do
         if (k == "plugins") then goto continue end
         if type(v) == "function" then goto continue end
-        if type(v) == "table" then coreConfig[k] = json.encode(v) end
+        if type(v) == "table" then 
+            table.insert(coreConfig, ("%s = %s"):format(k, json.encode(v)))
+            goto continue
+        end
         if type(v) == "thread" then goto continue end
+        table.insert(coreConfig, ("%s = %s"):format(k, v))
         coreConfig[k] = v
         ::continue::
     end
@@ -53,7 +57,7 @@ Relevant Variables
 %s
 Core Configuration
 %s
-    ]]):format(version, Config.latestVersion, table.concat(pluginVersions, ", "), table.concat(loadedPlugins, ", "), table.concat(disabledPlugins, ", "), variableList, table.concat(coreConfig, ", "))
+    ]]):format(version, Config.latestVersion, table.concat(pluginVersions, ", "), table.concat(loadedPlugins, ", "), table.concat(disabledPlugins, ", "), variableList, table.concat(coreConfig, "\n"))
 end
 
 function dumpPlugin(name)

diff --git a/sonorancad/core/httpd.lua b/sonorancad/core/httpd.lua
@@ -130,6 +130,18 @@ local PushEventHandler = {
     EVENT_REMOVE_911 = function(body)
         SetEmergencyCache(body.data.callId, nil)
         TriggerEvent('SonoranCAD::pushevents:CadCallRemoved', body.data.callId)
+    end,
+    EVENT_STREETSIGN_UPDATED = function(body)
+        TriggerEvent('SonoranCAD::pushevents:SmartSignUpdate', body.data.signData)
+    end,
+    EVENT_RECORD_ADD = function(body)
+        TriggerEvent('SonoranCAD::pushevents:RecordAdded', body.data.record)
+    end,
+    EVENT_RECORD_EDIT = function(body)
+        TriggerEvent('SonoranCAD::pushevents:RecordEdited', body.data.record)
+    end,
+    EVENT_RECORD_REMOVE = function(body)
+        TriggerEvent('SonoranCAD::pushevents:RecordRemoved', body.data.record)
     end
 }
 

diff --git a/sonorancad/fxmanifest.lua b/sonorancad/fxmanifest.lua
@@ -3,9 +3,7 @@ games {'gta5'}
 
 author 'Sonoran CAD'
 description 'Sonoran CAD FiveM Integration'
-version '2.6.2'
-
-lua54 'yes'
+version '2.6.3'
 
 server_scripts {
     'core/http.js'
@@ -31,4 +29,10 @@ client_scripts {
     ,'plugins/**/config_*.lua'
     ,'plugins/**/cl_*.lua'
     ,'plugins/**/cl_*.js'
-} 
+} 
+
+files {
+    'stream/data/*.ytyp',
+}
+
+data_file 'DLC_ITYP_REQUEST' 'stream/data/*.ytyp'
diff --git a/sonorancad/plugins/callcommands b/sonorancad/plugins/callcommands
diff --git a/sonorancad/plugins/civintegration b/sonorancad/plugins/civintegration
diff --git a/sonorancad/plugins/dispatchnotify b/sonorancad/plugins/dispatchnotify
diff --git a/sonorancad/plugins/postals b/sonorancad/plugins/postals
diff --git a/sonorancad/version.json b/sonorancad/version.json
@@ -1,4 +1,4 @@
 {
-  "resource" : "2.6.2",
-  "testedFxServerVersion": "3922"
+  "resource" : "2.6.3",
+  "testedFxServerVersion": "4162"
 }
+24 −0		.github/workflows/canary.yml
+7 −4		callcommands/CHANGEMEconfig_callcommands.lua
+4 −0		callcommands/README_callcommands.md
+6 −14		callcommands/cl_callcommands.lua
+114 −123		callcommands/sv_callcommands.lua
+1 −1		callcommands/version_callcommands.json
+4 −1		civintegration/CHANGEMEconfig_civintegration.lua
+10 −6		civintegration/sv_civintegration.lua
+2 −2		civintegration/version_civintegration.json
+24 −0		.github/workflows/canary.yml
+0 −3		.vscode/settings.json
+6 −3		dispatchnotify/CHANGEMEconfig_dispatchnotify.lua
+53 −81		dispatchnotify/cl_dispatchnotify.lua
+42 −87		dispatchnotify/sv_dispatchnotify.lua
+2 −2		dispatchnotify/version_dispatchnotify.json