From 398ed8315c3e2d53aa17954c80b700ab6ce2d000 Mon Sep 17 00:00:00 2001 From: Eichenholz Date: Thu, 6 Aug 2026 20:34:16 +0200 Subject: [PATCH 01/18] FIX - refine home status bar spacing --- frontend/src/assets/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index d2510f5..573cb99 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -344,13 +344,13 @@ button { left: 0; width: 100%; height: 45px; - padding: 11px 26px 0; + padding: 11px 34px 0; color: #fff; display: flex; justify-content: space-between; align-items: flex-start; font-size: 12px; - font-weight: 650; + font-weight: 500; text-shadow: 0 1px 3px #0009; pointer-events: none; } From 5caedc71432812b27a5bd42a3199d01ae12d4a61 Mon Sep 17 00:00:00 2001 From: Eichenholz Date: Thu, 6 Aug 2026 20:35:49 +0200 Subject: [PATCH 02/18] FIX - paginate home screen apps --- frontend/src/assets/main.css | 6 +--- frontend/src/stores/phone.ts | 4 +-- frontend/src/utils/pages.test.ts | 14 +++++++- frontend/src/utils/pages.ts | 9 +++++ frontend/src/views/SpringboardView.vue | 49 ++++++++++++++++++-------- 5 files changed, 59 insertions(+), 23 deletions(-) diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index 573cb99..daf9f7c 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -583,13 +583,10 @@ button { } } .springboard-track { - width: 300%; height: 100%; display: flex; touch-action: pan-y; - transform: translateX( - calc(var(--springboard-page) * -33.333333% + var(--drag-offset)) - ); + transform: translateX(calc(var(--springboard-offset) + var(--drag-offset))); transition: transform 0.46s cubic-bezier(0.22, 0.9, 0.24, 1); } .springboard--dragging .springboard-track { @@ -597,7 +594,6 @@ button { } .springboard-page { position: relative; - width: 33.333333%; flex: none; padding: 61px 22px 138px; } diff --git a/frontend/src/stores/phone.ts b/frontend/src/stores/phone.ts index a2589a7..996d4f1 100644 --- a/frontend/src/stores/phone.ts +++ b/frontend/src/stores/phone.ts @@ -1024,8 +1024,8 @@ export const usePhoneStore = defineStore('phone', { }) namespaceQueues.set(namespace, tracked) }, - setCurrentPage(page: number): void { - this.currentPage = clampPage(page) + setCurrentPage(page: number, pageCount?: number): void { + this.currentPage = clampPage(page, pageCount) }, setCameraLandscape(landscape: boolean): void { this.cameraLandscape = landscape diff --git a/frontend/src/utils/pages.test.ts b/frontend/src/utils/pages.test.ts index fc7f7c2..c52b5ed 100644 --- a/frontend/src/utils/pages.test.ts +++ b/frontend/src/utils/pages.test.ts @@ -1,9 +1,21 @@ import { describe, expect, it } from 'vitest' -import { clampPage } from './pages' +import { clampPage, paginateItems } from './pages' describe('page clamping', () => { it('keeps pages in range', () => { expect(clampPage(-4)).toBe(0) expect(clampPage(1)).toBe(1) expect(clampPage(9)).toBe(2) }) + + it('splits overflowing app grids into additional pages', () => { + expect( + paginateItems( + Array.from({ length: 21 }, (_, index) => index), + 16, + ), + ).toEqual([ + Array.from({ length: 16 }, (_, index) => index), + [16, 17, 18, 19, 20], + ]) + }) }) diff --git a/frontend/src/utils/pages.ts b/frontend/src/utils/pages.ts index 820dde2..d8e3583 100644 --- a/frontend/src/utils/pages.ts +++ b/frontend/src/utils/pages.ts @@ -1,5 +1,14 @@ export const SPRINGBOARD_PAGE_COUNT = 3 +export function paginateItems(items: readonly T[], pageSize: number): T[][] { + if (!Number.isInteger(pageSize) || pageSize <= 0) return [] + const pages: T[][] = [] + for (let index = 0; index < items.length; index += pageSize) { + pages.push(items.slice(index, index + pageSize)) + } + return pages +} + export function clampPage( page: number, pageCount = SPRINGBOARD_PAGE_COUNT, diff --git a/frontend/src/views/SpringboardView.vue b/frontend/src/views/SpringboardView.vue index 739dd4d..b2d413f 100644 --- a/frontend/src/views/SpringboardView.vue +++ b/frontend/src/views/SpringboardView.vue @@ -7,8 +7,9 @@ import SpringboardWidgets from '@/components/SpringboardWidgets.vue' import { PHONE_APPS } from '@/config/apps' import { usePhoneStore } from '@/stores/phone' import type { PhoneAppDefinition } from '@/types/apps' -import { clampPage, SPRINGBOARD_PAGE_COUNT } from '@/utils/pages' +import { paginateItems } from '@/utils/pages' +const APPS_PER_HOME_PAGE = 16 const phone = usePhoneStore() const searchQuery = ref('') const searchFocused = ref(false) @@ -21,6 +22,14 @@ let pointerStartedAt = 0 const gridApps = computed(() => [...PHONE_APPS].sort((a, b) => a.gridOrder - b.gridOrder), ) +const appPages = computed(() => + paginateItems(gridApps.value, APPS_PER_HOME_PAGE), +) +const pageCount = computed(() => appPages.value.length + 2) +const libraryPage = computed(() => pageCount.value - 1) +const isAppPage = computed( + () => phone.currentPage > 0 && phone.currentPage < libraryPage.value, +) const dockApps = computed(() => PHONE_APPS.filter((app) => app.dockOrder !== null).sort( (a, b) => (a.dockOrder ?? 0) - (b.dockOrder ?? 0), @@ -57,8 +66,10 @@ const alphabeticalGroups = computed(() => { }) const trackStyle = computed(() => ({ '--drag-offset': `${dragOffset.value}px`, - '--springboard-page': phone.currentPage, + '--springboard-offset': `${(-phone.currentPage * 100) / pageCount.value}%`, + width: `${pageCount.value * 100}%`, })) +const pageStyle = computed(() => ({ width: `${100 / pageCount.value}%` })) function onPointerDown(event: PointerEvent): void { const target = event.target as HTMLElement @@ -80,7 +91,10 @@ function finishPointer(event: PointerEvent): void { const elapsed = Math.max(1, Date.now() - pointerStartedAt) const velocity = Math.abs(distance) / elapsed if (Math.abs(distance) > 48 || velocity > 0.45) { - phone.setCurrentPage(phone.currentPage + (distance < 0 ? 1 : -1)) + phone.setCurrentPage( + phone.currentPage + (distance < 0 ? 1 : -1), + pageCount.value, + ) } dragging.value = false dragOffset.value = 0 @@ -116,22 +130,27 @@ function openAllApps(): void { >
- +
-
From 9465ed15796491c0f07c50002fe7127be5fd8ecd Mon Sep 17 00:00:00 2001 From: Eichenholz Date: Thu, 6 Aug 2026 20:36:09 +0200 Subject: [PATCH 03/18] ENH - organize App Library suggestions --- frontend/src/App.vue | 10 ++++++ frontend/src/assets/main.css | 11 ++++++ frontend/src/config/apps.test.ts | 16 +++++++++ frontend/src/config/apps.ts | 21 +++++++++++ frontend/src/stores/app-store.test.ts | 34 ++++++++++++++++++ frontend/src/stores/app-store.ts | 26 +++++++++++++- frontend/src/stores/phone.ts | 10 +++++- frontend/src/types/apps.ts | 8 +++++ frontend/src/views/SpringboardView.vue | 49 +++++++++++++++++++------- sky_phone/config/locales/en.lua | 5 ++- sky_phone/source/html/index.html | 4 +-- 11 files changed, 176 insertions(+), 18 deletions(-) create mode 100644 frontend/src/stores/app-store.test.ts diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f6e415c..bdb4664 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -28,6 +28,7 @@ import { useMailStore } from '@/stores/mail' import { useMediaStore } from '@/stores/media' import { useMarketplaceStore } from '@/stores/marketplace' import { useAppStoreStore } from '@/stores/app-store' +import { isPhoneAppId } from '@/config/apps' import { useNotesStore } from '@/stores/notes' import { useWeatherStore } from '@/stores/weather' import { @@ -377,6 +378,15 @@ onMounted(() => { } }) +watch( + () => route.params.appId, + (appId) => { + if (typeof appId === 'string' && isPhoneAppId(appId)) { + appStore.recordLaunch(appId) + } + }, +) + watch( [() => notifications.requiresAttention, () => calls.activeCall], ([requiresAttention, activeCall]) => { diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index daf9f7c..fe209ec 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -854,6 +854,9 @@ button { } .springboard-page--library { padding-top: 62px; + padding-bottom: 25px; + display: flex; + flex-direction: column; } .app-library-search, .app-search { @@ -882,14 +885,22 @@ button { color: white; } .app-library-groups { + flex: 1; + min-height: 0; display: grid; grid-template-columns: 1fr 1fr; gap: 13px 12px; margin-top: 16px; + padding-bottom: 24px; + overflow-y: auto; + scrollbar-width: none; transition: transform 0.35s ease, opacity 0.35s ease; } +.app-library-groups::-webkit-scrollbar { + display: none; +} .app-library-groups--behind { transform: scale(0.95); opacity: 0.45; diff --git a/frontend/src/config/apps.test.ts b/frontend/src/config/apps.test.ts index a5fd6bd..280401f 100644 --- a/frontend/src/config/apps.test.ts +++ b/frontend/src/config/apps.test.ts @@ -92,6 +92,22 @@ describe('app registry', () => { expect(isPhoneAppId('camera')).toBe(true) expect(isPhoneAppId('photos')).toBe(true) expect(isPhoneAppId('clock')).toBe(true) + expect( + PHONE_APPS.filter((app) => app.category === 'games').map((app) => app.id), + ).toEqual([ + 'snake', + 'memory', + 'number-merge', + 'minesweeper', + 'tower-stack', + 'sky-flappy', + 'neon-drop', + ]) + expect( + PHONE_APPS.filter((app) => app.category === 'social').map( + (app) => app.id, + ), + ).toEqual(['local-pages', 'phone', 'mail']) expect( PHONE_APPS.filter((app) => app.dockOrder !== null) .sort((a, b) => (a.dockOrder ?? 0) - (b.dockOrder ?? 0)) diff --git a/frontend/src/config/apps.ts b/frontend/src/config/apps.ts index 9377063..d765706 100644 --- a/frontend/src/config/apps.ts +++ b/frontend/src/config/apps.ts @@ -52,6 +52,7 @@ import type { export const PHONE_APPS: PhoneAppDefinition[] = [ { + category: 'productivity', component: markRaw( defineAsyncComponent(() => import('@/views/apps/CalendarApp.vue')), ), @@ -65,6 +66,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/calendar', }, { + category: 'social', component: markRaw( defineAsyncComponent(() => import('@/views/apps/LocalPagesApp.vue')), ), @@ -78,6 +80,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/local-pages', }, { + category: 'social', component: markRaw( defineAsyncComponent(() => import('@/views/apps/PhoneApp.vue')), ), @@ -91,6 +94,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/phone', }, { + category: 'utilities', component: markRaw( defineAsyncComponent(() => import('@/views/apps/MapApp.vue')), ), @@ -104,6 +108,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/map', }, { + category: 'social', component: markRaw( defineAsyncComponent(() => import('@/views/apps/MailApp.vue')), ), @@ -117,6 +122,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/mail', }, { + category: 'productivity', component: markRaw( defineAsyncComponent(() => import('@/views/apps/NotesApp.vue')), ), @@ -130,6 +136,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/notes', }, { + category: 'productivity', component: markRaw( defineAsyncComponent(() => import('@/views/apps/CalculatorApp.vue')), ), @@ -143,6 +150,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/calculator', }, { + category: 'utilities', component: markRaw( defineAsyncComponent(() => import('@/views/apps/CameraApp.vue')), ), @@ -156,6 +164,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/camera', }, { + category: 'productivity', component: markRaw( defineAsyncComponent(() => import('@/views/apps/ClockApp.vue')), ), @@ -169,6 +178,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/clock', }, { + category: 'utilities', component: markRaw( defineAsyncComponent(() => import('@/views/apps/WeatherApp.vue')), ), @@ -182,6 +192,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/weather', }, { + category: 'utilities', component: markRaw( defineAsyncComponent(() => import('@/views/apps/GalleryApp.vue')), ), @@ -195,6 +206,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/photos', }, { + category: 'utilities', component: markRaw( defineAsyncComponent(() => import('@/views/apps/AppStoreApp.vue')), ), @@ -208,6 +220,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/app-store', }, { + category: 'utilities', component: markRaw( defineAsyncComponent(() => import('@/views/apps/SettingsApp.vue')), ), @@ -221,6 +234,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/settings', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/SnakeApp.vue')), ), @@ -234,6 +248,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/snake', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/MemoryApp.vue')), ), @@ -247,6 +262,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/memory', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/NumberMergeApp.vue')), ), @@ -260,6 +276,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/number-merge', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/MinesweeperApp.vue')), ), @@ -273,6 +290,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/minesweeper', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/TowerStackApp.vue')), ), @@ -286,6 +304,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/tower-stack', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/SkyFlappyApp.vue')), ), @@ -299,6 +318,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/sky-flappy', }, { + category: 'shopping', component: markRaw( defineAsyncComponent(() => import('@/views/apps/CityMarktApp.vue')), ), @@ -312,6 +332,7 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ route: '/apps/citymarkt', }, { + category: 'games', component: markRaw( defineAsyncComponent(() => import('@/views/apps/NeonDropApp.vue')), ), diff --git a/frontend/src/stores/app-store.test.ts b/frontend/src/stores/app-store.test.ts new file mode 100644 index 0000000..e328370 --- /dev/null +++ b/frontend/src/stores/app-store.test.ts @@ -0,0 +1,34 @@ +import { createPinia, setActivePinia } from 'pinia' +import { beforeEach, describe, expect, it, vi } from 'vitest' + +import { useAppStoreStore } from '@/stores/app-store' + +const mocks = vi.hoisted(() => ({ saveDeviceNamespace: vi.fn() })) +vi.mock('@/stores/phone', () => ({ + usePhoneStore: () => ({ + saveDeviceNamespace: mocks.saveDeviceNamespace, + }), +})) + +describe('app store', () => { + beforeEach(() => { + setActivePinia(createPinia()) + mocks.saveDeviceNamespace.mockReset() + }) + + it('hydrates valid launch counts and persists launches with claimed apps', () => { + const apps = useAppStoreStore() + + apps.hydrate({ + claimedApps: ['snake'], + launchCounts: { mail: 3, invalid: 20, phone: -1 }, + }) + apps.recordLaunch('mail') + + expect(apps.launchCounts).toEqual({ mail: 4 }) + expect(mocks.saveDeviceNamespace).toHaveBeenCalledWith('apps', { + claimedApps: ['snake'], + launchCounts: { mail: 4 }, + }) + }) +}) diff --git a/frontend/src/stores/app-store.ts b/frontend/src/stores/app-store.ts index fce198d..8ce912c 100644 --- a/frontend/src/stores/app-store.ts +++ b/frontend/src/stores/app-store.ts @@ -1,10 +1,13 @@ import { defineStore } from 'pinia' +import { isPhoneAppId } from '@/config/apps' import { usePhoneStore } from '@/stores/phone' +import type { LaunchablePhoneAppId } from '@/types/apps' export const useAppStoreStore = defineStore('app-store', { state: () => ({ claimedApps: [] as string[], + launchCounts: {} as Partial>, }), actions: { claimApp(id: string): void { @@ -14,14 +17,35 @@ export const useAppStoreStore = defineStore('app-store', { } }, hydrate(payload: unknown): void { - const data = payload as { claimedApps?: unknown } | null + const data = payload as { + claimedApps?: unknown + launchCounts?: unknown + } | null this.claimedApps = Array.isArray(data?.claimedApps) ? data.claimedApps.filter((id): id is string => typeof id === 'string') : [] + this.launchCounts = {} + if (data?.launchCounts && typeof data.launchCounts === 'object') { + for (const [appId, count] of Object.entries(data.launchCounts)) { + if ( + isPhoneAppId(appId) && + typeof count === 'number' && + Number.isFinite(count) && + count > 0 + ) { + this.launchCounts[appId] = Math.floor(count) + } + } + } + }, + recordLaunch(appId: LaunchablePhoneAppId): void { + this.launchCounts[appId] = (this.launchCounts[appId] ?? 0) + 1 + this.persist() }, persist(): void { usePhoneStore().saveDeviceNamespace('apps', { claimedApps: this.claimedApps, + launchCounts: this.launchCounts, }) }, }, diff --git a/frontend/src/stores/phone.ts b/frontend/src/stores/phone.ts index 996d4f1..2845fea 100644 --- a/frontend/src/stores/phone.ts +++ b/frontend/src/stores/phone.ts @@ -935,7 +935,15 @@ const defaultLocales: LocaleTree = { noApps: 'No apps found', page: 'Page', pages: 'Home screen pages', - groups: { 0: 'Suggestions', 1: 'Recently Added', other: 'Other' }, + groups: { + suggestions: 'Suggestions', + recentlyAdded: 'Recently Added', + games: 'Games', + productivity: 'Productivity', + shopping: 'Shopping', + social: 'Social Networks', + utilities: 'Utilities', + }, widgets: { label: 'Widgets', weather: { city: 'Los Santos', condition: 'Partly Cloudy' }, diff --git a/frontend/src/types/apps.ts b/frontend/src/types/apps.ts index fe27ca5..7759abc 100644 --- a/frontend/src/types/apps.ts +++ b/frontend/src/types/apps.ts @@ -25,6 +25,13 @@ export type PhoneAppId = export type LaunchablePhoneAppId = PhoneAppId +export type PhoneAppCategory = + | 'games' + | 'productivity' + | 'shopping' + | 'social' + | 'utilities' + export type AppLaunchOrigin = { borderRadius: number scaleX: number @@ -34,6 +41,7 @@ export type AppLaunchOrigin = { } export type PhoneAppDefinition = { + category: PhoneAppCategory component: Component | null dockOrder: number | null gridOrder: number diff --git a/frontend/src/views/SpringboardView.vue b/frontend/src/views/SpringboardView.vue index b2d413f..8f8e0d6 100644 --- a/frontend/src/views/SpringboardView.vue +++ b/frontend/src/views/SpringboardView.vue @@ -5,12 +5,21 @@ import { computed, ref } from 'vue' import AppIcon from '@/components/AppIcon.vue' import SpringboardWidgets from '@/components/SpringboardWidgets.vue' import { PHONE_APPS } from '@/config/apps' +import { useAppStoreStore } from '@/stores/app-store' import { usePhoneStore } from '@/stores/phone' -import type { PhoneAppDefinition } from '@/types/apps' +import type { PhoneAppCategory, PhoneAppDefinition } from '@/types/apps' import { paginateItems } from '@/utils/pages' const APPS_PER_HOME_PAGE = 16 +const APP_LIBRARY_CATEGORIES: PhoneAppCategory[] = [ + 'games', + 'productivity', + 'social', + 'utilities', + 'shopping', +] const phone = usePhoneStore() +const appStore = useAppStoreStore() const searchQuery = ref('') const searchFocused = ref(false) const showAllApps = ref(false) @@ -43,13 +52,28 @@ const filteredApps = computed(() => { ) }) const appGroups = computed(() => { - const groups: PhoneAppDefinition[][] = [] - for (let index = 0; index < gridApps.value.length; index += 3) { - groups.push(gridApps.value.slice(index, index + 3)) - } - return groups.map((apps, index) => ({ - apps, - moreApps: groups[(index + 1) % groups.length] ?? [], + const suggestions = [...gridApps.value] + .sort( + (a, b) => + (appStore.launchCounts[b.id] ?? 0) - + (appStore.launchCounts[a.id] ?? 0) || a.gridOrder - b.gridOrder, + ) + .slice(0, 7) + const recentlyAdded = [...gridApps.value] + .sort((a, b) => b.gridOrder - a.gridOrder) + .slice(0, 7) + const groups = [ + { apps: suggestions, key: 'suggestions' }, + { apps: recentlyAdded, key: 'recentlyAdded' }, + ...APP_LIBRARY_CATEGORIES.map((category) => ({ + apps: gridApps.value.filter((app) => app.category === category), + key: category, + })), + ] + return groups.map((group) => ({ + ...group, + apps: group.apps.slice(0, 3), + moreApps: group.apps.slice(3), })) }) const alphabeticalGroups = computed(() => { @@ -179,8 +203,8 @@ function openAllApps(): void { :class="{ 'app-library-groups--behind': showAllApps }" >
@@ -192,6 +216,7 @@ function openAllApps(): void { :show-label="false" />
- {{ - phone.t(index < 2 ? `Home.groups.${index}` : 'Home.groups.other') - }} + {{ phone.t(`Home.groups.${group.key}`) }}
diff --git a/sky_phone/config/locales/en.lua b/sky_phone/config/locales/en.lua index 1ba811c..aef911e 100644 --- a/sky_phone/config/locales/en.lua +++ b/sky_phone/config/locales/en.lua @@ -26,7 +26,10 @@ Locales["en"] = { Home = { appLibrary = "App Library", appLibrarySearch = "Search apps", allApps = "All Apps", apps = "Apps", dock = "Dock", noApps = "No apps found", page = "Page", pages = "Home screen pages", - groups = { ["0"] = "Suggestions", ["1"] = "Recently Added", other = "Other" }, + groups = { + suggestions = "Suggestions", recentlyAdded = "Recently Added", games = "Games", + productivity = "Productivity", shopping = "Shopping", social = "Social Networks", utilities = "Utilities", + }, widgets = { label = "Widgets", weather = { city = "Los Santos", condition = "Partly Cloudy" }, diff --git a/sky_phone/source/html/index.html b/sky_phone/source/html/index.html index ab9817a..bb96cc3 100644 --- a/sky_phone/source/html/index.html +++ b/sky_phone/source/html/index.html @@ -4,8 +4,8 @@ Sky Phone - - + +
From db655551dcdf189d1e793a5ffd2cfae0e6ee21e7 Mon Sep 17 00:00:00 2001 From: Eichenholz Date: Thu, 6 Aug 2026 20:38:45 +0200 Subject: [PATCH 04/18] FIX - use five app rows per home page --- frontend/src/utils/pages.test.ts | 6 +++--- frontend/src/views/SpringboardView.vue | 2 +- sky_phone/source/html/index.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/utils/pages.test.ts b/frontend/src/utils/pages.test.ts index c52b5ed..341c115 100644 --- a/frontend/src/utils/pages.test.ts +++ b/frontend/src/utils/pages.test.ts @@ -11,11 +11,11 @@ describe('page clamping', () => { expect( paginateItems( Array.from({ length: 21 }, (_, index) => index), - 16, + 20, ), ).toEqual([ - Array.from({ length: 16 }, (_, index) => index), - [16, 17, 18, 19, 20], + Array.from({ length: 20 }, (_, index) => index), + [20], ]) }) }) diff --git a/frontend/src/views/SpringboardView.vue b/frontend/src/views/SpringboardView.vue index 8f8e0d6..69d592e 100644 --- a/frontend/src/views/SpringboardView.vue +++ b/frontend/src/views/SpringboardView.vue @@ -10,7 +10,7 @@ import { usePhoneStore } from '@/stores/phone' import type { PhoneAppCategory, PhoneAppDefinition } from '@/types/apps' import { paginateItems } from '@/utils/pages' -const APPS_PER_HOME_PAGE = 16 +const APPS_PER_HOME_PAGE = 20 const APP_LIBRARY_CATEGORIES: PhoneAppCategory[] = [ 'games', 'productivity', diff --git a/sky_phone/source/html/index.html b/sky_phone/source/html/index.html index bb96cc3..1d2984f 100644 --- a/sky_phone/source/html/index.html +++ b/sky_phone/source/html/index.html @@ -4,7 +4,7 @@ Sky Phone - + From ece0045287547b6cd76db05128c48a4cbb36454d Mon Sep 17 00:00:00 2001 From: Eichenholz Date: Thu, 6 Aug 2026 20:40:46 +0200 Subject: [PATCH 05/18] FIX - increase status bar frame spacing --- frontend/src/assets/main.css | 2 +- sky_phone/source/html/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index fe209ec..9b22883 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -344,7 +344,7 @@ button { left: 0; width: 100%; height: 45px; - padding: 11px 34px 0; + padding: 11px 42px 0; color: #fff; display: flex; justify-content: space-between; diff --git a/sky_phone/source/html/index.html b/sky_phone/source/html/index.html index 1d2984f..0e29ec7 100644 --- a/sky_phone/source/html/index.html +++ b/sky_phone/source/html/index.html @@ -4,8 +4,8 @@ Sky Phone - - + +
From ea2da5729d24471de545b4f2f478e1694196ab3d Mon Sep 17 00:00:00 2001 From: "Leon.Schmidt" Date: Thu, 6 Aug 2026 21:13:23 +0200 Subject: [PATCH 06/18] ADD - implement DarkChat service --- sky_phone/config/config.lua | 22 + sky_phone/config/locales/en.lua | 21 + sky_phone/fxmanifest.lua | 1 + sky_phone/source/client/main.lua | 33 + sky_phone/source/server/darkchat.lua | 848 +++++++++++++++++++++++++ sky_phone/source/server/db_migrate.lua | 155 +++++ 6 files changed, 1080 insertions(+) create mode 100644 sky_phone/source/server/darkchat.lua diff --git a/sky_phone/config/config.lua b/sky_phone/config/config.lua index 79cdbe3..7a8db69 100644 --- a/sky_phone/config/config.lua +++ b/sky_phone/config/config.lua @@ -47,6 +47,28 @@ Config.Messages = { DeleteBatchSize = 20, } +Config.DarkChat = { + AliasMaxLength = 32, + BodyMaxLength = 2000, + ThreadPageSize = 200, + SendsPerMinute = 30, + ActionsPerMinute = 60, + ReportsPerDay = 10, + VoiceMaxDurationMs = 60000, + VoiceMaxBase64Length = 360000, + VoiceWaveformSamples = 48, + CleanupIntervalSeconds = 30, + AllowedDisappearTimers = { + [0] = true, + [-1] = true, -- after reading + [60] = true, + [300] = true, + [3600] = true, + [86400] = true, + [604800] = true, + }, +} + Config.Mail = { Domain = "ifruit.com", LocalPartMinLength = 3, diff --git a/sky_phone/config/locales/en.lua b/sky_phone/config/locales/en.lua index 0e6ecaf..2ecaeb2 100644 --- a/sky_phone/config/locales/en.lua +++ b/sky_phone/config/locales/en.lua @@ -36,6 +36,27 @@ Locales["en"] = { }, }, Apps = { + darkchat = { + name = "DarkChat", newMessage = "New DarkChat message from {sender}", privateNotification = "New DarkChat message", + signInBody = "DarkChat identities are linked to your private iFruit account.", signInHint = "Sign in through Settings to continue.", + security = "Security", privateNetwork = "Private invitation-only network", noResults = "No Results", noResultsBody = "Try another alias or Dark-ID.", + noChats = "No Private Chats", noChatsBody = "Connect with a Dark-ID or invitation code. There is no public search.", newChat = "New Chat", + connectPrivately = "Connect privately", newChatBody = "Enter an exact Dark-ID or invitation code. Unknown identities require confirmation.", darkIdOrInvite = "Dark-ID or invitation code", continue = "Continue", contacts = "DarkChat Contacts", shareIdentity = "Tap to share your private identity", + message = "Dark message", activeNow = "Activity shared", encryptedSession = "Private session", serverPrivate = "Private server-stored conversation", + emoji = "Emoji", gif = "GIF", gifs = "GIFs", searchGifs = "Search GIFs", loadMore = "Load More", photosLater = "Photos · coming later", videosLater = "Videos · coming later", + voiceMessage = "Voice message", sending = "Sending", failed = "Not delivered", delivered = "Delivered", read = "Read", replying = "Replying to", + messageDeleted = "Message deleted", securityUpdate = "Security settings updated", timerChanged = "Disappearing messages: {timer}", + timerOff = "Off", timerAfterRead = "After reading", timerMinute = "1 minute", timerFiveMinutes = "5 minutes", timerHour = "1 hour", timerDay = "24 hours", timerWeek = "7 days", + copied = "Copied", reply = "Reply", copy = "Copy", deleteForMe = "Delete for me", deleteForBoth = "Delete for both", report = "Report", + contactSecurity = "Contact & Security", chatSince = "Private chat since {date}", notifications = "Notifications", readReceipts = "Read receipts", disappearing = "Disappearing messages", contactAlias = "Contact alias", saveContact = "Save Contact", addContact = "Add Contact", contactSaved = "Contact saved", removeContact = "Remove Contact", block = "Block User", unblock = "Unblock User", clearChat = "Clear Chat", chatCleared = "Chat cleared", + myIdentity = "My Dark Identity", alias = "Alias", notificationPrivacy = "Notification privacy", notificationFull = "Full · alias and message", notificationPrivate = "Private · generic message", notificationHidden = "Invisible · badge only", shareActivity = "Share activity status", inviteCode = "Private invitation code", copyInvite = "Copy Invite", privacyDisclaimer = "DarkChat stores messages on the server and does not claim end-to-end encryption.", + unknownIdentity = "Unknown Identity", unknownIdentityBody = "Only continue if you expected this identity. The account is not discoverable through public search.", openSecureChat = "Open Private Chat", + reportUser = "Report User", reportSpam = "Spam", reportHarassment = "Harassment", reportThreats = "Threats", reportIllegal = "Illegal content", reportOther = "Other", reportDetails = "Optional details", submitReport = "Submit Report", reported = "Report submitted", + microphoneUnavailable = "The microphone is unavailable.", recordingTooLarge = "The voice message is too large.", + errors = { + not_authenticated = "Sign in to your iFruit account first.", invalid_dark_id = "Enter a valid Dark-ID or invitation code.", profile_not_found = "This private identity was not found.", self_chat = "You cannot message your own identity.", conversation_not_found = "This conversation is unavailable.", blocked = "Messages are blocked in this conversation.", invalid_message = "Enter a valid message.", invalid_gif = "This GIF is invalid.", invalid_voice = "This voice message is invalid.", invalid_profile = "Check your alias and privacy settings.", rate_limited = "Too many requests. Try again shortly.", gif_provider_unconfigured = "GIF search is not configured.", gif_provider_unauthorized = "The GIF provider key is invalid.", gif_provider_rate_limited = "GIF search is busy. Try again shortly.", gif_provider_failed = "GIFs are temporarily unavailable.", default = "DarkChat could not complete the request.", + }, + }, messages = { name = "Messages", newMessage = "New message from {sender}", compose = "New Message", search = "Search", to = "To:", message = "Message", send = "Send", details = "Details", diff --git a/sky_phone/fxmanifest.lua b/sky_phone/fxmanifest.lua index 18cc5f2..1423294 100644 --- a/sky_phone/fxmanifest.lua +++ b/sky_phone/fxmanifest.lua @@ -45,6 +45,7 @@ server_scripts { 'source/server/calls.lua', 'source/server/media.lua', 'source/server/messages.lua', + 'source/server/darkchat.lua', 'source/server/notes.lua', 'source/server/mail.lua', 'source/server/marketplace.lua', diff --git a/sky_phone/source/client/main.lua b/sky_phone/source/client/main.lua index 40a8e41..1ab77d3 100644 --- a/sky_phone/source/client/main.lua +++ b/sky_phone/source/client/main.lua @@ -76,6 +76,20 @@ local server_callbacks = { "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", } @@ -380,6 +394,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) diff --git a/sky_phone/source/server/darkchat.lua b/sky_phone/source/server/darkchat.lua new file mode 100644 index 0000000..87368c0 --- /dev/null +++ b/sky_phone/source/server/darkchat.lua @@ -0,0 +1,848 @@ +Bridge.Database.AfterMigration("sky_phone", function() + +local allowed_voice_mimes = { + ["audio/webm"] = true, + ["audio/webm;codecs=opus"] = true, +} + +local report_reasons = { + spam = true, + harassment = true, + threats = true, + illegal = true, + other = true, +} + +local notification_modes = { + full = true, + private = true, + hidden = true, +} + +local function allowed_gif_url(value) + if type(value) ~= "string" or #value == 0 or #value > Config.Media.UrlMaxLength then + return false + end + local host = value:lower():match("^https://([^/:?#]+)") + if not host then + return false + end + for _, allowed_host in ipairs(Config.Media.AllowedGifHosts) do + local suffix = "." .. allowed_host + if host == allowed_host or host:sub(-#suffix) == suffix then + return true + end + end + return false +end + +local reaction_values = { + ["❤️"] = true, + ["👍"] = true, + ["👎"] = true, + ["😂"] = true, + ["‼️"] = true, + ["❓"] = true, +} + +local function trim(value) + if type(value) ~= "string" then + return nil + end + return value:match("^%s*(.-)%s*$") +end + +local function uuid() + local rows = Bridge.Database.Query("SELECT UUID() AS `id`", {}) + if not rows[1] or type(rows[1].id) ~= "string" then + error("[sky_phone] Database did not generate a DarkChat UUID.") + end + return rows[1].id +end + +local function affected_rows(result) + if type(result) == "number" then + return result + end + return type(result) == "table" and tonumber(result.affectedRows) or 0 +end + +local function profile_payload(row) + return { + id = tonumber(row.id), + darkId = row.dark_id, + inviteCode = row.invite_code, + alias = row.alias, + avatarSeed = tonumber(row.avatar_seed), + notificationMode = row.notification_mode, + activityVisible = row.activity_visible == 1 or row.activity_visible == true, + createdAt = row.created_at, + } +end + +local function load_profile(account_id) + local rows = Bridge.Database.Query([[ + SELECT `id`, `dark_id`, `invite_code`, `alias`, `avatar_seed`, `notification_mode`, + `activity_visible`, `created_at` + FROM `sky_phone_darkchat_profiles` + WHERE `account_id` = ? LIMIT 1 + ]], { account_id }) + return rows[1] +end + +local function create_profile(account_id) + for _ = 1, 10 do + local entropy = uuid():gsub("%-", ""):upper() + local dark_id = ("dark:%s-%s"):format(entropy:sub(1, 4), entropy:sub(5, 8)) + local invite_code = ("DC-%s-%s"):format(entropy:sub(9, 12), entropy:sub(13, 16)) + local seed = tonumber(entropy:sub(17, 23), 16) or 1 + local result = Bridge.Database.Query([[ + INSERT IGNORE INTO `sky_phone_darkchat_profiles` + (`account_id`, `dark_id`, `invite_code`, `alias`, `avatar_seed`) + VALUES (?, ?, ?, ?, ?) + ]], { account_id, dark_id, invite_code, "Shadow " .. entropy:sub(1, 4), seed }) + if affected_rows(result) > 0 then + return load_profile(account_id) + end + local existing = load_profile(account_id) + if existing then + return existing + end + end + error("[sky_phone] Could not generate a unique DarkChat profile after 10 attempts.") +end + +local function require_profile(source) + local account, error_response = SkyPhone.RequireAccount(source) + if not account then + return nil, nil, error_response + end + local profile = load_profile(account.id) or create_profile(account.id) + return profile, account +end + +local function load_membership(profile_id, conversation_id) + local rows = Bridge.Database.Query([[ + SELECT mine.`conversation_id`, mine.`notifications_enabled`, mine.`read_receipts`, mine.`cleared_at`, + conversation.`disappearing_seconds`, conversation.`created_at` AS `conversation_created_at`, + peer.`id` AS `peer_id`, peer.`account_id` AS `peer_account_id`, peer.`dark_id` AS `peer_dark_id`, + peer.`alias` AS `peer_alias`, peer.`avatar_seed` AS `peer_avatar_seed`, + peer.`activity_visible` AS `peer_activity_visible`, peer_member.`last_read_at` AS `peer_last_read_at`, + contact.`id` AS `contact_id`, contact.`alias_override`, block_mine.`id` AS `blocked_by_me`, + block_peer.`id` AS `blocked_by_peer` + FROM `sky_phone_darkchat_members` mine + JOIN `sky_phone_darkchat_conversations` conversation ON conversation.`id` = mine.`conversation_id` + JOIN `sky_phone_darkchat_members` peer_member + ON peer_member.`conversation_id` = mine.`conversation_id` AND peer_member.`profile_id` <> mine.`profile_id` + JOIN `sky_phone_darkchat_profiles` peer ON peer.`id` = peer_member.`profile_id` + LEFT JOIN `sky_phone_darkchat_contacts` contact + ON contact.`profile_id` = mine.`profile_id` AND contact.`contact_profile_id` = peer.`id` + LEFT JOIN `sky_phone_darkchat_blocks` block_mine + ON block_mine.`blocker_profile_id` = mine.`profile_id` AND block_mine.`blocked_profile_id` = peer.`id` + LEFT JOIN `sky_phone_darkchat_blocks` block_peer + ON block_peer.`blocker_profile_id` = peer.`id` AND block_peer.`blocked_profile_id` = mine.`profile_id` + WHERE mine.`profile_id` = ? AND mine.`conversation_id` = ? + LIMIT 1 + ]], { profile_id, conversation_id }) + return rows[1] +end + +local function peer_payload(row) + return { + id = tonumber(row.peer_id), + darkId = row.peer_dark_id, + alias = row.alias_override or row.peer_alias, + originalAlias = row.peer_alias, + avatarSeed = tonumber(row.peer_avatar_seed), + activityVisible = row.peer_activity_visible == 1 or row.peer_activity_visible == true, + isContact = row.contact_id ~= nil, + blocked = row.blocked_by_me ~= nil, + } +end + +local function decode_array(value, context) + if value == nil then + return {} + end + local decoded = json.decode(value) + if type(decoded) ~= "table" then + error(("[sky_phone] Invalid DarkChat JSON in %s."):format(context)) + end + return decoded +end + +local function message_payload(row, profile_id) + local deleted_for = decode_array(row.deleted_for_profiles, "deleted_for_profiles") + for _, deleted_profile_id in ipairs(deleted_for) do + if tonumber(deleted_profile_id) == tonumber(profile_id) then + return nil + end + end + local deleted_everywhere = row.deleted_for_everyone == 1 or row.deleted_for_everyone == true + local reactions = decode_array(row.reactions, "reactions") + local waveform = row.media_waveform and decode_array(row.media_waveform, "media_waveform") or nil + return { + id = row.id, + conversationId = row.conversation_id, + direction = tonumber(row.sender_profile_id) == tonumber(profile_id) and "sent" or "received", + senderProfileId = tonumber(row.sender_profile_id), + messageType = deleted_everywhere and "system" or row.message_type, + body = deleted_everywhere and "message_deleted" or row.body, + mediaMime = deleted_everywhere and nil or row.media_mime, + mediaPayload = not deleted_everywhere and row.message_type ~= "voice" and row.media_payload or nil, + mediaDurationMs = deleted_everywhere and nil or tonumber(row.media_duration_ms), + mediaWaveform = deleted_everywhere and nil or waveform, + replyToId = row.reply_to_id, + replyBody = row.reply_body, + reactions = reactions, + expiresAt = row.expires_at, + createdAt = row.created_at, + readAt = row.peer_last_read_at and row.peer_last_read_at >= row.created_at and row.peer_last_read_at or nil, + deletedForEveryone = deleted_everywhere, + } +end + +local function list_contacts(profile_id) + local rows = Bridge.Database.Query([[ + SELECT target.`id`, target.`dark_id`, target.`alias`, target.`avatar_seed`, contact.`alias_override`, + contact.`created_at` + FROM `sky_phone_darkchat_contacts` contact + JOIN `sky_phone_darkchat_profiles` target ON target.`id` = contact.`contact_profile_id` + WHERE contact.`profile_id` = ? + ORDER BY COALESCE(contact.`alias_override`, target.`alias`) ASC + ]], { profile_id }) + local contacts = {} + for index, row in ipairs(rows) do + contacts[index] = { + id = tonumber(row.id), + darkId = row.dark_id, + alias = row.alias_override or row.alias, + originalAlias = row.alias, + avatarSeed = tonumber(row.avatar_seed), + createdAt = row.created_at, + } + end + return contacts +end + +local function list_conversations(profile_id) + local rows = Bridge.Database.Query([[ + SELECT conversation.`id`, conversation.`disappearing_seconds`, conversation.`updated_at`, + peer.`id` AS `peer_id`, peer.`dark_id` AS `peer_dark_id`, peer.`alias` AS `peer_alias`, + peer.`avatar_seed` AS `peer_avatar_seed`, peer.`activity_visible`, contact.`alias_override`, + block_mine.`id` AS `blocked_by_me`, latest.`body` AS `last_body`, latest.`message_type` AS `last_type`, + latest.`created_at` AS `last_at`, latest.`deleted_for_everyone`, + (SELECT COUNT(*) FROM `sky_phone_darkchat_messages` unread + WHERE unread.`conversation_id` = conversation.`id` + AND unread.`sender_profile_id` <> mine.`profile_id` + AND unread.`created_at` > COALESCE(mine.`last_read_at`, '1970-01-01') + AND (unread.`expires_at` IS NULL OR unread.`expires_at` > CURRENT_TIMESTAMP)) AS `unread` + FROM `sky_phone_darkchat_members` mine + JOIN `sky_phone_darkchat_conversations` conversation ON conversation.`id` = mine.`conversation_id` + JOIN `sky_phone_darkchat_members` peer_member + ON peer_member.`conversation_id` = conversation.`id` AND peer_member.`profile_id` <> mine.`profile_id` + JOIN `sky_phone_darkchat_profiles` peer ON peer.`id` = peer_member.`profile_id` + LEFT JOIN `sky_phone_darkchat_contacts` contact + ON contact.`profile_id` = mine.`profile_id` AND contact.`contact_profile_id` = peer.`id` + LEFT JOIN `sky_phone_darkchat_blocks` block_mine + ON block_mine.`blocker_profile_id` = mine.`profile_id` AND block_mine.`blocked_profile_id` = peer.`id` + LEFT JOIN `sky_phone_darkchat_messages` latest ON latest.`id` = ( + SELECT message.`id` FROM `sky_phone_darkchat_messages` message + WHERE message.`conversation_id` = conversation.`id` + AND message.`created_at` >= COALESCE(mine.`cleared_at`, '1970-01-01') + AND (message.`expires_at` IS NULL OR message.`expires_at` > CURRENT_TIMESTAMP) + ORDER BY message.`created_at` DESC, message.`id` DESC LIMIT 1 + ) + WHERE mine.`profile_id` = ? + ORDER BY COALESCE(latest.`created_at`, conversation.`updated_at`) DESC + ]], { profile_id }) + local conversations = {} + for index, row in ipairs(rows) do + conversations[index] = { + id = row.id, + peer = { + id = tonumber(row.peer_id), + darkId = row.peer_dark_id, + alias = row.alias_override or row.peer_alias, + avatarSeed = tonumber(row.peer_avatar_seed), + activityVisible = row.activity_visible == 1 or row.activity_visible == true, + }, + disappearingSeconds = tonumber(row.disappearing_seconds), + blocked = row.blocked_by_me ~= nil, + lastMessage = row.deleted_for_everyone == 1 and "message_deleted" or row.last_body or "", + lastMessageType = row.deleted_for_everyone == 1 and "system" or row.last_type or "system", + lastMessageAt = row.last_at or row.updated_at, + unread = tonumber(row.unread) or 0, + } + end + return conversations +end + +local function notify_profile(profile_id, event_name, data) + local rows = Bridge.Database.Query([[ + SELECT `account_id`, `notification_mode` FROM `sky_phone_darkchat_profiles` + WHERE `id` = ? LIMIT 1 + ]], { profile_id }) + local target = rows[1] + if not target then + return + end + if event_name == "sky_phone:darkchat:new" and data.conversationId then + local members = Bridge.Database.Query([[ + SELECT `notifications_enabled` FROM `sky_phone_darkchat_members` + WHERE `profile_id` = ? AND `conversation_id` = ? LIMIT 1 + ]], { profile_id, data.conversationId }) + if not members[1] or members[1].notifications_enabled == 0 then + return + end + end + data.notificationMode = target.notification_mode + SkyPhone.NotifyAccountDevices(target.account_id, event_name, data) +end + +local function valid_voice(data) + if type(data.mediaPayload) ~= "string" or #data.mediaPayload == 0 + or #data.mediaPayload > Config.DarkChat.VoiceMaxBase64Length + or data.mediaPayload:find("[^A-Za-z0-9+/=]") then + return nil + end + if type(data.mediaMime) ~= "string" or not allowed_voice_mimes[data.mediaMime] then + return nil + end + local duration = tonumber(data.mediaDurationMs) + if not duration or duration < 300 or duration > Config.DarkChat.VoiceMaxDurationMs then + return nil + end + if type(data.mediaWaveform) ~= "table" or #data.mediaWaveform < 8 + or #data.mediaWaveform > Config.DarkChat.VoiceWaveformSamples then + return nil + end + local waveform = {} + for index, value in ipairs(data.mediaWaveform) do + local sample = tonumber(value) + if not sample or sample < 0 or sample > 1 then + return nil + end + waveform[index] = math.floor(sample * 1000 + 0.5) / 1000 + end + return { + duration = math.floor(duration), + mime = data.mediaMime, + payload = data.mediaPayload, + waveform = json.encode(waveform), + } +end + +Bridge.Callbacks.Register("sky_phone:darkchat:bootstrap", function(source) + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + return { + success = true, + data = { + profile = profile_payload(profile), + contacts = list_contacts(profile.id), + conversations = list_conversations(profile.id), + }, + } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:update-profile", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_profile", 10, 60) then + return { success = false, error = "rate_limited" } + end + local profile, account, error_response = require_profile(source) + if not profile then + return error_response + end + local alias = trim(data and data.alias) + local mode = data and data.notificationMode + if not alias or alias == "" or #alias > Config.DarkChat.AliasMaxLength + or not notification_modes[mode] or type(data.activityVisible) ~= "boolean" then + return { success = false, error = "invalid_profile" } + end + Bridge.Database.Query([[ + UPDATE `sky_phone_darkchat_profiles` + SET `alias` = ?, `notification_mode` = ?, `activity_visible` = ? + WHERE `id` = ? + ]], { alias, mode, data.activityVisible and 1 or 0, profile.id }) + return { success = true, data = profile_payload(load_profile(account.id)) } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:start", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_start", 20, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local identifier = trim(data and data.identifier) + if not identifier or #identifier > 32 then + return { success = false, error = "invalid_dark_id" } + end + local targets = Bridge.Database.Query([[ + SELECT `id` FROM `sky_phone_darkchat_profiles` + WHERE UPPER(`dark_id`) = UPPER(?) OR UPPER(`invite_code`) = UPPER(?) + LIMIT 1 + ]], { identifier, identifier }) + local target = targets[1] + if not target then + return { success = false, error = "profile_not_found" } + end + if tonumber(target.id) == tonumber(profile.id) then + return { success = false, error = "self_chat" } + end + local existing = Bridge.Database.Query([[ + SELECT mine.`conversation_id` + FROM `sky_phone_darkchat_members` mine + JOIN `sky_phone_darkchat_members` peer ON peer.`conversation_id` = mine.`conversation_id` + WHERE mine.`profile_id` = ? AND peer.`profile_id` = ? + LIMIT 1 + ]], { profile.id, target.id }) + local conversation_id = existing[1] and existing[1].conversation_id + if not conversation_id then + conversation_id = uuid() + local created = Bridge.Database.Transaction({ + { + query = "INSERT INTO `sky_phone_darkchat_conversations` (`id`) VALUES (?)", + params = { conversation_id }, + }, + { + query = "INSERT INTO `sky_phone_darkchat_members` (`conversation_id`, `profile_id`) VALUES (?, ?)", + params = { conversation_id, profile.id }, + }, + { + query = "INSERT INTO `sky_phone_darkchat_members` (`conversation_id`, `profile_id`) VALUES (?, ?)", + params = { conversation_id, target.id }, + }, + }) + if not created then + error("[sky_phone] Failed to create a DarkChat conversation transaction.") + end + end + return { success = true, data = { conversationId = conversation_id } } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:thread", function(source, data) + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local conversation_id = data and data.conversationId + if type(conversation_id) ~= "string" or #conversation_id ~= 36 then + return { success = false, error = "invalid_conversation" } + end + local membership = load_membership(profile.id, conversation_id) + if not membership then + return { success = false, error = "conversation_not_found" } + end + Bridge.Database.Query([[ + UPDATE `sky_phone_darkchat_members` SET `last_read_at` = CURRENT_TIMESTAMP + WHERE `conversation_id` = ? AND `profile_id` = ? + ]], { conversation_id, profile.id }) + if tonumber(membership.disappearing_seconds) == -1 then + Bridge.Database.Query([[ + UPDATE `sky_phone_darkchat_messages` + SET `expires_at` = DATE_ADD(CURRENT_TIMESTAMP, INTERVAL 1 SECOND) + WHERE `conversation_id` = ? AND `sender_profile_id` <> ? AND `expires_at` IS NULL + ]], { conversation_id, profile.id }) + end + local rows = Bridge.Database.Query([[ + SELECT message.*, reply.`body` AS `reply_body`, peer_member.`last_read_at` AS `peer_last_read_at` + FROM `sky_phone_darkchat_messages` message + JOIN `sky_phone_darkchat_members` mine + ON mine.`conversation_id` = message.`conversation_id` AND mine.`profile_id` = ? + JOIN `sky_phone_darkchat_members` peer_member + ON peer_member.`conversation_id` = message.`conversation_id` AND peer_member.`profile_id` <> ? + LEFT JOIN `sky_phone_darkchat_messages` reply ON reply.`id` = message.`reply_to_id` + WHERE message.`conversation_id` = ? + AND message.`created_at` >= COALESCE(mine.`cleared_at`, '1970-01-01') + AND (message.`expires_at` IS NULL OR message.`expires_at` > CURRENT_TIMESTAMP) + ORDER BY message.`created_at` DESC, message.`id` DESC LIMIT ? + ]], { profile.id, profile.id, conversation_id, Config.DarkChat.ThreadPageSize }) + local messages = {} + for index = #rows, 1, -1 do + local formatted = message_payload(rows[index], profile.id) + if formatted then + messages[#messages + 1] = formatted + end + end + return { + success = true, + data = { + conversation = { + id = conversation_id, + peer = peer_payload(membership), + disappearingSeconds = tonumber(membership.disappearing_seconds), + notificationsEnabled = membership.notifications_enabled == 1 or membership.notifications_enabled == true, + readReceipts = membership.read_receipts == 1 or membership.read_receipts == true, + blockedByPeer = membership.blocked_by_peer ~= nil, + createdAt = membership.conversation_created_at, + }, + messages = messages, + }, + } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:send", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_send", Config.DarkChat.SendsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local conversation_id = data and data.conversationId + local membership = type(conversation_id) == "string" and load_membership(profile.id, conversation_id) or nil + if not membership then + return { success = false, error = "conversation_not_found" } + end + if membership.blocked_by_me or membership.blocked_by_peer then + return { success = false, error = "blocked" } + end + local message_type = data.messageType + local body = trim(data.body) or "" + local media_payload + local media_mime + local media_duration + local media_waveform + if message_type == "text" or message_type == "emoji" then + if body == "" or #body > Config.DarkChat.BodyMaxLength then + return { success = false, error = "invalid_message" } + end + elseif message_type == "gif" then + if not allowed_gif_url(data.mediaPayload) then + return { success = false, error = "invalid_gif" } + end + media_payload = data.mediaPayload + media_mime = "image/gif" + elseif message_type == "voice" then + local voice = valid_voice(data) + if not voice then + return { success = false, error = "invalid_voice" } + end + media_payload = voice.payload + media_mime = voice.mime + media_duration = voice.duration + media_waveform = voice.waveform + else + return { success = false, error = "invalid_message" } + end + local reply_to = data.replyToId + if reply_to ~= nil then + local reply = Bridge.Database.Query([[ + SELECT `id` FROM `sky_phone_darkchat_messages` + WHERE `id` = ? AND `conversation_id` = ? LIMIT 1 + ]], { reply_to, conversation_id }) + if not reply[1] then + return { success = false, error = "invalid_reply" } + end + end + local timer = tonumber(membership.disappearing_seconds) or 0 + local id = uuid() + Bridge.Database.Query([[ + INSERT INTO `sky_phone_darkchat_messages` + (`id`, `conversation_id`, `sender_profile_id`, `message_type`, `body`, `media_payload`, + `media_mime`, `media_duration_ms`, `media_waveform`, `reply_to_id`, `expires_at`) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, + IF(? > 0, DATE_ADD(CURRENT_TIMESTAMP, INTERVAL ? SECOND), NULL)) + ]], { + id, conversation_id, profile.id, message_type, body, media_payload, media_mime, + media_duration, media_waveform, reply_to, timer, timer, + }) + Bridge.Database.Query( + "UPDATE `sky_phone_darkchat_conversations` SET `updated_at` = CURRENT_TIMESTAMP WHERE `id` = ?", + { conversation_id } + ) + local rows = Bridge.Database.Query([[ + SELECT message.*, reply.`body` AS `reply_body`, NULL AS `peer_last_read_at` + FROM `sky_phone_darkchat_messages` message + LEFT JOIN `sky_phone_darkchat_messages` reply ON reply.`id` = message.`reply_to_id` + WHERE message.`id` = ? LIMIT 1 + ]], { id }) + local message = message_payload(rows[1], profile.id) + TriggerClientEvent("sky_phone:darkchat:changed", source, { conversationId = conversation_id }) + notify_profile(tonumber(membership.peer_id), "sky_phone:darkchat:new", { + conversationId = conversation_id, + sender = profile.alias, + messageType = message_type, + preview = (message_type == "text" or message_type == "emoji") and body or message_type, + }) + return { success = true, data = message } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:media", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_media", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local rows = Bridge.Database.Query([[ + SELECT message.`media_payload`, message.`media_mime` + FROM `sky_phone_darkchat_messages` message + JOIN `sky_phone_darkchat_members` member ON member.`conversation_id` = message.`conversation_id` + WHERE message.`id` = ? AND member.`profile_id` = ? AND message.`message_type` = 'voice' + AND (message.`expires_at` IS NULL OR message.`expires_at` > CURRENT_TIMESTAMP) + LIMIT 1 + ]], { data and data.messageId, profile.id }) + if not rows[1] or type(rows[1].media_payload) ~= "string" then + return { success = false, error = "message_not_found" } + end + return { success = true, data = { payload = rows[1].media_payload, mime = rows[1].media_mime } } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:react", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_react", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + if not reaction_values[data and data.reaction] then + return { success = false, error = "invalid_reaction" } + end + local rows = Bridge.Database.Query([[ + SELECT message.`id`, message.`conversation_id`, message.`reactions` + FROM `sky_phone_darkchat_messages` message + JOIN `sky_phone_darkchat_members` member ON member.`conversation_id` = message.`conversation_id` + WHERE message.`id` = ? AND member.`profile_id` = ? LIMIT 1 + ]], { data.messageId, profile.id }) + local message = rows[1] + if not message then + return { success = false, error = "message_not_found" } + end + local reactions = decode_array(message.reactions, "reactions") + local key = tostring(profile.id) + if reactions[key] == data.reaction then + reactions[key] = nil + else + reactions[key] = data.reaction + end + Bridge.Database.Query("UPDATE `sky_phone_darkchat_messages` SET `reactions` = ? WHERE `id` = ?", { + json.encode(reactions), message.id, + }) + TriggerClientEvent("sky_phone:darkchat:changed", source, { conversationId = message.conversation_id }) + local membership = load_membership(profile.id, message.conversation_id) + notify_profile(tonumber(membership.peer_id), "sky_phone:darkchat:changed", { + conversationId = message.conversation_id, + }) + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:message-action", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_message_action", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local rows = Bridge.Database.Query([[ + SELECT message.* FROM `sky_phone_darkchat_messages` message + JOIN `sky_phone_darkchat_members` member ON member.`conversation_id` = message.`conversation_id` + WHERE message.`id` = ? AND member.`profile_id` = ? LIMIT 1 + ]], { data and data.messageId, profile.id }) + local message = rows[1] + if not message then + return { success = false, error = "message_not_found" } + end + if data.action == "delete_me" then + local deleted_for = decode_array(message.deleted_for_profiles, "deleted_for_profiles") + local already_deleted = false + for _, value in ipairs(deleted_for) do + already_deleted = already_deleted or tonumber(value) == tonumber(profile.id) + end + if not already_deleted then + deleted_for[#deleted_for + 1] = tonumber(profile.id) + end + Bridge.Database.Query("UPDATE `sky_phone_darkchat_messages` SET `deleted_for_profiles` = ? WHERE `id` = ?", { + json.encode(deleted_for), message.id, + }) + elseif data.action == "delete_all" then + if tonumber(message.sender_profile_id) ~= tonumber(profile.id) then + return { success = false, error = "not_message_owner" } + end + Bridge.Database.Query([[ + UPDATE `sky_phone_darkchat_messages` + SET `deleted_for_everyone` = 1, `body` = '', `media_payload` = NULL, + `media_mime` = NULL, `media_duration_ms` = NULL, `media_waveform` = NULL + WHERE `id` = ? + ]], { message.id }) + else + return { success = false, error = "invalid_action" } + end + local membership = load_membership(profile.id, message.conversation_id) + TriggerClientEvent("sky_phone:darkchat:changed", source, { conversationId = message.conversation_id }) + notify_profile(tonumber(membership.peer_id), "sky_phone:darkchat:changed", { + conversationId = message.conversation_id, + }) + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:update-conversation", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_conversation_settings", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local membership = load_membership(profile.id, data and data.conversationId) + if not membership then + return { success = false, error = "conversation_not_found" } + end + if type(data.notificationsEnabled) ~= "boolean" or type(data.readReceipts) ~= "boolean" then + return { success = false, error = "invalid_settings" } + end + local timer = tonumber(data.disappearingSeconds) + if not timer or not Config.DarkChat.AllowedDisappearTimers[timer] then + return { success = false, error = "invalid_timer" } + end + Bridge.Database.Transaction({ + { + query = "UPDATE `sky_phone_darkchat_members` SET `notifications_enabled` = ?, `read_receipts` = ? WHERE `conversation_id` = ? AND `profile_id` = ?", + params = { data.notificationsEnabled and 1 or 0, data.readReceipts and 1 or 0, data.conversationId, profile.id }, + }, + { + query = "UPDATE `sky_phone_darkchat_conversations` SET `disappearing_seconds` = ? WHERE `id` = ?", + params = { timer, data.conversationId }, + }, + { + query = "INSERT INTO `sky_phone_darkchat_messages` (`id`, `conversation_id`, `message_type`, `body`) VALUES (?, ?, 'system', ?)", + params = { uuid(), data.conversationId, "timer_changed:" .. tostring(timer) }, + }, + }) + TriggerClientEvent("sky_phone:darkchat:changed", source, { conversationId = data.conversationId }) + notify_profile(tonumber(membership.peer_id), "sky_phone:darkchat:changed", { + conversationId = data.conversationId, + }) + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:add-contact", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_contact", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local membership = load_membership(profile.id, data and data.conversationId) + local alias = trim(data and data.alias) + if not membership or not alias or alias == "" or #alias > Config.DarkChat.AliasMaxLength then + return { success = false, error = "invalid_contact" } + end + Bridge.Database.Query([[ + INSERT INTO `sky_phone_darkchat_contacts` (`profile_id`, `contact_profile_id`, `alias_override`) + VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `alias_override` = VALUES(`alias_override`) + ]], { profile.id, membership.peer_id, alias }) + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:remove-contact", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_contact", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local membership = load_membership(profile.id, data and data.conversationId) + if not membership then + return { success = false, error = "conversation_not_found" } + end + Bridge.Database.Query([[ + DELETE FROM `sky_phone_darkchat_contacts` WHERE `profile_id` = ? AND `contact_profile_id` = ? + ]], { profile.id, membership.peer_id }) + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:block", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_block", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local membership = load_membership(profile.id, data and data.conversationId) + if not membership or type(data.blocked) ~= "boolean" then + return { success = false, error = "invalid_request" } + end + if data.blocked then + Bridge.Database.Query([[ + INSERT IGNORE INTO `sky_phone_darkchat_blocks` (`blocker_profile_id`, `blocked_profile_id`) + VALUES (?, ?) + ]], { profile.id, membership.peer_id }) + else + Bridge.Database.Query([[ + DELETE FROM `sky_phone_darkchat_blocks` WHERE `blocker_profile_id` = ? AND `blocked_profile_id` = ? + ]], { profile.id, membership.peer_id }) + end + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:report", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_report", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local membership = load_membership(profile.id, data and data.conversationId) + local reason = data and data.reason + local details = trim(data and data.details) or "" + if not membership or not report_reasons[reason] or #details > 500 then + return { success = false, error = "invalid_report" } + end + local count = Bridge.Database.Query([[ + SELECT COUNT(*) AS `count` FROM `sky_phone_darkchat_reports` + WHERE `reporter_profile_id` = ? AND `created_at` >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY) + ]], { profile.id }) + if tonumber(count[1] and count[1].count) >= Config.DarkChat.ReportsPerDay then + return { success = false, error = "rate_limited" } + end + Bridge.Database.Query([[ + INSERT INTO `sky_phone_darkchat_reports` + (`id`, `reporter_profile_id`, `reported_profile_id`, `conversation_id`, `message_id`, `reason`, `details`) + VALUES (?, ?, ?, ?, ?, ?, ?) + ]], { uuid(), profile.id, membership.peer_id, data.conversationId, data.messageId, reason, details }) + return { success = true } +end) + +Bridge.Callbacks.Register("sky_phone:darkchat:clear", function(source, data) + if not SkyPhone.AllowOperation(source, "darkchat_clear", Config.DarkChat.ActionsPerMinute, 60) then + return { success = false, error = "rate_limited" } + end + local profile, _, error_response = require_profile(source) + if not profile then + return error_response + end + local membership = load_membership(profile.id, data and data.conversationId) + if not membership then + return { success = false, error = "conversation_not_found" } + end + Bridge.Database.Query([[ + UPDATE `sky_phone_darkchat_members` SET `cleared_at` = CURRENT_TIMESTAMP + WHERE `conversation_id` = ? AND `profile_id` = ? + ]], { data.conversationId, profile.id }) + return { success = true } +end) + +CreateThread(function() + while true do + Wait(Config.DarkChat.CleanupIntervalSeconds * 1000) + Bridge.Database.Query([[ + DELETE FROM `sky_phone_darkchat_messages` + WHERE `expires_at` IS NOT NULL AND `expires_at` <= CURRENT_TIMESTAMP + ]], {}) + end +end) + +end) diff --git a/sky_phone/source/server/db_migrate.lua b/sky_phone/source/server/db_migrate.lua index b1ef08b..b2d437a 100644 --- a/sky_phone/source/server/db_migrate.lua +++ b/sky_phone/source/server/db_migrate.lua @@ -657,6 +657,161 @@ local schema = { }, tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", }, + { + name = "sky_phone_darkchat_profiles", + columns = { + { name = "id", type = "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT" }, + { name = "account_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "dark_id", type = "CHAR(14) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "invite_code", type = "CHAR(11) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "alias", type = "VARCHAR(32) NOT NULL" }, + { name = "avatar_seed", type = "INT UNSIGNED NOT NULL" }, + { name = "notification_mode", type = "ENUM('full', 'private', 'hidden') NOT NULL DEFAULT 'private'" }, + { name = "activity_visible", type = "TINYINT(1) NOT NULL DEFAULT 0" }, + { name = "created_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + { name = "updated_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + uniqueKeys = { + { name = "uniq_sky_phone_darkchat_profile_account", columns = "(`account_id`)" }, + { name = "uniq_sky_phone_darkchat_profile_dark_id", columns = "(`dark_id`)" }, + { name = "uniq_sky_phone_darkchat_profile_invite", columns = "(`invite_code`)" }, + }, + foreignKeys = { + { column = "account_id", references = "`sky_phone_accounts` (`id`) ON DELETE CASCADE" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, + { + name = "sky_phone_darkchat_contacts", + columns = { + { name = "id", type = "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT" }, + { name = "profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "contact_profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "alias_override", type = "VARCHAR(32) NULL" }, + { name = "created_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + uniqueKeys = { + { name = "uniq_sky_phone_darkchat_contact", columns = "(`profile_id`, `contact_profile_id`)" }, + }, + foreignKeys = { + { column = "profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + { column = "contact_profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, + { + name = "sky_phone_darkchat_conversations", + columns = { + { name = "id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "disappearing_seconds", type = "INT NOT NULL DEFAULT 0" }, + { name = "created_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + { name = "updated_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + indexes = { + { name = "idx_sky_phone_darkchat_conversation_updated", columns = "(`updated_at`)" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, + { + name = "sky_phone_darkchat_members", + columns = { + { name = "id", type = "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT" }, + { name = "conversation_id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "notifications_enabled", type = "TINYINT(1) NOT NULL DEFAULT 1" }, + { name = "read_receipts", type = "TINYINT(1) NOT NULL DEFAULT 1" }, + { name = "last_read_at", type = "DATETIME NULL" }, + { name = "cleared_at", type = "DATETIME NULL" }, + { name = "joined_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + uniqueKeys = { + { name = "uniq_sky_phone_darkchat_member", columns = "(`conversation_id`, `profile_id`)" }, + }, + indexes = { + { name = "idx_sky_phone_darkchat_member_profile", columns = "(`profile_id`, `conversation_id`)" }, + }, + foreignKeys = { + { column = "conversation_id", references = "`sky_phone_darkchat_conversations` (`id`) ON DELETE CASCADE" }, + { column = "profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, + { + name = "sky_phone_darkchat_messages", + columns = { + { name = "id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "conversation_id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "sender_profile_id", type = "BIGINT UNSIGNED NULL" }, + { name = "message_type", type = "ENUM('text', 'emoji', 'gif', 'voice', 'system') NOT NULL DEFAULT 'text'" }, + { name = "body", type = "TEXT NOT NULL" }, + { name = "media_payload", type = "LONGTEXT NULL" }, + { name = "media_mime", type = "VARCHAR(80) NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "media_duration_ms", type = "INT UNSIGNED NULL" }, + { name = "media_waveform", type = "JSON NULL" }, + { name = "reply_to_id", type = "CHAR(36) NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "reactions", type = "JSON NULL" }, + { name = "deleted_for_profiles", type = "JSON NULL" }, + { name = "deleted_for_everyone", type = "TINYINT(1) NOT NULL DEFAULT 0" }, + { name = "expires_at", type = "DATETIME NULL" }, + { name = "created_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + indexes = { + { name = "idx_sky_phone_darkchat_message_thread", columns = "(`conversation_id`, `created_at`, `id`)" }, + { name = "idx_sky_phone_darkchat_message_expiry", columns = "(`expires_at`)" }, + }, + foreignKeys = { + { column = "conversation_id", references = "`sky_phone_darkchat_conversations` (`id`) ON DELETE CASCADE" }, + { column = "sender_profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE SET NULL" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, + { + name = "sky_phone_darkchat_blocks", + columns = { + { name = "id", type = "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT" }, + { name = "blocker_profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "blocked_profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "created_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + uniqueKeys = { + { name = "uniq_sky_phone_darkchat_block", columns = "(`blocker_profile_id`, `blocked_profile_id`)" }, + }, + foreignKeys = { + { column = "blocker_profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + { column = "blocked_profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, + { + name = "sky_phone_darkchat_reports", + columns = { + { name = "id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "reporter_profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "reported_profile_id", type = "BIGINT UNSIGNED NOT NULL" }, + { name = "conversation_id", type = "CHAR(36) NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "message_id", type = "CHAR(36) NULL", characterSet = "ascii", collation = "ascii_bin" }, + { name = "reason", type = "ENUM('spam', 'harassment', 'threats', 'illegal', 'other') NOT NULL" }, + { name = "details", type = "VARCHAR(500) NOT NULL DEFAULT ''" }, + { name = "status", type = "ENUM('open', 'reviewed', 'dismissed') NOT NULL DEFAULT 'open'" }, + { name = "created_at", type = "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP" }, + }, + primaryKey = "id", + indexes = { + { name = "idx_sky_phone_darkchat_report_target", columns = "(`reported_profile_id`, `created_at`)" }, + }, + foreignKeys = { + { column = "reporter_profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + { column = "reported_profile_id", references = "`sky_phone_darkchat_profiles` (`id`) ON DELETE CASCADE" }, + { column = "conversation_id", references = "`sky_phone_darkchat_conversations` (`id`) ON DELETE SET NULL" }, + }, + tableOptions = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", + }, } Bridge.Database.Migrate("sky_phone", schema) From db29a3dd07e263f43e9330235822e6661356443c Mon Sep 17 00:00:00 2001 From: "Leon.Schmidt" Date: Thu, 6 Aug 2026 21:13:36 +0200 Subject: [PATCH 07/18] ADD - build DarkChat phone app --- frontend/src/App.vue | 41 + .../src/assets/img/app-icons/darkchat.svg | 11 + frontend/src/assets/main.css | 390 +++++++++ frontend/src/components/AppIcon.vue | 3 + .../src/components/DarkChatVoiceMessage.vue | 96 +++ frontend/src/config/apps.ts | 15 + frontend/src/stores/darkchat.test.ts | 81 ++ frontend/src/stores/darkchat.ts | 155 ++++ frontend/src/stores/phone.ts | 21 + frontend/src/types/apps.ts | 1 + frontend/src/types/darkchat.ts | 90 +++ frontend/src/utils/preferences.ts | 1 + frontend/src/views/apps/DarkChatApp.vue | 743 ++++++++++++++++++ frontend/testserver/index.cjs | 216 +++++ sky_phone/source/html/index.html | 4 +- 15 files changed, 1866 insertions(+), 2 deletions(-) create mode 100644 frontend/src/assets/img/app-icons/darkchat.svg create mode 100644 frontend/src/components/DarkChatVoiceMessage.vue create mode 100644 frontend/src/stores/darkchat.test.ts create mode 100644 frontend/src/stores/darkchat.ts create mode 100644 frontend/src/types/darkchat.ts create mode 100644 frontend/src/views/apps/DarkChatApp.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a012683..bb4ae2c 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -26,6 +26,7 @@ import { useCallsStore } from '@/stores/calls' import { useAccountStore } from '@/stores/account' import { useMailStore } from '@/stores/mail' import { useMessagesStore } from '@/stores/messages' +import { useDarkChatStore } from '@/stores/darkchat' import { useMediaStore } from '@/stores/media' import { useMarketplaceStore } from '@/stores/marketplace' import { useAppStoreStore } from '@/stores/app-store' @@ -52,6 +53,7 @@ type AppMessage = { | MailEventData | MarketplaceEventData | MessagesEventData + | DarkChatEventData | PhoneCall | PhoneNotificationInput | PhoneOpenPayload @@ -79,6 +81,16 @@ type MessagesEventData = { title?: string } +type DarkChatEventData = { + conversationId?: string + device?: PhoneNotificationDevicePayload + notificationMode?: 'full' | 'private' | 'hidden' + preview?: string + sender?: string + text?: string + title?: string +} + type MarketplaceEventData = { counts?: MarketplaceCounts device?: PhoneNotificationDevicePayload @@ -109,6 +121,7 @@ const games = useGamesStore() const calls = useCallsStore() const mail = useMailStore() const messages = useMessagesStore() +const darkchat = useDarkChatStore() const media = useMediaStore() const marketplace = useMarketplaceStore() const appStore = useAppStoreStore() @@ -159,6 +172,7 @@ function hydratePhone(payload: PhoneOpenPayload): void { else marketplace.setCounts({ active: 0, unread: 0 }) void calls.bootstrap() void messages.loadConversations() + if (payload.account?.email) void darkchat.bootstrap() } async function hydrateDevelopmentPhone(): Promise { @@ -313,6 +327,33 @@ function onMessage(event: MessageEvent): void { } } notifications.show(notification) + } else if (event.data?.type === 'darkchat:changed') { + void darkchat.refreshInbox() + if (darkchat.activeConversation) { + void darkchat.openThread(darkchat.activeConversation.id) + } + } else if (event.data?.type === 'darkchat:new' && event.data.data) { + const data = event.data.data as DarkChatEventData + void darkchat.refreshInbox() + if (data.conversationId && darkchat.activeConversation?.id === data.conversationId) { + void darkchat.openThread(data.conversationId) + } + if (data.notificationMode !== 'hidden') { + const notification: PhoneNotificationInput = { + appId: 'darkchat', + subtitle: data.sender, + text: data.text ?? data.preview ?? phone.t('Apps.darkchat.privateNotification'), + title: data.title ?? phone.t('Apps.darkchat.name'), + } + if (data.device && (!phone.isOpen || data.device.imei !== phone.device?.imei)) { + notification.device = { + imei: data.device.imei, + name: data.device.name, + preferences: parsePhonePreferences(data.device.settings ?? null), + } + } + notifications.show(notification) + } } else if (event.data?.type === 'calls:changed') { void calls.loadRecents() } else if ( diff --git a/frontend/src/assets/img/app-icons/darkchat.svg b/frontend/src/assets/img/app-icons/darkchat.svg new file mode 100644 index 0000000..de63f3d --- /dev/null +++ b/frontend/src/assets/img/app-icons/darkchat.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css index 33946fe..b63af5a 100644 --- a/frontend/src/assets/main.css +++ b/frontend/src/assets/main.css @@ -582,6 +582,396 @@ button { transition-duration: 0.18s; } } + +/* DarkChat is intentionally independent from the phone appearance setting. */ +.phone-app:has(.darkchat-page), +.phone-app:has(.darkchat-page) .phone-app-window, +.phone-app:has(.darkchat-page) .phone-app-window__content { + background: #000 !important; + color-scheme: dark; +} +.phone-app:has(.darkchat-page) .phone-status-bar { + color: #fff !important; + --status-bar-color: #fff; +} +.app-icon--darkchat { background: #050507; } +.darkchat-page { + --dc-purple: #8b5cf6; + --dc-purple-dark: #5b21b6; + --dc-blue: #0a84ff; + --dc-red: #ff453a; + --dc-surface: #1c1c1e; + --dc-surface-2: #29292c; + --dc-border: #38383a; + --dc-muted: #8e8e93; + position: absolute; + inset: 0; + overflow: hidden; + background: #000; + color: #f5f5f7; + font-family: -apple-system, BlinkMacSystemFont, "SF Pro Display", "Segoe UI", sans-serif; +} +.darkchat-page button, +.darkchat-page input, +.darkchat-page textarea, +.darkchat-page select { font: inherit; } +.darkchat-page button { color: inherit; } +.darkchat-page input, +.darkchat-page textarea, +.darkchat-page select { color: #f5f5f7; } +.darkchat-page button:disabled { opacity: .34; } +.darkchat-page button:active:not(:disabled) { transform: scale(.96); } +.darkchat-round { + width: 39px; + height: 39px; + flex: none; + display: grid; + place-items: center; + padding: 0; + border: 1px solid var(--dc-border); + border-radius: 50%; + background: var(--dc-surface); + transition: transform .14s ease, background .2s ease; +} +.darkchat-round--large { width: 43px; height: 43px; } +.darkchat-round.active { background: var(--dc-purple); border-color: var(--dc-purple); } +.darkchat-pill { + min-width: 67px; + height: 37px; + padding: 0 15px; + border: 1px solid var(--dc-border); + border-radius: 19px; + background: var(--dc-surface); + font-size: 13px; + font-weight: 600; +} +.darkchat-gate { + height: 100%; + padding: 58px 27px 30px; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + text-align: center; +} +.darkchat-gate > span:not(.darkchat-loader) { + width: 74px; + height: 74px; + display: grid; + place-items: center; + border-radius: 24px; + background: linear-gradient(145deg, var(--dc-purple), var(--dc-purple-dark)); + box-shadow: 0 18px 45px rgb(91 33 182 / 40%); +} +.darkchat-gate h1 { margin: 21px 0 8px; font-size: 27px; } +.darkchat-gate p { margin: 0; color: #d1d1d6; font-size: 14px; line-height: 1.45; } +.darkchat-gate small { margin-top: 13px; color: var(--dc-muted); font-size: 11px; } +.darkchat-loader { + width: 27px; + height: 27px; + display: block; + border: 3px solid rgb(139 92 246 / 25%); + border-top-color: var(--dc-purple); + border-radius: 50%; + animation: darkchat-spin .7s linear infinite; +} +.darkchat-loader--small { width: 17px; height: 17px; border-width: 2px; } +.darkchat-inbox, +.darkchat-sheet-page, +.darkchat-thread { height: 100%; padding: 44px 0 25px; box-sizing: border-box; } +.darkchat-inbox { display: flex; flex-direction: column; } +.darkchat-inbox__header, +.darkchat-sheet-page > header, +.darkchat-thread__header { + height: 62px; + padding: 5px 15px 7px; + display: grid; + align-items: center; + grid-template-columns: 1fr auto 1fr; + box-sizing: border-box; + background: #000; +} +.darkchat-inbox__header > strong, +.darkchat-sheet-page > header > strong { font-size: 17px; font-weight: 720; letter-spacing: -.2px; } +.darkchat-inbox__header > :last-child, +.darkchat-sheet-page > header > :last-child { justify-self: end; } +.darkchat-security-strip { + height: 28px; + margin: 0 15px 4px; + padding: 0 10px; + display: flex; + align-items: center; + gap: 6px; + border: 1px solid rgb(139 92 246 / 20%); + border-radius: 9px; + background: rgb(139 92 246 / 8%); + color: #b9a3ff; + font-size: 9px; +} +.darkchat-security-strip span { flex: 1; } +.darkchat-security-strip button { padding: 0; border: 0; background: transparent; color: #b9a3ff; font-size: 8px; } +.darkchat-conversations { min-height: 0; flex: 1; padding: 3px 12px 76px; overflow-y: auto; } +.darkchat-conversation { + position: relative; + width: 100%; + min-height: 67px; + padding: 8px 3px; + display: flex; + align-items: center; + gap: 10px; + border: 0; + background: transparent; + text-align: left; +} +.darkchat-conversation::after { + content: ""; + position: absolute; + right: 0; + bottom: 0; + left: 59px; + height: 1px; + background: #262628; +} +.darkchat-unread { + position: absolute; + left: -4px; + width: 7px; + height: 7px; + border-radius: 50%; + background: var(--dc-purple); + box-shadow: 0 0 10px rgb(139 92 246 / 80%); +} +.darkchat-avatar { + width: 49px; + height: 49px; + flex: none; + display: grid; + place-items: center; + border: 1px solid rgb(255 255 255 / 17%); + border-radius: 50%; + color: rgb(255 255 255 / 90%); + font-size: 23px; + font-weight: 800; + text-shadow: 0 1px 7px rgb(0 0 0 / 35%); +} +.darkchat-avatar--small { width: 37px; height: 37px; font-size: 18px; } +.darkchat-avatar--header { width: 39px; height: 39px; font-size: 18px; } +.darkchat-conversation__body { min-width: 0; flex: 1; display: flex; flex-direction: column; gap: 3px; } +.darkchat-conversation__body > span { display: flex; align-items: center; gap: 4px; } +.darkchat-conversation__body strong { min-width: 0; flex: 1; overflow: hidden; font-size: 15px; text-overflow: ellipsis; white-space: nowrap; } +.darkchat-conversation__body time { color: var(--dc-muted); font-size: 10px; } +.darkchat-conversation__body svg { color: #636366; } +.darkchat-conversation__body small { overflow: hidden; color: var(--dc-muted); font-size: 11px; line-height: 1.25; text-overflow: ellipsis; white-space: nowrap; } +.darkchat-timer-icon { position: absolute; right: 4px; bottom: 7px; color: #a78bfa; } +.darkchat-empty { flex: 1; padding: 15px 40px 80px; display: flex; align-items: center; justify-content: center; flex-direction: column; text-align: center; } +.darkchat-empty > span { width: 57px; height: 57px; display: grid; place-items: center; border-radius: 20px; background: var(--dc-surface); color: var(--dc-purple); } +.darkchat-empty h2 { margin: 14px 0 5px; font-size: 18px; } +.darkchat-empty p { margin: 0; color: var(--dc-muted); font-size: 12px; line-height: 1.4; } +.darkchat-inbox__toolbar { + position: absolute; + z-index: 5; + right: 12px; + bottom: 28px; + left: 12px; + display: flex; + align-items: center; + gap: 8px; +} +.darkchat-inbox__toolbar label { + height: 43px; + padding: 0 13px; + flex: 1; + display: flex; + align-items: center; + gap: 8px; + border: 1px solid var(--dc-border); + border-radius: 23px; + background: rgb(28 28 30 / 94%); + backdrop-filter: blur(22px); +} +.darkchat-inbox__toolbar input { min-width: 0; flex: 1; border: 0; outline: 0; background: transparent; font-size: 12px; } +.darkchat-sheet-page { overflow-y: auto; padding-right: 15px; padding-left: 15px; } +.darkchat-sheet-page > header { position: sticky; z-index: 4; top: -1px; margin: 0 -15px; } +.darkchat-new-hero { padding: 14px 23px 19px; text-align: center; } +.darkchat-new-hero > span { width: 59px; height: 59px; margin: auto; display: grid; place-items: center; border-radius: 20px; background: linear-gradient(145deg, var(--dc-purple), var(--dc-purple-dark)); } +.darkchat-new-hero h2 { margin: 12px 0 4px; font-size: 19px; } +.darkchat-new-hero p { margin: 0; color: var(--dc-muted); font-size: 11px; line-height: 1.4; } +.darkchat-input { margin: 9px 0; padding: 9px 12px; display: flex; flex-direction: column; gap: 5px; border: 1px solid var(--dc-border); border-radius: 12px; background: var(--dc-surface); } +.darkchat-input span { color: var(--dc-muted); font-size: 9px; text-transform: uppercase; letter-spacing: .5px; } +.darkchat-input input { border: 0; outline: 0; background: transparent; font-size: 13px; } +.darkchat-primary, +.darkchat-danger { + width: 100%; + min-height: 40px; + margin: 3px 0 14px; + display: flex; + align-items: center; + justify-content: center; + gap: 7px; + border: 0; + border-radius: 12px; + background: linear-gradient(135deg, var(--dc-purple), var(--dc-purple-dark)); + font-size: 13px; + font-weight: 700; +} +.darkchat-danger { background: rgb(255 69 58 / 14%); color: var(--dc-red) !important; } +.darkchat-sheet-page h3 { margin: 17px 5px 5px; color: var(--dc-muted); font-size: 10px; text-transform: uppercase; letter-spacing: .5px; } +.darkchat-contact-row { + width: 100%; + min-height: 54px; + padding: 7px 5px; + display: flex; + align-items: center; + gap: 9px; + border: 0; + border-bottom: 1px solid #272729; + background: transparent; + text-align: left; +} +.darkchat-contact-row > span:nth-child(2) { min-width: 0; flex: 1; display: flex; flex-direction: column; } +.darkchat-contact-row strong { font-size: 13px; } +.darkchat-contact-row small { color: var(--dc-muted); font-size: 9px; } +.darkchat-contact-row svg { color: var(--dc-muted); } +.darkchat-qr-card { margin: 18px 0 6px; padding: 15px; display: grid; grid-template-columns: 72px 1fr; align-items: center; gap: 12px; border: 1px solid var(--dc-border); border-radius: 18px; background: var(--dc-surface); } +.darkchat-faux-qr { width: 72px; height: 72px; display: grid; place-items: center; border-radius: 10px; background: #fff; color: #111; } +.darkchat-qr-card > span { min-width: 0; display: flex; flex-direction: column; gap: 3px; } +.darkchat-qr-card > span strong { overflow: hidden; font-size: 12px; text-overflow: ellipsis; } +.darkchat-qr-card > span small { color: var(--dc-muted); font-size: 9px; } +.darkchat-qr-card > button { grid-column: 1 / -1; height: 35px; display: flex; align-items: center; justify-content: center; gap: 6px; border: 0; border-radius: 10px; background: rgb(139 92 246 / 16%); color: #c4b5fd; font-size: 11px; } +.darkchat-thread { display: flex; flex-direction: column; padding-bottom: 79px; } +.darkchat-thread--panel { padding-bottom: 342px; } +.darkchat-thread__header { position: relative; flex: none; grid-template-columns: 42px 1fr 42px; } +.darkchat-thread__identity { min-width: 0; padding: 0; display: flex; align-items: center; justify-content: center; gap: 8px; border: 0; background: transparent; } +.darkchat-thread__identity > span:nth-child(2) { min-width: 0; display: flex; flex-direction: column; align-items: flex-start; } +.darkchat-thread__identity strong { max-width: 142px; overflow: hidden; font-size: 13px; text-overflow: ellipsis; white-space: nowrap; } +.darkchat-thread__identity small { color: var(--dc-muted); font-size: 8px; } +.darkchat-thread__identity svg { color: var(--dc-muted); } +.darkchat-thread__meta { height: 21px; flex: none; display: flex; align-items: center; justify-content: center; gap: 3px; border-bottom: 1px solid #1b1b1d; color: var(--dc-muted); font-size: 8px; } +.darkchat-thread__messages { min-height: 0; padding: 12px 13px 18px; flex: 1; display: flex; flex-direction: column; align-items: flex-start; gap: 5px; overflow-y: auto; } +.darkchat-day { align-self: center; margin: 4px 0 8px; color: var(--dc-muted); font-size: 9px; font-weight: 600; } +.darkchat-system { max-width: 86%; margin: 7px auto; display: flex; align-items: center; gap: 4px; color: var(--dc-muted); font-size: 8px; text-align: center; } +.darkchat-message { + position: relative; + max-width: 82%; + padding: 7px 10px 6px; + display: flex; + flex-direction: column; + gap: 3px; + border: 0; + border-radius: 15px; + background: var(--dc-surface-2); + font-size: 12px; + line-height: 1.3; + text-align: left; + overflow-wrap: anywhere; + animation: darkchat-message-in .28s cubic-bezier(.32,.72,0,1) both; +} +.darkchat-message--sent { align-self: flex-end; background: linear-gradient(145deg, #8b5cf6, #6d28d9); } +.darkchat-message--received::before, +.darkchat-message--sent::after { content: ""; position: absolute; bottom: 0; width: 9px; height: 11px; } +.darkchat-message--received::before { left: -5px; border-bottom-right-radius: 10px; background: var(--dc-surface-2); } +.darkchat-message--sent::after { right: -5px; border-bottom-left-radius: 10px; background: #6d28d9; } +.darkchat-message > small { align-self: flex-end; color: rgb(255 255 255 / 57%); font-size: 7px; white-space: nowrap; } +.darkchat-message--received > small { color: var(--dc-muted); } +.darkchat-message--failed { outline: 1px solid var(--dc-red); } +.darkchat-message > img { width: min(181px, 62vw); max-height: 175px; margin: -5px -8px 1px; border-radius: 12px; object-fit: cover; } +.darkchat-reply-preview { padding: 4px 6px; display: flex; align-items: center; gap: 4px; overflow: hidden; border-left: 2px solid #c4b5fd; border-radius: 4px; background: rgb(0 0 0 / 18%); color: rgb(255 255 255 / 72%); font-size: 8px; text-overflow: ellipsis; white-space: nowrap; } +.darkchat-reactions { position: absolute; right: 4px; bottom: -15px; z-index: 2; padding: 1px 5px; border: 2px solid #000; border-radius: 9px; background: #343438; font-size: 9px; white-space: nowrap; } +.darkchat-message:has(.darkchat-reactions) { margin-bottom: 12px; } +.darkchat-replying { position: absolute; z-index: 6; right: 55px; bottom: 72px; left: 55px; min-height: 39px; padding: 5px 8px; display: flex; align-items: center; gap: 7px; border: 1px solid var(--dc-border); border-radius: 11px; background: rgb(28 28 30 / 96%); color: #c4b5fd; } +.darkchat-replying > span { min-width: 0; flex: 1; display: flex; flex-direction: column; } +.darkchat-replying small { font-size: 7px; text-transform: uppercase; } +.darkchat-replying strong { overflow: hidden; color: #fff; font-size: 9px; text-overflow: ellipsis; white-space: nowrap; } +.darkchat-replying button { width: 25px; height: 25px; display: grid; place-items: center; border: 0; border-radius: 50%; background: #343438; } +.darkchat-composer { position: absolute; z-index: 7; right: 12px; bottom: 28px; left: 12px; display: flex; align-items: flex-end; gap: 8px; } +.darkchat-composer > label { min-height: 41px; padding: 6px 6px 6px 13px; flex: 1; display: flex; align-items: center; gap: 5px; border: 1px solid var(--dc-border); border-radius: 21px; background: var(--dc-surface); } +.darkchat-composer textarea { min-height: 19px; max-height: 70px; min-width: 0; padding: 2px 0; flex: 1; resize: none; border: 0; outline: 0; background: transparent; font-size: 12px; line-height: 17px; } +.darkchat-composer label button { width: 28px; height: 28px; padding: 0; display: grid; place-items: center; border: 0; border-radius: 50%; background: transparent; color: #a78bfa; } +.darkchat-actions-bubbles { position: absolute; z-index: 8; bottom: 76px; left: 14px; display: flex; flex-direction: column-reverse; align-items: flex-start; gap: 6px; } +.darkchat-actions-bubbles button { min-height: 32px; padding: 3px 10px 3px 4px; display: flex; align-items: center; gap: 7px; border: 1px solid var(--dc-border); border-radius: 17px; background: var(--dc-surface); font-size: 9px; box-shadow: 0 7px 19px rgb(0 0 0 / 45%); animation: darkchat-bubble-in .23s cubic-bezier(.32,.72,0,1) both; } +.darkchat-actions-bubbles button > span { width: 24px; height: 24px; display: grid; place-items: center; border-radius: 50%; background: rgb(139 92 246 / 18%); color: #c4b5fd; font-size: 15px; } +.darkchat-gif-panel, +.darkchat-page .messages-full-emoji-picker { position: absolute; z-index: 8; right: 0; bottom: 0; left: 0; height: 285px; border-top: 1px solid var(--dc-border); background: rgb(20 20 22 / 97%); color: #fff; backdrop-filter: blur(25px); } +.darkchat-gif-panel > header { height: 37px; padding: 0 13px; display: flex; align-items: center; justify-content: space-between; } +.darkchat-gif-panel > header strong { font-size: 13px; } +.darkchat-gif-panel > header button { border: 0; background: transparent; color: #a78bfa; font-size: 11px; } +.darkchat-gif-panel > label { height: 31px; margin: 0 9px 6px; padding: 0 9px; display: flex; align-items: center; gap: 6px; border-radius: 16px; background: #2c2c2e; color: var(--dc-muted); } +.darkchat-gif-panel > label input { min-width: 0; flex: 1; border: 0; outline: 0; background: transparent; font-size: 10px; } +.darkchat-gif-panel > div { height: 175px; padding: 0 9px; display: grid; grid-template-columns: repeat(2, 1fr); gap: 5px; overflow-y: auto; } +.darkchat-gif-panel > div button { min-height: 80px; padding: 0; overflow: hidden; border: 0; border-radius: 9px; background: #2c2c2e; } +.darkchat-gif-panel > div img { width: 100%; height: 100%; object-fit: cover; } +.darkchat-load-more { width: calc(100% - 18px); height: 28px; margin: 4px 9px; border: 0; border-radius: 9px; background: #2c2c2e; color: #a78bfa !important; font-size: 10px; } +.darkchat-page .messages-full-emoji-picker { animation: darkchat-panel-in .28s cubic-bezier(.32,.72,0,1) both; } +.darkchat-page .messages-full-emoji-picker > header button, +.darkchat-page .messages-full-emoji-picker__search, +.darkchat-page .messages-full-emoji-picker nav button.active { background: #2c2c2e; color: #fff; } +.darkchat-page .messages-full-emoji-picker__search input { color: #fff; } +.darkchat-page .messages-full-emoji-picker nav { border-color: var(--dc-border); } +.darkchat-recorder { position: absolute; z-index: 9; right: 12px; bottom: 28px; left: 12px; height: 43px; padding: 0 7px; display: flex; align-items: center; gap: 6px; border: 1px solid var(--dc-border); border-radius: 22px; background: var(--dc-surface); } +.darkchat-recorder > button { width: 29px; height: 29px; display: grid; place-items: center; border: 0; border-radius: 50%; background: #2c2c2e; } +.darkchat-recorder > button:last-child { color: #a78bfa; } +.darkchat-recorder > i { width: 7px; height: 7px; border-radius: 50%; background: var(--dc-red); animation: messages-record-pulse 1s ease infinite; } +.darkchat-recorder time { font-size: 10px; } +.darkchat-recorder > span { height: 26px; min-width: 0; flex: 1; display: flex; align-items: center; justify-content: center; gap: 1px; overflow: hidden; } +.darkchat-recorder > span b { width: 2px; flex: none; border-radius: 2px; background: #a78bfa; } +.darkchat-voice { min-width: 177px; display: flex; align-items: center; gap: 7px; } +.darkchat-voice > button { width: 26px; height: 26px; display: grid; place-items: center; padding: 0; flex: none; border: 0; border-radius: 50%; background: rgb(255 255 255 / 17%); } +.darkchat-voice > div { min-width: 0; flex: 1; } +.darkchat-voice__wave { height: 23px; display: flex; align-items: center; gap: 1px; } +.darkchat-voice__wave i { width: 2px; border-radius: 2px; background: rgb(255 255 255 / 38%); } +.darkchat-voice__wave i.active { background: #fff; } +.darkchat-voice > div small { display: block; font-size: 7px; } +.darkchat-voice .darkchat-voice__speed { width: 27px; color: #fff; font-size: 7px; font-weight: 800; } +.darkchat-profile-hero { padding: 15px 0 17px; display: flex; align-items: center; flex-direction: column; } +.darkchat-profile-hero .darkchat-avatar { width: 67px; height: 67px; font-size: 30px; box-shadow: 0 13px 32px rgb(91 33 182 / 32%); } +.darkchat-profile-hero h2 { margin: 10px 0 3px; font-size: 20px; } +.darkchat-profile-hero button { padding: 4px 8px; display: flex; align-items: center; gap: 5px; border: 0; border-radius: 11px; background: var(--dc-surface); color: #c4b5fd; font-size: 9px; } +.darkchat-profile-hero small { margin-top: 6px; color: var(--dc-muted); font-size: 8px; } +.darkchat-settings-group, +.darkchat-danger-group { margin: 10px 0; overflow: hidden; border: 1px solid var(--dc-border); border-radius: 13px; background: var(--dc-surface); } +.darkchat-settings-group label, +.darkchat-danger-group button { width: 100%; min-height: 43px; padding: 0 12px; display: flex; align-items: center; justify-content: space-between; gap: 9px; border: 0; border-bottom: 1px solid var(--dc-border); background: transparent; font-size: 11px; } +.darkchat-settings-group label:last-child, +.darkchat-danger-group button:last-child { border-bottom: 0; } +.darkchat-settings-group label > span, +.darkchat-danger-group button { justify-content: flex-start; } +.darkchat-settings-group label > span { display: flex; align-items: center; gap: 8px; } +.darkchat-settings-group label > span svg { color: #a78bfa; } +.darkchat-settings-group input[type="checkbox"] { width: 36px; height: 21px; accent-color: var(--dc-purple); } +.darkchat-select select { min-width: 90px; border: 0; outline: 0; background: transparent; color: #a78bfa; font-size: 9px; text-align: right; } +.darkchat-danger-group button { color: var(--dc-red); text-align: left; } +.darkchat-save { padding: 7px; border: 0; background: transparent; color: #a78bfa !important; font-size: 11px; } +.darkchat-privacy-note { margin: 14px 4px 4px; display: flex; align-items: flex-start; gap: 7px; color: var(--dc-muted); font-size: 9px; line-height: 1.4; } +.darkchat-privacy-note svg { flex: none; color: #a78bfa; } +.darkchat-modal-backdrop { position: absolute; z-index: 40; inset: 0; padding: 44px 18px 27px; display: flex; align-items: center; justify-content: center; background: rgb(0 0 0 / 67%); backdrop-filter: blur(10px); } +.darkchat-modal, +.darkchat-message-menu { width: 100%; padding: 17px; display: flex; align-items: stretch; flex-direction: column; border: 1px solid var(--dc-border); border-radius: 21px; background: rgb(28 28 30 / 98%); box-shadow: 0 24px 70px rgb(0 0 0 / 60%); animation: darkchat-modal-in .3s cubic-bezier(.32,.72,0,1) both; } +.darkchat-modal { text-align: center; } +.darkchat-modal__icon { width: 52px; height: 52px; margin: 0 auto; display: grid; place-items: center; border-radius: 17px; background: rgb(139 92 246 / 16%); color: #a78bfa; } +.darkchat-modal__icon--danger { background: rgb(255 69 58 / 14%); color: var(--dc-red); } +.darkchat-modal h2 { margin: 11px 0 6px; font-size: 18px; } +.darkchat-modal p { margin: 0 0 10px; color: var(--dc-muted); font-size: 10px; line-height: 1.4; } +.darkchat-modal > strong { margin-bottom: 12px; color: #c4b5fd; font-size: 12px; } +.darkchat-modal > button:not(.darkchat-primary):not(.darkchat-danger) { min-height: 35px; border: 0; background: transparent; color: var(--dc-muted); font-size: 11px; } +.darkchat-modal select, +.darkchat-modal textarea { margin-bottom: 8px; padding: 9px; border: 1px solid var(--dc-border); border-radius: 10px; outline: 0; background: #2c2c2e; font-size: 11px; } +.darkchat-modal textarea { min-height: 65px; resize: none; } +.darkchat-message-menu { padding: 7px; } +.darkchat-message-menu > button { min-height: 39px; padding: 0 11px; display: flex; align-items: center; gap: 9px; border: 0; border-bottom: 1px solid var(--dc-border); background: transparent; font-size: 11px; text-align: left; } +.darkchat-message-menu > button:last-child { justify-content: center; border-bottom: 0; color: var(--dc-muted); } +.darkchat-message-menu > button.danger { color: var(--dc-red); } +.darkchat-reaction-row { margin: -30px 4px 8px; padding: 8px 5px; display: flex; justify-content: space-around; border: 1px solid var(--dc-border); border-radius: 20px; background: #2c2c2e; box-shadow: 0 7px 20px rgb(0 0 0 / 35%); } +.darkchat-reaction-row button { width: 34px; height: 31px; padding: 0; border: 0; border-radius: 13px; background: transparent; font-size: 18px; } +.darkchat-toast { position: absolute; z-index: 60; bottom: 95px; left: 50%; max-width: 80%; padding: 8px 13px; transform: translateX(-50%); border: 1px solid var(--dc-border); border-radius: 14px; background: rgb(44 44 46 / 96%); box-shadow: 0 8px 30px rgb(0 0 0 / 45%); font-size: 10px; text-align: center; } +.darkchat-toast-enter-active, +.darkchat-toast-leave-active { transition: opacity .2s ease, transform .2s ease; } +.darkchat-toast-enter-from, +.darkchat-toast-leave-to { opacity: 0; transform: translate(-50%, 8px); } +@keyframes darkchat-spin { to { transform: rotate(360deg); } } +@keyframes darkchat-message-in { from { opacity: 0; transform: translateY(8px) scale(.94); } } +@keyframes darkchat-bubble-in { from { opacity: 0; transform: translate(-8px, 6px) scale(.8); } } +@keyframes darkchat-panel-in { from { transform: translateY(100%); } } +@keyframes darkchat-modal-in { from { opacity: 0; transform: translateY(18px) scale(.92); } } .springboard-track { width: 300%; height: 100%; diff --git a/frontend/src/components/AppIcon.vue b/frontend/src/components/AppIcon.vue index 7c65c0c..5f96a04 100644 --- a/frontend/src/components/AppIcon.vue +++ b/frontend/src/components/AppIcon.vue @@ -5,6 +5,7 @@ import { useRouter } from 'vue-router' import { useMailStore } from '@/stores/mail' import { useMarketplaceStore } from '@/stores/marketplace' +import { useDarkChatStore } from '@/stores/darkchat' import { usePhoneStore } from '@/stores/phone' import type { PhoneAppDefinition } from '@/types/apps' @@ -23,11 +24,13 @@ const props = withDefaults( const phone = usePhoneStore() const mail = useMailStore() const marketplace = useMarketplaceStore() +const darkchat = useDarkChatStore() const router = useRouter() const iconFailed = ref(false) const unreadCount = computed(() => { if (props.app.id === 'mail') return mail.counts.unread if (props.app.id === 'citymarkt') return marketplace.counts.unread + if (props.app.id === 'darkchat') return darkchat.unreadCount return 0 }) const notificationBadgeColors = { diff --git a/frontend/src/components/DarkChatVoiceMessage.vue b/frontend/src/components/DarkChatVoiceMessage.vue new file mode 100644 index 0000000..2e29cb7 --- /dev/null +++ b/frontend/src/components/DarkChatVoiceMessage.vue @@ -0,0 +1,96 @@ + + + diff --git a/frontend/src/config/apps.ts b/frontend/src/config/apps.ts index 60a9faa..0335ff2 100644 --- a/frontend/src/config/apps.ts +++ b/frontend/src/config/apps.ts @@ -13,6 +13,7 @@ import { Mail, MapPinned, MessageCircle, + ShieldCheck, NotebookPen, Phone, Settings, @@ -32,6 +33,7 @@ import calendarIcon from '@/assets/img/app-icons/calendar.svg' import mailIcon from '@/assets/img/app-icons/mail.webp' import mapIcon from '@/assets/img/app-icons/map.webp' import messagesIcon from '@/assets/img/app-icons/sms.webp' +import darkChatIcon from '@/assets/img/app-icons/darkchat.svg' import notesIcon from '@/assets/img/app-icons/notes.webp' import photosIcon from '@/assets/img/app-icons/gallery.webp' import phoneIcon from '@/assets/img/app-icons/phone.webp' @@ -105,6 +107,19 @@ export const PHONE_APPS: PhoneAppDefinition[] = [ labelKey: 'Apps.messages.name', route: '/apps/messages', }, + { + component: markRaw( + defineAsyncComponent(() => import('@/views/apps/DarkChatApp.vue')), + ), + dockOrder: null, + gridOrder: 22, + icon: markRaw(ShieldCheck), + iconClass: 'app-icon--darkchat', + iconImage: darkChatIcon, + id: 'darkchat', + labelKey: 'Apps.darkchat.name', + route: '/apps/darkchat', + }, { component: markRaw( defineAsyncComponent(() => import('@/views/apps/MapApp.vue')), diff --git a/frontend/src/stores/darkchat.test.ts b/frontend/src/stores/darkchat.test.ts new file mode 100644 index 0000000..811ab04 --- /dev/null +++ b/frontend/src/stores/darkchat.test.ts @@ -0,0 +1,81 @@ +import { createPinia, setActivePinia } from 'pinia' +import { beforeEach, describe, expect, it, vi } from 'vitest' + +import { useDarkChatStore } from '@/stores/darkchat' +import type { DarkChatMessage, DarkChatThread } from '@/types/darkchat' +import { nuiCall } from '@/utils/nui' + +vi.mock('@/utils/nui', () => ({ nuiCall: vi.fn() })) +const mockNuiCall = vi.mocked(nuiCall) + +const conversation: DarkChatThread['conversation'] = { + blockedByPeer: false, + createdAt: '2026-08-06 20:00:00', + disappearingSeconds: 3600, + id: 'conversation-id', + notificationsEnabled: true, + peer: { alias: 'Nova', avatarSeed: 42, darkId: 'dark:N0VA-41KQ', id: 2 }, + readReceipts: true, +} + +function message(id: string): DarkChatMessage { + return { + body: 'Quiet channel', + conversationId: conversation.id, + createdAt: '2026-08-06 20:01:00', + direction: 'sent', + id, + messageType: 'text', + reactions: {}, + } +} + +describe('darkchat store', () => { + beforeEach(() => { + setActivePinia(createPinia()) + mockNuiCall.mockReset() + }) + + it('optimistically sends and confirms a private message', async () => { + let resolveSend: ((value: { data: DarkChatMessage; success: true }) => void) | undefined + const pending = new Promise<{ data: DarkChatMessage; success: true }>((resolve) => (resolveSend = resolve)) + mockNuiCall + .mockResolvedValueOnce({ data: { conversation, messages: [] }, success: true }) + .mockResolvedValueOnce({ data: { contacts: [], conversations: [], profile: null }, success: true }) + .mockImplementationOnce(() => pending) + .mockResolvedValueOnce({ data: { contacts: [], conversations: [], profile: null }, success: true }) + + const store = useDarkChatStore() + await store.openThread(conversation.id) + const sending = store.send({ body: 'Quiet channel', messageType: 'text' }) + expect(store.messages[0]).toMatchObject({ deliveryStatus: 'sending', body: 'Quiet channel' }) + + resolveSend?.({ data: message('server-message'), success: true }) + await sending + expect(store.messages[0]).toMatchObject({ deliveryStatus: 'delivered', id: 'server-message' }) + }) + + it('keeps failed messages visible for delivery feedback', async () => { + mockNuiCall + .mockResolvedValueOnce({ data: { conversation, messages: [] }, success: true }) + .mockResolvedValueOnce({ data: { contacts: [], conversations: [], profile: null }, success: true }) + .mockResolvedValueOnce({ error: 'blocked', success: false }) + + const store = useDarkChatStore() + await store.openThread(conversation.id) + await store.send({ body: 'Quiet channel', messageType: 'text' }) + expect(store.messages[0].deliveryStatus).toBe('failed') + }) + + it('loads protected voice data once', async () => { + mockNuiCall.mockResolvedValueOnce({ + data: { mime: 'audio/webm;codecs=opus', payload: 'ZmFrZQ==' }, + success: true, + }) + const store = useDarkChatStore() + expect(await store.loadMedia('voice-id')).toBe(true) + expect(await store.loadMedia('voice-id')).toBe(true) + expect(store.mediaSources['voice-id']).toBe('data:audio/webm;codecs=opus;base64,ZmFrZQ==') + expect(mockNuiCall).toHaveBeenCalledTimes(1) + }) +}) diff --git a/frontend/src/stores/darkchat.ts b/frontend/src/stores/darkchat.ts new file mode 100644 index 0000000..088d133 --- /dev/null +++ b/frontend/src/stores/darkchat.ts @@ -0,0 +1,155 @@ +import { computed, ref } from 'vue' +import { defineStore } from 'pinia' + +import type { + DarkChatBootstrap, + DarkChatContact, + DarkChatConversation, + DarkChatConversationSummary, + DarkChatMessage, + DarkChatOutgoing, + DarkChatProfile, + DarkChatThread, +} from '@/types/darkchat' +import { nuiCall, type NuiResponse } from '@/utils/nui' + +export const useDarkChatStore = defineStore('darkchat', () => { + const profile = ref(null) + const contacts = ref([]) + const conversations = ref([]) + const activeConversation = ref(null) + const messages = ref([]) + const mediaSources = ref>({}) + const loading = ref(false) + const lastError = ref(null) + const unreadCount = computed(() => + conversations.value.reduce((total, conversation) => total + conversation.unread, 0), + ) + + async function bootstrap(): Promise { + loading.value = true + const response = await nuiCall('darkchat:bootstrap') + loading.value = false + lastError.value = response.error ?? null + if (!response.success || !response.data) { + profile.value = null + contacts.value = [] + conversations.value = [] + return false + } + profile.value = response.data.profile + contacts.value = response.data.contacts + conversations.value = response.data.conversations + return true + } + + async function openThread(conversationId: string): Promise { + loading.value = true + const response = await nuiCall('darkchat:thread', { conversationId }) + loading.value = false + lastError.value = response.error ?? null + if (!response.success || !response.data) return false + activeConversation.value = response.data.conversation + messages.value = response.data.messages.map((message) => ({ + ...message, + deliveryStatus: message.direction === 'sent' ? 'delivered' : undefined, + })) + await refreshInbox() + return true + } + + async function refreshInbox(): Promise { + const response = await nuiCall('darkchat:bootstrap') + if (!response.success || !response.data) return false + profile.value = response.data.profile + contacts.value = response.data.contacts + conversations.value = response.data.conversations + return true + } + + async function start(identifier: string): Promise> { + const response = await nuiCall<{ conversationId: string }>('darkchat:start', { identifier }) + if (response.success) await refreshInbox() + return response + } + + async function send(outgoing: DarkChatOutgoing): Promise> { + if (!activeConversation.value) return { success: false, error: 'invalid_conversation' } + const clientId = `dark-pending-${Date.now()}-${Math.random().toString(36).slice(2, 8)}` + const optimistic: DarkChatMessage = { + body: outgoing.body ?? '', + clientId, + conversationId: activeConversation.value.id, + createdAt: new Date().toISOString().slice(0, 19).replace('T', ' '), + deliveryStatus: 'sending', + direction: 'sent', + id: clientId, + mediaDurationMs: outgoing.mediaDurationMs, + mediaMime: outgoing.mediaMime, + mediaWaveform: outgoing.mediaWaveform, + messageType: outgoing.messageType, + reactions: {}, + replyToId: outgoing.replyToId, + } + messages.value.push(optimistic) + if (outgoing.messageType === 'voice' && outgoing.mediaPayload) { + mediaSources.value[clientId] = `data:${outgoing.mediaMime};base64,${outgoing.mediaPayload}` + } + const response = await nuiCall('darkchat:send', { + ...outgoing, + conversationId: activeConversation.value.id, + }) + const index = messages.value.findIndex((message) => message.clientId === clientId) + if (!response.success || !response.data) { + if (index >= 0) messages.value[index].deliveryStatus = 'failed' + return response + } + const source = mediaSources.value[clientId] + delete mediaSources.value[clientId] + if (source) mediaSources.value[response.data.id] = source + if (index >= 0) { + messages.value[index] = { ...response.data, clientId, deliveryStatus: 'delivered' } + } + await refreshInbox() + return response + } + + async function loadMedia(messageId: string): Promise { + if (mediaSources.value[messageId]) return true + const response = await nuiCall<{ mime: string; payload: string }>('darkchat:media', { messageId }) + if (!response.success || !response.data) return false + mediaSources.value[messageId] = `data:${response.data.mime};base64,${response.data.payload}` + return true + } + + async function mutate(endpoint: string, data: Record): Promise { + const response = await nuiCall(`darkchat:${endpoint}`, data) + return response.success + } + + function closeThread(): void { + activeConversation.value = null + messages.value = [] + mediaSources.value = {} + } + + return { + activeConversation, + bootstrap, + closeThread, + contacts, + conversations, + lastError, + loadMedia, + loading, + mediaSources, + messages, + mutate, + openThread, + profile, + refreshInbox, + send, + start, + unreadCount, + } +}) diff --git a/frontend/src/stores/phone.ts b/frontend/src/stores/phone.ts index 6125088..1f27f1e 100644 --- a/frontend/src/stores/phone.ts +++ b/frontend/src/stores/phone.ts @@ -29,6 +29,27 @@ const namespaceQueues = new Map>() const defaultLocales: LocaleTree = { Apps: { + darkchat: { + name: 'DarkChat', newMessage: 'New DarkChat message from {sender}', privateNotification: 'New DarkChat message', + signInBody: 'DarkChat identities are linked to your private iFruit account.', signInHint: 'Sign in through Settings to continue.', + security: 'Security', privateNetwork: 'Private invitation-only network', noResults: 'No Results', noResultsBody: 'Try another alias or Dark-ID.', + noChats: 'No Private Chats', noChatsBody: 'Connect with a Dark-ID or invitation code. There is no public search.', newChat: 'New Chat', + connectPrivately: 'Connect privately', newChatBody: 'Enter an exact Dark-ID or invitation code. Unknown identities require confirmation.', darkIdOrInvite: 'Dark-ID or invitation code', continue: 'Continue', contacts: 'DarkChat Contacts', shareIdentity: 'Tap to share your private identity', + message: 'Dark message', activeNow: 'Activity shared', encryptedSession: 'Private session', serverPrivate: 'Private server-stored conversation', + emoji: 'Emoji', gif: 'GIF', gifs: 'GIFs', searchGifs: 'Search GIFs', loadMore: 'Load More', photosLater: 'Photos · coming later', videosLater: 'Videos · coming later', + voiceMessage: 'Voice message', sending: 'Sending', failed: 'Not delivered', delivered: 'Delivered', read: 'Read', replying: 'Replying to', + messageDeleted: 'Message deleted', securityUpdate: 'Security settings updated', timerChanged: 'Disappearing messages: {timer}', + timerOff: 'Off', timerAfterRead: 'After reading', timerMinute: '1 minute', timerFiveMinutes: '5 minutes', timerHour: '1 hour', timerDay: '24 hours', timerWeek: '7 days', + copied: 'Copied', reply: 'Reply', copy: 'Copy', deleteForMe: 'Delete for me', deleteForBoth: 'Delete for both', report: 'Report', + contactSecurity: 'Contact & Security', chatSince: 'Private chat since {date}', notifications: 'Notifications', readReceipts: 'Read receipts', disappearing: 'Disappearing messages', contactAlias: 'Contact alias', saveContact: 'Save Contact', addContact: 'Add Contact', contactSaved: 'Contact saved', removeContact: 'Remove Contact', block: 'Block User', unblock: 'Unblock User', clearChat: 'Clear Chat', chatCleared: 'Chat cleared', + myIdentity: 'My Dark Identity', alias: 'Alias', notificationPrivacy: 'Notification privacy', notificationFull: 'Full · alias and message', notificationPrivate: 'Private · generic message', notificationHidden: 'Invisible · badge only', shareActivity: 'Share activity status', inviteCode: 'Private invitation code', copyInvite: 'Copy Invite', privacyDisclaimer: 'DarkChat stores messages on the server and does not claim end-to-end encryption.', + unknownIdentity: 'Unknown Identity', unknownIdentityBody: 'Only continue if you expected this identity. The account is not discoverable through public search.', openSecureChat: 'Open Private Chat', + reportUser: 'Report User', reportSpam: 'Spam', reportHarassment: 'Harassment', reportThreats: 'Threats', reportIllegal: 'Illegal content', reportOther: 'Other', reportDetails: 'Optional details', submitReport: 'Submit Report', reported: 'Report submitted', + microphoneUnavailable: 'The microphone is unavailable.', recordingTooLarge: 'The voice message is too large.', + errors: { + not_authenticated: 'Sign in to your iFruit account first.', invalid_dark_id: 'Enter a valid Dark-ID or invitation code.', profile_not_found: 'This private identity was not found.', self_chat: 'You cannot message your own identity.', conversation_not_found: 'This conversation is unavailable.', blocked: 'Messages are blocked in this conversation.', invalid_message: 'Enter a valid message.', invalid_gif: 'This GIF is invalid.', invalid_voice: 'This voice message is invalid.', invalid_profile: 'Check your alias and privacy settings.', rate_limited: 'Too many requests. Try again shortly.', gif_provider_unconfigured: 'GIF search is not configured.', gif_provider_unauthorized: 'The GIF provider key is invalid.', gif_provider_rate_limited: 'GIF search is busy. Try again shortly.', gif_provider_failed: 'GIFs are temporarily unavailable.', default: 'DarkChat could not complete the request.', + }, + }, messages: { name: 'Messages', newMessage: 'New message from {sender}', diff --git a/frontend/src/types/apps.ts b/frontend/src/types/apps.ts index 375fef1..29e7cef 100644 --- a/frontend/src/types/apps.ts +++ b/frontend/src/types/apps.ts @@ -3,6 +3,7 @@ import type { Component } from 'vue' export type PhoneAppId = | 'phone' | 'messages' + | 'darkchat' | 'calculator' | 'camera' | 'clock' diff --git a/frontend/src/types/darkchat.ts b/frontend/src/types/darkchat.ts new file mode 100644 index 0000000..71040f4 --- /dev/null +++ b/frontend/src/types/darkchat.ts @@ -0,0 +1,90 @@ +import type { DatabaseDateValue } from '@/utils/date' + +export type DarkChatMessageType = 'text' | 'emoji' | 'gif' | 'voice' | 'system' +export type DarkChatNotificationMode = 'full' | 'private' | 'hidden' + +export type DarkChatIdentity = { + id: number + darkId: string + alias: string + originalAlias?: string + avatarSeed: number + activityVisible?: boolean + isContact?: boolean + blocked?: boolean +} + +export type DarkChatProfile = DarkChatIdentity & { + inviteCode: string + notificationMode: DarkChatNotificationMode + activityVisible: boolean + createdAt: DatabaseDateValue +} + +export type DarkChatContact = DarkChatIdentity & { + createdAt: DatabaseDateValue +} + +export type DarkChatConversationSummary = { + id: string + peer: DarkChatIdentity + disappearingSeconds: number + blocked: boolean + lastMessage: string + lastMessageType: DarkChatMessageType + lastMessageAt: DatabaseDateValue + unread: number +} + +export type DarkChatConversation = { + id: string + peer: DarkChatIdentity + disappearingSeconds: number + notificationsEnabled: boolean + readReceipts: boolean + blockedByPeer: boolean + createdAt: DatabaseDateValue +} + +export type DarkChatMessage = { + id: string + clientId?: string + conversationId: string + direction: 'sent' | 'received' + senderProfileId?: number + messageType: DarkChatMessageType + body: string + mediaMime?: string | null + mediaPayload?: string | null + mediaDurationMs?: number | null + mediaWaveform?: number[] | null + replyToId?: string | null + replyBody?: string | null + reactions: Record + expiresAt?: DatabaseDateValue | null + createdAt: DatabaseDateValue + readAt?: DatabaseDateValue | null + deletedForEveryone?: boolean + deliveryStatus?: 'sending' | 'delivered' | 'failed' +} + +export type DarkChatBootstrap = { + profile: DarkChatProfile + contacts: DarkChatContact[] + conversations: DarkChatConversationSummary[] +} + +export type DarkChatThread = { + conversation: DarkChatConversation + messages: DarkChatMessage[] +} + +export type DarkChatOutgoing = { + body?: string + messageType: 'text' | 'emoji' | 'gif' | 'voice' + mediaPayload?: string + mediaMime?: string + mediaDurationMs?: number + mediaWaveform?: number[] + replyToId?: string +} diff --git a/frontend/src/utils/preferences.ts b/frontend/src/utils/preferences.ts index f96575e..a6bd33c 100644 --- a/frontend/src/utils/preferences.ts +++ b/frontend/src/utils/preferences.ts @@ -50,6 +50,7 @@ const DEFAULT_APP_NOTIFICATIONS: Record< > = { phone: { enabled: true, sounds: true }, messages: { enabled: true, sounds: true }, + darkchat: { enabled: true, sounds: true }, 'app-store': { enabled: true, sounds: true }, calculator: { enabled: true, sounds: true }, snake: { enabled: true, sounds: true }, diff --git a/frontend/src/views/apps/DarkChatApp.vue b/frontend/src/views/apps/DarkChatApp.vue new file mode 100644 index 0000000..01b7ff5 --- /dev/null +++ b/frontend/src/views/apps/DarkChatApp.vue @@ -0,0 +1,743 @@ + + +