From 96743d28ba3d54a8f47a4c5c44c243a86c55f388 Mon Sep 17 00:00:00 2001 From: domwong Date: Thu, 11 Nov 2021 23:34:12 +0000 Subject: [PATCH] Commit from GitHub Actions (Generate Clients & Examples) --- clients/go/spam/spam.go | 6 +++++- clients/ts/package.json | 2 +- examples/db/create/go/createARecord.go | 2 +- examples/event/publish/go/publishAnEvent.go | 2 +- examples/spam/classify/curl/classifyAnEmail.sh | 2 +- .../curl/classifyAnEmailUsingTheRawData.sh | 6 ++++++ .../classify/go/classifyAnEmailUsingTheRawData.go | 15 +++++++++++++++ examples/spam/classify/node/classifyAnEmail.js | 2 +- .../node/classifyAnEmailUsingTheRawData.js | 13 +++++++++++++ 9 files changed, 44 insertions(+), 6 deletions(-) create mode 100755 examples/spam/classify/curl/classifyAnEmailUsingTheRawData.sh create mode 100755 examples/spam/classify/go/classifyAnEmailUsingTheRawData.go create mode 100755 examples/spam/classify/node/classifyAnEmailUsingTheRawData.js diff --git a/clients/go/spam/spam.go b/clients/go/spam/spam.go index efa7430..99b6e22 100755 --- a/clients/go/spam/spam.go +++ b/clients/go/spam/spam.go @@ -23,12 +23,16 @@ func (t *SpamService) Classify(request *ClassifyRequest) (*ClassifyResponse, err } type ClassifyRequest struct { - // The body of the email + // The raw body of the email including headers etc per RFC 822. Alternatively, use the other parameters to correctly format the message EmailBody string `json:"emailBody"` // The email address it has been sent from From string `json:"from"` + // the HTML version of the email body + HtmlBody string `json:"htmlBody"` // The subject of the email Subject string `json:"subject"` + // the plain text version of the email body + TextBody string `json:"textBody"` // The email address it is being sent to To string `json:"to"` } diff --git a/clients/ts/package.json b/clients/ts/package.json index f34477f..41e0533 100644 --- a/clients/ts/package.json +++ b/clients/ts/package.json @@ -79,5 +79,5 @@ "prepare": "npm run build" }, "types": "index.d.ts", - "version": "1.0.734" + "version": "1.0.736" } \ No newline at end of file diff --git a/examples/db/create/go/createARecord.go b/examples/db/create/go/createARecord.go index 003184c..283dd5d 100755 --- a/examples/db/create/go/createARecord.go +++ b/examples/db/create/go/createARecord.go @@ -12,10 +12,10 @@ func CreateArecord() { dbService := db.NewDbService(os.Getenv("MICRO_API_TOKEN")) rsp, err := dbService.Create(&db.CreateRequest{ Record: map[string]interface{}{ + "id": "1", "name": "Jane", "age": 42, "isActive": true, - "id": "1", }, Table: "users", }) diff --git a/examples/event/publish/go/publishAnEvent.go b/examples/event/publish/go/publishAnEvent.go index fd9dc17..cd945dc 100755 --- a/examples/event/publish/go/publishAnEvent.go +++ b/examples/event/publish/go/publishAnEvent.go @@ -12,9 +12,9 @@ func PublishAnEvent() { eventService := event.NewEventService(os.Getenv("MICRO_API_TOKEN")) rsp, err := eventService.Publish(&event.PublishRequest{ Message: map[string]interface{}{ - "user": "john", "id": "1", "type": "signup", + "user": "john", }, Topic: "user", }) diff --git a/examples/spam/classify/curl/classifyAnEmail.sh b/examples/spam/classify/curl/classifyAnEmail.sh index c957d00..b1076cd 100755 --- a/examples/spam/classify/curl/classifyAnEmail.sh +++ b/examples/spam/classify/curl/classifyAnEmail.sh @@ -2,8 +2,8 @@ curl "http://localhost:8080/spam/Classify" \ -H "Content-Type: application/json" \ -H "Authorization: Bearer $MICRO_API_TOKEN" \ -d '{ - "email_body": "Hi there,\n\nWelcome to M3O.\n\nThanks\nM3O team", "from": "noreply@m3o.com", "subject": "Welcome", + "text_body": "Hi there,\n\nWelcome to M3O.\n\nThanks\nM3O team", "to": "hello@example.com" }' \ No newline at end of file diff --git a/examples/spam/classify/curl/classifyAnEmailUsingTheRawData.sh b/examples/spam/classify/curl/classifyAnEmailUsingTheRawData.sh new file mode 100755 index 0000000..c699b79 --- /dev/null +++ b/examples/spam/classify/curl/classifyAnEmailUsingTheRawData.sh @@ -0,0 +1,6 @@ +curl "http://localhost:8080/spam/Classify" \ +-H "Content-Type: application/json" \ +-H "Authorization: Bearer $MICRO_API_TOKEN" \ +-d '{ + "email_body": "Subject: Welcome\r\nTo: hello@emaple.com\r\nFrom: noreply@m3o.com\r\n\r\nHi there,\n\nWelcome to M3O.\n\nThanks\nM3O team" +}' \ No newline at end of file diff --git a/examples/spam/classify/go/classifyAnEmailUsingTheRawData.go b/examples/spam/classify/go/classifyAnEmailUsingTheRawData.go new file mode 100755 index 0000000..3d7fb98 --- /dev/null +++ b/examples/spam/classify/go/classifyAnEmailUsingTheRawData.go @@ -0,0 +1,15 @@ +package example + +import ( + "fmt" + "os" + + "github.com/micro/services/clients/go/spam" +) + +// Check whether an email is likely to be spam based on its attributes +func ClassifyAnEmailUsingTheRawData() { + spamService := spam.NewSpamService(os.Getenv("MICRO_API_TOKEN")) + rsp, err := spamService.Classify(&spam.ClassifyRequest{}) + fmt.Println(rsp, err) +} diff --git a/examples/spam/classify/node/classifyAnEmail.js b/examples/spam/classify/node/classifyAnEmail.js index 0c468d8..91c000e 100755 --- a/examples/spam/classify/node/classifyAnEmail.js +++ b/examples/spam/classify/node/classifyAnEmail.js @@ -4,9 +4,9 @@ const { SpamService } = require("m3o/spam"); async function classifyAnEmail() { let spamService = new SpamService(process.env.MICRO_API_TOKEN); let rsp = await spamService.classify({ - email_body: "Hi there,\n\nWelcome to M3O.\n\nThanks\nM3O team", from: "noreply@m3o.com", subject: "Welcome", + text_body: "Hi there,\n\nWelcome to M3O.\n\nThanks\nM3O team", to: "hello@example.com", }); console.log(rsp); diff --git a/examples/spam/classify/node/classifyAnEmailUsingTheRawData.js b/examples/spam/classify/node/classifyAnEmailUsingTheRawData.js new file mode 100755 index 0000000..8cf7136 --- /dev/null +++ b/examples/spam/classify/node/classifyAnEmailUsingTheRawData.js @@ -0,0 +1,13 @@ +const { SpamService } = require("m3o/spam"); + +// Check whether an email is likely to be spam based on its attributes +async function classifyAnEmailUsingTheRawData() { + let spamService = new SpamService(process.env.MICRO_API_TOKEN); + let rsp = await spamService.classify({ + email_body: + "Subject: Welcome\r\nTo: hello@emaple.com\r\nFrom: noreply@m3o.com\r\n\r\nHi there,\n\nWelcome to M3O.\n\nThanks\nM3O team", + }); + console.log(rsp); +} + +classifyAnEmailUsingTheRawData();