Skip to content

Commit

Permalink
pkg: update constant names
Browse files Browse the repository at this point in the history 
Signed-off-by: Sumner Evans <[email protected]>
  • Loading branch information
@sumnerevans
sumnerevans committed Jan 20, 2025
1 parent 4c8e061 commit 3f1b0c8
Show file tree
Hide file tree
Showing 16 changed files with 150 additions and 166 deletions.
12 changes: 3 additions & 9 deletions pkg/connector/backfill.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
var _ bridgev2.BackfillingNetworkAPI = (*LinkedInClient)(nil)

func (lc *LinkedInClient) FetchMessages(ctx context.Context, params bridgev2.FetchMessagesParams) (*bridgev2.FetchMessagesResponse, error) {
conversationUrn := string(params.Portal.PortalKey.ID)
conversationUrn := string(params.Portal.ID)

variables := query.FetchMessagesVariables{
ConversationUrn: conversationUrn,
Expand Down Expand Up @@ -43,10 +43,6 @@ func (lc *LinkedInClient) FetchMessages(ctx context.Context, params bridgev2.Fet
return messages[j].DeliveredAt < messages[i].DeliveredAt
})

if err != nil {
return nil, err
}

backfilledMessages := make([]*bridgev2.BackfillMessage, len(messages))
cursor := networkid.PaginationCursor("")
if len(messages) > 0 {
Expand All @@ -58,12 +54,10 @@ func (lc *LinkedInClient) FetchMessages(ctx context.Context, params bridgev2.Fet
}
}

fetchMessagesResp := &bridgev2.FetchMessagesResponse{
return &bridgev2.FetchMessagesResponse{
Messages: backfilledMessages,
Cursor: cursor,
HasMore: len(messages) >= 20,
Forward: params.Forward,
}

return fetchMessagesResp, nil
}, nil
}
7 changes: 2 additions & 5 deletions pkg/connector/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ func (c *Config) UnmarshalYAML(node *yaml.Node) error {
}

c.displaynameTemplate, err = template.New("displayname").Parse(c.DisplaynameTemplate)
if err != nil {
return err
}
return nil
return err
}

