Pinned chats (#506)

jacob271 · web-flow · commit 3cfa2137c70a · 2022-06-19T12:52:01.000+02:00
* write acceptance tests for pinned chats

* add isPinned instance var and unit test

* add prefix to chat titled if chat is pinned

* fix lint
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st
@@ -10,4 +10,5 @@ initialize
 		isChannel: false;
 		position: self class defaultUnknownPosition;
 		numberOfRequestedMessages: self class defaultNumberOfRequestedMessages;
-		selectedReplyToMessageId: self class defaultSelectedReplyToMessageId.
+		selectedReplyToMessageId: self class defaultSelectedReplyToMessageId;
+		isPinned: false.
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/initializeFromChatEvent..st b/packages/TelegramClient-Core.package/TCCChat.class/instance/initializeFromChatEvent..st
@@ -6,7 +6,8 @@ initializeFromChatEvent: anEvent
 		id: (anEvent at: 'id');
 		canSendMessages: ((anEvent at: 'permissions') at: 'can_send_messages');
 		muted: ((anEvent at: 'notification_settings') at: 'mute_for') > 0;
-		lastMessage: ''.
+		lastMessage: '';
+		isPinned: false.
 
 	(anEvent at: 'photo') ifNotNil: [
 		self photoId: (((anEvent at: 'photo') at: 'small') at: 'id').
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/isPinned..st b/packages/TelegramClient-Core.package/TCCChat.class/instance/isPinned..st
@@ -0,0 +1,4 @@
+accessing
+isPinned: aBoolean
+
+	isPinned := aBoolean
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/isPinned.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/isPinned.st
@@ -0,0 +1,4 @@
+accessing
+isPinned
+
+	^ isPinned
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json
@@ -22,12 +22,14 @@
 		"ifNotWaitingForUpdate:" : "js 8/2/2020 13:17",
 		"infoLoaded" : "per 6/4/2021 15:59",
 		"infoLoaded:" : "per 6/4/2021 15:51",
-		"initialize" : "JS 5/26/2022 14:31",
-		"initializeFromChatEvent:" : "rgw 6/2/2022 15:24",
+		"initialize" : "js 6/18/2022 10:48",
+		"initializeFromChatEvent:" : "js 6/18/2022 10:47",
 		"isBasicGroup" : "per 6/15/2021 08:08",
 		"isChannel" : "per 7/17/2021 15:51",
 		"isChannel:" : "per 7/17/2021 15:50",
 		"isGroup" : "per 6/4/2021 14:42",
+		"isPinned" : "js 6/18/2022 10:18",
+		"isPinned:" : "js 6/18/2022 10:19",
 		"isPrivate" : "per 6/4/2021 14:42",
 		"isSuperGroup" : "per 6/15/2021 08:09",
 		"lastMessage" : "rs 6/19/2020 17:33",
diff --git a/packages/TelegramClient-Core.package/TCCChat.class/properties.json b/packages/TelegramClient-Core.package/TCCChat.class/properties.json
@@ -20,7 +20,8 @@
 		"messageIds",
 		"messageDictionary",
 		"selectedReplyToMessageId",
-		"photoId" ],
+		"photoId",
+		"isPinned" ],
 	"name" : "TCCChat",
 	"pools" : [
 		 ],
diff --git a/packages/TelegramClient-Core.package/TCCChats.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChats.class/methodProperties.json
@@ -6,4 +6,4 @@
 		"add:" : "pk 8/4/2021 11:17",
 		"getChat:" : "pk 8/4/2021 12:20",
 		"hasChat:" : "pk 8/4/2021 12:20",
-		"notify" : "js 7/31/2020 14:47" } }
+		"notify" : "js 6/18/2022 10:38" } }
diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateChatPosition..st b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateChatPosition..st
@@ -1,7 +1,8 @@
 event handling
 updateChatPosition: anEvent
-
+	
 	(self chats getChat: (anEvent at: 'chat_id'))
