1.0.7 (#147)

* fix so links don't get messed up by notifications

* bump version

* truncate accounts and fix login bug

* update packages

* add follow requests

* confirm quit

* fix top text

* fix multiple feed windows

Author: RasmusLindroth

README.md

@@ -39,6 +39,7 @@ You can find Linux binaries under [releases](https://github.com/RasmusLindroth/t
 * `:lists` show a list of your lists
 * `:muting`  lists users that you have muted
 * `:profile` go to your profile
+* `:requests` see following requests
 * `:saved` alias for bookmarks
 * `:tag` followed by the hashtag e.g. `:tag linux`
 * `:user` followed by a username e.g. `:user rasmus` to narrow a search include 

api/feed.go

@@ -223,6 +223,13 @@ func (ac *AccountClient) GetMuting(pg *mastodon.Pagination) ([]Item, error) {
 	return ac.getUserSimilar(fn)
 }
 
+func (ac *AccountClient) GetFollowRequests(pg *mastodon.Pagination) ([]Item, error) {
+	fn := func() ([]*mastodon.Account, error) {
+		return ac.Client.GetFollowRequests(context.Background(), pg)
+	}
+	return ac.getUserSimilar(fn)
+}
+
 func (ac *AccountClient) getUserSimilar(fn func() ([]*mastodon.Account, error)) ([]Item, error) {
 	var items []Item
 	users, err := fn()

api/user.go

@@ -71,3 +71,11 @@ func (ac *AccountClient) MuteUser(u *mastodon.Account) (*mastodon.Relationship,
 func (ac *AccountClient) UnmuteUser(u *mastodon.Account) (*mastodon.Relationship, error) {
 	return ac.Client.AccountUnmute(context.Background(), u.ID)
 }
+
+func (ac *AccountClient) FollowRequestAccept(u *mastodon.Account) error {
+	return ac.Client.FollowRequestAuthorize(context.Background(), u.ID)
+}
+
+func (ac *AccountClient) FollowRequestDeny(u *mastodon.Account) error {
+	return ac.Client.FollowRequestReject(context.Background(), u.ID)
+}

auth/add.go

@@ -82,7 +82,7 @@ func AddAccount(ad *AccountData) *mastodon.Client {
 	}
 	me, err := client.GetAccountCurrentUser(context.Background())
 	if err != nil {
-		fmt.Printf("\nCouldnät get user. Error: %v\nExiting...\n", err)
+		fmt.Printf("\nCouldn't get user. Error: %v\nExiting...\n", err)
 		os.Exit(1)
 	}
 	acc := Account{

auth/file.go

@@ -48,7 +48,7 @@ func (ad *AccountData) Save(filepath string) error {
 	if err != nil {
 		return err
 	}
-	f, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE, 0600)
+	f, err := os.OpenFile(filepath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
 		return err
 	}

auth/load.go

@@ -16,7 +16,11 @@ func StartAuth(newUser bool) *AccountData {
 		accs, err = GetAccounts(path)
 	}
 	if err != nil || accs == nil || len(accs.Accounts) == 0 || newUser {
-		AddAccount(nil)
+		if err == nil && accs != nil {
+			AddAccount(accs)
+		} else {
+			AddAccount(nil)
+		}
 		return StartAuth(false)
 	}
 	return accs

config.example.ini

@@ -6,6 +6,42 @@
 # default=true
 confirmation=true
 
+# Timelines adds windows of feeds. You can customize the number of feeds, what
+# they should show and the key to activate them.
+# 
+# Available timelines: home, direct, local, federated, bookmarks, saved,
+# favorited, notifications, lists, tag
+# 
+# Tag is special as you need to add the tag after, see the example below.
+# 
+# The syntax is:
+# timelines=feed,[name],[keys...]
+# 
+# Tha values in brackets are optional. You can see the syntax for keys under the
+# [input] section.
+# 
+# Some examples:
+# 
+# home timeline with the name Home
+# timelines=home,Home
+# 
+# local timeline with the name Local and it gets focus when you press 2
+# timelines=local,Local,'2'
+# 
+# notification timeline with the name [N]otifications and it gets focus when you
+# press n or N
+# timelines=notifications,[N]otifications,'n','N'
+# 
+# tag timeline for #linux with the name Linux and it gets focus when you press
+# timelines=tag linux,Linux,"F2"
+# 
+# 
+# If you don't set any timelines it will default to this:
+# timelines=home
+# timelines=notifications,[N]otifications,'n','N'
+# 
+
+
 # The date format to be used. See https://godoc.org/time#Time.Format
 # default=2006-01-02 15:04
 date-format=2006-01-02 15:04
@@ -27,20 +63,11 @@ date-today-format=15:04
 # default=-1
 date-relative=-1
 
-# The timeline that opens up when you start tut.
-# Valid values: home, direct, local, federated
-# default=home
-timeline=home
-
 # The max width of text before it wraps when displaying toots.
 # 0 = no restriction.
 # default=0
 max-width=0
 
-# If you want to display a list of notifications under your timeline feed.
-# default=true
-notification-feed=true
-
 # Where do you want the list of toots to be placed?
 # Valid values: left, right, top, bottom.
 # default=left
@@ -52,11 +79,6 @@ list-placement=left
 # default=row
 list-split=row
 
-# Hide notification text above list in column split. It's displayed as
-# [N]otifications.
-# default=false
-hide-notification-text=false
-
 # You can change the proportions of the list view in relation to the content
 # view list-proportion=1 and content-proportoin=3 will result in the content
 # taking up 3 times more space.
@@ -421,6 +443,14 @@ main-prev-feed="",'h','H',"Left"
 # default="",'l','L',"Right"
 main-next-feed="",'l','L',"Right"
 
+# Focus on the previous feed window
+# default="","Backtab"
+main-prev-window="","Backtab"
+
+# Focus on the next feed window
+# default="","Tab"
+main-next-window="","Tab"
+
 # Focus on the notification list
 # default="[N]otifications",'n','N'
 main-notification-focus="[N]otifications",'n','N'
@@ -497,6 +527,10 @@ user-block="[B]lock","Un[B]lock",'b','B'
 # default="[F]ollow","Un[F]ollow",'f','F'
 user-follow="[F]ollow","Un[F]ollow",'f','F'
 
+# Follow user
+# default="Follow [R]equest","Follow [R]equest",'r','R'
+user-follow-request-decide="Follow [R]equest","Follow [R]equest",'r','R'
+
 # Mute user
 # default="[M]ute","Un[M]ute",'m','M'
 user-mute="[M]ute","Un[M]ute",'m','M'

config/config.go

@@ -72,6 +72,13 @@ const (
 	LeaderUser
 )
 
+type Timeline struct {
+	FeedType  feed.FeedType
+	Subaction string
+	Name      string
+	Key       Key
+}
+
 type General struct {
 	Confirmation         bool
 	DateTodayFormat      string
@@ -94,6 +101,8 @@ type General struct {
 	LeaderKey            rune
 	LeaderTimeout        int64
 	LeaderActions        []LeaderAction
+	TimelineName         bool
+	Timelines            []Timeline
 }
 
 type Style struct {
@@ -306,12 +315,13 @@ type Input struct {
 	GlobalBack  Key
 	GlobalExit  Key
 
-	MainHome              Key
-	MainEnd               Key
-	MainPrevFeed          Key
-	MainNextFeed          Key
-	MainNotificationFocus Key
-	MainCompose           Key
+	MainHome       Key
+	MainEnd        Key
+	MainPrevFeed   Key
+	MainNextFeed   Key
+	MainPrevWindow Key
+	MainNextWindow Key
+	MainCompose    Key
 
 	StatusAvatar        Key
 	StatusBoost         Key
@@ -328,14 +338,15 @@ type Input struct {
 	StatusYank          Key
 	StatusToggleSpoiler Key
 
-	UserAvatar    Key
-	UserBlock     Key
-	UserFollow    Key
-	UserMute      Key
-	UserLinks     Key
-	UserUser      Key
-	UserViewFocus Key
-	UserYank      Key
+	UserAvatar              Key
+	UserBlock               Key
+	UserFollow              Key
+	UserFollowRequestDecide Key
+	UserMute                Key
+	UserLinks               Key
+	UserUser                Key
+	UserViewFocus           Key
+	UserYank                Key
 
 	ListOpenFeed Key
 
@@ -599,6 +610,7 @@ func parseGeneral(cfg *ini.File) General {
 			parts := strings.Split(l, ",")
 			if len(parts) != 2 {
 				fmt.Printf("leader-action must consist of two parts seperated by a comma. Your value is: %s\n", strings.Join(parts, ","))
+				os.Exit(1)
 			}
 			for i, p := range parts {
 				parts[i] = strings.TrimSpace(p)
@@ -658,6 +670,81 @@ func parseGeneral(cfg *ini.File) General {
 		}
 		general.LeaderActions = las
 	}
+
+	general.TimelineName = cfg.Section("general").Key("timeline-show-name").MustBool(true)
+	var tls []Timeline
+	timelines := cfg.Section("general").Key("timelines").ValueWithShadows()
+	for _, l := range timelines {
+		parts := strings.Split(l, ",")
+		for i, p := range parts {
+			parts[i] = strings.TrimSpace(p)
+		}
+		if len(parts) == 0 {
+			fmt.Printf("timelines must consist of atleast one part seperated by a comma. Your value is: %s\n", strings.Join(parts, ","))
+			os.Exit(1)
+		}
+		if len(parts) == 1 {
+			parts = append(parts, "")
+		}
+		cmd := parts[0]
+		var subaction string
+		if strings.Contains(parts[0], " ") {
+			p := strings.Split(cmd, " ")
+			cmd = p[0]
+			subaction = strings.Join(p[1:], " ")
+		}
+		tl := Timeline{}
+		switch cmd {
+		case "home":
+			tl.FeedType = feed.TimelineHome
+		case "direct":
+			tl.FeedType = feed.Conversations
+		case "local":
+			tl.FeedType = feed.TimelineLocal
+		case "federated":
+			tl.FeedType = feed.TimelineFederated
+		case "bookmarks":
+			tl.FeedType = feed.Saved
+		case "saved":
+			tl.FeedType = feed.Saved
+		case "favorited":
+			tl.FeedType = feed.Favorited
+		case "notifications":
+			tl.FeedType = feed.Notification
+		case "lists":
+			tl.FeedType = feed.Lists
+		case "tag":
+			tl.FeedType = feed.Tag
+			tl.Subaction = subaction
+		default:
+			fmt.Printf("timeline %s is invalid\n", parts[0])
+			os.Exit(1)
+		}
+		tl.Name = parts[1]
+		if len(parts) > 2 {
+			vals := []string{""}
+			vals = append(vals, parts[2:]...)
+			tl.Key = inputStrOrErr(vals, false)
+		}
+		tls = append(tls, tl)
+	}
+	if len(tls) == 0 {
+		tls = append(tls,
+			Timeline{
+				FeedType: feed.TimelineHome,
+				Name:     "",
+			},
+		)
+		tls = append(tls,
+			Timeline{
+				FeedType: feed.Notification,
+				Name:     "[N]otifications",
+				Key:      inputStrOrErr([]string{"", "'n'", "'N'"}, false),
+			},
+		)
+	}
+	general.Timelines = tls
+
 	return general
 }
 
@@ -893,12 +980,13 @@ func parseInput(cfg *ini.File) Input {
 		GlobalBack:  inputStrOrErr([]string{"\"[Esc]\"", "\"Esc\""}, false),
 		GlobalExit:  inputStrOrErr([]string{"\"[Q]uit\"", "'q'", "'Q'"}, false),
 
-		MainHome:              inputStrOrErr([]string{"\"\"", "'g'", "\"Home\""}, false),
-		MainEnd:               inputStrOrErr([]string{"\"\"", "'G'", "\"End\""}, false),
-		MainPrevFeed:          inputStrOrErr([]string{"\"\"", "'h'", "'H'", "\"Left\""}, false),
-		MainNextFeed:          inputStrOrErr([]string{"\"\"", "'l'", "'L'", "\"Right\""}, false),
-		MainNotificationFocus: inputStrOrErr([]string{"\"[N]otifications\"", "'n'", "'N'"}, false),
-		MainCompose:           inputStrOrErr([]string{"\"\"", "'c'", "'C'"}, false),
+		MainHome:       inputStrOrErr([]string{"\"\"", "'g'", "\"Home\""}, false),
+		MainEnd:        inputStrOrErr([]string{"\"\"", "'G'", "\"End\""}, false),
+		MainPrevFeed:   inputStrOrErr([]string{"\"\"", "'h'", "'H'", "\"Left\""}, false),
+		MainNextFeed:   inputStrOrErr([]string{"\"\"", "'l'", "'L'", "\"Right\""}, false),
+		MainPrevWindow: inputStrOrErr([]string{"\"\"", "\"Backtab\""}, false),
+		MainNextWindow: inputStrOrErr([]string{"\"\"", "\"Tab\""}, false),
+		MainCompose:    inputStrOrErr([]string{"\"\"", "'c'", "'C'"}, false),
 
 		StatusAvatar:        inputStrOrErr([]string{"\"[A]vatar\"", "'a'", "'A'"}, false),
 		StatusBoost:         inputStrOrErr([]string{"\"[B]oost\"", "\"Un[B]oost\"", "'b'", "'B'"}, true),
@@ -915,14 +1003,15 @@ func parseInput(cfg *ini.File) Input {
 		StatusYank:          inputStrOrErr([]string{"\"[Y]ank\"", "'y'", "'Y'"}, false),
 		StatusToggleSpoiler: inputStrOrErr([]string{"\"Press [Z] to toggle spoiler\"", "'z'", "'Z'"}, false),
 
-		UserAvatar:    inputStrOrErr([]string{"\"[A]vatar\"", "'a'", "'A'"}, false),
-		UserBlock:     inputStrOrErr([]string{"\"[B]lock\"", "\"Un[B]lock\"", "'b'", "'B'"}, true),
-		UserFollow:    inputStrOrErr([]string{"\"[F]ollow\"", "\"Un[F]ollow\"", "'f'", "'F'"}, true),
-		UserMute:      inputStrOrErr([]string{"\"[M]ute\"", "\"Un[M]ute\"", "'m'", "'M'"}, true),
-		UserLinks:     inputStrOrErr([]string{"\"[O]pen\"", "'o'", "'O'"}, false),
-		UserUser:      inputStrOrErr([]string{"\"[U]ser\"", "'u'", "'U'"}, false),
-		UserViewFocus: inputStrOrErr([]string{"\"[V]iew\"", "'v'", "'V'"}, false),
-		UserYank:      inputStrOrErr([]string{"\"[Y]ank\"", "'y'", "'Y'"}, false),
+		UserAvatar:              inputStrOrErr([]string{"\"[A]vatar\"", "'a'", "'A'"}, false),
+		UserBlock:               inputStrOrErr([]string{"\"[B]lock\"", "\"Un[B]lock\"", "'b'", "'B'"}, true),
+		UserFollow:              inputStrOrErr([]string{"\"[F]ollow\"", "\"Un[F]ollow\"", "'f'", "'F'"}, true),
+		UserFollowRequestDecide: inputStrOrErr([]string{"\"Follow [R]equest\"", "\"Follow [R]equest\"", "'r'", "'R'"}, true),
+		UserMute:                inputStrOrErr([]string{"\"[M]ute\"", "\"Un[M]ute\"", "'m'", "'M'"}, true),
+		UserLinks:               inputStrOrErr([]string{"\"[O]pen\"", "'o'", "'O'"}, false),
+		UserUser:                inputStrOrErr([]string{"\"[U]ser\"", "'u'", "'U'"}, false),
+		UserViewFocus:           inputStrOrErr([]string{"\"[V]iew\"", "'v'", "'V'"}, false),
+		UserYank:                inputStrOrErr([]string{"\"[Y]ank\"", "'y'", "'Y'"}, false),
 
 		ListOpenFeed: inputStrOrErr([]string{"\"[O]pen\"", "'o'", "'O'"}, false),
 
@@ -954,7 +1043,6 @@ func parseInput(cfg *ini.File) Input {
 	ic.MainEnd = inputOrErr(cfg, "main-end", false, ic.MainEnd)
 	ic.MainPrevFeed = inputOrErr(cfg, "main-prev-feed", false, ic.MainPrevFeed)
 	ic.MainNextFeed = inputOrErr(cfg, "main-next-feed", false, ic.MainNextFeed)
-	ic.MainNotificationFocus = inputOrErr(cfg, "main-notification-focus", false, ic.MainNotificationFocus)
 	ic.MainCompose = inputOrErr(cfg, "main-compose", false, ic.MainCompose)
 
 	ic.StatusAvatar = inputOrErr(cfg, "status-avatar", false, ic.StatusAvatar)
@@ -975,6 +1063,7 @@ func parseInput(cfg *ini.File) Input {
 	ic.UserAvatar = inputOrErr(cfg, "user-avatar", false, ic.UserAvatar)
 	ic.UserBlock = inputOrErr(cfg, "user-block", true, ic.UserBlock)
 	ic.UserFollow = inputOrErr(cfg, "user-follow", true, ic.UserFollow)
+	ic.UserFollowRequestDecide = inputOrErr(cfg, "user-follow-request-decide", true, ic.UserFollowRequestDecide)
 	ic.UserMute = inputOrErr(cfg, "user-mute", true, ic.UserMute)
 	ic.UserLinks = inputOrErr(cfg, "user-links", false, ic.UserLinks)
 	ic.UserUser = inputOrErr(cfg, "user-user", false, ic.UserUser)