Skip to content

Commit 72d7985

Browse files
purpshellpurpshell
committed
chore: linting and warnings
1 parent f95502d commit 72d7985

File tree

21 files changed

+272
-264
lines changed

21 files changed

+272
-264
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ logs/
55
!example-config.yaml
66
!.pre-commit-config.yaml
77
/start
8-
/pkg/mautrix
8+
/pkg/mautrix

‎build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
MAUTRIX_VERSION=$(cat go.mod | grep 'maunium.net/go/mautrix ' | awk '{ print $2 }' | head -n1)
33
GO_LDFLAGS="-s -w -X main.Tag=$(git describe --exact-match --tags 2>/dev/null) -X main.Commit=$(git rev-parse HEAD) -X 'main.BuildTime=`date -Iseconds`' -X 'maunium.net/go/mautrix.GoModVersion=$MAUTRIX_VERSION'"
4-
go build -ldflags="$GO_LDFLAGS" ./cmd/mautrix-twitter "$@"
4+
go build -ldflags="$GO_LDFLAGS" ./cmd/mautrix-twitter "$@"

‎cmd/mautrix-twitter/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
package main
1818

1919
import (
20-
"go.mau.fi/mautrix-twitter/pkg/connector"
2120
"maunium.net/go/mautrix/bridgev2/matrix/mxmain"
21+
22+
"go.mau.fi/mautrix-twitter/pkg/connector"
2223
)
2324

2425
// Information to find out exactly which commit the bridge was built from.
@@ -35,7 +36,7 @@ func main() {
3536
URL: "https://github.com/mautrix/twitter",
3637
Description: "A Matrix-Twitter puppeting bridge.",
3738
Version: "0.16.0",
38-
Connector: connector.NewConnector(),
39+
Connector: connector.NewConnector(),
3940
}
4041
m.InitVersion(Tag, Commit, BuildTime)
4142
m.Run()

‎pkg/connector/backfill.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ import (
55
"log"
66
"os"
77

8-
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/payload"
9-
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/types"
108
"maunium.net/go/mautrix/bridgev2"
119
"maunium.net/go/mautrix/bridgev2/networkid"
10+
11+
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/payload"
12+
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/types"
1213
)
1314

1415
var _ bridgev2.BackfillingNetworkAPI = (*TwitterClient)(nil)
1516

1617
func (tc *TwitterClient) FetchMessages(ctx context.Context, params bridgev2.FetchMessagesParams) (*bridgev2.FetchMessagesResponse, error) {
1718
conversationId := string(params.Portal.PortalKey.ID)
1819
cursor := params.Cursor
19-
//count := params.Count
20+
//count := params.Count
2021

2122
reqQuery := payload.DmRequestQuery{}.Default()
2223
reqQuery.Count = 25
@@ -42,10 +43,10 @@ func (tc *TwitterClient) FetchMessages(ctx context.Context, params bridgev2.Fetc
4243

4344
fetchMessagesResp := &bridgev2.FetchMessagesResponse{
4445
Messages: backfilledMessages,
45-
Cursor: networkid.PaginationCursor(messageResp.ConversationTimeline.MinEntryID),
46-
HasMore: messageResp.ConversationTimeline.Status == types.HAS_MORE,
47-
Forward: params.Forward,
46+
Cursor: networkid.PaginationCursor(messageResp.ConversationTimeline.MinEntryID),
47+
HasMore: messageResp.ConversationTimeline.Status == types.HAS_MORE,
48+
Forward: params.Forward,
4849
}
4950

5051
return fetchMessagesResp, nil
51-
}
52+
}

‎pkg/connector/client_sync.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ package connector
33
import (
44
"context"
55
"fmt"
6+
67
"github.com/rs/zerolog"
8+
"maunium.net/go/mautrix/bridgev2"
9+
"maunium.net/go/mautrix/bridgev2/simplevent"
10+
711
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/payload"
812
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/types"
913
"go.mau.fi/mautrix-twitter/pkg/twittermeow/methods"
10-
"maunium.net/go/mautrix/bridgev2"
11-
"maunium.net/go/mautrix/bridgev2/simplevent"
1214
)
1315

