Reorganize the project layout, fix some logging quirks
Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>
This commit is contained in:
@@ -1,45 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"git.laidback.moe/shinyoukai/mikuru"
|
||||
"go.yarn.social/client"
|
||||
)
|
||||
|
||||
var followCmd = &cobra.Command{
|
||||
Use: "follow <NICK> <URL>",
|
||||
Short: "Track a twtxt.txt feed, located in a Yarn pod or otherwise",
|
||||
Run: func(_ *cobra.Command, args []string) {
|
||||
cli, err := client.NewClient(
|
||||
client.WithURI(mikuru.Config.Host),
|
||||
client.WithToken(mikuru.Config.Token),
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if len(args) != 2 {
|
||||
log.Fatal("Not enough arguments")
|
||||
}
|
||||
nick := args[0]
|
||||
url := args[1]
|
||||
|
||||
observe(cli, nick, url)
|
||||
if err != nil {
|
||||
log.Fatalf("Could not follow %s at %s\n", nick, url)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
mikuru.ConfInit()
|
||||
rootCmd.AddCommand(followCmd)
|
||||
}
|
||||
|
||||
func observe(cli *client.Client, nick, url string) error {
|
||||
err := cli.Follow(nick, url)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
70
cmd/login.go
70
cmd/login.go
@@ -1,70 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"golang.org/x/term"
|
||||
"go.yarn.social/client"
|
||||
"git.laidback.moe/shinyoukai/mikuru"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var (
|
||||
username string
|
||||
password string
|
||||
)
|
||||
|
||||
var loginCmd = &cobra.Command{
|
||||
Use: "login",
|
||||
Short: "Authenticate against a Yarn pod",
|
||||
Aliases: []string{"auth", "signin"},
|
||||
Args: cobra.MaximumNArgs(0),
|
||||
Run: func(_ *cobra.Command, _ []string) {
|
||||
cli, err := client.NewClient(client.WithURI(mikuru.Config.Host))
|
||||
if err != nil {
|
||||
log.Fatal("Unable to create client", err)
|
||||
}
|
||||
signin(cli)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
mikuru.ConfInit()
|
||||
rootCmd.AddCommand(loginCmd)
|
||||
}
|
||||
|
||||
|
||||
func signin(cli *client.Client) {
|
||||
fmt.Printf("Username: ")
|
||||
fmt.Scanln(&username)
|
||||
|
||||
if len(username) == 0 {
|
||||
log.Fatal("No value. Bailing out")
|
||||
}
|
||||
|
||||
fmt.Printf("Password: ")
|
||||
data, err := term.ReadPassword(int(syscall.Stdin))
|
||||
if err != nil {
|
||||
log.Fatal("Unable to obtain password", err)
|
||||
}
|
||||
|
||||
password := string(data)
|
||||
|
||||
res, err := cli.Login(username, password)
|
||||
|
||||
if err != nil {
|
||||
log.Fatal("Unable to login", err)
|
||||
}
|
||||
|
||||
token := strings.Trim(fmt.Sprintf(res.Token), "{}")
|
||||
|
||||
fmt.Println("Login successful")
|
||||
fmt.Println("Place this token in your configuration file for later use")
|
||||
fmt.Println("Do not share it with anyone, it's classified information!")
|
||||
fmt.Println("")
|
||||
fmt.Printf("token = %v\n", token)
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package main
|
||||
|
||||
func main() {
|
||||
Execute()
|
||||
}
|
||||
48
cmd/post.go
48
cmd/post.go
@@ -1,48 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"git.laidback.moe/shinyoukai/mikuru"
|
||||
"go.yarn.social/client"
|
||||
"github.com/tj/go-editor"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var postCmd = &cobra.Command{
|
||||
Use: "post",
|
||||
Aliases: []string{"tweet"},
|
||||
Short: "Publish a new post to a Yarn pod",
|
||||
Run: func(_ *cobra.Command, args []string) {
|
||||
cli, err := client.NewClient(
|
||||
client.WithURI(mikuru.Config.Host),
|
||||
client.WithToken(mikuru.Config.Token),
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal("Unable to create client", err)
|
||||
}
|
||||
write(cli)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(postCmd)
|
||||
mikuru.ConfInit()
|
||||
}
|
||||
|
||||
func write(cli *client.Client) {
|
||||
var post string
|
||||
|
||||
data, err := editor.Read()
|
||||
|
||||
if err != nil {
|
||||
log.Fatal("Unable to read content from editor", err)
|
||||
}
|
||||
|
||||
post = string(data)
|
||||
|
||||
_, err = cli.Post(post, "")
|
||||
|
||||
if err != nil {
|
||||
log.Fatal("Unable to publish tweet", err)
|
||||
}
|
||||
}
|
||||
20
cmd/root.go
20
cmd/root.go
@@ -1,20 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"git.laidback.moe/shinyoukai/mikuru"
|
||||
)
|
||||
|
||||
var rootCmd = &cobra.Command{
|
||||
Use: "mikuru",
|
||||
Short: "A client for Yarn.social from the future",
|
||||
Version: mikuru.Version,
|
||||
}
|
||||
|
||||
func Execute() {
|
||||
err := rootCmd.Execute()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"git.laidback.moe/shinyoukai/mikuru"
|
||||
"go.yarn.social/client"
|
||||
)
|
||||
|
||||
var unfollowCmd = &cobra.Command{
|
||||
Use: "unfollow <NICK>",
|
||||
Short: "Cease to track a feed",
|
||||
Run: func(_ *cobra.Command, args []string) {
|
||||
cli, err := client.NewClient(
|
||||
client.WithURI(mikuru.Config.Host),
|
||||
client.WithToken(mikuru.Config.Token),
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if len(args) != 1 {
|
||||
log.Fatal("Not enough arguments")
|
||||
}
|
||||
nick := args[0]
|
||||
|
||||
leave_alone(cli, nick)
|
||||
if err != nil {
|
||||
log.Fatalf("Could not unfollow %s\n", nick)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
mikuru.ConfInit()
|
||||
rootCmd.AddCommand(unfollowCmd)
|
||||
}
|
||||
|
||||
func leave_alone(cli *client.Client, nick string) error {
|
||||
err := cli.Unfollow(nick)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user