Merge pull request #1 from arborchat/master

merging current state of root node

Author: jwhett

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,24 @@
+---
+title: 'Bug report'
+labels: bug
+---
+
+## Expected Behavior
+
+1.
+1.
+1.
+
+
+## Current Behavior
+
+1.
+1.
+1.
+
+
+## Other Observations
+
+-
+-
+

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,24 @@
+---
+title: 'Feature Request'
+labels: enhancement
+---
+
+## Story
+
+As a `user`
+I want `this feature`
+so that `it does a thing.`
+
+
+## Feature Explanation
+
+
+## Use-cases
+
+Example use-cases addressed by this feature.
+
+-
+-
+-
+
+

.github/PULL_REQUEST_TEMPLATE/pr-bugfix.md

@@ -0,0 +1,20 @@
+---
+title: 'Bug Fix'
+labels: bug
+---
+
+Fixes # .
+
+Erase all that do not apply:
+- This PR modified command line flags/arguments
+- This PR modified configuration file options
+- This PR modified keybindings (either changing defaults or adding new actions)
+- This PR modified the visible UI
+
+Changes proposed:
+
+- 
+- 
+- 
+
+

.github/PULL_REQUEST_TEMPLATE/pr-feature.md

@@ -0,0 +1,17 @@
+---
+title: 'Feature Implementation'
+labels: enhancement
+---
+
+Implements # .
+
+Erase all that do not apply:
+- This PR modified command line flags/arguments
+- This PR modified configuration file options
+- This PR modified keybindings (either changing defaults or adding new actions)
+- This PR modified the visible UI
+
+## Feature explanation
+
+
+

.travis.yml

@@ -5,3 +5,5 @@ install:
     - dep ensure
 script:
     - go test -v -cover ./...
+    - for os in linux darwin windows openbsd; do echo "building for $os" && env GOOS="$os" go build -o /dev/null; done
+    - ./build-releases.sh

Gopkg.lock

@@ -27,7 +27,7 @@
 
 [[constraint]]
   name = "github.com/arborchat/arbor-go"
-  version = "0.1.3"
+  version = "0.1.8"
 
 [[constraint]]
   name = "github.com/bbrks/wrap"

Gopkg.toml

@@ -20,6 +20,21 @@ This is muscadine's (and arbor's) killer feature. You can actually see the conte
 in. If someone replies to a much earlier message, you can tell that they are doing so. This is a marked improvement
 over the current clutter that can build up during group chat sessions.
 
+You may also notice the `[join]` and `[quit]` messages. Since Arbor does not track online users, Muscadine sends these
+messages to inform the chat of who is connected.
+
+The very first line in the screenshot contains some extra information about the current session:
+
+- Shown in the screenshot
+    - `Selected: Mon Jan 7 14:34:53 EST 2019`: shows the timestamp of the selected message (the red line in the screenshot)
+    - `Connected`: indicates Muscadine is connected to an Arbor server
+    - `all known threads complete`: indicates the entire chat history is loaded by the client
+- Not shown in the screenshot
+    - `Connecting...`: indicates Muscadine is trying to connect to an Arbor server
+    - `3+ broken threads, q to query`: The `3` indicates how many messages are missing their history. `q to query` is a
+    reminder to press q in order to ask the server for missing information. This key usually has no effect since Muscadine
+    automatically queries missing history on startup.
+
 ## What's a Muscadine?
 
 Muscadine is named after [muscadine grapes](https://en.wikipedia.org/wiki/Vitis_rotundifolia), a wild grape native to the
@@ -47,15 +62,15 @@ The keybindings are:
 - History Mode
     - up/down/j/k - scroll the selected message up and down
     - left/right/h/l - scroll the viewport (not the cursor) up and down
-    - enter/i - start a reply to the selected message
-    - r - reply to the earliest known message (the root message)
+    - enter/i/r - start a reply to the selected message
+    - n - reply to the earliest known message (the root message)
     - home/g - jump to top of history
     - end/G - jump to bottom of history
     - q - query the server for any missing chat history (only necessary if top status bar indicates)
 - Compose Mode:
     - enter - send your message (unless in paste mode)
     - ctrl+p - toggle "paste mode", in which the enter key will *not* send the message, but instead type a newline
-    - ctrl+\ - return to history mode
+    - escape - return to history mode
 - Global:
     - ctrl+c - quit
 

README.md

@@ -53,7 +53,7 @@ func (a *Archive) Needed(n int) []string {
 	if n >= len(needed) {
 		return needed
 	}
-	return needed[len(a.chronological)-n:]
+	return needed[len(needed)-n:]
 }
 
 // Has returns whether the archive contains a message with the given ID.
@@ -127,15 +127,15 @@ func (a *Archive) Persist(storage io.Writer) error {
 	return encoder.Encode(a.chronological)
 }
 
-// Load reads messages from the io.Reader. It expects those messages to be
+// Populate reads messages from the io.Reader. It expects those messages to be
 // in the format written by Archive.Persist(), and should only be used on
 // io.Readers that were populated with data from a call to Persist(). It
-// is legal to call Load() more than once to load the contents of more than
+// is legal to call Populate() more than once to load the contents of more than
 // one io.Reader into the Archive. This will always be performed nondestructively
 // when possible. Conflicting data (multiple different messages with the same
 // ID) will cause an error. All data from a source containing a conflict will
 // be rejected, so io.Readers loaded first take precedence.
-func (a *Archive) Load(storage io.Reader) error {
+func (a *Archive) Populate(storage io.Reader) error {
 	if storage == nil {
 		return fmt.Errorf("Unable to load from nil")
 	}