Overview
| Comment: | Adjust to recent ObjFW changes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
5dbb32c6338070feb8da288258a105e7 |
| User & Date: | js on 2017-05-08 00:54:30 |
| Other Links: | manifest | tags |
Context
|
2018-11-06
| ||
| 22:20 | Adjust to ObjFW changes check-in: 7a7f60e3e6 user: js tags: trunk | |
|
2017-05-08
| ||
| 00:54 | Adjust to recent ObjFW changes check-in: 5dbb32c633 user: js tags: trunk | |
|
2017-01-22
| ||
| 23:01 | Add ping timeout check-in: c17c999968 user: js tags: trunk | |
Changes
Modified src/IRCConnection.h from [2a183ce5dc] to [161d77c9d0].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import <ObjFW/ObjFW.h> @class IRCConnection; @class IRCUser; @protocol IRCConnectionDelegate <OFObject> @optional | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 |
#import <ObjFW/ObjFW.h>
@class IRCConnection;
@class IRCUser;
@protocol IRCConnectionDelegate <OFObject>
@optional
- (void)connection: (IRCConnection *)connection
didCreateSocket: (OF_KINDOF(OFTCPSocket) *)socket;
- (void)connection: (IRCConnection *)connection
didReceiveLine: (OFString *)line;
- (void)connection: (IRCConnection *)connection
didSendLine: (OFString *)line;
- (void)connectionWasEstablished: (IRCConnection *)connection;
- (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser *)user
joinChannel: (OFString *)channel;
- (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser *)user
leaveChannel: (OFString *)channel
reason: (OFString *)reason;
- (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser *)user
changeNicknameTo: (OFString *)nickname;
- (void)connection: (IRCConnection *)connection
didSeeUser: (IRCUser *)user
kickUser: (OFString *)kickedUser
channel: (OFString *)channel
reason: (OFString *)reason;
- (void)connection: (IRCConnection *)connection
didSeeUserQuit: (IRCUser *)user
reason: (OFString *)reason;
- (void)connection: (IRCConnection *)connection
didReceiveMessage: (OFString *)msg
channel: (OFString *)channel
user: (IRCUser *)user;
- (void)connection: (IRCConnection *)connection
didReceivePrivateMessage: (OFString *)msg
user: (IRCUser *)user;
- (void)connection: (IRCConnection *)connection
didReceiveNotice: (OFString *)notice
user: (IRCUser *)user;
- (void)connection: (IRCConnection *)connection
didReceiveNotice: (OFString *)notice
channel: (OFString *)channel
user: (IRCUser *)user;
- (void)connection: (IRCConnection *)connection
didReceiveNamesForChannel: (OFString *)channel;
- (void)connectionWasClosed: (IRCConnection *)connection;
@end
@interface IRCConnection: OFObject
{
Class _socketClass;
OF_KINDOF(OFTCPSocket) *_socket;
OFString *_server;
uint16_t _port;
OFString *_nickname, *_username, *_realname;
OFMutableDictionary OF_GENERIC(OFString *, OFMutableSet *) *_channels;
id <IRCConnectionDelegate> _delegate;
of_string_encoding_t _fallbackEncoding;
of_time_interval_t _pingInterval, _pingTimeout;
OFString *_pingData;
OFTimer *_pingTimer;
}
@property (assign) Class socketClass;
@property (nonatomic, copy) OFString *server;
@property uint16_t port;
@property (nonatomic, copy) OFString *nickname, *username, *realname;
@property (assign) id <IRCConnectionDelegate> delegate;
@property (readonly, nonatomic) OFTCPSocket *socket;
@property of_string_encoding_t fallbackEncoding;
@property of_time_interval_t pingInterval, pingTimeout;
+ (instancetype)connection;
- (void)sendLine: (OFString *)line;
- (void)sendLineWithFormat: (OFConstantString *)line, ...;
- (void)connect;
- (void)disconnect;
- (void)disconnectWithReason: (OFString *)reason;
- (void)joinChannel: (OFString *)channelName;
- (void)leaveChannel: (OFString *)channel;
- (void)leaveChannel: (OFString *)channel
reason: (OFString *)reason;
- (void)sendMessage: (OFString *)msg
to: (OFString *)to;
- (void)sendNotice: (OFString *)notice
to: (OFString *)to;
- (void)kickUser: (OFString *)user
channel: (OFString *)channel
reason: (OFString *)reason;
- (void)changeNicknameTo: (OFString *)nickname;
- (void)processLine: (OFString *)line;
- (void)handleConnection;
- (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel;
@end
|
Modified src/IRCConnection.m from [84167a7c12] to [40d21b42ac].
| ︙ | ︙ | |||
106 107 108 109 110 111 112 |
}
- (void)disconnect
{
[self disconnectWithReason: nil];
}
| | | | | | | | | | | | | | | | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 |
}
- (void)disconnect
{
[self disconnectWithReason: nil];
}
- (void)disconnectWithReason: (OFString *)reason
{
void *pool = objc_autoreleasePoolPush();
reason = [[reason componentsSeparatedByString: @"\n"] firstObject];
if (reason == nil)
[self sendLine: @"QUIT"];
else
[self sendLineWithFormat: @"QUIT :%@", reason];
objc_autoreleasePoolPop(pool);
}
- (void)joinChannel: (OFString *)channel
{
void *pool = objc_autoreleasePoolPush();
channel = [[channel componentsSeparatedByString: @"\n"] firstObject];
[self sendLineWithFormat: @"JOIN %@", channel];
objc_autoreleasePoolPop(pool);
}
- (void)leaveChannel: (OFString *)channel
{
[self leaveChannel: channel
reason: nil];
}
- (void)leaveChannel: (OFString *)channel
reason: (OFString *)reason
{
void *pool = objc_autoreleasePoolPush();
channel = [[channel componentsSeparatedByString: @"\n"] firstObject];
reason = [[reason componentsSeparatedByString: @"\n"] firstObject];
if (reason == nil)
[self sendLineWithFormat: @"PART %@", channel];
else
[self sendLineWithFormat: @"PART %@ :%@", channel, reason];
[_channels removeObjectForKey: channel];
objc_autoreleasePoolPop(pool);
}
- (void)sendLine: (OFString *)line
{
if ([_delegate respondsToSelector: @selector(connection:didSendLine:)])
[_delegate connection: self
didSendLine: line];
[_socket writeLine: line];
}
- (void)sendLineWithFormat: (OFConstantString *)format, ...
{
void *pool = objc_autoreleasePoolPush();
OFString *line;
va_list args;
va_start(args, format);
line = [[[OFString alloc] initWithFormat: format
arguments: args] autorelease];
va_end(args);
[self sendLine: line];
objc_autoreleasePoolPop(pool);
}
- (void)sendMessage: (OFString *)msg
to: (OFString *)to
{
void *pool = objc_autoreleasePoolPush();
for (OFString *line in [msg componentsSeparatedByString: @"\n"])
[self sendLineWithFormat: @"PRIVMSG %@ :%@", to, line];
objc_autoreleasePoolPop(pool);
}
- (void)sendNotice: (OFString *)notice
to: (OFString *)to
{
void *pool = objc_autoreleasePoolPush();
for (OFString *line in [notice componentsSeparatedByString: @"\n"])
[self sendLineWithFormat: @"NOTICE %@ :%@", to, line];
objc_autoreleasePoolPop(pool);
}
- (void)kickUser: (OFString *)user
channel: (OFString *)channel
reason: (OFString *)reason
{
void *pool = objc_autoreleasePoolPush();
reason = [[reason componentsSeparatedByString: @"\n"] firstObject];
[self sendLineWithFormat: @"KICK %@ %@ :%@", channel, user, reason];
objc_autoreleasePoolPop(pool);
}
- (void)changeNicknameTo: (OFString *)nickname
{
void *pool = objc_autoreleasePoolPush();
nickname = [[nickname componentsSeparatedByString: @"\n"]
firstObject];
[self sendLineWithFormat: @"NICK %@", nickname];
objc_autoreleasePoolPop(pool);
}
- (void)IRC_processLine: (OFString *)line
{
OFArray *components;
OFString *action = nil;
if ([_delegate respondsToSelector:
@selector(connection:didReceiveLine:)])
[_delegate connection: self
|
| ︙ | ︙ | |||
571 572 573 574 575 576 577 | [_delegate connectionWasClosed: self]; [_socket cancelAsyncRequests]; [_socket release]; _socket = nil; } | | | | | | | | | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 |
[_delegate connectionWasClosed: self];
[_socket cancelAsyncRequests];
[_socket release];
_socket = nil;
}
- (void)processLine: (OFString *)line
{
void *pool = objc_autoreleasePoolPush();
[self IRC_processLine: line];
objc_autoreleasePoolPop(pool);
}
- (bool)socket: (OFTCPSocket *)socket
didReceiveWronglyEncodedLine: (OFString *)line
exception: (OFException *)exception
{
if (line != nil) {
[self IRC_processLine: line];
[socket asyncReadLineWithTarget: self
selector: @selector(socket:
didReceiveLine:
exception:)];
}
return false;
}
- (bool)socket: (OFTCPSocket *)socket
didReceiveLine: (OFString *)line
exception: (OFException *)exception
{
if (line != nil) {
[self IRC_processLine: line];
return true;
}
if ([exception isKindOfClass: [OFInvalidEncodingException class]]) {
|
| ︙ | ︙ | |||
619 620 621 622 623 624 625 | } if ([_delegate respondsToSelector: @selector(connectionWasClosed:)]) [_delegate connectionWasClosed: self]; [_pingTimer invalidate]; | | > | | 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 |
}
if ([_delegate respondsToSelector: @selector(connectionWasClosed:)])
[_delegate connectionWasClosed: self];
[_pingTimer invalidate];
[_socket performSelector: @selector(cancelAsyncRequests)
afterDelay: 0];
[_socket release];
_socket = nil;
return false;
}
- (void)handleConnection
{
[_socket asyncReadLineWithTarget: self
selector: @selector(socket:didReceiveLine:
exception:)];
}
- (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel
{
return [[[_channels objectForKey: channel] copy] autorelease];
}
@end
|
Modified src/IRCUser.h from [797976d335] to [0435690016].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 |
#import <ObjFW/OFObject.h>
@interface IRCUser: OFObject <OFCopying>
{
OFString *_nickname, *_username, *_hostname;
}
| | | | | 24 25 26 27 28 29 30 31 32 33 34 35 |
#import <ObjFW/OFObject.h>
@interface IRCUser: OFObject <OFCopying>
{
OFString *_nickname, *_username, *_hostname;
}
@property (readonly, nonatomic) OFString *nickname, *username, *hostname;
+ (instancetype)IRCUserWithString: (OFString *)string;
- initWithString: (OFString *)string;
@end
|
Modified src/IRCUser.m from [b7bd4aa235] to [3d00fb209b].
| ︙ | ︙ | |||
32 33 34 35 36 37 38 | #import <ObjFW/macros.h> #import "IRCUser.h" @implementation IRCUser @synthesize username = _username, nickname = _nickname, hostname = _hostname; | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 |
#import <ObjFW/macros.h>
#import "IRCUser.h"
@implementation IRCUser
@synthesize username = _username, nickname = _nickname, hostname = _hostname;
+ (instancetype)IRCUserWithString: (OFString *)string
{
return [[[self alloc] initWithString: string] autorelease];
}
- initWithString: (OFString *)string
{
char *tmp2 = NULL;
self = [super init];
@try {
char *tmp;
|
| ︙ | ︙ | |||
89 90 91 92 93 94 95 |
}
- copy
{
return [self retain];
}
| | | 89 90 91 92 93 94 95 96 97 98 99 100 101 |
}
- copy
{
return [self retain];
}
- (OFString *)description
{
return [OFString stringWithFormat: @"%@!%@@%@",
_nickname, _username, _hostname];
}
@end
|