Merge branch 'dev' into feature/funk

# Conflicts:
#	frontend/src/config/apps.test.ts
#	frontend/src/config/apps.ts
#	frontend/src/stores/phone.ts
#	frontend/testserver/index.cjs
#	sky_phone/config/locales/en.lua
#	sky_phone/source/html/index.html
#	sky_phone/source/server/db_migrate.lua
This commit is contained in:
DerEchteAlec
2026-08-07 16:06:51 +02:00
50 changed files with 6108 additions and 164 deletions
+39
View File
@@ -70,12 +70,28 @@ local server_callbacks = {
"calls:answer",
"calls:decline",
"calls:hangup",
"banking:overview",
"banking:transfer",
"messages:conversations",
"messages:thread",
"messages:send",
"messages:media",
"messages:delete",
"messages:gifs",
"darkchat:bootstrap",
"darkchat:update-profile",
"darkchat:start",
"darkchat:thread",
"darkchat:send",
"darkchat:media",
"darkchat:react",
"darkchat:message-action",
"darkchat:update-conversation",
"darkchat:add-contact",
"darkchat:remove-contact",
"darkchat:block",
"darkchat:report",
"darkchat:clear",
"gallery:list",
"media:config",
}
@@ -370,6 +386,10 @@ RegisterNetEvent("sky_phone:calls:changed", function()
SendNUIMessage({ type = "calls:changed" })
end)
RegisterNetEvent("sky_phone:banking:changed", function()
SendNUIMessage({ type = "banking:changed" })
end)
RegisterNetEvent("sky_phone:messages:changed", function(data)
SendNUIMessage({ type = "messages:changed", data = data })
end)
@@ -381,6 +401,25 @@ RegisterNetEvent("sky_phone:messages:new", function(data)
SendNUIMessage({ type = "messages:new", data = data })
end)
RegisterNetEvent("sky_phone:darkchat:changed", function(data)
SendNUIMessage({ type = "darkchat:changed", data = data })
end)
RegisterNetEvent("sky_phone:darkchat:new", function(data)
local darkchat_locale = get_locale().Nui.Apps.darkchat
data.title = darkchat_locale.name
if data.notificationMode == "private" then
data.sender = nil
data.text = darkchat_locale.privateNotification
elseif data.notificationMode == "hidden" then
data.sender = nil
data.text = ""
else
data.text = darkchat_locale.newMessage:gsub("{sender}", tostring(data.sender))
end
SendNUIMessage({ type = "darkchat:new", data = data })
end)
RegisterNetEvent("sky_phone:call:incoming", function(data)
notification_focus = true
SetNuiFocus(true, true)