Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

fix: layout of the thread psage

Acho Arnold Ewin1bd98f322adb
diff --git a/api/docs/docs.go b/api/docs/docs.go
index dadff723..c5745825 100644
--- a/api/docs/docs.go
+++ b/api/docs/docs.go
@@ -3348,6 +3348,7 @@ const docTemplate = `{
"required": [
"created_at",
"delivered_count",
+ "expired_count",
"failed_count",
"pending_count",
"request_id",
@@ -3364,6 +3365,10 @@ const docTemplate = `{
"type": "integer",
"example": 25
},
+ "expired_count": {
+ "type": "integer",
+ "example": 3
+ },
"failed_count": {
"type": "integer",
"example": 5
@@ -3374,7 +3379,7 @@ const docTemplate = `{
},
"request_id": {
"type": "string",
- "example": "bulk-32343a19-da5e-4b1b-a767-3298a73703cb"
+ "example": "bulk-csv-a1B2c3D4e5"
},
"scheduled_count": {
"type": "integer",
diff --git a/api/docs/swagger.json b/api/docs/swagger.json
index 69e9d363..009797ca 100644
--- a/api/docs/swagger.json
+++ b/api/docs/swagger.json
@@ -3345,6 +3345,7 @@
"required": [
"created_at",
"delivered_count",
+ "expired_count",
"failed_count",
"pending_count",
"request_id",
@@ -3361,6 +3362,10 @@
"type": "integer",
"example": 25
},
+ "expired_count": {
+ "type": "integer",
+ "example": 3
+ },
"failed_count": {
"type": "integer",
"example": 5
@@ -3371,7 +3376,7 @@
},
"request_id": {
"type": "string",
- "example": "bulk-32343a19-da5e-4b1b-a767-3298a73703cb"
+ "example": "bulk-csv-a1B2c3D4e5"
},
"scheduled_count": {
"type": "integer",
@@ -5367,4 +5372,4 @@
"in": "header"
}
}
-}
+}
\ No newline at end of file
diff --git a/api/docs/swagger.yaml b/api/docs/swagger.yaml
index 4c6d0938..bb004171 100644
--- a/api/docs/swagger.yaml
+++ b/api/docs/swagger.yaml
@@ -48,6 +48,9 @@ definitions:
delivered_count:
example: 25
type: integer
+ expired_count:
+ example: 3
+ type: integer
failed_count:
example: 5
type: integer
@@ -55,7 +58,7 @@ definitions:
example: 30
type: integer
request_id:
- example: bulk-32343a19-da5e-4b1b-a767-3298a73703cb
+ example: bulk-csv-a1B2c3D4e5
type: string
scheduled_count:
example: 50
@@ -69,6 +72,7 @@ definitions:
required:
- created_at
- delivered_count
+ - expired_count
- failed_count
- pending_count
- request_id
diff --git a/api/pkg/entities/bulk_message.go b/api/pkg/entities/bulk_message.go
index 86227ffa..218e50f2 100644
--- a/api/pkg/entities/bulk_message.go
+++ b/api/pkg/entities/bulk_message.go
@@ -4,7 +4,7 @@ import "time"
// BulkMessage represents a summary of a bulk message batch
type BulkMessage struct {
- RequestID string `json:"request_id" example:"bulk-csv-a1B2c3D4e5"`
+ RequestID string `json:"request_id" example:"bulk-httpsms-file.csv"`
Total int64 `json:"total" example:"150"`
ScheduledCount int64 `json:"scheduled_count" example:"50"`
PendingCount int64 `json:"pending_count" example:"30"`
diff --git a/web/app/pages/bulk-messages/index.vue b/web/app/pages/bulk-messages/index.vue
index a8336246..ff723751 100644
--- a/web/app/pages/bulk-messages/index.vue
+++ b/web/app/pages/bulk-messages/index.vue
@@ -2,7 +2,7 @@
import { mdiArrowLeft, mdiMicrosoftExcel, mdiSendCheck } from '@mdi/js'
import { ErrorMessages } from '~/utils/errors'
import { toApiError } from '~/utils/api-error'
-import type { BulkMessageOrder } from '~~/shared/types/bulk-message'
+import type { EntitiesBulkMessage } from '~~/shared/types/api'
import capitalize from '~/utils/capitalize'
definePageMeta({
@@ -25,7 +25,7 @@ const loading = ref(true)
const loadingHistory = ref(true)
const errorTitle = ref('')
const errorMessages = ref(new ErrorMessages())
-const bulkOrders = ref<BulkMessageOrder[]>([])
+const bulkOrders = ref<EntitiesBulkMessage[]>([])
function parseErrors(error: unknown): ErrorMessages {
const bag = new ErrorMessages()
@@ -50,7 +50,7 @@ async function fetchBulkOrders() {
loadingHistory.value = true
try {
const api = useApi()
- const response = await api<{ data: BulkMessageOrder[] }>(
+ const response = await api<{ data: EntitiesBulkMessage[] }>(
'/v1/bulk-messages',
{
method: 'GET',
diff --git a/web/app/pages/heartbeats/[id].vue b/web/app/pages/heartbeats/[id].vue
index 641ba818..679fd36b 100644
--- a/web/app/pages/heartbeats/[id].vue
+++ b/web/app/pages/heartbeats/[id].vue
@@ -6,7 +6,7 @@ import {
} from 'date-fns'
import { Bar } from 'vue-chartjs'
import type { ChartData, ChartOptions } from 'chart.js'
-import type { Heartbeat } from '~~/shared/types/heartbeat'
+import type { EntitiesHeartbeat } from '~~/shared/types/api'
definePageMeta({
middleware: ['auth'],
@@ -23,7 +23,7 @@ const phonesStore = usePhonesStore()
const { formatPhoneNumber, formatTimestamp } = useFilters()
const loading = ref(true)
-const heartbeats = ref<Heartbeat[]>([])
+const heartbeats = ref<EntitiesHeartbeat[]>([])
const phoneId = computed(() => route.params.id as string)
interface HeartbeatTableItem {
diff --git a/web/app/pages/threads/[id]/index.vue b/web/app/pages/threads/[id]/index.vue
index 45d051f9..91fc3095 100644
--- a/web/app/pages/threads/[id]/index.vue
+++ b/web/app/pages/threads/[id]/index.vue
@@ -18,7 +18,7 @@ import {
import Pusher from 'pusher-js'
import type { Channel } from 'pusher-js'
import { isValidPhoneNumber } from 'libphonenumber-js'
-import type { Message } from '~/shared/types/message'
+import type { EntitiesMessage } from '~~/shared/types/api'
definePageMeta({
middleware: ['auth'],
@@ -43,7 +43,7 @@ const formMessage = ref('')
const submitting = ref(false)
const loadingMessages = ref(false)
const hideMessages = ref(true)
-const messages = ref<Message[]>([])
+const messages = ref<EntitiesMessage[]>([])
const selectedMenuItem = ref(-1)
const messageBody = ref<HTMLElement | null>(null)
const form = ref<{ validate: () => Promise<{ valid: boolean }> } | null>(null)
@@ -68,29 +68,29 @@ const messageVisibility = computed(() =>
)
const contact = computed(() => threadsStore.currentThread?.contact ?? '')
-function isMT(message: Message): boolean {
+function isMT(message: EntitiesMessage): boolean {
return message.type === 'mobile-terminated'
}
-function isMo(message: Message): boolean {
+function isMo(message: EntitiesMessage): boolean {
return message.type === 'mobile-originated'
}
-function isMissedCall(message: Message): boolean {
+function isMissedCall(message: EntitiesMessage): boolean {
return message.type === 'call/missed'
}
-function isPending(message: Message): boolean {
+function isPending(message: EntitiesMessage): boolean {
return ['sending', 'pending', 'scheduled'].includes(message.status)
}
-function statusColor(message: Message): string {
+function statusColor(message: EntitiesMessage): string {
if (message.status === 'sending') return 'warning'
if (message.status === 'scheduled') return 'teal'
return 'primary'
}
-function canResend(message: Message): boolean {
+function canResend(message: EntitiesMessage): boolean {
return (
isMT(message) &&
(message.status === 'expired' || message.status === 'failed')
@@ -114,9 +114,9 @@ function scrollToElement() {
function loadMessages(hide = true) {
loadingMessages.value = true
const threadId = route.params.id as string
- messagesStore
+ threadsStore
.loadThreadMessages(threadId)
- .then((msgs: Message[]) => {
+ .then((msgs: EntitiesMessage[]) => {
messages.value = [...msgs].reverse()
})
.finally(() => {
@@ -143,20 +143,26 @@ async function loadData() {
}
async function archiveThread() {
- await threadsStore.updateThread(threadsStore.currentThread!.id, true)
+ await threadsStore.updateThread({
+ threadId: threadsStore.currentThread!.id,
+ isArchived: true,
+ })
setTimeout(() => {
selectedMenuItem.value = -1
}, 1000)
}
async function unArchiveThread() {
- await threadsStore.updateThread(threadsStore.currentThread!.id, false)
+ await threadsStore.updateThread({
+ threadId: threadsStore.currentThread!.id,
+ isArchived: false,
+ })
setTimeout(() => {
selectedMenuItem.value = -1
}, 1000)
}
-async function resendMessage(message: Message) {
+async function resendMessage(message: EntitiesMessage) {
await messagesStore.sendMessage({
from: message.owner,
to: message.contact,
@@ -169,7 +175,7 @@ async function resendMessage(message: Message) {
loadMessages(false)
}
-async function deleteMessage(message: Message) {
+async function deleteMessage(message: EntitiesMessage) {
await messagesStore.deleteMessage(message.id)
setTimeout(() => {
selectedMenuItem.value = -1
@@ -177,7 +183,7 @@ async function deleteMessage(message: Message) {
loadMessages(false)
}
-async function copyMessageId(message: Message) {
+async function copyMessageId(message: EntitiesMessage) {
await navigator.clipboard.writeText(message.id)
notificationsStore.addNotification({
message: 'Message ID copied to clipboard',
@@ -204,7 +210,7 @@ async function sendMessage(event: KeyboardEvent | Event) {
submitting.value = true
await messagesStore.sendMessage({
- from: phonesStore.owner,
+ from: phonesStore.owner!,
to: threadsStore.currentThread!.contact,
content: formMessage.value,
sim: 'DEFAULT',
@@ -256,7 +262,11 @@ onBeforeUnmount(() => {
<VIcon :icon="mdiDotsVertical" />
</VBtn>
</template>
- <VList class="px-2" nav :density="mdAndDown ? 'compact' : 'default'">
+ <VList
+ class="pa-0"
+ prepend-gap="24"
+ :density="mdAndDown ? 'compact' : 'default'"
+ >
<VListItem
v-if="
threadsStore.currentThread &&
@@ -293,12 +303,17 @@ onBeforeUnmount(() => {
</VList>
</VMenu>
</VAppBar>
- <VProgressLinear v-if="loadingMessages" color="primary" indeterminate />
+ <VProgressLinear
+ v-if="loadingMessages"
+ class="mt-n5 py-1"
+ color="primary"
+ indeterminate
+ />
<VContainer v-if="threadsStore.currentThread">
<div
ref="messageBody"
class="messages-body no-scrollbar"
- :class="{ 'pr-7': lgAndUp }"
+ :class="{ 'pr-7 pl-3': lgAndUp }"
>
<VRow
v-for="message in messages"
@@ -315,12 +330,20 @@ onBeforeUnmount(() => {
}"
>
<VSpacer v-if="isMT(message)" />
- <VAvatar
+ <v-avatar
v-if="isMo(message)"
:color="threadsStore.currentThread!.color"
+ size="40"
>
- <VIcon :icon="mdiAccount" />
- </VAvatar>
+ <v-icon
+ v-if="isValidPhoneNumber(message.contact)"
+ color="white"
+ >{{ mdiAccount }}</v-icon
+ >
+ <span v-else class="text-white text-headline-small">{{
+ message.contact.substring(0, 1)
+ }}</span>
+ </v-avatar>
<VAvatar v-if="isMissedCall(message)" color="#1e1e1e">
<VIcon size="large" color="red" :icon="mdiCallMissed" />
</VAvatar>
@@ -331,33 +354,42 @@ onBeforeUnmount(() => {
<VIcon :icon="mdiDotsVertical" />
</VBtn>
</template>
- <VList class="px-2" nav density="compact">
+ <VList class="pa-0" prepend-gap="24" density="compact">
<VListItem
v-if="canResend(message)"
@click.prevent="resendMessage(message)"
>
- <template #prepend><VIcon :icon="mdiRefresh" /></template>
- <VListItemTitle>Resend Message</VListItemTitle>
+ <template #prepend
+ ><VIcon size="small" :icon="mdiRefresh"
+ /></template>
+ <VListItemTitle class="text-body-medium"
+ >Resend Message</VListItemTitle
+ >
</VListItem>
<VListItem @click.prevent="copyMessageId(message)">
<template #prepend
- ><VIcon :icon="mdiContentCopy"
+ ><VIcon size="small" :icon="mdiContentCopy"
/></template>
- <VListItemTitle>Copy Message ID</VListItemTitle>
+ <VListItemTitle class="text-body-medium"
+ >Copy Message ID</VListItemTitle
+ >
</VListItem>
<VListItem @click.prevent="deleteMessage(message)">
<template #prepend
- ><VIcon :icon="mdiDelete" color="error"
+ ><VIcon size="small" :icon="mdiDelete" color="error"
/></template>
- <VListItemTitle>Delete Message</VListItemTitle>
+ <VListItemTitle class="text-body-medium"
+ >Delete Message</VListItemTitle
+ >
</VListItem>
</VList>
</VMenu>
<div>
<VCard
- class="ml-2"
rounded="shaped"
+ :variant="isMT(message) ? 'flat' : 'tonal'"
:color="isMT(message) ? 'primary' : undefined"
+ :class="{ 'ml-2': !isMT(message) }"
>
<VCardText
v-if="message.content"
@@ -372,7 +404,10 @@ onBeforeUnmount(() => {
>
</VCardText>
</VCard>
- <VCard v-if="message.attachments?.length">
+ <VCard
+ v-if="message.attachments?.length"
+ :class="{ 'ml-2': !isMT(message) }"
+ >
<VCardText class="pb-2">
<a
v-for="(attachment, index) in message.attachments"
@@ -443,25 +478,33 @@ onBeforeUnmount(() => {
<VIcon :icon="mdiDotsVertical" />
</VBtn>
</template>
- <VList class="px-2" nav density="compact">
+ <VList class="pa-0" prepend-gap="16" density="compact">
<VListItem
v-if="canResend(message)"
@click.prevent="resendMessage(message)"
>
- <template #prepend><VIcon :icon="mdiRefresh" /></template>
- <VListItemTitle>Resend Message</VListItemTitle>
+ <template #prepend
+ ><VIcon size="small" :icon="mdiRefresh"
+ /></template>
+ <VListItemTitle class="text-body-medium"
+ >Resend Message</VListItemTitle
+ >
</VListItem>
<VListItem @click.prevent="copyMessageId(message)">
<template #prepend
- ><VIcon :icon="mdiContentCopy"
+ ><VIcon size="small" :icon="mdiContentCopy"
/></template>
- <VListItemTitle>Copy Message ID</VListItemTitle>
+ <VListItemTitle class="text-body-medium"
+ >Copy Message ID</VListItemTitle
+ >
</VListItem>
<VListItem @click.prevent="deleteMessage(message)">
<template #prepend
- ><VIcon :icon="mdiDelete" color="error"
+ ><VIcon size="small" :icon="mdiDelete" color="error"
/></template>
- <VListItemTitle>Delete Message</VListItemTitle>
+ <VListItemTitle class="text-body-medium"
+ >Delete Message</VListItemTitle
+ >
</VListItem>
</VList>
</VMenu>
diff --git a/web/app/stores/auth.ts b/web/app/stores/auth.ts
index a58d66a9..7d8e17ae 100644
--- a/web/app/stores/auth.ts
+++ b/web/app/stores/auth.ts
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia'
import type { User as FirebaseUser } from 'firebase/auth'
import { setAuthHeader, setApiKey } from '~/composables/useApi'
-import type { User } from '~~/shared/types/user'
+import type { EntitiesUser } from '~~/shared/types/api'
export interface AuthUser {
email: string | null
@@ -12,7 +12,7 @@ export interface AuthUser {
export const useAuthStore = defineStore('auth', () => {
const authStateChanged = ref(false)
const authUser = ref<AuthUser | null>(null)
- const user = ref<User | null>(null)
+ const user = ref<EntitiesUser | null>(null)
const { apiFetch } = useApi()
async function setAuthUserAction(newUser: AuthUser | null | undefined) {
@@ -48,7 +48,7 @@ export const useAuthStore = defineStore('auth', () => {
}
async function loadUser() {
- const response = await apiFetch<{ data: User }>('/v1/users/me')
+ const response = await apiFetch<{ data: EntitiesUser }>('/v1/users/me')
user.value = response.data
}
@@ -61,7 +61,7 @@ export const useAuthStore = defineStore('auth', () => {
const activePhone = phonesStore.activePhone
if (!activePhone) return
- const response = await apiFetch<{ data: User }>('/v1/users/me', {
+ const response = await apiFetch<{ data: EntitiesUser }>('/v1/users/me', {
method: 'PUT',
body: {
active_phone_id: activePhone.id,
@@ -80,8 +80,8 @@ export const useAuthStore = defineStore('auth', () => {
return response.message
}
- async function rotateApiKey(userId: string): Promise<User> {
- const response = await apiFetch<{ data: User }>(
+ async function rotateApiKey(userId: string): Promise<EntitiesUser> {
+ const response = await apiFetch<{ data: EntitiesUser }>(
`/v1/users/${userId}/api-keys`,
{
method: 'DELETE',
diff --git a/web/app/stores/billing.ts b/web/app/stores/billing.ts
index a9fd9395..6d5db82e 100644
--- a/web/app/stores/billing.ts
+++ b/web/app/stores/billing.ts
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia'
-import type { BillingUsage } from '~~/shared/types/billing'
-import type { User } from '~~/shared/types/user'
import type {
+ EntitiesBillingUsage,
+ EntitiesUser,
EntitiesWebhook,
EntitiesDiscord,
EntitiesMessageSendSchedule,
@@ -17,18 +17,20 @@ import type {
} from '~~/shared/types/api'
export const useBillingStore = defineStore('billing', () => {
- const billingUsage = ref<BillingUsage | null>(null)
- const billingUsageHistory = ref<BillingUsage[]>([])
+ const billingUsage = ref<EntitiesBillingUsage | null>(null)
+ const billingUsageHistory = ref<EntitiesBillingUsage[]>([])
const { apiFetch } = useApi()
const notificationsStore = useNotificationsStore()
async function loadBillingUsage() {
- const response = await apiFetch<{ data: BillingUsage }>('/v1/billing/usage')
+ const response = await apiFetch<{ data: EntitiesBillingUsage }>(
+ '/v1/billing/usage',
+ )
billingUsage.value = response.data
}
async function loadBillingUsageHistory() {
- const response = await apiFetch<{ data: BillingUsage[] }>(
+ const response = await apiFetch<{ data: EntitiesBillingUsage[] }>(
'/v1/billing/usage-history',
)
billingUsageHistory.value = response.data
@@ -257,7 +259,7 @@ export const useBillingStore = defineStore('billing', () => {
payload: RequestsUserNotificationUpdate,
): Promise<void> {
const authStore = useAuthStore()
- const response = await apiFetch<{ data: User }>(
+ const response = await apiFetch<{ data: EntitiesUser }>(
`/v1/users/${userId}/notifications`,
{
method: 'PUT',
diff --git a/web/app/stores/messages.ts b/web/app/stores/messages.ts
index b56cd36d..abaf47b6 100644
--- a/web/app/stores/messages.ts
+++ b/web/app/stores/messages.ts
@@ -1,7 +1,6 @@
import { defineStore } from 'pinia'
-import type { EntitiesMessage } from '~~/shared/types/api'
+import type { EntitiesMessage, EntitiesBulkMessage } from '~~/shared/types/api'
import type { SearchMessagesRequest } from '~~/shared/types/message'
-import type { BulkMessageOrder } from '~~/shared/types/bulk-message'
import { getApiErrorMessage } from '~/utils/api-error'
export type SIM = 'SIM1' | 'SIM2' | 'DEFAULT'
@@ -79,8 +78,8 @@ export const useMessagesStore = defineStore('messages', () => {
})
}
- async function fetchBulkMessageOrders(): Promise<BulkMessageOrder[]> {
- const response = await apiFetch<{ data: BulkMessageOrder[] }>(
+ async function fetchBulkMessageOrders(): Promise<EntitiesBulkMessage[]> {
+ const response = await apiFetch<{ data: EntitiesBulkMessage[] }>(
'/v1/bulk-messages',
)
return response.data ?? []
diff --git a/web/app/stores/phones.ts b/web/app/stores/phones.ts
index 2a0bb3a2..d7412ffb 100644
--- a/web/app/stores/phones.ts
+++ b/web/app/stores/phones.ts
@@ -1,12 +1,11 @@
import { defineStore } from 'pinia'
-import type { EntitiesPhone } from '~~/shared/types/api'
-import type { Heartbeat } from '~~/shared/types/heartbeat'
+import type { EntitiesPhone, EntitiesHeartbeat } from '~~/shared/types/api'
import { getApiErrorMessage } from '~/utils/api-error'
export const usePhonesStore = defineStore('phones', () => {
const phones = ref<EntitiesPhone[]>([])
const owner = ref<string | null>(null)
- const heartbeat = ref<Heartbeat | null>(null)
+ const heartbeat = ref<EntitiesHeartbeat | null>(null)
const { apiFetch } = useApi()
const notificationsStore = useNotificationsStore()
@@ -76,10 +75,13 @@ export const usePhonesStore = defineStore('phones', () => {
}
}
- async function getHeartbeat(limit = 1): Promise<Heartbeat[]> {
- const response = await apiFetch<{ data: Heartbeat[] }>('/v1/heartbeats', {
- query: { limit, owner: owner.value },
- })
+ async function getHeartbeat(limit = 1): Promise<EntitiesHeartbeat[]> {
+ const response = await apiFetch<{ data: EntitiesHeartbeat[] }>(
+ '/v1/heartbeats',
+ {
+ query: { limit, owner: owner.value },
+ },
+ )
if (response.data.length > 0) {
heartbeat.value = response.data[0]!
} else {
diff --git a/web/app/stores/threads.ts b/web/app/stores/threads.ts
index 61c84473..7312153c 100644
--- a/web/app/stores/threads.ts
+++ b/web/app/stores/threads.ts
@@ -1,16 +1,18 @@
import { defineStore } from 'pinia'
-import type { MessageThread } from '~~/shared/types/message-thread'
-import type { Message } from '~~/shared/types/message'
+import type {
+ EntitiesMessageThread,
+ EntitiesMessage,
+} from '~~/shared/types/api'
export const useThreadsStore = defineStore('threads', () => {
- const threads = ref<MessageThread[]>([])
+ const threads = ref<EntitiesMessageThread[]>([])
const threadId = ref<string | null>(null)
const loadingThreads = ref(true)
const archivedThreads = ref(false)
const { apiFetch } = useApi()
const notificationsStore = useNotificationsStore()
- const currentThread = computed<MessageThread | null>(() => {
+ const currentThread = computed<EntitiesMessageThread | null>(() => {
return threads.value.find((x) => x.id === threadId.value) ?? null
})
@@ -29,7 +31,7 @@ export const useThreadsStore = defineStore('threads', () => {
return
}
- const response = await apiFetch<{ data: MessageThread[] }>(
+ const response = await apiFetch<{ data: EntitiesMessageThread[] }>(
'/v1/message-threads',
{
params: {
@@ -45,18 +47,23 @@ export const useThreadsStore = defineStore('threads', () => {
loadingThreads.value = false
}
- async function loadThreadMessages(id: string | null): Promise<Message[]> {
+ async function loadThreadMessages(
+ id: string | null,
+ ): Promise<EntitiesMessage[]> {
threadId.value = id
const thread = currentThread.value
if (!thread) throw new Error(`Cannot find thread with id ${id}`)
- const response = await apiFetch<{ data: Message[] }>('/v1/messages', {
- params: {
- contact: thread.contact,
- owner: thread.owner,
- limit: 50,
+ const response = await apiFetch<{ data: EntitiesMessage[] }>(
+ '/v1/messages',
+ {
+ params: {
+ contact: thread.contact,
+ owner: thread.owner,
+ limit: 50,
+ },
},
- })
+ )
return response.data
}
diff --git a/web/shared/types/api.ts b/web/shared/types/api.ts
index dba3c6ca..df85420a 100644
--- a/web/shared/types/api.ts
+++ b/web/shared/types/api.ts
@@ -55,11 +55,13 @@ export interface EntitiesBulkMessage {
created_at: string;
/** @example 25 */
delivered_count: number;
+ /** @example 3 */
+ expired_count: number;
/** @example 5 */
failed_count: number;
/** @example 30 */
pending_count: number;
- /** @example "bulk-32343a19-da5e-4b1b-a767-3298a73703cb" */
+ /** @example "bulk-csv-a1B2c3D4e5" */
request_id: string;
/** @example 50 */
scheduled_count: number;
diff --git a/web/shared/types/billing.ts b/web/shared/types/billing.ts
deleted file mode 100644
index 5943b81e..00000000
--- a/web/shared/types/billing.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface BillingUsage {
- id: string
- user_id: string
- start_timestamp: string
- end_timestamp: string
- sent_messages: number
- received_messages: number
- total_cost: number
- created_at: string
-}
diff --git a/web/shared/types/bulk-message.ts b/web/shared/types/bulk-message.ts
deleted file mode 100644
index 9946967c..00000000
--- a/web/shared/types/bulk-message.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export interface BulkMessageOrder {
- request_id: string
- created_at: string
- total: number
- pending_count: number
- scheduled_count: number
- sent_count: number
- delivered_count: number
- failed_count: number
- expired_count: number
-}
diff --git a/web/shared/types/heartbeat.ts b/web/shared/types/heartbeat.ts
deleted file mode 100644
index c1d08265..00000000
--- a/web/shared/types/heartbeat.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface Heartbeat {
- id: string
- owner: string
- phone_number: string
- charging: boolean
- timestamp: string
-}
diff --git a/web/shared/types/message-thread.ts b/web/shared/types/message-thread.ts
deleted file mode 100644
index 9efd8193..00000000
--- a/web/shared/types/message-thread.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface MessageThread {
- color: string
- contact: string
- created_at: string
- id: string
- last_message_content: string
- last_message_id: string
- is_archived: boolean
- order_timestamp: string
- owner: string
- status: string
- updated_at: string
-}
diff --git a/web/shared/types/message.ts b/web/shared/types/message.ts
index b17b53ec..d47a2db9 100644
--- a/web/shared/types/message.ts
+++ b/web/shared/types/message.ts
@@ -1,22 +1,3 @@
-export interface Message {
- contact: string
- content: string
- attachments: Array<string> | null
- created_at: string
- failure_reason: string
- id: string
- last_attempted_at: string | null
- order_timestamp: string
- owner: string
- received_at: string | null
- request_received_at: string | null
- send_time: number | null
- sent_at: string
- status: string
- type: string
- updated_at: string
-}
-
export interface SearchMessagesRequest {
owners: string[]
types: string[]
diff --git a/web/shared/types/user.ts b/web/shared/types/user.ts
deleted file mode 100644
index 8a034f44..00000000
--- a/web/shared/types/user.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export interface User {
- id: string
- email: string
- api_key: string
- active_phone_id: string | null
- timezone: string
- subscription_id: string | null
- subscription_name: string | null
- subscription_status: string | null
- subscription_renews_at: string | null
- subscription_ends_at: string | null
- notification_heartbeat_enabled: boolean
- notification_message_status_enabled: boolean
- notification_newsletter_enabled: boolean
- notification_webhook_enabled: boolean
-}
diff --git a/web/tsconfig.tsbuildinfo b/web/tsconfig.tsbuildinfo
index f492acbc..2a319007 100644
--- a/web/tsconfig.tsbuildinfo
+++ b/web/tsconfig.tsbuildinfo
@@ -1 +1 @@
-{"root":["./app/composables/useapi.ts","./app/composables/usefilters.ts","./app/middleware/auth.ts","./app/middleware/guest.ts","./app/plugins/chart.client.ts","./app/plugins/firebase.client.ts","./app/plugins/highlightjs.client.ts","./app/plugins/vphoneinput.client.ts","./app/plugins/vue-glow.client.ts","./app/stores/app.ts","./app/stores/auth.ts","./app/stores/billing.ts","./app/stores/messages.ts","./app/stores/notifications.ts","./app/stores/phones.ts","./app/stores/threads.ts","./app/types/nuxt-shims.d.ts","./app/utils/api-error.ts","./app/utils/bag.ts","./app/utils/capitalize.ts","./app/utils/countries.ts","./app/utils/errors.ts","./app/utils/filters.ts","./shared/types/api.ts","./shared/types/billing.ts","./shared/types/bulk-message.ts","./shared/types/heartbeat.ts","./shared/types/message-thread.ts","./shared/types/message.ts","./shared/types/user.ts"],"errors":true,"version":"6.0.3"}
\ No newline at end of file
+{"root":["./app/composables/useapi.ts","./app/composables/usefilters.ts","./app/middleware/auth.ts","./app/middleware/guest.ts","./app/plugins/chart.client.ts","./app/plugins/firebase.client.ts","./app/plugins/highlightjs.client.ts","./app/plugins/vphoneinput.client.ts","./app/plugins/vue-glow.client.ts","./app/stores/app.ts","./app/stores/auth.ts","./app/stores/billing.ts","./app/stores/messages.ts","./app/stores/notifications.ts","./app/stores/phones.ts","./app/stores/threads.ts","./app/types/nuxt-shims.d.ts","./app/utils/api-error.ts","./app/utils/bag.ts","./app/utils/capitalize.ts","./app/utils/countries.ts","./app/utils/errors.ts","./app/utils/filters.ts","./shared/types/api.ts","./shared/types/message.ts"],"errors":true,"version":"6.0.3"}
\ No newline at end of file