login, roadmap: cleanup/linting

mautrix · Oct 17, 2024 · 71734ba · 71734ba
1 parent 41ed6de
commit 71734ba
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 65 deletions.
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -9,8 +9,8 @@
       * [x] Videos
       * [x] Gifs
   * [x] Message reactions
-  * [ ] Typing notifications
-  * [ ] Read receipts
+  * [x] Typing notifications
+  * [x] Read receipts
 * Twitter → Matrix
   * [x] Message content
     * [x] Text
@@ -23,7 +23,7 @@
   * [ ] Message history
     * [ ] When creating portal
     * [ ] Missed messages
-  * [] Avatars
+  * [x] Avatars
   * [ ] † Typing notifications
   * [ ] † Read receipts
 * Misc
@@ -34,4 +34,4 @@
   * [ ] Option to use own Matrix account for messages sent from other Twitter clients
   * [ ] E2EE in Matrix rooms
 
-† Information not automatically sent from source, i.e. implementation may not be possible
+† Implementation is impossible / really difficult  at the current state of the mautrix-go framework
diff --git a/pkg/connector/login.go b/pkg/connector/login.go
@@ -75,65 +75,6 @@ func (t *TwitterLogin) Start(_ context.Context) (*bridgev2.LoginStep, error) {
 						{Type: bridgev2.LoginCookieTypeCookie, Name: "auth_token"},
 					},
 				},
-				/*
-						{
-							ID: "guest_id",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "guest_id" },
-							},
-						},
-						{
-							ID: "twid",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "twid" },
-							},
-						},
-						{
-							ID: "kdt",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "kdt" },
-							},
-						},
-						{
-							ID: "night_mode",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "night_mode" },
-							},
-						},
-						{
-							ID: "personalization_id",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "personalization_id" },
-							},
-						},
-						{
-							ID: "guest_id_marketing",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "guest_id_marketing" },
-							},
-						},
-						{
-							ID: "guest_id_ads",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "guest_id_ads" },
-							},
-						},
-						{
-							ID: "d_prefs",
-							Required: false,
-							Sources: []bridgev2.LoginCookieFieldSource{
-								{ Type: bridgev2.LoginCookieTypeCookie, Name: "d_prefs" },
-							},
-						},
-					},
-				*/
 			},
 		},
 	}, nil

diff --git a/pkg/twittermeow/data/payload/json.go b/pkg/twittermeow/data/payload/json.go
@@ -29,7 +29,7 @@ func (p *GraphQLPayload) Encode() ([]byte, error) {
 }
 
 type SendTypingNotificationVariables struct {
-	ConversationID string `json:"conversationId, omitempty"`
+	ConversationID string `json:"conversationId,omitempty"`
 }
 
 type DMMessageDeleteMutationVariables struct {

diff --git a/pkg/twittermeow/session_loader.go b/pkg/twittermeow/session_loader.go
@@ -152,7 +152,7 @@ func (s *SessionLoader) LoadPage(url string) error {
 
 func (s *SessionLoader) doCookiesMetaDataLoad() error {
 	logData := []interface{}{
-		&payload.JotLogPayload{Description: "rweb:cookiesMetadata:load", Product: "rweb", EventValue: time.UnixMilli(fetchedTime).Sub(time.Now()).Milliseconds()},
+		&payload.JotLogPayload{Description: "rweb:cookiesMetadata:load", Product: "rweb", EventValue: time.Until(time.UnixMilli(fetchedTime)).Milliseconds()},
 	}
 	return s.client.performJotClientEvent(payload.JotLoggingCategoryPerftown, false, logData)
 }