Repository: openmeetings Updated Branches: refs/heads/master 136005bc2 -> 736e68262
no jira: chat init is refactored Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/736e6826 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/736e6826 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/736e6826 Branch: refs/heads/master Commit: 736e682627ce44ee345a4c03373e532c2048a972 Parents: 136005b Author: Maxim Solodovnik <[email protected]> Authored: Mon Nov 6 18:10:06 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Nov 6 18:10:31 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/user/chat/Chat.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/736e6826/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index a0d8f8b..380ae41 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -37,7 +37,6 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; import java.time.Duration; import java.time.Instant; -import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -164,13 +163,12 @@ public class Chat extends Panel { if (showDashboardChat) { ChatDao dao = getBean(ChatDao.class); //TODO limited count should be loaded with "earlier" link - List<ChatMessage> list = new ArrayList<>(dao.getGlobal(0, 30)); + StringBuilder sb = new StringBuilder(getReinit()); for(Long roomId : getUserRooms(getUserId())) { Room r = getBean(RoomDao.class).get(roomId); - list.addAll(dao.getRoom(roomId, 0, 30, !r.isChatModerated() || isModerator(getUserId(), roomId))); + sb.append(addRoom(r)); } - list.addAll(dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30)); - StringBuilder sb = new StringBuilder(getReinit()); + List<ChatMessage> list = dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30); if (!list.isEmpty()) { sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");"); }
