Add support for various muc management methods to muc processor

monal-im · Dec 29, 2023 · f427cfe · f427cfe
1 parent a6809c1
commit f427cfe
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 15 deletions.
diff --git a/Monal/Classes/MLIQProcessor.m b/Monal/Classes/MLIQProcessor.m
@@ -558,7 +558,7 @@ +(BOOL) processRosterWithAccount:(xmpp*) account andIqNode:(XMPPIQ*) iqNode
     }
 
     if(!account.connectionProperties.conferenceServer && [features containsObject:@"http://jabber.org/protocol/muc"])
-        account.connectionProperties.conferenceServer = iqNode.from;
+        account.connectionProperties.conferenceServer = iqNode.fromUser;
 $$
 
 $$class_handler(handleServerDiscoItems, $$ID(xmpp*, account), $$ID(XMPPIQ*, iqNode))

diff --git a/Monal/Classes/MLMucProcessor.h b/Monal/Classes/MLMucProcessor.h
@@ -25,8 +25,12 @@ NS_ASSUME_NONNULL_BEGIN
 -(void) join:(NSString*) room;
 -(void) leave:(NSString*) room withBookmarksUpdate:(BOOL) updateBookmarks;
 
--(void) setAffiliation:(NSString*) affiliation ofUser:(NSString*) jid inRoom:(NSString*) roomJid;
--(void) publishAvatar:(UIImage*) image forMuc:(NSString*) room;
+//muc management methods
+-(NSString* _Nullable) createGroup:(NSString*) node;
+-(void) changeNameOfMuc:(NSString*) room to:(NSString*) name;
+-(void) changeSubjectOfMuc:(NSString*) room to:(NSString*) subject;
+-(void) publishAvatar:(UIImage* _Nullable) image forMuc:(NSString*) room;
+-(void) setAffiliation:(NSString*) affiliation ofUser:(NSString*) jid inMuc:(NSString*) roomJid;
 
 -(void) pingAllMucs;
 -(void) ping:(NSString*) roomJid;

diff --git a/Monal/Classes/MLMucProcessor.m b/Monal/Classes/MLMucProcessor.m
diff --git a/Monal/Classes/XMPPIQ.h b/Monal/Classes/XMPPIQ.h
@@ -9,6 +9,8 @@
 #import "XMPPStanza.h"
 #import "MLContact.h"
 
+@class XMPPDataForm;
+
 NS_ASSUME_NONNULL_BEGIN
 
 FOUNDATION_EXPORT NSString* const kiqGetType;
@@ -117,6 +119,7 @@ removes a contact from the roster
 -(void) setInstantRoom;
 
 -(void) setVcardAvatarWithData:(NSData*) imageData andType:(NSString*) imageType;
+-(void) setRemoveVcardAvatar;
 -(void) setVcardQuery;
 
 #pragma mark - account
@@ -130,6 +133,8 @@ removes a contact from the roster
 -(void) requestBlockList;
 
 -(void) setMucAdminQueryWithAffiliation:(NSString*) affiliation forJid:(NSString*) jid;
+-(void) setGetRoomConfig;
+-(void) setRoomConfig:(XMPPDataForm*) configForm;
 
 @end
 

diff --git a/Monal/Classes/XMPPIQ.m b/Monal/Classes/XMPPIQ.m
@@ -345,13 +345,33 @@ -(void) getEntitySoftWareVersionTo:(NSString*) to
 
 #pragma mark MUC
 
+-(void) setGetRoomConfig
+{
+    [self addChildNode:[[MLXMLNode alloc] initWithElement:@"query" andNamespace:@"http://jabber.org/protocol/muc#owner"]];
+}
+
+-(void) setRoomConfig:(XMPPDataForm*) configForm
+{
+    [self addChildNode:[[MLXMLNode alloc] initWithElement:@"query" andNamespace:@"http://jabber.org/protocol/muc#owner" withAttributes:@{} andChildren:@[configForm] andData:nil]];
+}
+
 -(void) setInstantRoom
 {
     [self addChildNode:[[MLXMLNode alloc] initWithElement:@"query" andNamespace:@"http://jabber.org/protocol/muc#owner" withAttributes:@{} andChildren:@[
         [[XMPPDataForm alloc] initWithType:@"submit" andFormType:@"http://jabber.org/protocol/muc#roomconfig"]
     ] andData:nil]];
 }
 
+-(void) setRemoveVcardAvatar
+{
+    [self addChildNode:[[MLXMLNode alloc] initWithElement:@"vCard" andNamespace:@"vcard-temp" withAttributes:@{} andChildren:@[
+        [[MLXMLNode alloc] initWithElement:@"PHOTO" withAttributes:@{} andChildren:@[
+            [[MLXMLNode alloc] initWithElement:@"PHOTO" andData:nil],
+            [[MLXMLNode alloc] initWithElement:@"BINVAL" andData:nil],
+        ] andData:nil]
+    ] andData:nil]];
+}
+
 -(void) setVcardAvatarWithData:(NSData*) imageData andType:(NSString*) imageType
 {
     [self addChildNode:[[MLXMLNode alloc] initWithElement:@"vCard" andNamespace:@"vcard-temp" withAttributes:@{} andChildren:@[

diff --git a/Monal/Classes/XMPPPresence.h b/Monal/Classes/XMPPPresence.h
@@ -80,6 +80,9 @@ allow subscription. Called in response to a remote request.
 -(void) unsubscribedContact:(MLContact*) contact;
 
 #pragma mark MUC
+
+-(void) createRoom:(NSString*) room withNick:(NSString*) nick;
+
 /**
  join specified room on server
  */

diff --git a/Monal/Classes/XMPPPresence.m b/Monal/Classes/XMPPPresence.m
@@ -68,6 +68,12 @@ -(void) setLastInteraction:(NSDate*) date
 
 #pragma mark MUC 
 
+-(void) createRoom:(NSString*) room withNick:(NSString*) nick
+{
+    self.to = [NSString stringWithFormat:@"%@/%@", room, nick];
+    [self addChildNode:[[MLXMLNode alloc] initWithElement:@"x" andNamespace:@"http://jabber.org/protocol/muc" withAttributes:@{} andChildren:@[] andData:nil]];
+}
+
 -(void) joinRoom:(NSString*) room withNick:(NSString*) nick
 {
     [self.attributes setObject:[NSString stringWithFormat:@"%@/%@", room, nick] forKey:@"to"];