Overview
Comment: | Don't implement IRCConnectionDelegate on OFObject. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
c99e07382f3d50e498f16baf60018010 |
User & Date: | js on 2013-02-14 00:32:03 |
Other Links: | manifest | tags |
Context
2013-02-14
| ||
23:03 | Improve Makefile. check-in: 8575560a38 user: js tags: trunk | |
00:32 | Don't implement IRCConnectionDelegate on OFObject. check-in: c99e07382f user: js tags: trunk | |
00:20 | Prefix all ivars with an underscore. check-in: 8845b8b00b user: js tags: trunk | |
Changes
Modified src/IRCConnection.h from [1a5a5724ae] to [3b4efe637d].
︙ | |||
21 22 23 24 25 26 27 | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | - - - - | */ #import <ObjFW/ObjFW.h> @class IRCConnection; @class IRCUser; |
︙ |
Modified src/IRCConnection.m from [74ae5fa759] to [41b9bcc218].
︙ | |||
184 185 186 187 188 189 190 191 192 193 194 195 196 197 | 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | + | [self sendLineWithFormat: @"PART %@ :%@", channel, reason]; [_channels removeObjectForKey: channel]; } - (void)sendLine: (OFString*)line { if ([_delegate respondsToSelector: @selector(connection:didSendLine:)]) [_delegate connection: self didSendLine: line]; [_socket writeLine: line]; } - (void)sendLineWithFormat: (OFConstantString*)format, ... |
︙ | |||
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 | 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 | + + + + + | } - (void)IRC_processLine: (OFString*)line { OFArray *components; OFString *action = nil; if ([_delegate respondsToSelector: @selector(connection:didReceiveLine:)]) [_delegate connection: self didReceiveLine: line]; components = [line componentsSeparatedByString: @" "]; /* PING */ if ([components count] == 2 && [[components firstObject] isEqual: @"PING"]) { OFMutableString *s = [[line mutableCopy] autorelease]; [s replaceOccurrencesOfString: @"PING" withString: @"PONG"]; [self sendLine: s]; return; } action = [[components objectAtIndex: 1] uppercaseString]; /* Connected */ if ([action isEqual: @"001"] && [components count] >= 4) { if ([_delegate respondsToSelector: @selector(connectionWasEstablished:)]) [_delegate connectionWasEstablished: self]; return; } /* JOIN */ if ([action isEqual: @"JOIN"] && [components count] == 3) { OFString *who = [components objectAtIndex: 0]; OFString *where = [components objectAtIndex: 2]; |
︙ | |||
294 295 296 297 298 299 300 301 302 303 304 305 306 307 | 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 | + + | [_channels setObject: channel forKey: where]; } else channel = [_channels objectForKey: where]; [channel addObject: [user nickname]]; if ([_delegate respondsToSelector: @selector(connection:didSeeUser:joinChannel:)]) [_delegate connection: self didSeeUser: user joinChannel: where]; return; } |
︙ | |||
337 338 339 340 341 342 343 344 345 346 347 348 349 350 | 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 | + + | [user hasPrefix: @"%"] || [user hasPrefix: @"*"]) user = [user substringWithRange: of_range(1, [user length] - 1)]; [channel addObject: user]; } if ([_delegate respondsToSelector: @selector(connection:didReceiveNamesForChannel:)]) [_delegate connection: self didReceiveNamesForChannel: where]; return; } /* PART */ |
︙ | |||
363 364 365 366 367 368 369 370 371 372 373 374 375 376 | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 | + + | if ([components count] > 3) reason = [line substringWithRange: of_range(pos + 2, [line length] - pos - 2)]; [channel removeObject: [user nickname]]; if ([_delegate respondsToSelector: @selector(connection:didSeeUser:leaveChannel:reason:)]) [_delegate connection: self didSeeUser: user leaveChannel: where reason: reason]; return; } |
︙ | |||
393 394 395 396 397 398 399 400 401 402 403 404 405 406 | 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | + + | if ([components count] > 4) reason = [line substringWithRange: of_range(pos + 2, [line length] - pos - 2)]; [channel removeObject: [user nickname]]; if ([_delegate respondsToSelector: @selector(connection:didSeeUser:kickUser:channel:reason:)]) [_delegate connection: self didSeeUser: user kickUser: whom channel: where reason: reason]; return; |
︙ | |||
423 424 425 426 427 428 429 430 431 432 433 434 435 436 | 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 | + + | reason = [line substringWithRange: of_range(pos + 2, [line length] - pos - 2)]; enumerator = [_channels objectEnumerator]; while ((channel = [enumerator nextObject]) != nil) [channel removeObject: [user nickname]]; if ([_delegate respondsToSelector: @selector(connection:didSeeUserQuit:reason:)]) [_delegate connection: self didSeeUserQuit: user reason: reason]; return; } |
︙ | |||
457 458 459 460 461 462 463 464 465 466 467 468 469 470 | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 | + + | while ((channel = [enumerator nextObject]) != nil) { if ([channel containsObject: [user nickname]]) { [channel removeObject: [user nickname]]; [channel addObject: nickname]; } } if ([_delegate respondsToSelector: @selector(connection:didSeeUser:changeNicknameTo:)]) [_delegate connection: self didSeeUser: user changeNicknameTo: nickname]; return; } |
︙ | |||
479 480 481 482 483 484 485 | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | - + + + - + + + + | from = [from substringWithRange: of_range(1, [from length] - 1)]; msg = [line substringWithRange: of_range(pos + 2, [line length] - pos - 2)]; user = [IRCUser IRCUserWithString: from]; |
︙ | |||
513 514 515 516 517 518 519 | 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 | - + + + - + + + + | if (![from containsString: @"!"] || [to isEqual: @"*"]) { /* System message - ignore for now */ return; } user = [IRCUser IRCUserWithString: from]; |
︙ | |||
580 581 582 583 584 585 586 587 588 | 608 609 610 611 612 613 614 615 616 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | selector: @selector(socket:didReceiveLine: exception:)]; } - (OFSet*)usersInChannel: (OFString*)channel { return [[[_channels objectForKey: channel] copy] autorelease]; } @end |