-		position: ((anEvent at: 'position') at: 'order').
+		position: ((anEvent at: 'position') at: 'order');
+		isPinned: ((anEvent at: 'position') at: 'is_pinned').
 
 	self chats notify.
diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"addChat:" : "pk 8/5/2021 16:36",
+		"addChat:" : "js 6/18/2022 09:27",
 		"addNewMessage:" : "pk 8/5/2021 16:37",
 		"answeredMessageReceived:" : "JS 5/26/2022 15:58",
 		"chatHistoryReceived:" : "pk 8/5/2021 16:37",
@@ -15,5 +15,5 @@
 		"initialize" : "RS 8/1/2021 12:51",
 		"openNewChat:" : "pk 8/5/2021 16:38",
 		"searchChat:" : "pk 8/5/2021 16:38",
-		"updateChatPosition:" : "RS 8/1/2021 12:55",
+		"updateChatPosition:" : "js 6/18/2022 11:04",
 		"updateLastMessage:" : "RS 8/1/2021 12:55" } }
diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addTitle.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addTitle.st
@@ -1,8 +1,13 @@
 drawing
 addTitle
 
+	| prefix |
+	prefix := ''.
+	self chat isPinned ifTrue: [
+		prefix := '[pinned] '
+	].
 	self addMorph: (TextMorph new
 		position: self topLeft + self class defaultTitleOffset;
-		contents: ((self chatName condensedIntoOneLine truncateWithElipsisTo: self class defaultTitleLength) asText addAttribute: TextEmphasis bold);
+		contents: ((prefix, self chatName condensedIntoOneLine truncateWithElipsisTo: self class defaultTitleLength) asText addAttribute: TextEmphasis bold);
 		lock;
 		yourself).
diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json
@@ -14,7 +14,7 @@
 		"addBorder" : "RK 8/4/2021 12:05",
 		"addLastMessage" : "RK 8/4/2021 12:06",
 		"addPhoto" : "js 6/13/2022 18:09",
-		"addTitle" : "RK 8/4/2021 12:06",
+		"addTitle" : "js 6/18/2022 10:55",
 		"chat" : "rs 6/17/2020 21:45",
 		"chat:" : "rs 6/17/2020 21:45",
 		"chatId" : "8/5/2021 21:14:18",
diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatsList.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"chatItemClicked:event:from:" : "JB 7/23/2021 12:39",
 		"chats" : "rs 6/17/2020 22:38",
 		"chats:" : "f.w. 7/15/2020 23:57",
-		"createChatListItem:" : "js 7/31/2020 23:05",
+		"createChatListItem:" : "js 6/18/2022 10:34",
 		"deselectChats" : "RS 7/17/2021 12:11",
 		"indicateKeyboardFocus" : "per 6/19/2021 13:49",
 		"initialize" : "per 6/24/2021 23:08",
diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testChatCorrectlyConstructedFromJson.st b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testChatCorrectlyConstructedFromJson.st
@@ -10,4 +10,5 @@ testChatCorrectlyConstructedFromJson
 	self assert: true equals: mockChat canSendMessages.
 	self assert: false equals: mockChat muted.
 	self assert: TCTMMocks mockImageId equals: mockChat photoId.
-	self assert: true equals: mockChat hasPhoto.
+	self assert: true equals: mockChat hasPhoto.
+	self assert: false equals: mockChat isPinned.
diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/methodProperties.json
@@ -8,7 +8,7 @@
 		"testAddAnsweredMessage" : "JS 5/26/2022 15:05",
 		"testAddNewestMessage" : "RS 7/31/2021 15:45",
 		"testAddOldestMessage" : "TR 6/22/2021 09:49",
