Update to ObjFW changes

[jubjub.git] / src / gui / cli / JubCLIUI.m

diff --git a/src/gui/cli/JubCLIUI.m b/src/gui/cli/JubCLIUI.m
index e44a3f31fc621387e04d9d705afd7c0844c58c25..6f0b03a68c5d51440a6c13d36b8f5850f7845a27 100644 (file)
--- a/src/gui/cli/JubCLIUI.m
+++ b/src/gui/cli/JubCLIUI.m
@@ -77,34 +77,26 @@ BEGINCLICOMMAND(JubCLIPresenceCommand, @":t", @"<status> [<message>]",
                return;
        }
 
-       XMPPPresence *presence;
        OFString *show = parameters[0];
 
        if (![@[ @"available", @"away", @"dnd", @"xa", @"chat", @"unavailable" ]
            containsObject: show]) {
-               [of_stdout writeLine: @"<status> must be one of:"
+               [of_stdout writeLine: @"<status> must be one of: "
                    @"available, away, dnd, xa, chat, unavailable"];
                return;
        }
 
-       if ([show isEqual: @"unavailable"])
-               presence = [XMPPPresence presenceWithType: show];
-       else
-               presence = [XMPPPresence presence];
-
-       if (![@[ @"available", @"unavailable" ] containsObject: show])
-               presence.show = show;
-
        if ([parameters count] == 2) {
-               [_ui.client.connection sendStanza: presence];
+               [_ui.client sendPresenceWithStatus: show];
                return;
        }
 
-       OFArray *message =
-           [parameters arrayByRemovingObject: [parameters firstObject]];
-       presence.status = [message componentsJoinedByString: @" "];
+       OFString *message = [[parameters
+           arrayByRemovingObject: [parameters firstObject]]
+               componentsJoinedByString: @" "];
 
-       [_ui.client.connection sendStanza: presence];
+       [_ui.client sendPresenceWithStatus: show
+                                     text: message];
 }
 ENDCLICOMMAND
 
@@ -236,7 +228,7 @@ ENDCLICOMMAND
                __block size_t longest = 0;
 
                [_commands enumerateKeysAndObjectsUsingBlock:
-                   ^(OFString *key, id<JubCLICommand> command, BOOL *stop) {
+                   ^(OFString *key, id<JubCLICommand> command, bool *stop) {
                        size_t length = [command.command length] +
                            (command.params == nil ? 0 :
                                (1 + [command.params length]));