Skip to content

Commit 5555caf

Browse files
author
Jeff Yanta
committed
Initial implementation of the RevealIdentity RPC
1 parent f62c762 commit 5555caf

File tree

8 files changed

+245
-33
lines changed

8 files changed

+245
-33
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
firebase.google.com/go/v4 v4.8.0
77
github.com/aws/aws-sdk-go-v2 v0.17.0
88
github.com/bits-and-blooms/bloom/v3 v3.1.0
9-
github.com/code-payments/code-protobuf-api v1.16.7-0.20240618135651-59879f609687
9+
github.com/code-payments/code-protobuf-api v1.16.7-0.20240618171829-bb587a7f24ce
1010
github.com/emirpasic/gods v1.12.0
1111
github.com/envoyproxy/protoc-gen-validate v1.0.4
1212
github.com/golang-jwt/jwt/v5 v5.0.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
121121
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
122122
github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
123123
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
124-
github.com/code-payments/code-protobuf-api v1.16.7-0.20240618135651-59879f609687 h1:1/DZnT2ipA/Eo/AmFgheQomKeSFwsIAaUcxV9dOvTRg=
125-
github.com/code-payments/code-protobuf-api v1.16.7-0.20240618135651-59879f609687/go.mod h1:pHQm75vydD6Cm2qHAzlimW6drysm489Z4tVxC2zHSsU=
124+
github.com/code-payments/code-protobuf-api v1.16.7-0.20240618171829-bb587a7f24ce h1:wdPvuDHfEmymPn4zSaVD2ymK4pRKHlegAhTnl52d/IY=
125+
github.com/code-payments/code-protobuf-api v1.16.7-0.20240618171829-bb587a7f24ce/go.mod h1:pHQm75vydD6Cm2qHAzlimW6drysm489Z4tVxC2zHSsU=
126126
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 h1:NmTXa/uVnDyp0TY5MKi197+3HWcnYWfnHGyaFthlnGw=
127127
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
128128
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=

‎pkg/code/data/chat/v2/memory/store.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"sync"
88
"time"
99

10+
"github.com/pkg/errors"
11+
1012
chat "github.com/code-payments/code-server/pkg/code/data/chat/v2"
1113
"github.com/code-payments/code-server/pkg/database/query"
1214
)
@@ -240,6 +242,31 @@ func (s *store) AdvancePointer(_ context.Context, chatId chat.ChatId, memberId c
240242
return false, nil
241243
}
242244

