Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added PhoneNumberMatcher #89

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open

Added PhoneNumberMatcher #89

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e9503e5
Added first version of phone matcher port
Mar 23, 2021
b286ba7
Added first version of phone matcher port
Mar 23, 2021
7a5e4a4
Fix module name
Mar 23, 2021
50bf9c3
Update go version
Mar 23, 2021
314f08e
Escape parentheses
Mar 23, 2021
c9c99eb
Escape parentheses
Mar 23, 2021
3bebb51
Fix endless loop
Mar 23, 2021
f6fd65d
Fix wrong regex
Mar 23, 2021
b6a7ec4
Fix new endless loop
Mar 23, 2021
44ad373
Export Number
Mar 23, 2021
b8e3569
Remove rune conversion
Mar 23, 2021
67b632f
Fix nil value check
Mar 23, 2021
877d5d5
Fix conditional logic
Mar 23, 2021
8516f17
Fix infinite loop
Mar 23, 2021
53888a6
Ignore invalid utf-8 chars
Mar 23, 2021
3a248d7
Fix unintended infinite loop at extractInnerMatch
Mar 23, 2021
213aaba
Fix unintended infinite loop at extractInnerMatch
Mar 23, 2021
6c13f2b
Escape plus sign
Mar 23, 2021
9e8f8e2
Get last char, instead of next char after candidate
Mar 23, 2021
2a3bf65
Catch + before numbers
Mar 23, 2021
3989f2d
Typo
Mar 23, 2021
0a638d7
Fixed logic error
Mar 25, 2021
89d8133
Fix wrong offset
Mar 25, 2021
a8bd4e6
Remove valid rune checking
Mar 25, 2021
c11d83c
Added comments
Mar 25, 2021
a46b374
Reset unused files
Mar 25, 2021
1832dc6
Set mod to nyaruka
Mar 25, 2021
30bc715
Set go version to 1.13
Mar 25, 2021
7592927
Ran go mod tidy, reset cmd/phonnumbers/go.mod
Mar 26, 2021
116bfc6
Merge branch 'nyaruka:main' into main
mauritsderuiter95 Jul 12, 2021
1266270
Merge branch 'nyaruka:main' into main
mauritsderuiter95 Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/phoneserver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ replace github.com/nyaruka/phonenumbers => ../../
require (
github.com/aws/aws-lambda-go v1.13.1
github.com/nyaruka/phonenumbers v0.0.0-00010101000000-000000000000
)
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

white spaces?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't have changed. I reset the file to an earlier commit

17 changes: 17 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
cristaloleg marked this conversation as resolved.
Show resolved Hide resolved
github.com/aws/aws-lambda-go v1.23.0 h1:Vjwow5COkFJp7GePkk9kjAo/DyX36b7wVPKwseQZbRo=
github.com/aws/aws-lambda-go v1.23.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8 changes: 0 additions & 8 deletions matcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ import (
"unicode"
)

type PhoneNumberMatcher struct {
}

func NewPhoneNumberMatcher(seq string) *PhoneNumberMatcher {
// TODO(ttacon): to be implemented
return nil
}

func ContainsOnlyValidXChars(number *PhoneNumber, candidate string) bool {
// The characters 'x' and 'X' can be (1) a carrier code, in which
// case they always precede the national significant number or (2)
Expand Down
Loading