shithub: hell

Info  •  Files  •  Log  •  Branches

/cat shows qualified username

--- a/commands.go

+++ b/commands.go

@@ -4,7 +4,7 @@

 	"strings"

 )

-var commands = []string{"examine", "reply", "like", "thread", "open", "prev", "download", "dm", "rt", "parent", "children", "rm", "mark", "unmark", "account", "import", "pause", "resume", "url", "fpost", "ufpost", "edit", "notice", "stats", "next", "view", "bookmarks", "follow", "unfollow", "likes", "help", "reload", "attach", "detach", "pinned", "cat", "play", "translate", "read", "version", "local", "public", "block", "unblock", "unlike", "home"}

+var commands = []string{"examine", "reply", "like", "thread", "open", "prev", "download", "dm", "rt", "parent", "children", "rm", "mark", "unmark", "account", "import", "pause", "resume", "url", "fpost", "ufpost", "edit", "notice", "stats", "next", "view", "bookmarks", "follow", "unfollow", "likes", "help", "reload", "attach", "detach", "pinned", "cat", "play", "translate", "read", "version", "local", "public", "block", "unblock", "unlike", "home", "page"}

 func processInput(input string) (command string, arguments string, found bool) {

--- a/main.go

+++ b/main.go

@@ -303,7 +303,7 @@

 				if index == "" {

 					index = lastindex

 				}

-				line, _ := templater.render("$standard_status\n$detail_line")

+				line, _ := templater.render("$index $username_full $content $media_descriptions\n$detail_line")

 				fmt.Print(line)

 				return

 			case "translate":

--- a/mastodon.go

+++ b/mastodon.go

@@ -181,6 +181,7 @@

 			sb.WriteString("Follow request pending\n")

 		}

 	}

+	sb.WriteString("\n")

 	accountstring, _ := hyphenate(sb.String())

 	return accountstring

 }

--- a/renderer.go

+++ b/renderer.go

@@ -58,6 +58,9 @@

 	return fmt.Sprintf("<%s>", st.status.Account.Username)

 }

+func (st *StatusFormatter) username_full() string {

+	return fmt.Sprintf("<%s>", st.status.Account.Acct)

+}

 func (st *StatusFormatter) detailLine() string {

 	var sb strings.Builder

 	var items []string

@@ -190,6 +193,17 @@

 func (usr *username) String() string {

 	return usr.username()

 }

+

+// Formatted <username@domain> stringer

+type username_full struct {

+	*StatusFormatter

+}

+

+func (usr *username_full) String() string {

+	return usr.username_full()

+}

+

+

 func (pr *postref) renderStatus(content string, index string) (string, map[string]string) {

 	doc, err := html.Parse(strings.NewReader(content))

--- a/templater.go

+++ b/templater.go

@@ -25,6 +25,7 @@

 			{key: "media_descriptions", stringer: &mediaDescriptions{sf}},

 			{key: "detail_line", stringer: &detailLine{sf}},

 			{key: "username", stringer: &username{sf}},

+			{key: "username_full", stringer: &username_full{sf}},

 			{key: "boostuser", stringer: &boostedusername{sf}},

 			{key: "boostcontent", stringer: &boostContent{sf}},

 			{key: "boosted_media_descriptions", stringer: &boostMediaDescriptions{sf}},

-- 

⑨