Revert "generate callback ids in core, enforce register before send"

This reverts commit 62e01cc.

packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/loadInfo.st

@@ -1,15 +1,14 @@
 loading
 loadInfo
 
-	| callbackID |
-	callbackID := self core registerCallback: [:aBasicGroupFullInfoEvent |
-		self
-			memberCount: (aBasicGroupFullInfoEvent at: 'members') size;
-			description: (aBasicGroupFullInfoEvent at: 'description');
-			addMembersFrom: (aBasicGroupFullInfoEvent at: 'members').
-		].
 	self core client send: (TCCRequest
 		newWithType: 'getBasicGroupFullInfo'
 		from: {
 		'basic_group_id'->self groupId.
-		'@extra'->callbackID}).
+		'@extra'->self groupId}).
+	self core registerCallback: [:aBasicGroupFullInfoEvent |
+		self
+			memberCount: (aBasicGroupFullInfoEvent at: 'members') size;
+			description: (aBasicGroupFullInfoEvent at: 'description').
+		self addMembersFrom: (aBasicGroupFullInfoEvent at: 'members').
+		] with: self groupId asString

packages/TelegramClient-Core.package/TCCBasicGroupChat.class/methodProperties.json

@@ -4,4 +4,4 @@
 	"instance" : {
 		"initializeFromChatEvent:" : "per 6/4/2021 15:06",
 		"isBasicGroup" : "per 6/15/2021 08:41",
-		"loadInfo" : "pk 6/18/2021 09:43" } }
+		"loadInfo" : "per 6/15/2021 08:36" } }

packages/TelegramClient-Core.package/TCCChat.class/instance/positionKnown..st

@@ -1,4 +1,4 @@
 accessing
 positionKnown: aBoolean
 
-	positionKnown := aBoolean 
+	positionKnown := aBoolean

packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json

@@ -32,7 +32,7 @@
 		"position" : "RS 5/10/2021 21:11",
 		"position:" : "5/11/2021 10:09:15",
 		"positionKnown" : "RS 5/10/2021 21:11",
-		"positionKnown:" : "pk 6/16/2021 09:30",
+		"positionKnown:" : "5/11/2021 10:09:15",
 		"requestMessages:" : "js 8/1/2020 18:05",
 		"stillRequestedMessages" : "js 8/1/2020 18:05",
 		"title" : "rs 6/7/2020 22:24",

packages/TelegramClient-Core.package/TCCCore.class/instance/initialize.st

@@ -7,7 +7,6 @@ initialize
 		chats: TCCChats newWithDefaultSorting;
 		loggedInUserID: 0;
 		pendingRequests: Dictionary new;
-		users: (TCCUsers new core: self);
-		callbackCounter: 0.
+		users: (TCCUsers new core: self).
 
 	[self receiveLoop] fork.

packages/TelegramClient-Core.package/TCCCore.class/instance/registerCallback.with..st

@@ -0,0 +1,4 @@
+utility
+registerCallback: aClosure with: aCallbackId
+
+	self pendingRequests at: (aCallbackId asString) put: aClosure

packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json

@@ -5,9 +5,6 @@
 		"authHandler" : "R.S 5/20/2020 16:10",
 		"authHandler:" : "R.S 5/20/2020 16:10",
 		"authSucceeded" : "RS 4/28/2021 21:07",
-		"callbackCounter" : "pk 6/18/2021 09:38",
-		"callbackCounter:" : "pk 6/18/2021 09:38",
-		"callbackCounterPreIncrement" : "pk 6/18/2021 09:39",
 		"chats" : "R.S 6/1/2020 15:34",
 		"chats:" : "R.S 6/1/2020 15:34",
 		"chatsHandler" : "rs 6/7/2020 21:50",
@@ -16,21 +13,20 @@
 		"client" : "R.S 5/20/2020 16:08",
 		"client:" : "js 6/13/2020 19:10",
 		"freeClient" : "6/9/2021 14:12:18",
-		"generateCallbackID" : "pk 6/18/2021 09:39",
 		"getChatHistoryFrom:" : "per 6/4/2021 15:30",
 		"getOwnProfile" : "pk 5/13/2021 09:44",
 		"handleEvent:" : "per 6/4/2021 11:54",
 		"handleMessageEvent:" : "pk 5/28/2021 09:41",
 		"handlePendingEvent:" : "5/30/2021 12:11:04",
-		"initialize" : "pk 6/18/2021 09:38",
+		"initialize" : "pk 5/21/2021 09:13",
 		"initializeHandlers" : "js 8/1/2020 18:09",
 		"isClientAlive" : "js 5/28/2020 17:18",
 		"loggedInUserID" : "rs 7/5/2020 14:48",
 		"loggedInUserID:" : "rs 7/5/2020 14:48",
 		"pendingRequests" : "pk 5/13/2021 09:46",
 		"pendingRequests:" : "pk 5/13/2021 09:46",
 		"receiveLoop" : "R.S 6/1/2020 15:24",
