Skip to content

chat and group chat message #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SummonY wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chat and group chat message #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4cb664
Groupchat should not deal with chat message.
SummonY Aug 24, 2015
e5248e1
Chat should not deal with groupchat message.
SummonY Aug 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Extensions/XEP-0045/XMPPRoom.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,11 @@ - (void)xmppStream:(XMPPStream *)sender didReceivePresence:(XMPPPresence *)prese

- (void)xmppStream:(XMPPStream *)sender didReceiveMessage:(XMPPMessage *)message
{
// This method is invoked on the moduleQueue.
if ([[message type] isEqualToString:@"chat"]) { // Room should not deal with single chat message
return NO;
}

// This method is invoked on the moduleQueue.

XMPPJID *from = [message from];

Expand Down Expand Up @@ -1093,6 +1097,10 @@ - (void)xmppStream:(XMPPStream *)sender didReceiveMessage:(XMPPMessage *)message

- (void)xmppStream:(XMPPStream *)sender didSendMessage:(XMPPMessage *)message
{
if ([[message type] isEqualToString:@"chat"]) { // Room should not deal with single chat message
return NO;
}

// This method is invoked on the moduleQueue.

XMPPJID *to = [message to];
Expand Down
6 changes: 5 additions & 1 deletion Extensions/XEP-0136/XMPPMessageArchiving.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,11 @@ - (BOOL)shouldArchiveMessage:(XMPPMessage *)message outgoing:(BOOL)isOutgoing xm
//
// 2. 'otr' and 'expire' value are taken from the <item> element that matches the contact, if present,
// else from the default element.


if ([[message type] isEqualToString:@"groupchat"]) { // chat should not deal with groupchat message
return NO;
}

NSXMLElement *match = nil;

NSString *messageThread = [[message elementForName:@"thread"] stringValue];
Expand Down