Merge branch 'v0.4.1'

* v0.4.1: (26 commits) Update screenshot Update README.md Add some return errors Fix scrolling, fix help page Reset event.go Fix theme mapping Fix hide mpim Fix theme colors in view Fix searching Fix sorting of buckets Speed up presence discovery for im channels Trying out a sorting mechanism Fix user presence Add deleted user check Remove components dependency out of slack.go Start with conversations api Fix character width calculation in chat pane Add individual name colors Add optional emoji support Add optional date/time formatting ...
jpbruinsslot · Oct 27, 2018 · 757850d · 757850d
2 parents 1c06c37 + 7db9711
commit 757850d
Show file tree

Hide file tree

Showing 81 changed files with 3,450 additions and 1,409 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -35,11 +35,11 @@
 
 [[constraint]]
   name = "github.com/nlopes/slack"
-  version = "0.2.0"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/nsf/termbox-go"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/renstrom/fuzzysearch"

diff --git a/Makefile b/Makefile
@@ -3,9 +3,12 @@ default: test
 # -timeout 	timout in seconds
 #  -v		verbose output
 test:
-	@echo "+ $@"
+	@ echo "+ $@"
 	@ go test -timeout=5s -v
 
+dev: build
+	@ ./bin/slack-term -debug
+
 # `CGO_ENABLED=0`
 # Because of dynamically linked libraries, this will statically compile the
 # app with all libraries built in. You won't be able to cross-compile if CGO

diff --git a/README.md b/README.md
@@ -35,86 +35,13 @@ Setup
 1. Get a slack token, click [here](https://api.slack.com/docs/oauth-test-tokens) 
 
 2. Create a `.slack-term` file, and place it in your home directory. Below is
-   an an example file, you can leave out the `OPTIONAL` parts, you are only
-   required to specify a `slack_token`. Remember that your file should be
-   a valid json file so don't forget to remove the comments.
+   an example of such a file. You are only required to specify a
+   `slack_token`. For more configuration options of the `.slack-term` file,
+   see the [wiki](https://github.com/erroneousboat/slack-term/wiki).
 
 ```javascript
 {
-    "slack_token": "yourslacktokenhere",
-
-    // OPTIONAL: set the width of the sidebar (between 1 and 11), default is 1
-    "sidebar_width": 1,
-
-    // OPTIONAL: turn on desktop notifications for all incoming messages, set
-    // the value as: "all", and for only mentions and im messages set the
-    // value as: "mention", default is turned off: ""
-    "notify": "",
-
-    // OPTIONAL: define custom key mappings, defaults are:
-    "key_map": {
-        "command": {
-            "i": "mode-insert",
-            "/": "mode-search",
-            "k": "channel-up",
-            "j": "channel-down",
-            "g": "channel-top",
-            "G": "channel-bottom",
-            "<previous>": "chat-up",
-            "C-b": "chat-up",
-            "C-u": "chat-up",
-            "<next>": "chat-down",
-            "C-f": "chat-down",
-            "C-d": "chat-down",
-            "n": "channel-search-next",
-            "N": "channel-search-previous",
-            "q": "quit",
-            "<f1>": "help"
-        },
-        "insert": {
-            "<left>": "cursor-left",
-            "<right>": "cursor-right",
-            "<enter>": "send",
-            "<escape>": "mode-command",
-            "<backspace>": "backspace",
-            "C-8": "backspace",
-            "<delete>": "delete",
-            "<space>": "space"
-        },
-        "search": {
-            "<left>": "cursor-left",
-            "<right>": "cursor-right",
-            "<escape>": "clear-input",
-            "<enter>": "clear-input",
-            "<backspace>": "backspace",
-            "C-8": "backspace",
-            "<delete>": "delete",
-            "<space>": "space"
-        }
-    },
-
-    // OPTIONAL: override the default theme (see wiki for more information),
-    // defaults are:
-    "theme": {
-        "view": {
-            "fg": "white",
-            "bg": "default",
-            "border_fg": "white",
-            "border_bg": "white",
-            "par_fg": "white",
-            "par_label_fg": "white"
-        },
-        "channel": {
-            "prefix": "",
-            "icon": "",
-            "text": ""
-        },
-        "message": {
-            "time": "",
-            "name": "",
-            "text": ""
-        }
-    }
+    "slack_token": "yourslacktokenhere"
 }
 ```
 
@@ -128,19 +55,11 @@ command:
 $ slack-term
 ```
 
-You can also specify the location of the config file, this will give you
-the possibility to run several instances of `slack-term` with different
-accounts.
-
-```bash
-$ slack-term -config [path-to-config-file]
-```
-
 Default Key Mapping
 -------------------
 
-Below are the default key-mapping for `slack-term`, you can change them
-in your `slack-term.json` file.
+Below are the default key-mappings for `slack-term`, you can change them
+in your `.slack-term` file.
 
 | mode    | key       | action                     |
 |---------|-----------|----------------------------|