-		"registerCallback:" : "pk 6/18/2021 09:41",
+		"registerCallback:with:" : "RK 5/19/2021 10:43",
 		"requestUser:with:" : "pk 5/21/2021 09:33",
 		"searchChat:" : "f.w. 7/15/2020 22:53",
 		"sendMessage:to:" : "rs 6/13/2020 15:26",

packages/TelegramClient-Core.package/TCCCore.class/properties.json

@@ -12,8 +12,7 @@
 		"users",
 		"chats",
 		"loggedInUserID",
-		"pendingRequests",
-		"callbackCounter" ],
+		"pendingRequests" ],
 	"name" : "TCCCore",
 	"pools" : [
 		 ],

packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadGeneralInfo.st

@@ -1,14 +1,14 @@
 loading
 loadGeneralInfo
-
-	| callbackID |
-	callbackID := self core
-		registerCallback: [:aSupergroupFullInfoEvent |
-			self
-				memberCount: (aSupergroupFullInfoEvent at: 'member_count');
-				description: (aSupergroupFullInfoEvent at: 'description')].
-
+
 	self core client send: (TCCRequest
 		newWithType: 'getSupergroupFullInfo'
 		from: {'supergroup_id'->self groupId.
-			'@extra'->callbackID}).
+			'@extra'->self groupId}).
+
+	self core
+		registerCallback: [:aSupergroupFullInfoEvent |
+			self
+				memberCount: (aSupergroupFullInfoEvent at: 'member_count');
+				description: (aSupergroupFullInfoEvent at: 'description').]
+		with: self groupId.

packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMembers.st

@@ -1,14 +1,14 @@
 loading
 loadMembers
 
-	| callbackID |
-	callbackID := self core
-		registerCallback: [:aSupergroupMembersEvent |
-			self addMembersFrom: (aSupergroupMembersEvent at: 'members')].
-
 	self core client send: (TCCRequest
 		newWithType: 'getSupergroupMembers'
 		from: {'supergroup_id'->self groupId.
 			'offset'->self members size.
 			'limit'->self class defaultLimit.
-			'@extra'->callbackID}).
+			'@extra'->('#', self groupId)}).
+
+	self core
+		registerCallback: [:aSupergroupMembersEvent |
+			self addMembersFrom: (aSupergroupMembersEvent at: 'members').]
+		with: '#', self groupId.

packages/TelegramClient-Core.package/TCCSuperGroupChat.class/methodProperties.json

@@ -4,7 +4,7 @@
 	"instance" : {
 		"initializeFromChatEvent:" : "per 6/4/2021 15:08",
 		"isSuperGroup" : "per 6/15/2021 08:41",
-		"loadGeneralInfo" : "pk 6/18/2021 09:44",
+		"loadGeneralInfo" : "TR 6/15/2021 16:39",
 		"loadInfo" : "TR 6/14/2021 14:54",
-		"loadMembers" : "pk 6/18/2021 09:44",
+		"loadMembers" : "TR 6/15/2021 16:39",
 		"loadMoreMembers" : "per 6/15/2021 08:15" } }

packages/TelegramClient-Core.package/TCCUsers.class/instance/requestUserFor..st

@@ -1,9 +1,9 @@
 utility
 requestUserFor: aUserId
 
-	| callbackID |
-	callbackID := self core
+	self core
 		registerCallback:
-			[:userEvent | (self at: aUserId) resolveWith: (TCCUser newFrom: userEvent)].
+			[:userEvent | (self at: aUserId) resolveWith: (TCCUser newFrom: userEvent)]
+		with: (aUserId asString).
 
-	self core requestUser: aUserId with: callbackID
+	self core requestUser: aUserId with: aUserId

packages/TelegramClient-Core.package/TCCUsers.class/methodProperties.json

@@ -5,4 +5,4 @@
 		"core" : "RK 5/19/2021 10:34",
 		"core:" : "TR 6/15/2021 16:52",
 		"getUserFor:" : "RK 5/19/2021 11:05",
-		"requestUserFor:" : "pk 6/18/2021 09:47" } }
+		"requestUserFor:" : "pk 5/21/2021 09:33" } }

packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json

@@ -10,7 +10,6 @@
 		"testAuthHandler" : "per 5/21/2021 16:28",
 		"testBasicGroupMembers" : "per 6/10/2021 20:47",
 		"testCallback" : "per 5/21/2021 16:28",
-		"testCallbackID" : "pk 6/18/2021 09:30",
 		"testChatsHandler" : "per 5/21/2021 16:28",
 		"testErrorConstants" : "js 8/2/2020 21:23",
 		"testLoggedInUserID" : "TR 6/13/2021 14:48",