diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
| commit | 6e60768abe6f0caa639febf068d718d62881ce62 (patch) | |
| tree | 0600c72a7a9a3f7c1df167b3f870b38863e9a564 /model/channel.go | |
| parent | e22e7b8b7b66f342c2df693bbfc06a85980d253e (diff) | |
| parent | ac7918c5540900ab0dbe43d61b8c1155e4279b55 (diff) | |
| download | chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.gz chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.bz2 chat-6e60768abe6f0caa639febf068d718d62881ce62.zip | |
Fixing merge conflict
Diffstat (limited to 'model/channel.go')
| -rw-r--r-- | model/channel.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/model/channel.go b/model/channel.go index 7d8edeee7..a7f007960 100644 --- a/model/channel.go +++ b/model/channel.go @@ -120,3 +120,11 @@ func (o *Channel) ExtraUpdated() { func (o *Channel) PreExport() { } + +func GetDMNameFromIds(userId1, userId2 string) string { + if userId1 > userId2 { + return userId2 + "__" + userId1 + } else { + return userId1 + "__" + userId2 + } +} |