14-
func (tc *TwitterClient) syncChannels(ctx context.Context) {
16+
func (tc *TwitterClient) syncChannels(_ context.Context) {
1517
//log := zerolog.Ctx(ctx)
1618

1719
reqQuery := payload.DmRequestQuery{}.Default()
@@ -44,7 +46,6 @@ func (tc *TwitterClient) syncChannels(ctx context.Context) {
4446

4547
methods.MergeMaps(tc.userCache, inboxData.Users)
4648

47-
4849
conversations, err := inboxData.Prettify()
4950
if err != nil {
5051
panic(fmt.Sprintf("failed to prettify inbox data after fetching conversations: %s", err.Error()))
@@ -66,12 +67,12 @@ func (tc *TwitterClient) syncChannels(ctx context.Context) {
6667
return c.
6768
Str("portal_key", conv.ConversationID)
6869
},
69-
PortalKey: tc.MakePortalKey(conv),
70+
PortalKey: tc.MakePortalKey(conv),
7071
CreatePortal: true,
7172
},
72-
ChatInfo: tc.ConversationToChatInfo(&conv),
73+
ChatInfo: tc.ConversationToChatInfo(&conv),
7374
LatestMessageTS: latestMessageTS,
7475
}
7576
tc.connector.br.QueueRemoteEvent(tc.userLogin, evt)
7677
}
77-
}
78+
}

‎pkg/connector/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ type TwitterConfig struct {
99

1010
func (tc *TwitterConnector) GetConfig() (example string, data any, upgrader configupgrade.Upgrader) {
1111
return "", nil, configupgrade.NoopUpgrader
12-
}
12+
}

‎pkg/connector/connector.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ import (
2020
"context"
2121
"fmt"
2222
"log"
23+
24+
"maunium.net/go/mautrix/bridgev2"
25+
"maunium.net/go/mautrix/bridgev2/database"
26+
2327
"go.mau.fi/mautrix-twitter/pkg/twittermeow"
2428
twitCookies "go.mau.fi/mautrix-twitter/pkg/twittermeow/cookies"
2529
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/types"
26-
"maunium.net/go/mautrix/bridgev2"
27-
"maunium.net/go/mautrix/bridgev2/database"
2830
)
2931

