Skip to content

Commit 928a88b

Browse files
purpshellpurpshell
committed
twittermeow,connector: clean warnings
1 parent 1527f1a commit 928a88b

File tree

8 files changed

+32
-23
lines changed

8 files changed

+32
-23
lines changed

‎pkg/connector/backfill.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"log"
66
"os"
77

8+
"go.mau.fi/util/ptr"
89
"maunium.net/go/mautrix/bridgev2"
910
"maunium.net/go/mautrix/bridgev2/networkid"
1011

@@ -19,7 +20,7 @@ func (tc *TwitterClient) FetchMessages(ctx context.Context, params bridgev2.Fetc
1920
cursor := params.Cursor
2021
//count := params.Count
2122

22-
reqQuery := payload.DmRequestQuery{}.Default()
23+
reqQuery := ptr.Ptr(payload.DmRequestQuery{}.Default())
2324
reqQuery.Count = 25
2425
messageResp, err := tc.client.FetchConversationContext(conversationId, reqQuery, payload.CONTEXT_FETCH_DM_CONVERSATION_HISTORY)
2526
if err != nil {

‎pkg/connector/client.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ func (tc *TwitterClient) Connect(ctx context.Context) error {
120120
}
121121

122122
func (tc *TwitterClient) Disconnect() {
123-
tc.client.Disconnect()
123+
err := tc.client.Disconnect()
124+
if err != nil {
125+
tc.userLogin.Log.Error().Err(err).Msg("failed to disconnect, err:")
126+
}
124127
}
125128

126129
func (tc *TwitterClient) IsLoggedIn() bool {
@@ -139,11 +142,11 @@ func (tc *TwitterClient) IsThisUser(_ context.Context, userID networkid.UserID)
139142
return networkid.UserID(tc.client.GetCurrentUserID()) == userID
140143
}
141144

142-
func (tc *TwitterClient) GetChatInfo(ctx context.Context, portal *bridgev2.Portal) (*bridgev2.ChatInfo, error) {
145+
func (tc *TwitterClient) GetChatInfo(_ context.Context, portal *bridgev2.Portal) (*bridgev2.ChatInfo, error) {
143146
conversationId := string(portal.PortalKey.ID)
144147
queryConversationPayload := payload.DmRequestQuery{}.Default()
145148
queryConversationPayload.IncludeConversationInfo = true
146-
conversationData, err := tc.client.FetchConversationContext(conversationId, queryConversationPayload, payload.CONTEXT_FETCH_DM_CONVERSATION)
149+
conversationData, err := tc.client.FetchConversationContext(conversationId, &queryConversationPayload, payload.CONTEXT_FETCH_DM_CONVERSATION)
147150
if err != nil {
148151
return nil, err
149152
}
@@ -161,15 +164,15 @@ func (tc *TwitterClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta
161164
return tc.ConversationToChatInfo(&conversation), nil
162165
}
163166

164-
func (tc *TwitterClient) GetUserInfo(ctx context.Context, ghost *bridgev2.Ghost) (*bridgev2.UserInfo, error) {
167+
func (tc *TwitterClient) GetUserInfo(_ context.Context, ghost *bridgev2.Ghost) (*bridgev2.UserInfo, error) {
165168
userInfo := tc.GetUserInfoBridge(string(ghost.ID))
166169
if userInfo == nil {
167170
return nil, fmt.Errorf("failed to find user info in cache by id: %s", ghost.ID)
168171
}
169172
return userInfo, nil
170173
}
171174

172-
func (tc *TwitterClient) GetCapabilities(ctx context.Context, portal *bridgev2.Portal) *bridgev2.NetworkRoomCapabilities {
175+
func (tc *TwitterClient) GetCapabilities(_ context.Context, _ *bridgev2.Portal) *bridgev2.NetworkRoomCapabilities {
173176
return &bridgev2.NetworkRoomCapabilities{
174177
FormattedText: false,
175178
UserMentions: true,

‎pkg/connector/client_sync.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66

77
"github.com/rs/zerolog"
8+
"go.mau.fi/util/ptr"
89
"maunium.net/go/mautrix/bridgev2"
910
"maunium.net/go/mautrix/bridgev2/simplevent"
1011

@@ -16,7 +17,7 @@ import (
1617
func (tc *TwitterClient) syncChannels(_ context.Context) {
1718
//log := zerolog.Ctx(ctx)
1819

19-
reqQuery := payload.DmRequestQuery{}.Default()
20+
reqQuery := ptr.Ptr(payload.DmRequestQuery{}.Default())
2021
initalInboxState, err := tc.client.GetInitialInboxState(reqQuery)
2122
if err != nil {
2223
panic(fmt.Sprintf("failed to fetch initial inbox state: %s", err.Error()))

‎pkg/twittermeow/account.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (c *Client) SetPushNotificationConfig(setting PushNotificationSetting, conf
8181
return fmt.Errorf("unknown push notification setting: %d", setting)
8282
}
8383

84-
payload := payload.WebPushConfigPayload{
84+
webPushPayload := payload.WebPushConfigPayload{
8585
Env: 3,
8686
ProtocolVersion: 1,
8787

@@ -93,14 +93,14 @@ func (c *Client) SetPushNotificationConfig(setting PushNotificationSetting, conf
9393
}
9494

9595
if config.P256DH != nil {
96-
payload.P256DH = methods.EncodeToUnpaddedBase64URL(config.P256DH)
96+
webPushPayload.P256DH = methods.EncodeToUnpaddedBase64URL(config.P256DH)
9797
}
9898

9999
if config.P256DH != nil {
100-
payload.Auth = methods.EncodeToUnpaddedBase64URL(config.Auth)
100+
webPushPayload.Auth = methods.EncodeToUnpaddedBase64URL(config.Auth)
101101
}
102102

103-
encodedBody, err := json.Marshal(payload)
103+
encodedBody, err := json.Marshal(webPushPayload)
104104

105105
if err != nil {
106106
return err

‎pkg/twittermeow/client.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package twittermeow
22

33
import (
4+
"context"
45
"fmt"
56
"log"
67
"net"
@@ -9,6 +10,8 @@ import (
910
"strings"
1011
"time"
1112

13+
"go.mau.fi/util/ptr"
14+
1215
"go.mau.fi/mautrix-twitter/pkg/twittermeow/cookies"
1316
"go.mau.fi/mautrix-twitter/pkg/twittermeow/crypto"
1417
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/endpoints"
@@ -135,7 +138,7 @@ func (c *Client) LoadMessagesPage() (*response.XInboxData, *response.AccountSett
135138
return nil, nil, err
136139
}
137140

138-
initialInboxState, err := c.GetInitialInboxState((&payload.DmRequestQuery{}).Default())
141+
initialInboxState, err := c.GetInitialInboxState(ptr.Ptr(payload.DmRequestQuery{}.Default()))
139142
if err != nil {
140143
return nil, nil, err
141144
}
@@ -174,8 +177,9 @@ func (c *Client) SetProxy(proxyAddr string) error {
174177
if err != nil {
175178
return err
176179
}
177-
//lint:ignore SA1019 TODO fix deprecated method
178-
c.http.Transport.(*http.Transport).Dial = c.socksProxy.Dial
180+
c.http.Transport.(*http.Transport).DialContext = func(ctx context.Context, network string, addr string) (net.Conn, error) {
181+
return c.socksProxy.Dial(network, addr)
182+
}
179183
contextDialer, ok := c.socksProxy.(proxy.ContextDialer)
180184
if ok {
181185
c.http.Transport.(*http.Transport).DialContext = contextDialer.DialContext

‎pkg/twittermeow/client_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func deleteConversationTest(initialInboxData *response.XInboxData) {
5959
firstConversation := conversations[0].Conversation
6060

6161
payload := payload.DmRequestQuery{}.Default()
62-
err = cli.DeleteConversation(firstConversation.ConversationID, payload)
62+
err = cli.DeleteConversation(firstConversation.ConversationID, &payload)
6363
if err != nil {
6464
log.Fatal(err)
6565
}
@@ -129,9 +129,9 @@ func createConversationAndSendMessageTest() {
129129
myUserID := cli.GetCurrentUserID()
130130
conversationId := fmt.Sprintf("%s-%s", pickedUser.IDStr, myUserID)
131131

132-
contextQuery := (&payload.DmRequestQuery{}).Default()
132+
contextQuery := payload.DmRequestQuery{}.Default()
133133
contextQuery.IncludeConversationInfo = true
134-
_, err = cli.FetchConversationContext(conversationId, contextQuery, payload.CONTEXT_FETCH_DM_CONVERSATION)
134+
_, err = cli.FetchConversationContext(conversationId, &contextQuery, payload.CONTEXT_FETCH_DM_CONVERSATION)
135135
if err != nil {
136136
log.Fatal(err)
137137
}
@@ -355,7 +355,7 @@ func logAllTrustedConversations(initialInboxData *response.XInboxData) {
355355

356356
paginationNextEntryID := trustedInboxTimeline.MinEntryID
357357
paginationStatus := trustedInboxTimeline.Status
358-
reqQuery := (&payload.DmRequestQuery{})
358+
reqQuery := &payload.DmRequestQuery{}
359359

360360
for paginationStatus == types.HAS_MORE {
361361
reqQuery.MaxID = paginationNextEntryID
@@ -410,7 +410,7 @@ func logAllMessagesInConversation(initialInboxData *response.XInboxData) {
410410
reqQuery := (&payload.DmRequestQuery{}).Default()
411411
for conversationMessageHistoryStatus == types.HAS_MORE {
412412
reqQuery.MaxID = paginationNextEntryID
413-
fetchMessagesResponse, err := cli.FetchConversationContext(firstConversation.ConversationID, reqQuery, payload.CONTEXT_FETCH_DM_CONVERSATION_HISTORY)
413+
fetchMessagesResponse, err := cli.FetchConversationContext(firstConversation.ConversationID, &reqQuery, payload.CONTEXT_FETCH_DM_CONVERSATION_HISTORY)
414414
if err != nil {
415415
log.Fatal(err)
416416
}

‎pkg/twittermeow/data/payload/form.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ type DmRequestQuery struct {
8888
Ext string `url:"ext"`
8989
}
9090

91-
func (p *DmRequestQuery) Encode() ([]byte, error) {
91+
func (p DmRequestQuery) Encode() ([]byte, error) {
9292
values, err := query.Values(p)
9393
if err != nil {
9494
return nil, err
9595
}
9696
return []byte(values.Encode()), nil
9797
}
9898

99-
func (p DmRequestQuery) Default() *DmRequestQuery {
100-
return &DmRequestQuery{
99+
func (p DmRequestQuery) Default() DmRequestQuery {
100+
return DmRequestQuery{
101101
NSFWFilteringEnabled: false,
102102
IncludeProfileInterstitialType: 1,
103103
IncludeBlocking: 1,

‎pkg/twittermeow/polling.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (pc *PollingClient) startListening() {
4646
userUpdatesQuery.Cursor = pc.currentCursor
4747
}
4848

49-
userUpdatesResponse, err := pc.client.GetDMUserUpdates(userUpdatesQuery)
49+
userUpdatesResponse, err := pc.client.GetDMUserUpdates(&userUpdatesQuery)
5050
if err != nil {
5151
log.Fatal(err)
5252
}

0 commit comments

Comments
 (0)