IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1289 from mattermost/plt-516-2

Browse Source 
PLT-516 Part 1 of performance fixes for large teams
This commit is contained in:
Joram Wilander
2015-11-04 09:43:06 -05:00
parent 56ce3bc997 ee66b08934
commit 559ca09f2c
9 changed files with 95 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/user.go
View File

@@ -49,7 +49,7 @@ func InitUser(r *mux.Router) {
sr.Handle("/newimage", ApiUserRequired(uploadProfileImage)).Methods("POST")
sr.Handle("/me", ApiAppHandler(getMe)).Methods("GET")
sr.Handle("/status", ApiUserRequiredActivity(getStatuses, false)).Methods("GET")
sr.Handle("/status", ApiUserRequiredActivity(getStatuses, false)).Methods("POST")
sr.Handle("/profiles", ApiUserRequired(getProfiles)).Methods("GET")
sr.Handle("/profiles/{id:[A-Za-z0-9]+}", ApiUserRequired(getProfiles)).Methods("GET")
sr.Handle("/{id:[A-Za-z0-9]+}", ApiUserRequired(getUser)).Methods("GET")
@@ -1483,16 +1483,31 @@ func updateUserNotify(c *Context, w http.ResponseWriter, r *http.Request) {
}
func getStatuses(c *Context, w http.ResponseWriter, r *http.Request) {
userIds := model.ArrayFromJson(r.Body)
if len(userIds) == 0 {
c.SetInvalidParam("getStatuses", "userIds")
return
}
if result := <-Srv.Store.User().GetProfiles(c.Session.TeamId); result.Err != nil {
c.Err = result.Err
return
} else {
profiles := result.Data.(map[string]*model.User)
statuses := map[string]string{}
for _, profile := range profiles {
found := false
for _, uid := range userIds {
if uid == profile.Id {
found = true
}
}
if !found {
continue
}
if profile.IsOffline() {
statuses[profile.Id] = model.USER_OFFLINE
} else if profile.IsAway() {

8
api/user_test.go
View File

@@ -1020,9 +1020,15 @@ func TestStatuses(t *testing.T) {
ruser := Client.Must(Client.CreateUser(&user, "")).Data.(*model.User)
store.Must(Srv.Store.User().VerifyEmail(ruser.Id))
user2 := model.User{TeamId: rteam.Data.(*model.Team).Id, Email: strings.ToLower(model.NewId()) + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"}
ruser2 := Client.Must(Client.CreateUser(&user2, "")).Data.(*model.User)
store.Must(Srv.Store.User().VerifyEmail(ruser2.Id))
Client.LoginByEmail(team.Name, user.Email, user.Password)
r1, err := Client.GetStatuses()
userIds := []string{ruser2.Id}
r1, err := Client.GetStatuses(userIds)
if err != nil {
t.Fatal(err)
}

4
model/client.go
View File

@@ -801,8 +801,8 @@ func (c *Client) ResetPassword(data map[string]string) (*Result, *AppError) {
}
}
func (c *Client) GetStatuses() (*Result, *AppError) {
if r, err := c.DoApiGet("/users/status", "", ""); err != nil {
func (c *Client) GetStatuses(data []string) (*Result, *AppError) {
if r, err := c.DoApiPost("/users/status", ArrayToJson(data)); err != nil {
return nil, err
} else {
return &Result{r.Header.Get(HEADER_REQUEST_ID),

9
web/react/components/channel_loader.jsx
View File

@@ -30,19 +30,14 @@ export default class ChannelLoader extends React.Component {
AsyncClient.getChannels(true, true);
AsyncClient.getChannelExtraInfo(true);
AsyncClient.findTeams();
AsyncClient.getStatuses();
AsyncClient.getMyTeam();
setTimeout(() => AsyncClient.getStatuses(), 3000); // temporary until statuses are reworked a bit
/* Perform pending post clean-up */
PostStore.clearPendingPosts();
/* Set up interval functions */
this.intervalId = setInterval(
function pollStatuses() {
AsyncClient.getStatuses();
},
30000
);
this.intervalId = setInterval(() => AsyncClient.getStatuses(), 30000);
/* Device tracking setup */
var iOS = (/(iPad|iPhone|iPod)/g).test(navigator.userAgent);

82
web/react/components/sidebar.jsx
View File

@@ -100,74 +100,56 @@ export default class Sidebar extends React.Component {
}
getStateFromStores() {
const members = ChannelStore.getAllMembers();
var teamMemberMap = UserStore.getActiveOnlyProfiles();
var currentId = ChannelStore.getCurrentId();
const currentUserId = UserStore.getCurrentId();
const currentChannelId = ChannelStore.getCurrentId();
var teammates = [];
for (var id in teamMemberMap) {
if (id === currentUserId) {
continue;
}
teammates.push(teamMemberMap[id]);
}
const channels = Object.assign([], ChannelStore.getAll());
const publicChannels = channels.filter((channel) => channel.type === Constants.OPEN_CHANNEL);
const privateChannels = channels.filter((channel) => channel.type === Constants.PRIVATE_CHANNEL);
const directChannels = channels.filter((channel) => channel.type === Constants.DM_CHANNEL);
const preferences = PreferenceStore.getPreferences(Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW);
var visibleDirectChannels = [];
var hiddenDirectChannelCount = 0;
for (var i = 0; i < teammates.length; i++) {
const teammate = teammates[i];
if (teammate.id === currentUserId) {
for (var i = 0; i < directChannels.length; i++) {
const dm = directChannels[i];
const teammate = Utils.getDirectTeammate(dm.id);
if (!teammate) {
continue;
}
const channelName = Utils.getDirectChannelName(currentUserId, teammate.id);
const member = members[dm.id];
const msgCount = dm.total_msg_count - member.msg_count;
let forceShow = false;
let channel = ChannelStore.getByName(channelName);
// always show a channel if either it is the current one or if it is unread, but it is not currently being left
const forceShow = (currentChannelId === dm.id || msgCount > 0) && !this.isLeaving.get(dm.id);
const preferenceShow = preferences.some((preference) => (preference.name === teammate.id && preference.value !== 'false'));
if (channel) {
const member = members[channel.id];
const msgCount = channel.total_msg_count - member.msg_count;
if (preferenceShow || forceShow) {
dm.display_name = Utils.displayUsername(teammate.id);
dm.teammate_id = teammate.id;
dm.status = UserStore.getStatus(teammate.id);
// always show a channel if either it is the current one or if it is unread, but it is not currently being left
forceShow = (currentId === channel.id || msgCount > 0) && !this.isLeaving.get(channel.id);
} else {
channel = {};
channel.fake = true;
channel.name = channelName;
channel.last_post_at = 0;
channel.total_msg_count = 0;
channel.type = 'D';
}
visibleDirectChannels.push(dm);
channel.display_name = Utils.displayUsername(teammate.id);
channel.teammate_id = teammate.id;
channel.status = UserStore.getStatus(teammate.id);
if (preferences.some((preference) => (preference.name === teammate.id && preference.value !== 'false'))) {
visibleDirectChannels.push(channel);
} else if (forceShow) {
// make sure that unread direct channels are visible
const preference = PreferenceStore.setPreference(Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, teammate.id, 'true');
AsyncClient.savePreferences([preference]);
visibleDirectChannels.push(channel);
} else {
hiddenDirectChannelCount += 1;
if (forceShow && !preferenceShow) {
// make sure that unread direct channels are visible
const preference = PreferenceStore.setPreference(Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, teammate.id, 'true');
AsyncClient.savePreferences([preference]);
}
}
}
const hiddenDirectChannelCount = UserStore.getActiveOnlyProfileList().length - visibleDirectChannels.length;
visibleDirectChannels.sort(this.sortChannelsByDisplayName);
const tutorialPref = PreferenceStore.getPreference(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), {value: '0'});
return {
activeId: currentId,
channels: ChannelStore.getAll(),
activeId: currentChannelId,
members,
publicChannels,
privateChannels,
visibleDirectChannels,
hiddenDirectChannelCount,
showTutorialTip: parseInt(tutorialPref.value, 10) === TutorialSteps.CHANNEL_POPOVER
@@ -534,11 +516,9 @@ export default class Sidebar extends React.Component {
this.lastUnreadChannel = null;
// create elements for all 3 types of channels
const publicChannels = this.state.channels.filter((channel) => channel.type === 'O');
const publicChannelItems = publicChannels.map(this.createChannelElement);
const publicChannelItems = this.state.publicChannels.map(this.createChannelElement);
const privateChannels = this.state.channels.filter((channel) => channel.type === 'P');
const privateChannelItems = privateChannels.map(this.createChannelElement);
const privateChannelItems = this.state.privateChannels.map(this.createChannelElement);
const directMessageItems = this.state.visibleDirectChannels.map((channel, index, arr) => {
return this.createChannelElement(channel, index, arr, this.handleLeaveDirectChannel);

33
web/react/stores/user_store.jsx
View File

@@ -204,12 +204,13 @@ class UserStoreClass extends EventEmitter {
}
getActiveOnlyProfiles() {
var active = {};
var current = this.getProfiles();
const active = {};
const profiles = this.getProfiles();
const currentId = this.getCurrentId();
for (var key in current) {
if (current[key].delete_at === 0) {
active[key] = current[key];
for (var key in profiles) {
if (profiles[key].delete_at === 0 && profiles[key].id !== currentId) {
active[key] = profiles[key];
}
}
@@ -219,9 +220,10 @@ class UserStoreClass extends EventEmitter {
getActiveOnlyProfileList() {
const profileMap = this.getActiveOnlyProfiles();
const profiles = [];
const currentId = this.getCurrentId();
for (const id in profileMap) {
if (profileMap.hasOwnProperty(id)) {
if (profileMap.hasOwnProperty(id) && id !== currentId) {
profiles.push(profileMap[id]);
}
}
@@ -235,6 +237,14 @@ class UserStoreClass extends EventEmitter {
BrowserStore.setItem('profiles', ps);
}
saveProfiles(profiles) {
const currentId = this.getCurrentId();
if (currentId in profiles) {
delete profiles[currentId];
}
BrowserStore.setItem('profiles', profiles);
}
setSessions(sessions) {
BrowserStore.setItem('sessions', sessions);
}
@@ -320,15 +330,8 @@ UserStore.dispatchToken = AppDispatcher.register((payload) => {
switch (action.type) {
case ActionTypes.RECIEVED_PROFILES:
for (var id in action.profiles) {
// profiles can have incomplete data, so don't overwrite current user
if (id === UserStore.getCurrentId()) {
continue;
}
var profile = action.profiles[id];
UserStore.saveProfile(profile);
UserStore.emitChange(profile.id);
}
UserStore.saveProfiles(action.profiles);
UserStore.emitChange();
break;
case ActionTypes.RECIEVED_ME:
UserStore.setCurrentUser(action.me);

18
web/react/utils/async_client.jsx
View File

@@ -588,13 +588,23 @@ export function getMe() {
}
export function getStatuses() {
if (isCallInProgress('getStatuses')) {
const directChannels = ChannelStore.getAll().filter((channel) => channel.type === Constants.DM_CHANNEL);
const teammateIds = [];
for (var i = 0; i < directChannels.length; i++) {
const teammate = utils.getDirectTeammate(directChannels[i].id);
if (teammate) {
teammateIds.push(teammate.id);
}
}
if (isCallInProgress('getStatuses') || teammateIds.length === 0) {
return;
}
callTracker.getStatuses = utils.getTimestamp();
client.getStatuses(
function getStatusesSuccess(data, textStatus, xhr) {
client.getStatuses(teammateIds,
(data, textStatus, xhr) => {
callTracker.getStatuses = 0;
if (xhr.status === 304 || !data) {
@@ -606,7 +616,7 @@ export function getStatuses() {
statuses: data
});
},
function getStatusesFailure(err) {
(err) => {
callTracker.getStatuses = 0;
dispatchError(err, 'getStatuses');
}

5
web/react/utils/client.jsx
View File

@@ -1069,12 +1069,13 @@ export function exportTeam(success, error) {
});
}
export function getStatuses(success, error) {
export function getStatuses(ids, success, error) {
$.ajax({
url: '/api/v1/users/status',
dataType: 'json',
contentType: 'application/json',
type: 'GET',
type: 'POST',
data: JSON.stringify(ids),
success,
error: function onError(xhr, status, err) {
var e = handleError('getStatuses', xhr, status, err);

1
web/react/utils/constants.jsx
View File

@@ -127,6 +127,7 @@ module.exports = {
MAX_DMS: 20,
DM_CHANNEL: 'D',
OPEN_CHANNEL: 'O',
PRIVATE_CHANNEL: 'P',
INVITE_TEAM: 'I',
OPEN_TEAM: 'O',
MAX_POST_LEN: 4000,