Skip to content

Commit 5cb8a5e

Browse files
committed
Fix channels
1 parent caccd11 commit 5cb8a5e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Chat/src/main/java/ru/ifmo/neerc/chat/xmpp/XmppChat.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ public void processMessage(org.jivesoftware.smack.packet.Message message) {
321321
timestamp
322322
);
323323

324-
if (chatMessage.getTo() != null
324+
if (chatMessage.getType() != ChatMessage.Type.channel
325+
&& chatMessage.getTo() != null
325326
&& !name.equals(chatMessage.getUser().getName())
326327
&& !name.equals(chatMessage.getTo())) {
327328
return;

Chat/src/main/resources/ru/ifmo/neerc/chat/client/res/help.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<html>
22
<body>
3-
<h2>NEERC Chat 2016.12a-multiroom</h2>
3+
<h2>NEERC Chat 2016.12b-multiroom</h2>
44
Author: Matvey Kazakov<br>
55
Contributors:
66
<ul>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ subprojects {
99
apply plugin: 'java'
1010
sourceCompatibility = 1.7
1111
group "ru.ifmo.neerc"
12-
version "2016.12a-multiroom-SNAPSHOT"
12+
version "2016.12b-multiroom-SNAPSHOT"
1313
repositories {
1414
mavenLocal();
1515
maven {

0 commit comments

Comments
 (0)