245+
// UpgradeIdentity implements chat.Store.UpgradeIdentity
246+
func (s *store) UpgradeIdentity(_ context.Context, chatId chat.ChatId, memberId chat.MemberId, platform chat.Platform, platformId string) error {
247+
switch platform {
248+
case chat.PlatformTwitter:
249+
default:
250+
return errors.Errorf("platform not supported for identity upgrades: %s", platform.String())
251+
}
252+
253+
s.mu.Lock()
254+
defer s.mu.Unlock()
255+
256+
item := s.findMemberById(chatId, memberId)
257+
if item == nil {
258+
return chat.ErrMemberNotFound
259+
}
260+
if item.Platform != chat.PlatformCode {
261+
return chat.ErrMemberIdentityAlreadyUpgraded
262+
}
263+
264+
item.Platform = platform
265+
item.PlatformId = platformId
266+
267+
return nil
268+
}
269+
243270
// SetMuteState implements chat.Store.SetMuteState
244271
func (s *store) SetMuteState(_ context.Context, chatId chat.ChatId, memberId chat.MemberId, isMuted bool) error {
245272
s.mu.Lock()

‎pkg/code/data/chat/v2/model.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,22 @@ func (p PointerType) String() string {
192192
}
193193

194194
// ToProto returns the proto representation of the platform
195-
func (p Platform) ToProto() chatpb.ChatMemberIdentity_Platform {
195+
func GetPlatformFromProto(proto chatpb.Platform) Platform {
196+
switch proto {
197+
case chatpb.Platform_TWITTER:
198+
return PlatformTwitter
199+
default:
200+
return PlatformUnknown
201+
}
202+
}
203+
204+
// ToProto returns the proto representation of the platform
205+
func (p Platform) ToProto() chatpb.Platform {
196206
switch p {
197207
case PlatformTwitter:
198-
return chatpb.ChatMemberIdentity_TWITTER
208+
return chatpb.Platform_TWITTER
199209
default:
200-
return chatpb.ChatMemberIdentity_UNKNOWN
210+
return chatpb.Platform_UNKNOWN_PLATFORM
201211
}
202212
}
203213

‎pkg/code/data/chat/v2/store.go‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import (
88
)
99

1010
var (
11-
ErrChatExists = errors.New("chat already exists")
12-
ErrChatNotFound = errors.New("chat not found")
13-
ErrMemberExists = errors.New("chat member already exists")
14-
ErrMemberNotFound = errors.New("chat member not found")
15-
ErrMessageExsits = errors.New("chat message already exists")
16-
ErrMessageNotFound = errors.New("chat message not found")
17-
ErrInvalidPointerType = errors.New("invalid pointer type")
11+
ErrChatExists = errors.New("chat already exists")
12+
ErrChatNotFound = errors.New("chat not found")
13+
ErrMemberExists = errors.New("chat member already exists")
14+
ErrMemberNotFound = errors.New("chat member not found")
15+
ErrMemberIdentityAlreadyUpgraded = errors.New("chat member identity already upgraded")
16+
ErrMessageExsits = errors.New("chat message already exists")
17+
ErrMessageNotFound = errors.New("chat message not found")
18+
ErrInvalidPointerType = errors.New("invalid pointer type")
1819
)
1920

2021
// todo: Define interface methods
@@ -56,6 +57,9 @@ type Store interface {
5657
// AdvancePointer advances a chat pointer for a chat member
5758
AdvancePointer(ctx context.Context, chatId ChatId, memberId MemberId, pointerType PointerType, pointer MessageId) (bool, error)
5859

60+
// UpgradeIdentity upgrades a chat member's identity from an anonymous state
61+
UpgradeIdentity(ctx context.Context, chatId ChatId, memberId MemberId, platform Platform, platformId string) error
62+
5963
// SetMuteState updates the mute state for a chat member
6064
SetMuteState(ctx context.Context, chatId ChatId, memberId MemberId, isMuted bool) error
6165

‎pkg/code/data/internal.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ type DatabaseData interface {
407407
PutChatMemberV2(ctx context.Context, record *chat_v2.MemberRecord) error
408408
PutChatMessageV2(ctx context.Context, record *chat_v2.MessageRecord) error
409409
AdvanceChatPointerV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, pointerType chat_v2.PointerType, pointer chat_v2.MessageId) (bool, error)
410+
UpgradeChatMemberIdentityV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, platform chat_v2.Platform, platformId string) error
410411
SetChatMuteStateV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, isMuted bool) error
411412
SetChatSubscriptionStateV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, isSubscribed bool) error
412413

@@ -1507,6 +1508,9 @@ func (dp *DatabaseProvider) PutChatMessageV2(ctx context.Context, record *chat_v
15071508
func (dp *DatabaseProvider) AdvanceChatPointerV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, pointerType chat_v2.PointerType, pointer chat_v2.MessageId) (bool, error) {
15081509
return dp.chatv2.AdvancePointer(ctx, chatId, memberId, pointerType, pointer)
15091510
}
1511+
func (dp *DatabaseProvider) UpgradeChatMemberIdentityV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, platform chat_v2.Platform, platformId string) error {
1512+
return dp.chatv2.UpgradeIdentity(ctx, chatId, memberId, platform, platformId)
1513+
}
15101514
func (dp *DatabaseProvider) SetChatMuteStateV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, isMuted bool) error {
15111515
return dp.chatv2.SetMuteState(ctx, chatId, memberId, isMuted)
15121516
}

0 commit comments

Comments
 (0)