30-
type TwitterConnector struct{
32+
type TwitterConnector struct {
3133
br *bridgev2.Bridge
32-
34+
3335
Config *TwitterConfig
3436
}
3537

@@ -43,7 +45,7 @@ func (tc *TwitterConnector) Init(bridge *bridgev2.Bridge) {
4345
tc.br = bridge
4446
}
4547

46-
func (tc *TwitterConnector) Start(ctx context.Context) error {
48+
func (tc *TwitterConnector) Start(_ context.Context) error {
4749

4850
log.Println("starting....")
4951
return nil
@@ -63,10 +65,10 @@ func (tc *TwitterConnector) GetName() bridgev2.BridgeName {
6365
func (tc *TwitterConnector) GetDBMetaTypes() database.MetaTypes {
6466
return database.MetaTypes{
6567
Reaction: nil,
66-
Portal: nil,
67-
Message: nil,
68-
Ghost: nil,
69-
UserLogin: func () any {
68+
Portal: nil,
69+
Message: nil,
70+
Ghost: nil,
71+
UserLogin: func() any {
7072
return &UserLoginMetadata{}
7173
},
7274
}
@@ -80,16 +82,16 @@ type UserLoginMetadata struct {
8082
Cookies string
8183
}
8284

83-
func (tc *TwitterConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLogin) error {
85+
func (tc *TwitterConnector) LoadUserLogin(_ context.Context, login *bridgev2.UserLogin) error {
8486
meta := login.Metadata.(*UserLoginMetadata)
8587
clientOpts := &twittermeow.ClientOpts{
86-
Cookies: twitCookies.NewCookiesFromString(meta.Cookies),
88+
Cookies: twitCookies.NewCookiesFromString(meta.Cookies),
8789
WithJOTClient: true,
8890
}
8991
twitClient := &TwitterClient{
9092
connector: tc,
9193
userLogin: login,
92-
client: twittermeow.NewClient(clientOpts, login.Log),
94+
client: twittermeow.NewClient(clientOpts, login.Log),
9395
userCache: make(map[string]types.User),
9496
}
9597
twitClient.client.SetEventHandler(twitClient.HandleTwitterEvent)
@@ -99,9 +101,8 @@ func (tc *TwitterConnector) LoadUserLogin(ctx context.Context, login *bridgev2.U
99101
return fmt.Errorf("failed to load messages page")
100102
}
101103

102-
103104
login.RemoteName = currentUser.ScreenName
104105
login.Client = twitClient
105-
106+
106107
return nil
107108
}

‎pkg/connector/handlematrix.go

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ package connector
22

33
import (
44
"context"
5-
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/payload"
5+
66
"maunium.net/go/mautrix/bridgev2"
77
"maunium.net/go/mautrix/bridgev2/database"
88
"maunium.net/go/mautrix/bridgev2/networkid"
99
"maunium.net/go/mautrix/event"
10+
11+
"go.mau.fi/mautrix-twitter/pkg/twittermeow/data/payload"
1012
)
1113

1214
var (
@@ -23,11 +25,11 @@ var (
2325
func (tc *TwitterClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.MatrixMessage) (message *bridgev2.MatrixMessageResponse, err error) {
2426
conversationId := string(msg.Portal.ID)
2527
sendDMPayload := &payload.SendDirectMessagePayload{
26-
ConversationID: conversationId,
27-
IncludeCards: 1,
28+
ConversationID: conversationId,
29+
IncludeCards: 1,
2830
IncludeQuoteCount: true,
29-
RecipientIds: false,
30-
DmUsers: false,
31+
RecipientIds: false,
32+
DmUsers: false,
3133
}
3234

3335
if msg.ReplyTo != nil {
@@ -50,7 +52,7 @@ func (tc *TwitterClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.
5052
}
5153

5254
uploadMediaParams := &payload.UploadMediaQuery{
53-
MediaType: MSG_TYPE_TO_MEDIA_TYPE[content.MsgType],
55+
MediaType: MSG_TYPE_TO_MEDIA_TYPE[content.MsgType],
5456
MediaCategory: MSG_TYPE_TO_MEDIA_CATEGORY[content.MsgType],
5557
}
5658
uploadedMediaResponse, err := tc.client.UploadMedia(uploadMediaParams, data)
@@ -77,36 +79,36 @@ func (tc *TwitterClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.
7779
respMessageData := messageData[0]
7880
return &bridgev2.MatrixMessageResponse{
7981
DB: &database.Message{
80-
ID: networkid.MessageID(respMessageData.MessageID),
81-
MXID: msg.Event.ID,
82-
Room: msg.Portal.PortalKey,
83-
SenderID: networkid.UserID(tc.client.GetCurrentUserID()),
82+
ID: networkid.MessageID(respMessageData.MessageID),
83+
MXID: msg.Event.ID,
84+
Room: msg.Portal.PortalKey,
85+
SenderID: networkid.UserID(tc.client.GetCurrentUserID()),
8486
Timestamp: respMessageData.SentAt,
8587
},
8688
}, nil
8789
}
8890

89-
func (tc *TwitterClient) HandleMatrixReactionRemove(ctx context.Context, msg *bridgev2.MatrixReactionRemove) error {
91+
func (tc *TwitterClient) HandleMatrixReactionRemove(_ context.Context, msg *bridgev2.MatrixReactionRemove) error {
9092
return tc.doHandleMatrixReaction(true, string(msg.Portal.ID), string(msg.TargetReaction.MessageID), msg.TargetReaction.Emoji)
9193
}
9294

93-
func (tc *TwitterClient) PreHandleMatrixReaction(ctx context.Context, msg *bridgev2.MatrixReaction) (bridgev2.MatrixReactionPreResponse, error) {
95+
func (tc *TwitterClient) PreHandleMatrixReaction(_ context.Context, msg *bridgev2.MatrixReaction) (bridgev2.MatrixReactionPreResponse, error) {
9496
return bridgev2.MatrixReactionPreResponse{
95-
SenderID: networkid.UserID(tc.userLogin.ID),
96-
Emoji: msg.Content.RelatesTo.Key,
97+
SenderID: networkid.UserID(tc.userLogin.ID),
98+
Emoji: msg.Content.RelatesTo.Key,
9799
MaxReactions: 1,
98100
}, nil
99101
}
100102

101-
func (tc *TwitterClient) HandleMatrixReaction(ctx context.Context, msg *bridgev2.MatrixReaction) (reaction *database.Reaction, err error) {
103+
func (tc *TwitterClient) HandleMatrixReaction(_ context.Context, msg *bridgev2.MatrixReaction) (reaction *database.Reaction, err error) {
102104
return nil, tc.doHandleMatrixReaction(false, string(msg.Portal.ID), string(msg.TargetMessage.ID), msg.PreHandleResp.Emoji)
103105
}
104106

105107
func (tc *TwitterClient) doHandleMatrixReaction(remove bool, conversationId, messageId, emoji string) error {
106108
reactionPayload := &payload.ReactionActionPayload{
107109
ConversationID: conversationId,
108-
MessageID: messageId,
109-
ReactionTypes: []string{"Emoji"},
110+
MessageID: messageId,
111+
ReactionTypes: []string{"Emoji"},
110112
EmojiReactions: []string{emoji},
111113
}
112114
reactionResponse, err := tc.client.React(reactionPayload, remove)
@@ -134,4 +136,4 @@ func (tc *TwitterClient) HandleMatrixReadReceipt(ctx context.Context, msg *bridg
134136
}
135137

136138
return tc.client.MarkConversationRead(params)
137-
}
139+
}

0 commit comments

Comments
 (0)