diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
| commit | 848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09 (patch) | |
| tree | 98390442e8052b8e02469e5ccf7596e22b7ea07f /api/channel.go | |
| parent | e87adce4a059b97a65198b326be6304abdf4e657 (diff) | |
| parent | bee26e3f2654ce7acce647818847480569236343 (diff) | |
| download | chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.gz chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.bz2 chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.zip | |
fixing merge conflicts
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/api/channel.go b/api/channel.go index 88db27def..4d8dbad09 100644 --- a/api/channel.go +++ b/api/channel.go @@ -8,7 +8,6 @@ import ( "fmt" "github.com/gorilla/mux" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" "net/http" "strings" ) @@ -542,7 +541,7 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { message := model.NewMessage(c.Session.TeamId, id, c.Session.UserId, model.ACTION_VIEWED) message.Add("channel_id", id) - store.PublishAndForget(message) + PublishAndForget(message) result := make(map[string]string) result["id"] = id @@ -657,7 +656,7 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { message := model.NewMessage(c.Session.TeamId, "", userId, model.ACTION_USER_ADDED) - store.PublishAndForget(message) + PublishAndForget(message) <-Srv.Store.Channel().UpdateLastViewedAt(id, oUser.Id) w.Write([]byte(cm.ToJson())) |