ソースを参照

Upgrade astatine to latest

ayntgl 4 年 前
コミット
339dd3b41e
4 ファイル変更9 行追加11 行削除
  1. 1 1
      go.mod
  2. 2 0
      go.sum
  3. 0 2
      main.go
  4. 6 8
      ui/app.go

+ 1 - 1
go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/BurntSushi/toml v1.0.0
 	github.com/atotto/clipboard v0.1.4
-	github.com/ayntgl/astatine v0.24.1-0.20220323171957-44de48cba9b9
+	github.com/ayntgl/astatine v0.24.1-0.20220324085605-e85d32085ce8
 	github.com/gdamore/tcell/v2 v2.4.1-0.20220313203054-2a1a1b586447
 	github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966

+ 2 - 0
go.sum

@@ -6,6 +6,8 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/ayntgl/astatine v0.24.1-0.20220323171957-44de48cba9b9 h1:7noMugVd2FGlZcq3pawMZ0H+RZu++AFPVPPWFA370v4=
 github.com/ayntgl/astatine v0.24.1-0.20220323171957-44de48cba9b9/go.mod h1:A54lIYhmYBAYhUaiR90Ahlw+oSi5gN+70PNvQ+6xjMY=
+github.com/ayntgl/astatine v0.24.1-0.20220324085605-e85d32085ce8 h1:tn/I/8Zv22Q8ERV/awDfLTSKQR5eH5AAYpzCIuRUaqw=
+github.com/ayntgl/astatine v0.24.1-0.20220324085605-e85d32085ce8/go.mod h1:xRC0h8PGhVmnvNh2eKSkJJ4xvtcQEZpvKmepqRMbNEU=
 github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
 github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=

+ 0 - 2
main.go

@@ -58,7 +58,6 @@ func main() {
 			}
 
 			if lr.Token != "" && !lr.Mfa {
-				app.Session.Token = lr.Token
 				app.Session.Identify.Token = lr.Token
 				err = app.Connect()
 				if err != nil {
@@ -83,7 +82,6 @@ func main() {
 						panic(err)
 					}
 
-					app.Session.Token = lr.Token
 					app.Session.Identify.Token = lr.Token
 					err = app.Connect()
 					if err != nil {

+ 6 - 8
ui/app.go

@@ -47,14 +47,12 @@ func (app *App) Connect() error {
 	// Whereas, for bot accounts, the guilds are dispatched discretely in the GUILD_CREATE gateway events.
 	if !strings.HasPrefix(app.Session.Identify.Token, "Bot") {
 		app.Session.UserAgent = app.Config.General.UserAgent
-		app.Session.Identify = astatine.Identify{
-			Compress:       false,
-			LargeThreshold: 0,
-			Intents:        0,
-			Properties: astatine.IdentifyProperties{
-				OS:      app.Config.General.Identify.Os,
-				Browser: app.Config.General.Identify.Browser,
-			},
+		app.Session.Identify.Compress = false
+		app.Session.Identify.LargeThreshold = 0
+		app.Session.Identify.Intents = 0
+		app.Session.Identify.Properties = astatine.IdentifyProperties{
+			OS:      app.Config.General.Identify.Os,
+			Browser: app.Config.General.Identify.Browser,
 		}
 		app.Session.AddHandlerOnce(app.onSessionReady)
 	}