func upgradeConfig(helper up.Helper) {
Expand All @@ -41,7 +38,7 @@ type DisplaynameParams struct {
LastName string
}

func (c *Config) FormatDisplayname(firstName string, lastName string) string {
func (c *Config) FormatDisplayname(firstName, lastName string) string {
var nameBuf strings.Builder
err := c.displaynameTemplate.Execute(&nameBuf, &DisplaynameParams{
FirstName: firstName,
Expand Down
6 changes: 3 additions & 3 deletions pkg/connector/handlematrix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ func (lc *LinkedInClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2
return nil, err
}

attachmentType := payload.MESSAGING_FILE_ATTACHMENT
attachmentType := payload.MediaUploadFileAttachment
if content.MsgType == event.MsgImage {
attachmentType = payload.MESSAGING_PHOTO_ATTACHMENT
attachmentType = payload.MediaUploadTypePhotoAttachment
}

mediaMetadata, err := lc.client.UploadMedia(attachmentType, content.FileName, data, types.JSON_PLAINTEXT_UTF8)
mediaMetadata, err := lc.client.UploadMedia(attachmentType, content.FileName, data, types.ContentTypeJSONPlaintextUTF8)
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/linkedingo/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ func (c *Client) Logout() error {
return err
}

logoutUrl := fmt.Sprintf("%s?%s", routing.LOGOUT_URL, string(encodedQuery))
logoutUrl := fmt.Sprintf("%s?%s", routing.LinkedInLogoutURL, string(encodedQuery))

logoutDefinition := routing.RequestStoreDefinition[routing.LOGOUT_URL]
logoutDefinition := routing.RequestStoreDefinition[routing.LinkedInLogoutURL]
headers := c.buildHeaders(logoutDefinition.HeaderOpts)
_, _, err = c.MakeRequest(logoutUrl, http.MethodGet, headers, make([]byte, 0), logoutDefinition.ContentType)
_, _, err = c.MakeRequest(logoutUrl, http.MethodGet, headers, nil, logoutDefinition.ContentType)
_ = c.Disconnect()
c.cookies.Store = make(map[cookies.LinkedInCookieName]string)
return err
Expand Down Expand Up @@ -113,7 +113,7 @@ func (c *Client) GetCurrentUserProfile() (*types.UserLoginProfile, error) {
WithXLiLang: true,
})

_, data, err := c.MakeRequest(string(routing.VOYAGER_COMMON_ME_URL), http.MethodGet, headers, make([]byte, 0), types.JSON_LINKEDIN_NORMALIZED)
_, data, err := c.MakeRequest(string(routing.LinkedInVoyagerCommonMeURL), http.MethodGet, headers, make([]byte, 0), types.ContentTypeJSONLinkedInNormalized)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/linkedingo/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (c *Client) makeRequestDirect(url string, method string, headers http.Heade
return nil, nil, err
}

if contentType != types.NONE {
if contentType != "" {
headers.Set("content-type", string(contentType))
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/linkedingo/media.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (

func (c *Client) UploadMedia(mediaUploadType payload.MediaUploadType, fileName string, mediaBytes []byte, contentType types.ContentType) (*response.MediaMetadata, error) {
uploadMetadataQuery := query.DoActionQuery{
Action: query.ACTION_UPLOAD,
Action: query.ActionUpload,
}
uploadMetadataPayload := payload.UploadMediaMetadataPayload{
MediaUploadType: mediaUploadType,
FileSize: len(mediaBytes),
Filename: fileName,
}

_, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MEDIA_UPLOAD_METADATA_URL, uploadMetadataPayload, uploadMetadataQuery)
_, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMediaUploadMetadataURL, uploadMetadataPayload, uploadMetadataQuery)
if err != nil {
return nil, err
}
Expand Down
60 changes: 30 additions & 30 deletions pkg/linkedingo/messaging.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ func (c *Client) GetThreads(variables query.GetThreadsVariables) (*response.Mess
withCursor := variables.LastUpdatedBefore != 0 && variables.NextCursor != ""
var queryId types.GraphQLQueryIDs
if withCursor {
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_CONVERSATIONS_WITH_CURSOR
queryId = types.GraphQLQueryIDMessengerConversationsWithCursor
} else if variables.SyncToken != "" {
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_CONVERSATIONS_WITH_SYNC_TOKEN
queryId = types.GraphQLQueryIDMessengerConversationsWithSyncToken
} else {
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_CONVERSATIONS
queryId = types.GraphQLQueryIDMessengerConversations
}

variablesQuery, err := variables.Encode()
Expand All @@ -44,7 +44,7 @@ func (c *Client) GetThreads(variables query.GetThreadsVariables) (*response.Mess
Variables: string(variablesQuery),
}

_, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_GRAPHQL_URL, nil, &threadQuery)
_, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingGraphQLURL, nil, &threadQuery)
if err != nil {
return nil, err
}
Expand All @@ -68,11 +68,11 @@ func (c *Client) FetchMessages(variables query.FetchMessagesVariables) (*respons

var queryId types.GraphQLQueryIDs
if withCursor {
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_MESSAGES_BY_CONVERSATION
queryId = types.GraphQLQueryIDMessengerMessagesByConversation
} else if withAnchorTimestamp {
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_MESSAGES_BY_ANCHOR_TIMESTAMP
queryId = types.GraphQLQueryIDMessengerMessagesByAnchorTimestamp
} else {
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_MESSAGES_BY_SYNC_TOKEN
queryId = types.GraphQLQueryIDMessengerMessagesBySyncToken
}

variablesQuery, err := variables.Encode()
Expand All @@ -84,7 +84,7 @@ func (c *Client) FetchMessages(variables query.FetchMessagesVariables) (*respons
Variables: string(variablesQuery),
}

_, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_GRAPHQL_URL, nil, &messagesQuery)
_, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingGraphQLURL, nil, &messagesQuery)
if err != nil {
return nil, err
}
Expand All @@ -105,17 +105,17 @@ func (c *Client) FetchMessages(variables query.FetchMessagesVariables) (*respons
}

func (c *Client) EditMessage(messageUrn string, p payload.MessageBody) error {
editMessageUrl := fmt.Sprintf("%s/%s", routing.VOYAGER_MESSAGING_DASH_MESSENGER_MESSAGES_URL, url.QueryEscape(messageUrn))
editMessageUrl := fmt.Sprintf("%s/%s", routing.LinkedInVoyagerMessagingDashMessengerMessagesURL, url.QueryEscape(messageUrn))

headerOpts := types.HeaderOpts{
WithCookies: true,
WithCsrfToken: true,
Origin: string(routing.BASE_URL),
Origin: string(routing.LinkedInBaseURL),
WithXLiTrack: true,
WithXLiProtocolVer: true,
WithXLiPageInstance: true,
WithXLiLang: true,
Extra: map[string]string{"accept": string(types.JSON)},
Extra: map[string]string{"accept": string(types.ContentTypeJSON)},
}
headers := c.buildHeaders(headerOpts)

Expand All @@ -132,7 +132,7 @@ func (c *Client) EditMessage(messageUrn string, p payload.MessageBody) error {
return err
}

resp, respBody, err := c.MakeRequest(editMessageUrl, http.MethodPost, headers, payloadBytes, types.PLAINTEXT_UTF8)
resp, respBody, err := c.MakeRequest(editMessageUrl, http.MethodPost, headers, payloadBytes, types.ContentTypePlaintextUTF8)
if err != nil {
return err
}
Expand All @@ -148,7 +148,7 @@ func (c *Client) EditMessage(messageUrn string, p payload.MessageBody) error {
// so you do not have to set it if u dont want to
func (c *Client) SendMessage(p payload.SendMessagePayload) (*response.MessageSentResponse, error) {
actionQuery := query.DoActionQuery{
Action: query.ACTION_CREATE_MESSAGE,
Action: query.ActionCreateMessage,
}

if p.MailboxUrn == "" {
Expand All @@ -163,7 +163,7 @@ func (c *Client) SendMessage(p payload.SendMessagePayload) (*response.MessageSen
p.Message.OriginToken = uuid.NewString()
}

resp, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_DASH_MESSENGER_MESSAGES_URL, p, actionQuery)
resp, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingDashMessengerMessagesURL, p, actionQuery)
if err != nil {
return nil, err
}
Expand All @@ -182,14 +182,14 @@ func (c *Client) SendMessage(p payload.SendMessagePayload) (*response.MessageSen

func (c *Client) StartTyping(conversationUrn string) error {
actionQuery := query.DoActionQuery{
Action: query.ACTION_TYPING,
Action: query.ActionTyping,
}

typingPayload := payload.StartTypingPayload{
ConversationUrn: conversationUrn,
}

resp, _, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_DASH_MESSENGER_CONVERSATIONS_URL, typingPayload, actionQuery)
resp, _, err := c.MakeRoutingRequest(routing.LinkedInMessagingDashMessengerConversationsURL, typingPayload, actionQuery)
if err != nil {
return err
}
Expand All @@ -203,14 +203,14 @@ func (c *Client) StartTyping(conversationUrn string) error {

func (c *Client) DeleteMessage(messageUrn string) error {
actionQuery := query.DoActionQuery{
Action: query.ACTION_RECALL,
Action: query.ActionRecall,
}

deleteMsgPayload := payload.DeleteMessagePayload{
MessageUrn: messageUrn,
}

resp, _, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_DASH_MESSENGER_MESSAGES_URL, deleteMsgPayload, actionQuery)
resp, _, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingDashMessengerMessagesURL, deleteMsgPayload, actionQuery)
if err != nil {
return err
}
Expand Down Expand Up @@ -243,7 +243,7 @@ func (c *Client) MarkThreadRead(conversationUrns []string, read bool) (*response
}

queryStr := fmt.Sprintf("ids=List(%s)", queryUrnValues)
markReadUrl := fmt.Sprintf("%s?%s", routing.VOYAGER_MESSAGING_DASH_MESSENGER_CONVERSATIONS_URL, queryStr)
markReadUrl := fmt.Sprintf("%s?%s", routing.LinkedInMessagingDashMessengerConversationsURL, queryStr)
patchEntitiesPayload := payload.PatchEntitiesPayload{
Entities: entities,
}
Expand All @@ -256,16 +256,16 @@ func (c *Client) MarkThreadRead(conversationUrns []string, read bool) (*response
headerOpts := types.HeaderOpts{
WithCookies: true,
WithCsrfToken: true,
Origin: string(routing.BASE_URL),
Origin: string(routing.LinkedInBaseURL),
WithXLiTrack: true,
WithXLiProtocolVer: true,
WithXLiPageInstance: true,
WithXLiLang: true,
Extra: map[string]string{"accept": string(types.JSON)},
Extra: map[string]string{"accept": string(types.ContentTypeJSON)},
}

headers := c.buildHeaders(headerOpts)
resp, respBody, err := c.MakeRequest(markReadUrl, http.MethodPost, headers, payloadBytes, types.PLAINTEXT_UTF8)
resp, respBody, err := c.MakeRequest(markReadUrl, http.MethodPost, headers, payloadBytes, types.ContentTypePlaintextUTF8)
if err != nil {
return nil, err
}
Expand All @@ -279,7 +279,7 @@ func (c *Client) MarkThreadRead(conversationUrns []string, read bool) (*response
}

func (c *Client) DeleteConversation(conversationUrn string) error {
deleteConvUrl := fmt.Sprintf("%s/%s", routing.VOYAGER_MESSAGING_DASH_MESSENGER_CONVERSATIONS_URL, url.QueryEscape(conversationUrn))
deleteConvUrl := fmt.Sprintf("%s/%s", routing.LinkedInMessagingDashMessengerConversationsURL, url.QueryEscape(conversationUrn))

headers := c.buildHeaders(types.HeaderOpts{
WithCookies: true,
Expand All @@ -288,13 +288,13 @@ func (c *Client) DeleteConversation(conversationUrn string) error {
WithXLiPageInstance: true,
WithXLiLang: true,
WithXLiProtocolVer: true,
Origin: string(routing.BASE_URL),
Origin: string(routing.LinkedInBaseURL),
Extra: map[string]string{
"accept": string(types.GRAPHQL),
"accept": string(types.ContentTypeGraphQL),
},
})

resp, _, err := c.MakeRequest(deleteConvUrl, http.MethodDelete, headers, nil, types.NONE)
resp, _, err := c.MakeRequest(deleteConvUrl, http.MethodDelete, headers, nil, "")
if err != nil {
return err
}
Expand All @@ -308,15 +308,15 @@ func (c *Client) DeleteConversation(conversationUrn string) error {

// pass true to second arg to react and pass false to unreact
func (c *Client) SendReaction(p payload.SendReactionPayload, react bool) error {
action := query.ACTION_REACT_WITH_EMOJI
action := query.ActionReactWithEmoji
if !react {
action = query.ACTION_UNREACT_WITH_EMOJI
action = query.ActionUnreactWithEmoji
}
actionQuery := query.DoActionQuery{
Action: action,
}

resp, _, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_DASH_MESSENGER_MESSAGES_URL, p, actionQuery)
resp, _, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingDashMessengerMessagesURL, p, actionQuery)
if err != nil {
return err
}
Expand All @@ -339,7 +339,7 @@ func (c *Client) GetReactionsForEmoji(vars query.GetReactionsForEmojiVariables)
Variables: string(variablesQuery),
}

_, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_GRAPHQL_URL, nil, &gqlQuery)
_, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingGraphQLURL, nil, &gqlQuery)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/linkedingo/page_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ func (c *Client) newPageLoader() *PageLoader {
}

func (pl *PageLoader) LoadMessagesPage() error {
messagesDefinition := routing.RequestStoreDefinition[routing.MESSAGES_BASE_URL]
messagesDefinition := routing.RequestStoreDefinition[routing.LinkedInMessagingBaseURL]
headers := pl.client.buildHeaders(messagesDefinition.HeaderOpts)
_, respBody, err := pl.client.MakeRequest(string(routing.MESSAGES_BASE_URL), string(messagesDefinition.Method), headers, nil, types.NONE)
_, respBody, err := pl.client.MakeRequest(string(routing.LinkedInMessagingBaseURL), string(messagesDefinition.Method), headers, nil, "")
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit 3f1b0c8

Please sign in to comment.