Refactored code structure

mrusme · Apr 3, 2021 · b22aedc · b22aedc
1 parent 9235494
commit b22aedc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/mast/cmd.go b/mast/cmd.go
@@ -1,10 +1,7 @@
 package mast
 
 import (
-  "context"
   "strings"
-
-  "github.com/mattn/go-mastodon"
 )
 
 type CmdReturnCode int
@@ -24,7 +21,6 @@ func CmdAvailable() ([]string) {
 
     "t",
     "toot",
-    "tootpublic",
 
     "tp",
     "tootprivate",
@@ -98,28 +94,28 @@ func CmdAutocompleter(input string, knownUsers []string) ([]string) {
   return entries
 }
 
-func CmdProcessor(mastodonClient *mastodon.Client, input string) (CmdReturnCode) {
+func CmdProcessor(timeline *Timeline, input string) (CmdReturnCode) {
   split := strings.SplitN(input, " ", 2)
   cmd := split[0]
   args := split[1]
 
   switch cmd {
-  case "quit", "exit", "bye":
-    return CodeQuit
-  case "t", "toot", "tootpublic":
-    return CmdToot(mastodonClient, args, VisibilityPublic)
+  case "t", "toot":
+    return CmdToot(timeline, args, VisibilityPublic)
   case "tp", "tootprivate":
-    return CmdToot(mastodonClient, args, VisibilityPrivate)
+    return CmdToot(timeline, args, VisibilityPrivate)
   case "tu", "tootunlisted":
-    return CmdToot(mastodonClient, args, VisibilityUnlisted)
+    return CmdToot(timeline, args, VisibilityUnlisted)
   case "td", "tootdirect":
-    return CmdToot(mastodonClient, args, VisibilityUnlisted)
+    return CmdToot(timeline, args, VisibilityUnlisted)
+  case "quit", "exit", "bye":
+    return CodeQuit
   }
 
   return CodeOk
 }
 
-func CmdToot(mastodonClient *mastodon.Client, content string, visibility string) (CmdReturnCode) {
+func CmdToot(timeline *Timeline, content string, visibility string) (CmdReturnCode) {
   var status string = ""
   var spoiler string = ""
   var sensitive bool = false
@@ -136,18 +132,10 @@ func CmdToot(mastodonClient *mastodon.Client, content string, visibility string)
 
   status = splitSpoiler[0]
 
-  newToot := mastodon.Toot{
-    Status: status,
-    Visibility: visibility,
-    Sensitive: sensitive,
-    SpoilerText: spoiler,
-  }
-
-  _, err := mastodonClient.PostStatus(context.Background(), &newToot)
+  _, err := timeline.Toot(&status, -1, nil, &visibility, sensitive, &spoiler)
   if err != nil {
     return CodeNotOk
   }
 
   return CodeOk
 }
-
diff --git a/mast/timeline.go b/mast/timeline.go
@@ -32,6 +32,7 @@ func NewTimeline(mastodonClient *mastodon.Client) Timeline {
     client: mastodonClient,
 
     LastRenderedIndex: -1,
+    Type: TimelineHome,
     TootIndexStatusIDMappings: make(map[string]int),
   }
 
@@ -87,3 +88,14 @@ func (timeline *Timeline) Load(timelineType TimelineType) (error) {
 
   return nil
 }
+
+func (timeline *Timeline) Toot(status *string, inReplyTo int, filesToUpload *[]string, visibility *string, sensitive bool, spoiler *string) (*mastodon.Status, error) {
+  newToot := mastodon.Toot{
+    Status: *status,
+    Visibility: *visibility,
+    Sensitive: sensitive,
+    SpoilerText: *spoiler,
+  }
+
+  return timeline.client.PostStatus(context.Background(), &newToot)
+}
diff --git a/tui/tui.go b/tui/tui.go
@@ -44,7 +44,7 @@ func TUI(tuiCore TUICore) {
       if key == tcell.KeyEnter {
         cmd := tuiCore.CmdLine.GetText()
         tuiCore.CmdLine.SetText("...")
-        retCode := mast.CmdProcessor(tuiCore.Client, cmd)
+        retCode := mast.CmdProcessor(&tuiCore.Timeline, cmd)
         tuiCore.CmdLine.SetText("")
 
         switch retCode {
@@ -111,7 +111,7 @@ func TUI(tuiCore TUICore) {
 func (tuiCore *TUICore) UpdateTimeline(scrollToEnd bool) bool {
   _, _, w, _ := tuiCore.Stream.Box.GetInnerRect()
 
-  err := tuiCore.Timeline.Load(mast.TimelineHome)
+  err := tuiCore.Timeline.Load(tuiCore.Timeline.Type)
   if err != nil {
     // TODO: Display errors somewhere
     return false