Skip to content

Commit bb98f3d

Browse files
committed
Change hermes package
1 parent d5721b6 commit bb98f3d

File tree

6 files changed

+58
-49
lines changed

6 files changed

+58
-49
lines changed

api/go.mod

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ require (
1717
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1818
github.com/dgraph-io/ristretto/v2 v2.4.0
1919
github.com/dustin/go-humanize v1.0.1
20+
github.com/go-hermes/hermes/v2 v2.6.2
2021
github.com/gofiber/contrib/otelfiber v1.0.10
2122
github.com/gofiber/fiber/v2 v2.52.11
2223
github.com/gofiber/swagger v1.1.1
@@ -30,7 +31,6 @@ require (
3031
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
3132
github.com/jszwec/csvutil v1.10.0
3233
github.com/lib/pq v1.11.1
33-
github.com/matcornic/hermes v1.3.0
3434
github.com/nyaruka/phonenumbers v1.6.8
3535
github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177
3636
github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -58,6 +58,18 @@ require (
5858
gorm.io/plugin/opentelemetry v0.1.16
5959
)
6060

61+
require (
62+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
63+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
64+
github.com/inbucket/html2text v1.0.0 // indirect
65+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
66+
github.com/olekukonko/errors v1.2.0 // indirect
67+
github.com/olekukonko/ll v0.1.4 // indirect
68+
github.com/sirupsen/logrus v1.9.4 // indirect
69+
github.com/spf13/cast v1.10.0 // indirect
70+
github.com/yuin/goldmark v1.7.16 // indirect
71+
)
72+
6173
require (
6274
cel.dev/expr v0.25.1 // indirect
6375
cloud.google.com/go v0.123.0 // indirect
@@ -78,8 +90,6 @@ require (
7890
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
7991
github.com/KyleBanks/depth v1.2.1 // indirect
8092
github.com/Masterminds/goutils v1.1.1 // indirect
81-
github.com/Masterminds/semver v1.5.0 // indirect
82-
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
8393
github.com/PuerkitoBio/goquery v1.11.0 // indirect
8494
github.com/andybalholm/brotli v1.2.0 // indirect
8595
github.com/andybalholm/cascadia v1.3.3 // indirect
@@ -121,13 +131,10 @@ require (
121131
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
122132
github.com/hashicorp/go-version v1.8.0 // indirect
123133
github.com/huandu/xstrings v1.5.0 // indirect
124-
github.com/imdario/mergo v0.3.16 // indirect
125-
github.com/inbucket/html2text v1.0.0 // indirect
126134
github.com/jackc/pgpassfile v1.0.0 // indirect
127135
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
128136
github.com/jackc/pgx/v5 v5.8.0 // indirect
129137
github.com/jackc/puddle/v2 v2.2.2 // indirect
130-
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 // indirect
131138
github.com/jinzhu/inflection v1.0.0 // indirect
132139
github.com/json-iterator/go v1.1.12 // indirect
133140
github.com/klauspost/compress v1.18.3 // indirect
@@ -139,9 +146,6 @@ require (
139146
github.com/mitchellh/reflectwalk v1.0.2 // indirect
140147
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
141148
github.com/modern-go/reflect2 v1.0.2 // indirect
142-
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
143-
github.com/olekukonko/errors v1.2.0 // indirect
144-
github.com/olekukonko/ll v0.1.4 // indirect
145149
github.com/olekukonko/tablewriter v1.1.3 // indirect
146150
github.com/paulmach/orb v0.12.0 // indirect
147151
github.com/pierrec/lz4/v4 v4.1.25 // indirect
@@ -150,7 +154,6 @@ require (
150154
github.com/redis/go-redis/extra/rediscmd/v9 v9.17.3 // indirect
151155
github.com/richardlehane/mscfb v1.0.6 // indirect
152156
github.com/richardlehane/msoleps v1.0.6 // indirect
153-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
154157
github.com/segmentio/asm v1.2.1 // indirect
155158
github.com/shopspring/decimal v1.4.0 // indirect
156159
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect

api/go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc
5050
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
5151
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
5252
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
53-
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
54-
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
55-
github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
56-
github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
53+
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
54+
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
55+
github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
56+
github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
5757
github.com/NdoleStudio/go-otelroundtripper v0.0.13 h1:fDgdxcNJov4LTrMhXqJnF/E3jO4HJVczj90wkxh5PSc=
5858
github.com/NdoleStudio/go-otelroundtripper v0.0.13/go.mod h1:UIUQ22ErFoBUyLuPDrVNRRKmBHBTfzQO9GF1ztqDvqo=
5959
github.com/NdoleStudio/lemonsqueezy-go v1.3.1 h1:lMUVgdAx2onbOUJIVPR05xAANYuCMXBRaGWpAdA4LiM=
@@ -119,10 +119,14 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
119119
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
120120
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
121121
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
122+
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
123+
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
122124
github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
123125
github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
124126
github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg=
125127
github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo=
128+
github.com/go-hermes/hermes/v2 v2.6.2 h1:RuGQlICVtIHixfxtYwN7hAoqGyGxr+D3kE42oE6emcw=
129+
github.com/go-hermes/hermes/v2 v2.6.2/go.mod h1:RLVNk31/1KqF35vK3mAaQVuJvMH+K5//6OTGJk+j/80=
126130
github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
127131
github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
128132
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -208,8 +212,6 @@ github.com/hirosassa/zerodriver v0.1.4 h1:8bzamKUOHHq03aEk12qi/lnji2dM+IhFOe+RpK
208212
github.com/hirosassa/zerodriver v0.1.4/go.mod h1:hHOOAQvVGwBV1iVVYujM6vwOBBqQcBIFpJxCD9mJU7Y=
209213
github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
210214
github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
211-
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
212-
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
213215
github.com/inbucket/html2text v1.0.0 h1:N5kza++4uBBDJ2Z3KUnTRyPNoBcW+YfOgNiNmNB+sgs=
214216
github.com/inbucket/html2text v1.0.0/go.mod h1:5TrhXQKGU+LXurODaSm55Y9eXoPBRnYiOz4x2XfUoJU=
215217
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
@@ -222,8 +224,6 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
222224
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
223225
github.com/jaswdr/faker/v2 v2.9.1 h1:J0Rjqb2/FquZnoZplzkGVL5LmhNkeIpvsSMoJKzn+8E=
224226
github.com/jaswdr/faker/v2 v2.9.1/go.mod h1:jZq+qzNQr8/P+5fHd9t3txe2GNPnthrTfohtnJ7B+68=
225-
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA=
226-
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
227227
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
228228
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
229229
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
@@ -250,8 +250,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
250250
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
251251
github.com/lib/pq v1.11.1 h1:wuChtj2hfsGmmx3nf1m7xC2XpK6OtelS2shMY+bGMtI=
252252
github.com/lib/pq v1.11.1/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
253-
github.com/matcornic/hermes v1.3.0 h1:k6rih7zpUgfIF/57F3WeBi9n68XkvhC/z8eQTRIsQqc=
254-
github.com/matcornic/hermes v1.3.0/go.mod h1:X3MXWWBHjKSfgQl0xjv+NQTAGWSiNr/fZTlhAEQJ63Q=
255253
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
256254
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
257255
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
@@ -316,12 +314,14 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
316314
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
317315
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
318316
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
319-
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
320-
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
321317
github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
322318
github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
323319
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
324320
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
321+
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
322+
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
323+
github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
324+
github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
325325
github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
326326
github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
327327
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
@@ -368,6 +368,8 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul
368368
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
369369
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
370370
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
371+
github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
372+
github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
371373
go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
372374
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
373375
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=

api/pkg/emails/hermes_mailer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strconv"
66
"time"
77

8-
"github.com/matcornic/hermes"
8+
"github.com/go-hermes/hermes/v2"
99
)
1010

1111
// HermesGeneratorConfig contains details for the generator

api/pkg/emails/hermes_notification_email_factory.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/NdoleStudio/httpsms/pkg/events"
88

99
"github.com/NdoleStudio/httpsms/pkg/entities"
10-
"github.com/matcornic/hermes"
10+
"github.com/go-hermes/hermes/v2"
1111
"github.com/palantir/stacktrace"
1212
)
1313

@@ -33,11 +33,11 @@ func (factory *hermesNotificationEmailFactory) DiscordSendFailed(user *entities.
3333
fmt.Sprintf("We ran into an error while fowarding an incoming SMS to your discord server at %s", user.UserTimeString(time.Now())),
3434
},
3535
Dictionary: []hermes.Entry{
36-
{"Discord Channel ID", payload.DiscordChannelID},
37-
{"Event Name", payload.EventType},
38-
{"Phone Number", factory.formatPhoneNumber(payload.Owner)},
39-
{"HTTP Response Code", factory.formatHTTPResponseCode(payload.HTTPResponseStatusCode)},
40-
{"Error Message / HTTP Response", payload.ErrorMessage},
36+
{Key: "Discord Channel ID", Value: payload.DiscordChannelID},
37+
{Key: "Event Name", Value: payload.EventType},
38+
{Key: "Phone Number", Value: factory.formatPhoneNumber(payload.Owner)},
39+
{Key: "HTTP Response Code", Value: factory.formatHTTPResponseCode(payload.HTTPResponseStatusCode)},
40+
{Key: "Error Message / HTTP Response", Value: payload.ErrorMessage},
4141
},
4242
Actions: []hermes.Action{
4343
{
@@ -83,13 +83,13 @@ func (factory *hermesNotificationEmailFactory) WebhookSendFailed(user *entities.
8383
fmt.Sprintf("We ran into an error while fowarding a webhook event from httpSMS to your webserver at %s", user.UserTimeString(time.Now())),
8484
},
8585
Dictionary: []hermes.Entry{
86-
{"Server URL", payload.WebhookURL},
87-
{"Event Name", payload.EventType},
88-
{"Event ID", payload.EventID},
89-
{"Phone Number", factory.formatPhoneNumber(payload.Owner)},
90-
{"HTTP Response Code", factory.formatHTTPResponseCode(payload.HTTPResponseStatusCode)},
91-
{"Error Message / HTTP Response", payload.ErrorMessage},
92-
{"Event Payload", payload.EventPayload},
86+
{Key: "Server URL", Value: payload.WebhookURL},
87+
{Key: "Event Name", Value: payload.EventType},
88+
{Key: "Event ID", Value: payload.EventID},
89+
{Key: "Phone Number", Value: factory.formatPhoneNumber(payload.Owner)},
90+
{Key: "HTTP Response Code", Value: factory.formatHTTPResponseCode(payload.HTTPResponseStatusCode)},
91+
{Key: "Error Message / HTTP Response", Value: payload.ErrorMessage},
92+
{Key: "Event Payload", Value: payload.EventPayload},
9393
},
9494
Actions: []hermes.Action{
9595
{
@@ -135,11 +135,11 @@ func (factory *hermesNotificationEmailFactory) MessageExpired(user *entities.Use
135135
fmt.Sprintf("The SMS message which you sent to %s has expired at %s and you will need to resend this message.", factory.formatPhoneNumber(payload.Contact), user.UserTimeString(time.Now())),
136136
},
137137
Dictionary: []hermes.Entry{
138-
{"ID", payload.MessageID.String()},
139-
{"From", factory.formatPhoneNumber(payload.Owner)},
140-
{"To", factory.formatPhoneNumber(payload.Contact)},
141-
{"Message", payload.Content},
142-
{"Encrypted", factory.formatBool(payload.Encrypted)},
138+
{Key: "ID", Value: payload.MessageID.String()},
139+
{Key: "From", Value: factory.formatPhoneNumber(payload.Owner)},
140+
{Key: "To", Value: factory.formatPhoneNumber(payload.Contact)},
141+
{Key: "Message", Value: payload.Content},
142+
{Key: "Encrypted", Value: factory.formatBool(payload.Encrypted)},
143143
},
144144
Actions: []hermes.Action{
145145
{
@@ -185,12 +185,12 @@ func (factory *hermesNotificationEmailFactory) MessageFailed(user *entities.User
185185
fmt.Sprintf("The SMS message which you sent to %s has failed at %s and you will need to resend this message.", factory.formatPhoneNumber(payload.Contact), user.UserTimeString(time.Now())),
186186
},
187187
Dictionary: []hermes.Entry{
188-
{"ID", payload.ID.String()},
189-
{"From", factory.formatPhoneNumber(payload.Owner)},
190-
{"To", factory.formatPhoneNumber(payload.Contact)},
191-
{"Message", payload.Content},
192-
{"Encrypted", factory.formatBool(payload.Encrypted)},
193-
{"Failure Reason", payload.ErrorMessage},
188+
{Key: "ID", Value: payload.ID.String()},
189+
{Key: "From", Value: factory.formatPhoneNumber(payload.Owner)},
190+
{Key: "To", Value: factory.formatPhoneNumber(payload.Contact)},
191+
{Key: "Message", Value: payload.Content},
192+
{Key: "Encrypted", Value: factory.formatBool(payload.Encrypted)},
193+
{Key: "Failure Reason", Value: payload.ErrorMessage},
194194
},
195195
Actions: []hermes.Action{
196196
{

api/pkg/emails/hermes_theme.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package emails
22

3-
import "github.com/matcornic/hermes"
3+
import "github.com/go-hermes/hermes/v2"
44

55
// hermesTheme is the theme by default
66
type hermesTheme struct{}
77

8+
func (dt *hermesTheme) Styles() hermes.StylesDefinition {
9+
return hermes.Default{}.Styles()
10+
}
11+
812
func newHermesTheme() hermes.Theme {
913
return &hermesTheme{}
1014
}

api/pkg/emails/hermes_user_email_factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
"github.com/NdoleStudio/httpsms/pkg/entities"
8-
"github.com/matcornic/hermes"
8+
"github.com/go-hermes/hermes/v2"
99
"github.com/palantir/stacktrace"
1010
)
1111

0 commit comments

Comments
 (0)