-		"testChatCorrectlyConstructedFromJson" : "rgw 6/2/2022 16:17",
+		"testChatCorrectlyConstructedFromJson" : "js 6/18/2022 10:46",
 		"testChatNoPhotoCorrectlyConstructedFromJson" : "rgw 6/2/2022 16:17",
 		"testGetMessageById" : "JS 5/27/2022 19:32",
 		"testId" : "pk 8/5/2021 17:13",
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUpdateChatPositionEventForNotPinnedChatWithId..st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUpdateChatPositionEventForNotPinnedChatWithId..st
@@ -0,0 +1,12 @@
+chat event
+mockUpdateChatPositionEventForNotPinnedChatWithId: aNumber 
+	"@linter-ignore"
+
+ 	^ (JsonObject newFrom: {
+ 			'chat_id' -> aNumber.
+			'position' -> (JsonObject newFrom: {
+ 				'@type' -> 'chatPosition'.
+				'is_pinned' -> false.
+				'order' -> '314159'.
+ 			}).
+		})
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUpdateChatPositionEventForPinnedChatWithId..st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUpdateChatPositionEventForPinnedChatWithId..st
@@ -0,0 +1,12 @@
+chat event
+mockUpdateChatPositionEventForPinnedChatWithId: aNumber 
+	"@linter-ignore"
+
+ 	^ (JsonObject newFrom: {
+ 			'chat_id' -> aNumber.
+			'position' -> (JsonObject newFrom: {
+ 				'@type' -> 'chatPosition'.
+				'is_pinned' -> true.
+				'order' -> '314159'.
+ 			}).
+		})
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json
@@ -49,6 +49,8 @@
 		"mockTextReplyMessageWith:inChat:" : "rgw 5/12/2022 15:03",
 		"mockUnloadedBasicGroupChat" : "rgw 6/6/2022 18:03",
 		"mockUnloadedSuperGroupChat" : "rgw 6/2/2022 12:10",
+		"mockUpdateChatPositionEventForNotPinnedChatWithId:" : "js 6/18/2022 11:03",
+		"mockUpdateChatPositionEventForPinnedChatWithId:" : "js 6/18/2022 11:04",
 		"mockUpdateNewMessageJsonEventFrom:" : "7/25/2021 12:12:21",
 		"mockUser1" : "JS 6/11/2022 09:38",
 		"mockUser2" : "RK 6/26/2021 10:05",
diff --git a/packages/TelegramClientTests-UI.package/TCTUChatListItemTests.class/instance/testChatIsNotPinned.st b/packages/TelegramClientTests-UI.package/TCTUChatListItemTests.class/instance/testChatIsNotPinned.st
@@ -0,0 +1,8 @@
+testing
+testChatIsNotPinned
+
+	| chat |
+	chat := (self core chatsHandler chats reject: [:aChat | aChat isPinned]) first.
+	self core chatsHandler updateChatPosition: (TCTMMocks mockUpdateChatPositionEventForNotPinnedChatWithId: chat id).
+	self wantsToTest: (TCUChatListItem newWithChat: chat width: 500).
+	self assertNotReading: 'pinned' in: (self subject)
diff --git a/packages/TelegramClientTests-UI.package/TCTUChatListItemTests.class/instance/testChatIsPinned.st b/packages/TelegramClientTests-UI.package/TCTUChatListItemTests.class/instance/testChatIsPinned.st
@@ -0,0 +1,8 @@
+testing
+testChatIsPinned
+
+	| chat |
+	chat := (self core chatsHandler chats reject: [:aChat | aChat isPinned]) first.
+	self core chatsHandler updateChatPosition: (TCTMMocks mockUpdateChatPositionEventForPinnedChatWithId: chat id).
+	self wantsToTest: (TCUChatListItem newWithChat: chat width: 500).
+	self assertReading: 'pinned' in: (self subject)
diff --git a/packages/TelegramClientTests-UI.package/TCTUChatListItemTests.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUChatListItemTests.class/methodProperties.json
@@ -4,4 +4,6 @@
 	"instance" : {
 		"setUp" : "rgw 6/2/2022 16:10",
 		"testChatHasPhoto" : "JS 6/11/2022 09:44",
+		"testChatIsNotPinned" : "js 6/18/2022 11:02",
+		"testChatIsPinned" : "js 6/18/2022 11:02",
 		"testChatWithoutPhotoHasDefaultPhoto" : "rgw 6/2/2022 16:41" } }
