Skip to content

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

Fix ESLINT warnings

Acho Arnold9827ebf2e5f6
diff --git a/api/pkg/validators/bulk_message_handler_validator.go b/api/pkg/validators/bulk_message_handler_validator.go
index d640c648..3fa0c35c 100644
--- a/api/pkg/validators/bulk_message_handler_validator.go
+++ b/api/pkg/validators/bulk_message_handler_validator.go
@@ -12,12 +12,12 @@ import (
"github.com/xuri/excelize/v2"
+ "github.com/NdoleStudio/httpsms/pkg/cache"
"github.com/NdoleStudio/httpsms/pkg/entities"
"github.com/NdoleStudio/httpsms/pkg/repositories"
"github.com/NdoleStudio/httpsms/pkg/requests"
"github.com/NdoleStudio/httpsms/pkg/services"
"github.com/NdoleStudio/httpsms/pkg/telemetry"
- "github.com/NdoleStudio/httpsms/pkg/cache"
"github.com/dustin/go-humanize"
"github.com/jszwec/csvutil"
"github.com/nyaruka/phonenumbers"
@@ -123,6 +123,7 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, user
result.Add("document", fmt.Sprintf("Cannot parse the uploaded excel file with name [%s].", header.Filename))
return nil, result
}
+ defer excel.Close()
rows, err := excel.GetRows(excel.GetSheetName(0))
if err != nil {
@@ -212,14 +213,14 @@ func (v *BulkMessageHandlerValidator) parseCSV(ctxLogger telemetry.Logger, user
var messages []*requests.BulkMessage
if err := csvutil.Unmarshal(content, &messages); err != nil {
ctxLogger.Error(stacktrace.Propagate(err, fmt.Sprintf("cannot unmarshall contents [%s] into type [%T] for file [%s] and user [%s]", content, messages, header.Filename, user.ID)))
- result.Add("document", fmt.Sprintf("Cannot read the conents of the uploaded file [%s].", header.Filename))
+ result.Add("document", fmt.Sprintf("Cannot read the contents of the uploaded file [%s].", header.Filename))
return nil, result
}
return messages, url.Values{}
}
-func (v *BulkMessageHandlerValidator) validateMessages(ctx context.Context, messages []*requests.BulkMessage) url.Values {
+func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messages []*requests.BulkMessage) url.Values {
result := url.Values{}
for index, message := range messages {
@@ -251,7 +252,6 @@ func (v *BulkMessageHandlerValidator) validateMessages(ctx context.Context, mess
}
}
}
- }
if _, err := phonenumbers.Parse(message.FromPhoneNumber, phonenumbers.UNKNOWN_REGION); err != nil {
result.Add("document", fmt.Sprintf("Row [%d]: The FromPhoneNumber [%s] is not a valid E.164 phone number", index+2, message.FromPhoneNumber))
diff --git a/web/models/api.ts b/web/models/api.ts
index 029b5f01..660e7493 100644
--- a/web/models/api.ts
+++ b/web/models/api.ts
@@ -1,5 +1,3 @@
-/* eslint-disable */
-/* tslint:disable */
// @ts-nocheck
/*
* ---------------------------------------------------------------
diff --git a/web/pages/messages/index.vue b/web/pages/messages/index.vue
index 78a46533..eec128e8 100644
--- a/web/pages/messages/index.vue
+++ b/web/pages/messages/index.vue
@@ -106,7 +106,8 @@ export default {
let contentType = 'application/octet-stream'
const lowerUrl = cleanUrl.toLowerCase()
- if (lowerUrl.endsWith('.jpg') || lowerUrl.endsWith('.jpeg')) contentType = 'image/jpeg'
+ if (lowerUrl.endsWith('.jpg') || lowerUrl.endsWith('.jpeg'))
+ contentType = 'image/jpeg'
else if (lowerUrl.endsWith('.png')) contentType = 'image/png'
else if (lowerUrl.endsWith('.gif')) contentType = 'image/gif'
else if (lowerUrl.endsWith('.mp4')) contentType = 'video/mp4'
@@ -120,7 +121,7 @@ export default {
to: this.formPhoneNumber,
from: this.$store.getters.getOwner,
content: this.formContent,
- attachments: attachments,
+ attachments,
sim: this.simSelected.code,
})
.then(() => {
diff --git a/web/pages/phone-api-keys/index.vue b/web/pages/phone-api-keys/index.vue
index dc19e75c..e83a2d70 100644
--- a/web/pages/phone-api-keys/index.vue
+++ b/web/pages/phone-api-keys/index.vue
@@ -24,9 +24,9 @@
<v-col cols="12" md="9" offset-md="1" xl="8" offset-xl="2">
<div class="d-flex mt-3 mb-4">
<v-progress-circular
+ v-if="loading"
:size="24"
:width="2"
- v-if="loading"
color="primary"
class="mt-2 mr-2"
indeterminate
diff --git a/web/pages/settings/index.vue b/web/pages/settings/index.vue
index 10cbf94f..6d3415d0 100644
--- a/web/pages/settings/index.vue
+++ b/web/pages/settings/index.vue
@@ -828,7 +828,7 @@ import {
mdiSquareEditOutline,
mdiQrcode,
} from '@mdi/js'
-import QRCode from 'qrcode'
+import { toCanvas } from 'qrcode'
import { ErrorMessages } from '~/plugins/errors'
import LoadingButton from '~/components/LoadingButton.vue'
@@ -955,7 +955,7 @@ export default Vue.extend({
generateQrCode(text) {
const canvas = this.$refs.qrCodeCanvas
if (canvas) {
- QRCode.toCanvas(canvas, text, { errorCorrectionLevel: 'H' }, (err) => {
+ toCanvas(canvas, text, { errorCorrectionLevel: 'H' }, (err) => {
if (err) {
this.$store.dispatch('addNotification', {
message: 'Failed to generate API key QR code',
diff --git a/web/pages/threads/_id/index.vue b/web/pages/threads/_id/index.vue
index 00636a0f..4ea6504d 100644
--- a/web/pages/threads/_id/index.vue
+++ b/web/pages/threads/_id/index.vue
@@ -173,11 +173,8 @@
>
</v-card-text>
</v-card>
- <v-card
- v-if="message.attachments?.length"
- shaped
- >
- <v-card-title>Message Attachments</v-card-title>
+ <v-card v-if="message.attachments?.length" shaped>
+ <v-card-title>Message Attachments</v-card-title>
<v-card-text>
<v-row>
<v-col
@@ -195,8 +192,12 @@
class="bg-grey-lighten-2 rounded"
cover
>
- <template v-slot:placeholder>
- <v-row class="fill-height ma-0" align="center" justify="center">
+ <template #placeholder>
+ <v-row
+ class="fill-height ma-0"
+ align="center"
+ justify="center"
+ >
<v-progress-circular
indeterminate
color="grey-lighten-1"
@@ -204,10 +205,18 @@
</v-row>
</template>
</v-img>
-
- <div v-else class="text-center pa-4 bg-grey-lighten-4 rounded">
- <v-icon icon="mdi-file-document-outline" size="large"></v-icon>
- <div class="text-caption mt-2">Unsupported file type</div>
+
+ <div
+ v-else
+ class="text-center pa-4 bg-grey-lighten-4 rounded"
+ >
+ <v-icon
+ icon="mdi-file-document-outline"
+ size="large"
+ ></v-icon>
+ <div class="text-caption mt-2">
+ Unsupported file type
+ </div>
</div>
</v-col>
</v-row>