1.0.23 (#201)

* Removing directstream shouldn't crash tut

* update version

* Ignore tut binary (#194)

When I do 'go build .' it yields a 'tut' file in the current directory
that's not currently ignored.

* Print error when failing to connect (#193)

When setting up, network errors wouldn't print any useful information:

  Instance: bsd.network

  Couldn't connect to instance: https://bsd.network
  Try again or press ^C.

Now:

  Instance: bsd.network

  Couldn't connect to instance https://bsd.network:
  Get "https://bsd.network/api/v1/instance": x509: certificate signed
  by unknown authority
  Try again or press ^C.

(Turns out I didn't have root certificates installed.)

* set config with flag and env

* list tags that you follow

* fix help

* update readme

* remove unused field

* user search and multiple tags

Co-authored-by: Sijmen J. Mulder <[email protected]>

Author: RasmusLindroth

.gitignore

@@ -2,3 +2,4 @@
 Makefile
 bin/
 TODO.md
+tut

README.md

@@ -63,6 +63,7 @@ You can find Linux binaries under [releases](https://github.com/RasmusLindroth/t
 * `:requests` see following requests
 * `:saved` alias for bookmarks
 * `:tag` followed by the hashtag e.g. `:tag linux`
+* `:tags` list of followed tags
 * `:unfollow-tag` followed by the hashtag to unfollow e.g. `:unfollow-tag tut`
 * `:user` followed by a username e.g. `:user rasmus` to narrow a search include 
 * `:window` switch window by index (zero indexed) e.g. `:window 0` for the first window.
@@ -169,14 +170,18 @@ Commands:
     example-config - creates the default configuration file in the current directory and names it ./config.example.ini
 
 Flags:
-    --help -h - prints this message
-    --version -v - prints the version
-    --new-user -n - add one more user to tut
-    --user <name> -u <name> - login directly to user named <name>
-        Don't use a = between --user and the <name> 
-        If two users are named the same. Use full name like [email protected]
+	-h  --help             prints this message
+	-v  --version          prints the version
+	-n  --new-user         add one more user to tut
+	-c  --config <path>    load config.ini from <path>
+	-d --config-dir <path> load all config from <path>
+	-u  --user <name>      login directly to user named <name>
+		If two users are named the same. Use full name like [email protected]
 ```
 
+If you don't want to set `--config` or `--config-dir` everytime you can set
+the environment variables `TUT_CONF` and `TUT_CONF_DIR` instead.
+
 ## Templates
 You can customise how toots and user profiles are displayed with a
 Go [text/template](https://pkg.go.dev/text/template).

api/feed.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"strings"
 
 	"github.com/RasmusLindroth/go-mastodon"
 )
@@ -156,7 +157,14 @@ func (ac *AccountClient) GetConversations(pg *mastodon.Pagination) ([]Item, erro
 
 func (ac *AccountClient) GetUsers(search string) ([]Item, error) {
 	var items []Item
-	users, err := ac.Client.AccountsSearch(context.Background(), search, 10)
+	var users []*mastodon.Account
+	var err error
+	if strings.HasPrefix(search, "@") && len(strings.Split(search, "@")) == 3 {
+		users, err = ac.Client.AccountsSearch(context.Background(), search, 10, true)
+	}
+	if len(users) == 0 || err != nil {
+		users, err = ac.Client.AccountsSearch(context.Background(), search, 10, false)
+	}
 	if err != nil {
 		return items, err
 	}
@@ -257,6 +265,18 @@ func (ac *AccountClient) GetUserPinned(id mastodon.ID) ([]Item, error) {
 	return items, nil
 }
 
+func (ac *AccountClient) GetTags(pg *mastodon.Pagination) ([]Item, error) {
+	var items []Item
+	tags, err := ac.Client.TagsFollowed(context.Background(), pg)
+	if err != nil {
+		return items, err
+	}
+	for _, t := range tags {
+		items = append(items, NewTagItem(t))
+	}
+	return items, nil
+}
+
 func (ac *AccountClient) GetLists() ([]Item, error) {
 	var items []Item
 	lists, err := ac.Client.GetLists(context.Background())
@@ -302,3 +322,22 @@ func (ac *AccountClient) GetTag(pg *mastodon.Pagination, search string) ([]Item,
 	}
 	return ac.getStatusSimilar(fn, "public")
 }
+
+func (ac *AccountClient) GetTagMultiple(pg *mastodon.Pagination, search string) ([]Item, error) {
+	fn := func() ([]*mastodon.Status, error) {
+		var s string
+		td := mastodon.TagData{}
+		parts := strings.Split(search, " ")
+		for i, p := range parts {
+			if i == 0 {
+				s = p
+				continue
+			}
+			if len(p) > 0 {
+				td.Any = append(td.Any, p)
+			}
+		}
+		return ac.Client.GetTimelineHashtagMultiple(context.Background(), s, false, &td, pg)
+	}
+	return ac.getStatusSimilar(fn, "public")
+}

api/item.go

@@ -392,3 +392,44 @@ func (s *ListItem) Filtered() (bool, string) {
 func (n *ListItem) Pinned() bool {
 	return false
 }
+
+func NewTagItem(item *mastodon.Tag) Item {
+	return &TagItem{id: newID(), item: item, showSpoiler: true}
+}
+
+type TagItem struct {
+	id          uint
+	item        *mastodon.Tag
+	showSpoiler bool
+}
+
+func (t *TagItem) ID() uint {
+	return t.id
+}
+
+func (t *TagItem) Type() MastodonType {
+	return TagType
+}
+
+func (t *TagItem) ToggleSpoiler() {
+}
+
+func (t *TagItem) ShowSpoiler() bool {
+	return true
+}
+
+func (t *TagItem) Raw() interface{} {
+	return t.item
+}
+
+func (t *TagItem) URLs() ([]util.URL, []mastodon.Mention, []mastodon.Tag, int) {
+	return nil, nil, nil, 0
+}
+
+func (t *TagItem) Filtered() (bool, string) {
+	return false, ""
+}
+
+func (t *TagItem) Pinned() bool {
+	return false
+}

api/stream.go

@@ -16,6 +16,7 @@ const (
 	ProfileType
 	NotificationType
 	ListsType
+	TagType
 )
 
 type StreamType uint
@@ -193,6 +194,8 @@ func (ac *AccountClient) RemoveGenericReceiver(rec *Receiver, st StreamType, dat
 		id = "LocalStream"
 	case FederatedStream:
 		id = "FederatedStream"
+	case DirectStream:
+		id = "DirectStream"
 	case TagStream:
 		id = "TagStream" + data
 	case ListStream:

api/tags.go

@@ -3,6 +3,8 @@ package api
 import (
 	"context"
 	"errors"
+
+	"github.com/RasmusLindroth/go-mastodon"
 )
 
 func (ac *AccountClient) FollowTag(tag string) error {
@@ -33,3 +35,17 @@ func (ac *AccountClient) UnfollowTag(tag string) error {
 	}
 	return nil
 }
+
+func (ac *AccountClient) TagToggleFollow(tag *mastodon.Tag) (*mastodon.Tag, error) {
+	var t *mastodon.Tag
+	var err error
+	switch tag.Following {
+	case true:
+		t, err = ac.Client.TagUnfollow(context.Background(), tag.Name)
+	case false:
+		t, err = ac.Client.TagFollow(context.Background(), tag.Name)
+	default:
+		t, err = ac.Client.TagFollow(context.Background(), tag.Name)
+	}
+	return t, err
+}

auth/add.go

@@ -35,7 +35,7 @@ func AddAccount(ad *AccountData) *mastodon.Client {
 		})
 		_, err = client.GetInstance(context.Background())
 		if err != nil {
-			fmt.Printf("\nCouldn't connect to instance: %s\nTry again or press ^C.\n", server)
+			fmt.Printf("\nCouldn't connect to instance %s:\n%s\nTry again or press ^C.\n", server, err)
 			fmt.Println("--------------------------------------------------------------")
 		} else {
 			break

config.example.ini

@@ -152,7 +152,8 @@ leader-timeout=1000
 # Available commands: home, direct, local, federated, clear-notifications,
 # compose, edit, history, blocking, bookmarks, saved, favorited, boosts,
 # favorites, following, followers, muting, newer, preferences, profile,
-# notifications, lists, tag, window, list-placement, list-split, proportions
+# notifications, lists, tag, tags, window, list-placement, list-split,
+# proportions
 # 
 # The shortcuts are up to you, but keep them quite short and make sure they
 # don't collide. If you have one shortcut that is "f" and an other one that is
@@ -666,6 +667,14 @@ link-open="[O]pen",'o','O'
 # default="[Y]ank",'y','Y'
 link-yank="[Y]ank",'y','Y'
 
+# Open tag feed
+# default="[O]pen",'o','O'
+tag-open-feed="[O]pen",'o','O'
+
+# Toggle follow on tag
+# default="[F]ollow","Un[F]ollow",'f','F'
+tag-follow="[F]ollow","Un[F]ollow",'f','F'
+
 # Edit spoiler text on new toot
 # default="[C]W text",'c','C'
 compose-edit-spoiler="[C]W text",'c','C'