Differences From Artifact [5544578885]:
- File src/IRCConnection.m — part of check-in [50a9cc56c6] at 2012-11-24 10:02:32 on branch trunk — API improvements. (user: js, size: 15373) [annotate] [blame] [check-ins using]
To Artifact [002f1423f2]:
- File
src/IRCConnection.m
— part of check-in
[620b9b2a30]
at
2012-11-24 11:56:58
on branch trunk
— Remove the IRCChannels class.
It was only overcomplicating things with no gain at all. Instead,
strings are used to describe channels now and the storage of users in a
channel is inside IRCConnection now. (user: js, size: 14919) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
32 33 34 35 36 37 38 | #import <ObjFW/OFInvalidEncodingException.h> #import <ObjFW/macros.h> #import "IRCConnection.h" #import "IRCUser.h" | < | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
#import <ObjFW/OFInvalidEncodingException.h>
#import <ObjFW/macros.h>
#import "IRCConnection.h"
#import "IRCUser.h"
@implementation IRCConnection
- init
{
self = [super init];
@try {
|
| ︙ | ︙ | |||
142 143 144 145 146 147 148 |
{
if (reason == nil)
[self sendLine: @"QUIT"];
else
[self sendLineWithFormat: @"QUIT :%@", reason];
}
| | | | | | | < | | 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 |
{
if (reason == nil)
[self sendLine: @"QUIT"];
else
[self sendLineWithFormat: @"QUIT :%@", reason];
}
- (void)joinChannel: (OFString*)channel
{
[self sendLineWithFormat: @"JOIN %@", channel];
}
- (void)leaveChannel: (OFString*)channel
{
[self leaveChannel: channel
reason: nil];
}
- (void)leaveChannel: (OFString*)channel
reason: (OFString*)reason
{
if (reason == nil)
[self sendLineWithFormat: @"PART %@", channel];
else
[self sendLineWithFormat: @"PART %@ :%@", channel, reason];
[channels removeObjectForKey: channel];
}
- (void)sendLine: (OFString*)line
{
[delegate connection: self
didSendLine: line];
|
| ︙ | ︙ | |||
190 191 192 193 194 195 196 | [self sendLine: line]; [pool release]; } - (void)sendMessage: (OFString*)msg | < < < < < < | | | | < < < < < < | | < | 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 |
[self sendLine: line];
[pool release];
}
- (void)sendMessage: (OFString*)msg
to: (OFString*)to
{
[self sendLineWithFormat: @"PRIVMSG %@ :%@", to, msg];
}
- (void)sendNotice: (OFString*)notice
to: (OFString*)to
{
[self sendLineWithFormat: @"NOTICE %@ :%@", to, notice];
}
- (void)kickUser: (OFString*)user
channel: (OFString*)channel
reason: (OFString*)reason
{
[self sendLineWithFormat: @"KICK %@ %@ :%@", channel, user, reason];
}
- (void)changeNicknameTo: (OFString*)nickname_
{
[self sendLineWithFormat: @"NICK %@", nickname_];
}
|
| ︙ | ︙ | |||
260 261 262 263 264 265 266 |
}
/* JOIN */
if ([action isEqual: @"JOIN"] && [components count] == 3) {
OFString *who = [components objectAtIndex: 0];
OFString *where = [components objectAtIndex: 2];
IRCUser *user;
| | | | | > | < | | > | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 |
}
/* JOIN */
if ([action isEqual: @"JOIN"] && [components count] == 3) {
OFString *who = [components objectAtIndex: 0];
OFString *where = [components objectAtIndex: 2];
IRCUser *user;
OFMutableSet *channel;
who = [who substringWithRange: of_range(1, [who length] - 1)];
user = [IRCUser IRCUserWithString: who];
if ([who hasPrefix: [nickname stringByAppendingString: @"!"]]) {
channel = [OFMutableSet set];
[channels setObject: channel
forKey: where];
} else
channel = [channels objectForKey: where];
[channel addObject: [user nickname]];
[delegate connection: self
didSeeUser: user
joinChannel: where];
return;
}
/* NAMES reply */
if ([action isEqual: @"353"] && [components count] >= 6) {
OFString *where;
OFMutableSet *channel;
OFArray *users;
size_t pos;
OFEnumerator *enumerator;
OFString *user;
where = [components objectAtIndex: 4];
if ((channel = [channels objectForKey: where]) == nil) {
/* We did not request that */
return;
}
pos = [[components objectAtIndex: 0] length] +
[[components objectAtIndex: 1] length] +
[[components objectAtIndex: 2] length] +
|
| ︙ | ︙ | |||
313 314 315 316 317 318 319 |
enumerator = [users objectEnumerator];
while ((user = [enumerator nextObject]) != nil) {
if ([user hasPrefix: @"@"] || [user hasPrefix: @"+"] ||
[user hasPrefix: @"%"] || [user hasPrefix: @"*"])
user = [user substringWithRange:
of_range(1, [user length] - 1)];
| | | | | | | | | | | | | | | | | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 |
enumerator = [users objectEnumerator];
while ((user = [enumerator nextObject]) != nil) {
if ([user hasPrefix: @"@"] || [user hasPrefix: @"+"] ||
[user hasPrefix: @"%"] || [user hasPrefix: @"*"])
user = [user substringWithRange:
of_range(1, [user length] - 1)];
[channel addObject: user];
}
[delegate connection: self
didReceiveNamesForChannel: where];
return;
}
/* PART */
if ([action isEqual: @"PART"] && [components count] >= 3) {
OFString *who = [components objectAtIndex: 0];
OFString *where = [components objectAtIndex: 2];
IRCUser *user;
OFMutableSet *channel;
OFString *reason = nil;
size_t pos = [who length] + 1 +
[[components objectAtIndex: 1] length] + 1 + [where length];
who = [who substringWithRange: of_range(1, [who length] - 1)];
user = [IRCUser IRCUserWithString: who];
channel = [channels objectForKey: where];
if ([components count] > 3)
reason = [line substringWithRange:
of_range(pos + 2, [line length] - pos - 2)];
[channel removeObject: [user nickname]];
[delegate connection: self
didSeeUser: user
leaveChannel: where
reason: reason];
return;
}
/* KICK */
if ([action isEqual: @"KICK"] && [components count] >= 4) {
OFString *who = [components objectAtIndex: 0];
OFString *where = [components objectAtIndex: 2];
OFString *whom = [components objectAtIndex: 3];
IRCUser *user;
OFMutableSet *channel;
OFString *reason = nil;
size_t pos = [who length] + 1 +
[[components objectAtIndex: 1] length] + 1 +
[where length] + 1 + [whom length];
who = [who substringWithRange: of_range(1, [who length] - 1)];
user = [IRCUser IRCUserWithString: who];
channel = [channels objectForKey: where];
if ([components count] > 4)
reason = [line substringWithRange:
of_range(pos + 2, [line length] - pos - 2)];
[channel removeObject: [user nickname]];
[delegate connection: self
didSeeUser: user
kickUser: whom
channel: where
reason: reason];
return;
}
/* QUIT */
if ([action isEqual: @"QUIT"] && [components count] >= 2) {
OFString *who = [components objectAtIndex: 0];
IRCUser *user;
OFString *reason = nil;
size_t pos = [who length] + 1 +
[[components objectAtIndex: 1] length];
OFEnumerator *enumerator;
OFMutableSet *channel;
who = [who substringWithRange: of_range(1, [who length] - 1)];
user = [IRCUser IRCUserWithString: who];
if ([components count] > 2)
reason = [line substringWithRange:
of_range(pos + 2, [line length] - pos - 2)];
enumerator = [channels objectEnumerator];
while ((channel = [enumerator nextObject]) != nil)
[channel removeObject: [user nickname]];
[delegate connection: self
didSeeUserQuit: user
reason: reason];
return;
}
/* NICK */
if ([action isEqual: @"NICK"] && [components count] == 3) {
OFString *who = [components objectAtIndex: 0];
OFString *newNickname = [components objectAtIndex: 2];
IRCUser *user;
OFEnumerator *enumerator;
OFMutableSet *channel;
who = [who substringWithRange: of_range(1, [who length] - 1)];
newNickname = [newNickname substringWithRange:
of_range(1, [newNickname length] - 1)];
user = [IRCUser IRCUserWithString: who];
if ([[user nickname] isEqual: nickname]) {
[nickname release];
nickname = [[user nickname] copy];
}
enumerator = [channels keyEnumerator];
while ((channel = [enumerator nextObject]) != nil) {
if ([channel containsObject: [user nickname]]) {
[channel removeObject: [user nickname]];
[channel addObject: newNickname];
}
}
[delegate connection: self
didSeeUser: user
changeNicknameTo: newNickname];
|
| ︙ | ︙ | |||
458 459 460 461 462 463 464 | from = [from substringWithRange: of_range(1, [from length] - 1)]; msg = [line substringWithRange: of_range(pos + 2, [line length] - pos - 2)]; user = [IRCUser IRCUserWithString: from]; | | < < < < > | < | | 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 | from = [from substringWithRange: of_range(1, [from length] - 1)]; msg = [line substringWithRange: of_range(pos + 2, [line length] - pos - 2)]; user = [IRCUser IRCUserWithString: from]; if (![to isEqual: nickname]) [delegate connection: self didReceiveMessage: msg channel: to user: user]; else [delegate connection: self didReceivePrivateMessage: msg user: user]; return; } |
| ︙ | ︙ | |||
496 497 498 499 500 501 502 |
if (![from containsString: @"!"] || [to isEqual: @"*"]) {
/* System message - ignore for now */
return;
}
user = [IRCUser IRCUserWithString: from];
| | < < < < > | < | | 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 |
if (![from containsString: @"!"] || [to isEqual: @"*"]) {
/* System message - ignore for now */
return;
}
user = [IRCUser IRCUserWithString: from];
if (![to isEqual: nickname])
[delegate connection: self
didReceiveNotice: notice
channel: to
user: user];
else
[delegate connection: self
didReceiveNotice: notice
user: user];
return;
}
}
|
| ︙ | ︙ | |||
563 564 565 566 567 568 569 570 571 572 573 574 575 576 |
- (void)handleConnection
{
[sock asyncReadLineWithTarget: self
selector: @selector(connection:didReceiveLine:
exception:)];
}
- (void)dealloc
{
[sock release];
[server release];
[nickname release];
[username release];
| > > > > > | 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 |
- (void)handleConnection
{
[sock asyncReadLineWithTarget: self
selector: @selector(connection:didReceiveLine:
exception:)];
}
- (OFSet*)usersInChannel: (OFString*)channel
{
return [[[channels objectForKey: channel] copy] autorelease];
}
- (void)dealloc
{
[sock release];
[server release];
[nickname release];
[username release];
|
| ︙ | ︙ | |||
594 595 596 597 598 599 600 |
- (void)connectionWasEstablished: (IRCConnection*)connection
{
}
- (void)connection: (IRCConnection*)connection
didSeeUser: (IRCUser*)user
| | | | > | < > < | | 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 612 613 614 615 616 617 618 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 646 647 648 649 |
- (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
channel: (OFString*)channel
user: (IRCUser*)user
{
}
- (void)connection: (IRCConnection*)connection
didReceiveNotice: (OFString*)notice
user: (IRCUser*)user
{
}
- (void)connection: (IRCConnection*)connection
didReceiveNamesForChannel: (OFString*)channel
{
}
- (void)connectionWasClosed: (IRCConnection*)connection
{
}
@end
|