Skip to content

Commit 3f1b0c8

Browse files
sumnerevanssumnerevans
committed
pkg: update constant names
Signed-off-by: Sumner Evans <[email protected]>
1 parent 4c8e061 commit 3f1b0c8

16 files changed

+150
-166
lines changed

‎pkg/connector/backfill.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
var _ bridgev2.BackfillingNetworkAPI = (*LinkedInClient)(nil)
1515

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

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

46-
if err != nil {
47-
return nil, err
48-
}
49-
5046
backfilledMessages := make([]*bridgev2.BackfillMessage, len(messages))
5147
cursor := networkid.PaginationCursor("")
5248
if len(messages) > 0 {
@@ -58,12 +54,10 @@ func (lc *LinkedInClient) FetchMessages(ctx context.Context, params bridgev2.Fet
5854
}
5955
}
6056

61-
fetchMessagesResp := &bridgev2.FetchMessagesResponse{
57+
return &bridgev2.FetchMessagesResponse{
6258
Messages: backfilledMessages,
6359
Cursor: cursor,
6460
HasMore: len(messages) >= 20,
6561
Forward: params.Forward,
66-
}
67-
68-
return fetchMessagesResp, nil
62+
}, nil
6963
}

‎pkg/connector/config.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ func (c *Config) UnmarshalYAML(node *yaml.Node) error {
2626
}
2727

2828
c.displaynameTemplate, err = template.New("displayname").Parse(c.DisplaynameTemplate)
29-
if err != nil {
30-
return err
31-
}
32-
return nil
29+
return err
3330
}
3431

