ObjIRC  Check-in [5dbb32c633]

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: 5dbb32c6338070feb8da288258a105e7182ea60fb9a4ec6c693593f659baa048
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].

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
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







-
+








-
+

-
+

-
+







@interface IRCConnection: OFObject
{
	Class _socketClass;
	OF_KINDOF(OFTCPSocket) *_socket;
	OFString *_server;
	uint16_t _port;
	OFString *_nickname, *_username, *_realname;
	OFMutableDictionary *_channels;
	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 (copy) OFString *server;
@property (nonatomic, copy) OFString *server;
@property uint16_t port;
@property (copy) OFString *nickname, *username, *realname;
@property (nonatomic, copy) OFString *nickname, *username, *realname;
@property (assign) id <IRCConnectionDelegate> delegate;
@property (readonly, retain) OFTCPSocket *socket;
@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;
112
113
114
115
116
117
118
119

120
112
113
114
115
116
117
118

119
120







-
+

		to: (OFString*)to;
- (void)kickUser: (OFString*)user
	 channel: (OFString*)channel
	  reason: (OFString*)reason;
- (void)changeNicknameTo: (OFString*)nickname;
- (void)processLine: (OFString*)line;
- (void)handleConnection;
- (OFSet*)usersInChannel: (OFString*)channel;
- (OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel;
@end

Modified src/IRCConnection.m from [84167a7c12] to [40d21b42ac].

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
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 cancelAsyncRequests];
	[_socket performSelector: @selector(cancelAsyncRequests)
		      afterDelay: 0];
	[_socket release];
	_socket = nil;

	return false;
}

- (void)handleConnection
{
	[_socket asyncReadLineWithTarget: self
				selector: @selector(socket:didReceiveLine:
					      exception:)];
}

- (OFSet*)usersInChannel: (OFString*)channel
- (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
31

32
33
34
35
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 (copy, readonly) 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].

whitespace changes only