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.

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

Support ENS names in shared urls #3892

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions protocol/messenger_contacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,11 @@ func (m *Messenger) BuildContact(request *requests.BuildContact) (*Contact, erro
return contact, nil
}

func (m *Messenger) GetContactByENSName(ensName string) (*Contact, error) {
// FIXME: get contact with m.backend.StatusNode().EnsService().API().PublicKeyOf(ensName)
return nil, nil
}

func (m *Messenger) scheduleSyncFiltersForContact(publicKey *ecdsa.PublicKey) (*transport.Filter, error) {
filter, err := m.transport.JoinPrivate(publicKey)
if err != nil {
Expand Down
14 changes: 12 additions & 2 deletions protocol/messenger_share_urls.go
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,18 @@ func (m *Messenger) ShareUserURLWithENS(contactID string) (string, error) {
}

func (m *Messenger) parseUserURLWithENS(ensName string) (*URLDataResponse, error) {
// TODO: fetch contact by ens name
return nil, fmt.Errorf("not implemented yet")
contact, err := m.GetContactByENSName(ensName)
if err != nil {
return nil, err
}

if contact == nil {
return nil, ErrContactNotFound
}

return &URLDataResponse{
Contact: m.prepareContactData(contact),
}, nil
}

func (m *Messenger) prepareEncodedUserData(contact *Contact) (string, string, error) {
Expand Down
21 changes: 10 additions & 11 deletions protocol/messenger_share_urls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,20 +375,19 @@ func (s *MessengerShareUrlsSuite) TestShareUserURLWithENS() {
s.Require().Equal(expectedURL, url)
}

// TODO: ens in the next ticket
// func (s *MessengerShareUrlsSuite) TestParseUserURLWithENS() {
// _, contact := s.createContact()
func (s *MessengerShareUrlsSuite) TestParseUserURLWithENS() {
_, contact := s.createContact()

// url := fmt.Sprintf("%s/u#%s", baseShareURL, contact.EnsName)
url := fmt.Sprintf("%s/u#%s", baseShareURL, contact.EnsName)

// urlData, err := s.m.ParseSharedURL(url)
// s.Require().NoError(err)
// s.Require().NotNil(urlData)
urlData, err := s.m.ParseSharedURL(url)
s.Require().NoError(err)
s.Require().NotNil(urlData)

// s.Require().NotNil(urlData.Contact)
// s.Require().Equal(contact.DisplayName, urlData.Contact.DisplayName)
// s.Require().Equal(contact.Bio, urlData.Contact.DisplayName)
// }
s.Require().NotNil(urlData.Contact)
s.Require().Equal(contact.DisplayName, urlData.Contact.DisplayName)
s.Require().Equal(contact.Bio, urlData.Contact.DisplayName)
}

func (s *MessengerShareUrlsSuite) TestParseUserURLWithData() {
url := "https://status.app/u/G10A4B0JdgwyRww90WXtnP1oNH1ZLQNM0yX0Ja9YyAMjrqSZIYINOHCbFhrnKRAcPGStPxCMJDSZlGCKzmZrJcimHY8BbcXlORrElv_BbQEegnMDPx1g9C5VVNl0fE4y#zQ3shwQPhRuDJSjVGVBnTjCdgXy5i9WQaeVPdGJD6yTarJQSj"
Expand Down