3532
func upgradeConfig(helper up.Helper) {
@@ -41,7 +38,7 @@ type DisplaynameParams struct {
4138
LastName string
4239
}
4340

44-
func (c *Config) FormatDisplayname(firstName string, lastName string) string {
41+
func (c *Config) FormatDisplayname(firstName, lastName string) string {
4542
var nameBuf strings.Builder
4643
err := c.displaynameTemplate.Execute(&nameBuf, &DisplaynameParams{
4744
FirstName: firstName,

‎pkg/connector/handlematrix.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ func (lc *LinkedInClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2
7070
return nil, err
7171
}
7272

73-
attachmentType := payload.MESSAGING_FILE_ATTACHMENT
73+
attachmentType := payload.MediaUploadFileAttachment
7474
if content.MsgType == event.MsgImage {
75-
attachmentType = payload.MESSAGING_PHOTO_ATTACHMENT
75+
attachmentType = payload.MediaUploadTypePhotoAttachment
7676
}
7777

78-
mediaMetadata, err := lc.client.UploadMedia(attachmentType, content.FileName, data, types.JSON_PLAINTEXT_UTF8)
78+
mediaMetadata, err := lc.client.UploadMedia(attachmentType, content.FileName, data, types.ContentTypeJSONPlaintextUTF8)
7979
if err != nil {
8080
return nil, err
8181
}

‎pkg/linkedingo/client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ func (c *Client) Logout() error {
8181
return err
8282
}
8383

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

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

116-
_, data, err := c.MakeRequest(string(routing.VOYAGER_COMMON_ME_URL), http.MethodGet, headers, make([]byte, 0), types.JSON_LINKEDIN_NORMALIZED)
116+
_, data, err := c.MakeRequest(string(routing.LinkedInVoyagerCommonMeURL), http.MethodGet, headers, make([]byte, 0), types.ContentTypeJSONLinkedInNormalized)
117117
if err != nil {
118118
return nil, err
119119
}

‎pkg/linkedingo/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (c *Client) makeRequestDirect(url string, method string, headers http.Heade
125125
return nil, nil, err
126126
}
127127

128-
if contentType != types.NONE {
128+
if contentType != "" {
129129
headers.Set("content-type", string(contentType))
130130
}
131131

‎pkg/linkedingo/media.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313

1414
func (c *Client) UploadMedia(mediaUploadType payload.MediaUploadType, fileName string, mediaBytes []byte, contentType types.ContentType) (*response.MediaMetadata, error) {
1515
uploadMetadataQuery := query.DoActionQuery{
16-
Action: query.ACTION_UPLOAD,
16+
Action: query.ActionUpload,
1717
}
1818
uploadMetadataPayload := payload.UploadMediaMetadataPayload{
1919
MediaUploadType: mediaUploadType,
2020
FileSize: len(mediaBytes),
2121
Filename: fileName,
2222
}
2323

24-
_, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MEDIA_UPLOAD_METADATA_URL, uploadMetadataPayload, uploadMetadataQuery)
24+
_, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMediaUploadMetadataURL, uploadMetadataPayload, uploadMetadataQuery)
2525
if err != nil {
2626
return nil, err
2727
}

‎pkg/linkedingo/messaging.go

+30-30
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ func (c *Client) GetThreads(variables query.GetThreadsVariables) (*response.Mess
2727
withCursor := variables.LastUpdatedBefore != 0 && variables.NextCursor != ""
2828
var queryId types.GraphQLQueryIDs
2929
if withCursor {
30-
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_CONVERSATIONS_WITH_CURSOR
30+
queryId = types.GraphQLQueryIDMessengerConversationsWithCursor
3131
} else if variables.SyncToken != "" {
32-
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_CONVERSATIONS_WITH_SYNC_TOKEN
32+
queryId = types.GraphQLQueryIDMessengerConversationsWithSyncToken
3333
} else {
34-
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_CONVERSATIONS
34+
queryId = types.GraphQLQueryIDMessengerConversations
3535
}
3636

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

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

6969
var queryId types.GraphQLQueryIDs
7070
if withCursor {
71-
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_MESSAGES_BY_CONVERSATION
71+
queryId = types.GraphQLQueryIDMessengerMessagesByConversation
7272
} else if withAnchorTimestamp {
73-
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_MESSAGES_BY_ANCHOR_TIMESTAMP
73+
queryId = types.GraphQLQueryIDMessengerMessagesByAnchorTimestamp
7474
} else {
75-
queryId = types.GRAPHQL_QUERY_ID_MESSENGER_MESSAGES_BY_SYNC_TOKEN
75+
queryId = types.GraphQLQueryIDMessengerMessagesBySyncToken
7676
}
7777

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

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

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

110110
headerOpts := types.HeaderOpts{
111111
WithCookies: true,
112112
WithCsrfToken: true,
113-
Origin: string(routing.BASE_URL),
113+
Origin: string(routing.LinkedInBaseURL),
114114
WithXLiTrack: true,
115115
WithXLiProtocolVer: true,
116116
WithXLiPageInstance: true,
117117
WithXLiLang: true,
118-
Extra: map[string]string{"accept": string(types.JSON)},
118+
Extra: map[string]string{"accept": string(types.ContentTypeJSON)},
119119
}
120120
headers := c.buildHeaders(headerOpts)
121121

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

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

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

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

183183
func (c *Client) StartTyping(conversationUrn string) error {
184184
actionQuery := query.DoActionQuery{
185-
Action: query.ACTION_TYPING,
185+
Action: query.ActionTyping,
186186
}
187187

188188
typingPayload := payload.StartTypingPayload{
189189
ConversationUrn: conversationUrn,
190190
}
191191

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

204204
func (c *Client) DeleteMessage(messageUrn string) error {
205205
actionQuery := query.DoActionQuery{
206-
Action: query.ACTION_RECALL,
206+
Action: query.ActionRecall,
207207
}
208208

209209
deleteMsgPayload := payload.DeleteMessagePayload{
210210
MessageUrn: messageUrn,
211211
}
212212

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

245245
queryStr := fmt.Sprintf("ids=List(%s)", queryUrnValues)
246-
markReadUrl := fmt.Sprintf("%s?%s", routing.VOYAGER_MESSAGING_DASH_MESSENGER_CONVERSATIONS_URL, queryStr)
246+
markReadUrl := fmt.Sprintf("%s?%s", routing.LinkedInMessagingDashMessengerConversationsURL, queryStr)
247247
patchEntitiesPayload := payload.PatchEntitiesPayload{
248248
Entities: entities,
249249
}
@@ -256,16 +256,16 @@ func (c *Client) MarkThreadRead(conversationUrns []string, read bool) (*response
256256
headerOpts := types.HeaderOpts{
257257
WithCookies: true,
258258
WithCsrfToken: true,
259-
Origin: string(routing.BASE_URL),
259+
Origin: string(routing.LinkedInBaseURL),
260260
WithXLiTrack: true,
261261
WithXLiProtocolVer: true,
262262
WithXLiPageInstance: true,
263263
WithXLiLang: true,
264-
Extra: map[string]string{"accept": string(types.JSON)},
264+
Extra: map[string]string{"accept": string(types.ContentTypeJSON)},
265265
}
266266

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

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

284284
headers := c.buildHeaders(types.HeaderOpts{
285285
WithCookies: true,
@@ -288,13 +288,13 @@ func (c *Client) DeleteConversation(conversationUrn string) error {
288288
WithXLiPageInstance: true,
289289
WithXLiLang: true,
290290
WithXLiProtocolVer: true,
291-
Origin: string(routing.BASE_URL),
291+
Origin: string(routing.LinkedInBaseURL),
292292
Extra: map[string]string{
293-
"accept": string(types.GRAPHQL),
293+
"accept": string(types.ContentTypeGraphQL),
294294
},
295295
})
296296

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

309309
// pass true to second arg to react and pass false to unreact
310310
func (c *Client) SendReaction(p payload.SendReactionPayload, react bool) error {
311-
action := query.ACTION_REACT_WITH_EMOJI
311+
action := query.ActionReactWithEmoji
312312
if !react {
313-
action = query.ACTION_UNREACT_WITH_EMOJI
313+
action = query.ActionUnreactWithEmoji
314314
}
315315
actionQuery := query.DoActionQuery{
316316
Action: action,
317317
}
318318

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

342-
_, respData, err := c.MakeRoutingRequest(routing.VOYAGER_MESSAGING_GRAPHQL_URL, nil, &gqlQuery)
342+
_, respData, err := c.MakeRoutingRequest(routing.LinkedInVoyagerMessagingGraphQLURL, nil, &gqlQuery)
343343
if err != nil {
344344
return nil, err
345345
}

‎pkg/linkedingo/page_loader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ func (c *Client) newPageLoader() *PageLoader {
3333
}
3434

3535
func (pl *PageLoader) LoadMessagesPage() error {
36-
messagesDefinition := routing.RequestStoreDefinition[routing.MESSAGES_BASE_URL]
36+
messagesDefinition := routing.RequestStoreDefinition[routing.LinkedInMessagingBaseURL]
3737
headers := pl.client.buildHeaders(messagesDefinition.HeaderOpts)
38-
_, respBody, err := pl.client.MakeRequest(string(routing.MESSAGES_BASE_URL), string(messagesDefinition.Method), headers, nil, types.NONE)
38+
_, respBody, err := pl.client.MakeRequest(string(routing.LinkedInMessagingBaseURL), string(messagesDefinition.Method), headers, nil, "")
3939
if err != nil {
4040
return err
4141
}

0 commit comments

Comments
 (0)