-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64 from gdpelican/chat-switching
Allow for switching between multiple chat topics
- Loading branch information
Showing
10 changed files
with
366 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 24 additions & 35 deletions
59
assets/javascripts/discourse/components/babble-icon.js.es6
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,37 @@ | ||
| import { observes } from 'ember-addons/ember-computed-decorators'; | ||
| import initializeBabble from "../lib/babble" | ||
|
|
||
| export default Ember.Component.extend({ | ||
|
|
||
| classNames: ['babble-icon'], | ||
| tagName: 'li', | ||
|
|
||
| _init: function() { | ||
| const self = this | ||
| const messageBus = Discourse.__container__.lookup('message-bus:main') | ||
| self.set('babbleIcon', Discourse.SiteSettings.babble_icon) | ||
|
|
||
| if (!Discourse.Babble) { | ||
| Discourse.Babble = {} | ||
| Discourse.Babble.refresh = function(data) { | ||
| self.set('babbleEnabled', Discourse.SiteSettings.babble_enabled && data.id) | ||
| if (!self.get('babbleEnabled')) { return } | ||
|
|
||
| var resetTopicField = function(topic, field) { | ||
| topic[field] = data[field] | ||
| if (!topic[field] && Discourse.Babble.topic) { topic[field] = Discourse.Babble.topic[field] } | ||
| } | ||
|
|
||
| var humanizeGroupName = function(group) { | ||
| if (!group.name) { return '' } | ||
| return group.name.charAt(0).toUpperCase() + group.name.slice(1).replace(/_/g, ' ') | ||
| } | ||
| currentTopicId: function() { | ||
| return Discourse.Babble.currentTopicId | ||
| }.property('Discourse.Babble.currentTopicId'), | ||
|
|
||
| var topic = Discourse.Topic.create(data) | ||
| resetTopicField(topic, 'last_read_post_number') | ||
| resetTopicField(topic, 'highest_post_number') | ||
| currentTopic: function() { | ||
| return Discourse.Babble.currentTopic | ||
| }.property('Discourse.Babble.currentTopic'), | ||
|
|
||
| topic.details.group_names = _.map(topic.details.allowed_groups, humanizeGroupName).join(', ') | ||
| @observes('currentTopicId') | ||
| babbleEnabled: function() { | ||
| return Discourse.SiteSettings.babble_enabled && this.get('currentTopicId') | ||
| }, | ||
|
|
||
| var postStream = Discourse.PostStream.create(topic.post_stream) | ||
| postStream.posts = topic.post_stream.posts | ||
| postStream.topic = topic | ||
|
|
||
| Discourse.Babble.topic = topic | ||
| Discourse.Babble.postStream = postStream | ||
|
|
||
| self.set('unreadCount', topic.highest_post_number - topic.last_read_post_number) | ||
| } | ||
| unreadCount: function() { | ||
| if (Discourse.Babble.unreadCount > 0) { | ||
| return Discourse.Babble.unreadCount | ||
| } else { | ||
| return null | ||
| } | ||
| }.property('Discourse.Babble.unreadCount'), | ||
|
|
||
| _init: function() { | ||
| if (!Discourse.Babble) { Discourse.Babble = initializeBabble } | ||
|
|
||
| Discourse.ajax('/babble/topic.json').then(Discourse.Babble.refresh) | ||
| messageBus.subscribe('/babble/topic', Discourse.Babble.refresh) | ||
| this.set('babbleIcon', Discourse.SiteSettings.babble_icon) | ||
| Discourse.ajax('/babble/topics/default.json').then(Discourse.Babble.setCurrentTopic) | ||
| Discourse.ajax('/babble/topics.json').then(Discourse.Babble.setAvailableTopics) | ||
| }.on('init') | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| export default Ember.Object.create({ | ||
|
|
||
| setCurrentTopic: function(data) { | ||
| const self = Discourse.Babble | ||
|
|
||
| if (!data.id) { | ||
| self.set('currentTopic', null) | ||
| self.set('currentTopicId', null) | ||
| self.set('latestPost', null) | ||
| return | ||
| } | ||
|
|
||
| const messageBus = Discourse.__container__.lookup('message-bus:main') | ||
|
|
||
| var resetTopicField = function(topic, field) { | ||
| topic[field] = data[field] | ||
| if (!topic[field] && self.get('currentTopic')) { topic[field] = self.get('currentTopic')[field] } | ||
| } | ||
|
|
||
| var humanizeGroupName = function(group) { | ||
| if (!group.name) { return '' } | ||
| return group.name.charAt(0).toUpperCase() + group.name.slice(1).replace(/_/g, ' ') | ||
| } | ||
|
|
||
| var topic = Discourse.Topic.create(data) | ||
| resetTopicField(topic, 'last_read_post_number') | ||
| resetTopicField(topic, 'highest_post_number') | ||
|
|
||
| if (self.get('currentTopicId') != topic.id) { | ||
| if (self.get('currentTopicId')) { | ||
| messageBus.unsubscribe('/babble/topics/' + self.get('currentTopicId')) | ||
| messageBus.unsubscribe('/babble/topics/' + self.get('currentTopicId') + '/posts') | ||
| } | ||
| self.set('currentTopicId', topic.id) | ||
| messageBus.subscribe('/babble/topics/' + self.get('currentTopicId'), self.setCurrentTopic) | ||
| messageBus.subscribe('/babble/topics/' + self.get('currentTopicId') + '/posts', self.handleNewPost) | ||
|
|
||
| var postStream = Discourse.PostStream.create(topic.post_stream) | ||
| postStream.posts = topic.post_stream.posts | ||
| postStream.topic = topic | ||
|
|
||
| topic.postStream = postStream | ||
| topic.details.group_names = _.map(topic.details.allowed_groups, humanizeGroupName).join(', ') | ||
| } else { | ||
| topic.postStream = self.get('currentTopic.postStream') | ||
| } | ||
|
|
||
| self.set('unreadCount', topic.highest_post_number - topic.last_read_post_number) | ||
| self.set('currentTopic', topic) | ||
| }, | ||
|
|
||
| setAvailableTopics: function(data) { | ||
| Discourse.Babble.set('availableTopics', (data || {}).topics || []) | ||
| }, | ||
|
|
||
| lastPostIsMine: function() { | ||
| return Discourse.Babble.get('latestPost.user_id') == Discourse.User.current().id | ||
| }, | ||
|
|
||
| handleNewPost: function(data) { | ||
| const self = Discourse.Babble | ||
|
|
||
| var postStream = self.get('currentTopic.postStream') | ||
| var post = postStream.storePost(Discourse.Post.create(data)) | ||
| post.created_at = moment(data.created_at, 'YYYY-MM-DD HH:mm:ss Z') | ||
| postStream.appendPost(post) | ||
|
|
||
| self.set('latestPost', post) | ||
|
|
||
| if (self.lastPostIsMine()) { | ||
| self.set('unreadCount', 0) | ||
| } else { | ||
| var topic = self.get('currentTopic') | ||
| self.set('unreadCount', topic.highest_post_number - topic.last_read_post_number) | ||
| } | ||
| } | ||
| }) |
57 changes: 42 additions & 15 deletions
57
assets/javascripts/discourse/templates/components/babble-menu.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,47 @@ | ||
| {{#menu-panel visible=visible}} | ||
| <section class="babble-chat"> | ||
| <div class="babble-title-wrapper"> | ||
| <div class="babble-title"> | ||
| <h4 class="babble-group-title">{{topic.title}}</h4> | ||
| <i class="fa fa-eye" title="{{i18n 'babble.visibility_message' groupNames=topic.details.group_names}}"></i> | ||
| <div class="babble-title-wrapper"> | ||
| <div class="babble-title"> | ||
| {{#if viewingChat}} | ||
| <h4 class="babble-group-title">{{currentTopic.title}}</h4> | ||
| <button class="babble-context-toggle normalized"> | ||
| <i class="fa fa-eye" title="{{i18n 'babble.topic_visibility_tooltip' groupNames=currentTopic.details.group_names}}"></i> | ||
| </button> | ||
| {{#if multipleTopicsAvailable}} | ||
| <button {{action 'viewTopics' bubbles=false}} class="babble-context-toggle for-topics normalized"> | ||
| <i class="fa fa-exchange" title="{{i18n 'babble.view_topics_tooltip'}}"></i> | ||
| </button> | ||
| {{/if}} | ||
| {{else}} | ||
| <button {{action 'viewChat' bubbles=false}} class="babble-context-toggle for-chat normalized"> | ||
| <i class="fa fa-chevron-left" title="{{i18n 'babble.view_chat_tooltip'}}"></i> | ||
| </button> | ||
| <h4 class="babble-topic-switcher-title">{{i18n 'babble.select_topic'}}</h4> | ||
| {{/if}} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <ul class="babble-posts"> | ||
| {{#unless topic.postStream.posts}} | ||
| <li class="babble-empty-topic-message">{{i18n 'babble.empty_topic_message'}}</li> | ||
| {{/unless}} | ||
| {{#each post in topic.postStream.posts}} | ||
| {{babble-post post=post topic=topic}} | ||
| {{/each}} | ||
| {{conditional-loading-spinner condition=topic.postStream.loadingBelow}} | ||
| </ul> | ||
| {{babble-composer}} | ||
|
|
||
| {{#if viewingChat}} | ||
| <ul class="babble-posts"> | ||
| {{#unless currentTopic.postStream.posts}} | ||
| <li class="babble-empty-topic-message">{{i18n 'babble.empty_topic_message'}}</li> | ||
| {{/unless}} | ||
| {{#each post in currentTopic.postStream.posts}} | ||
| {{babble-post post=post topic=currentTopic}} | ||
| {{/each}} | ||
| {{conditional-loading-spinner condition=currentTopic.postStream.loadingBelow}} | ||
| </ul> | ||
| {{babble-composer topic=currentTopic}} | ||
| {{else}} | ||
| <ul class="babble-available-topics"> | ||
| {{#each topic in availableTopics}} | ||
| <li class="babble-available-topic row"> | ||
| <button {{action 'changeTopic' topic bubbles=false}} class="normalized"> | ||
| <div class="babble-available-topic-title">{{topic.title}}</div> | ||
| </button> | ||
| </li> | ||
| {{/each}} | ||
| </ul> | ||
| {{/if}} | ||
| </section> | ||
| {{/menu-panel}} |
Oops, something went wrong.