Add new members to group (#527)

rgwohlbold · web-flow · commit b48d4fb7b5f6 · 2022-07-22T15:53:37.000+02:00
* Add new message class

* Make it work

* Refactor some parts and fix linter

* Add Acceptance Testing

* Improve code style

* Improve Test Coverage

* Rename TCUAddMembersMessage to TCUInfoMessage

* Make DayDividerMessage look like InfoMessage
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/README.md b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/README.md
@@ -0,0 +1 @@
+Reprents a message where members are added to a group.
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/class/newFrom..st b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/class/newFrom..st
@@ -0,0 +1,6 @@
+instance creation
+newFrom: aJsonObject
+
+	^ self new
+		members: (aJsonObject at: 'member_user_ids');
+		yourself
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/asSnippet.st b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/asSnippet.st
@@ -0,0 +1,4 @@
+accessing
+asSnippet
+
+	^ self asText
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/asText.st b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/asText.st
@@ -0,0 +1,7 @@
+accessing
+asText
+
+	| names |
+	
+	names := self members collect: [:aUserId | (self core userStore getUserFor: aUserId) fullName].
+	^ 'Added: ' , (names joinSeparatedBy: ', ')
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/members..st b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/members..st
@@ -0,0 +1,4 @@
+accessing
+members: aList
+
+	members := aList
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/members.st b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/instance/members.st
@@ -0,0 +1,4 @@
+accessing
+members
+
+	^ members
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/methodProperties.json
@@ -0,0 +1,8 @@
+{
+	"class" : {
+		"newFrom:" : "rgw 7/21/2022 13:36" },
+	"instance" : {
+		"asSnippet" : "rgw 7/21/2022 14:15",
+		"asText" : "rgw 7/21/2022 15:06",
+		"members" : "rgw 7/21/2022 13:33",
+		"members:" : "rgw 7/21/2022 13:33" } }
diff --git a/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/properties.json b/packages/TelegramClient-Core.package/TCCAddMembersMessage.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "TelegramClient-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "rgw 7/21/2022 13:37",
+	"instvars" : [
+		"members" ],
+	"name" : "TCCAddMembersMessage",
+	"pools" : [
+		 ],
+	"super" : "TCCUserMessage",
+	"type" : "normal" }
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json
@@ -17,7 +17,7 @@
 		"freeClient" : "6/9/2021 14:12:18",
 		"generateCallbackId" : "pk 8/5/2021 17:04",
 		"getOwnProfile" : "pk 8/5/2021 17:05",
-		"handleEvent:" : "aka 7/10/2022 10:28",
+		"handleEvent:" : "rgw 7/21/2022 13:13",
 		"handleMessageEvent:" : "rgw 5/12/2022 13:44",
 		"handlePendingEvent:" : "per 8/2/2021 15:05",
 		"imageStore" : "pk 6/19/2021 17:15",
diff --git a/packages/TelegramClient-Core.package/TCCMessage.class/class/newMessageWith..st b/packages/TelegramClient-Core.package/TCCMessage.class/class/newMessageWith..st
@@ -4,4 +4,5 @@ newMessageWith: aJsonObject
 	^ (aJsonObject at: '@type') caseOf: {
 		['messageText'] -> [TCCTextMessage newFrom: aJsonObject].
 		['messagePhoto'] -> [TCCPhotoMessage newFrom: aJsonObject].
+		['messageChatAddMembers'] -> [TCCAddMembersMessage newFrom: aJsonObject].
 	} otherwise: [TCCNotSupportedMessage new]
diff --git a/packages/TelegramClient-Core.package/TCCMessage.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCMessage.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"newMessageWith:" : "aka 7/14/2022 16:43" },
+		"newMessageWith:" : "rgw 7/21/2022 13:43" },
 	"instance" : {
 		"chat" : "aka 7/14/2022 16:41",
 		"chat:" : "aka 7/14/2022 16:41",
diff --git a/packages/TelegramClient-Core.package/TCCUserMessage.class/instance/asSnippet.st b/packages/TelegramClient-Core.package/TCCUserMessage.class/instance/asSnippet.st
@@ -1,4 +1,4 @@
 accessing
 asSnippet
 
-	self subclassResponsibility.
+	^ self subclassResponsibility
diff --git a/packages/TelegramClient-Core.package/TCCUserMessage.class/instance/asText.st b/packages/TelegramClient-Core.package/TCCUserMessage.class/instance/asText.st
@@ -1,4 +1,4 @@
 accessing
 asText
 
-	self subclassResponsibility.
+	^ self subclassResponsibility
diff --git a/packages/TelegramClient-Core.package/TCCUserMessage.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCUserMessage.class/methodProperties.json
@@ -5,8 +5,8 @@
 		"timeStampToDateAndTime:" : "JB 5/16/2021 09:42" },
 	"instance" : {
 		"asReplySnippet" : "rgw 5/12/2022 16:05",
-		"asSnippet" : "tom.richter 6/28/2021 15:05",
-		"asText" : "TR 6/20/2021 10:13",
+		"asSnippet" : "rgw 7/21/2022 15:11",
+		"asText" : "rgw 7/21/2022 15:11",
 		"isOutgoing" : "js 8/2/2020 22:00",
 		"isOutgoing:" : "pk 8/4/2021 11:42",
 		"isReply" : "rgw 5/12/2022 15:40",
diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addAtBottom..st b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addAtBottom..st
@@ -1,18 +1,16 @@
 messages
 addAtBottom: aCoreMessage
 
-	| wrapper wasFullyScrolledDown messageItem |
+	| wasFullyScrolledDown messageItem |
 
 	(self isFromCurrentChat: aCoreMessage)
 		ifFalse: [ ^ self ].
 	
 	(aCoreMessage isFirstMessageOfDay) ifTrue: [self addBottomDayDividerForDate: aCoreMessage date asDate].
 	
 	wasFullyScrolledDown := self isFullyScrolledDown.
-	messageItem := TCUUserMessage newFrom: aCoreMessage.
-	messageItem when: #requestScroll send: #requestScrollToMessage: to: self with: (aCoreMessage replyToMessageId).
-	wrapper := TCUMessageWrapper newFromMessage: messageItem withWidth: self scroller width.
-	self scroller addMorphBack: wrapper.
-	self items addLast: wrapper.
+	messageItem := self createMessageItemFrom: aCoreMessage.
+	self scroller addMorphBack: messageItem.
+	self items addLast: messageItem.
 	wasFullyScrolledDown
 		ifTrue: [ self scrollToNewestMessage ]
diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addAtTop..st b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addAtTop..st
@@ -1,20 +1,18 @@
 messages
 addAtTop: aCoreMessage
 
-	| wrapper messageItem lastMessage |
+	| messageItem lastMessage |
 	(self isFromCurrentChat: aCoreMessage) ifFalse: [^ self].
 	
 	(aCoreMessage isLastMessageOfDay and: self items isEmpty not) ifTrue: [
 		lastMessage := self items first message messageModel.
-		self addTopDayDividerForDate: (lastMessage date asDate)
+		self addTopDayDividerForDate: lastMessage date asDate
 	].
 	
-	messageItem := TCUUserMessage newFrom: aCoreMessage.
-	messageItem when: #requestScroll send: #requestScrollToMessage: to: self with: (aCoreMessage replyToMessageId).
-	wrapper := TCUMessageWrapper newFromMessage: messageItem withWidth: self scroller width.
-	self scroller addMorphFront: wrapper.
-	self items addFirst: wrapper.
+	messageItem := self createMessageItemFrom: aCoreMessage.
+	self scroller addMorphFront: messageItem.
+	self items addFirst: messageItem.
 	
 	self isFullyScrolledDown
 		ifTrue: [self scrollToNewestMessage].
-	self scrollBy: 0 @ (wrapper height negated).
+	self scrollBy: 0 @ (messageItem height negated).
diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/createMessageItemFrom..st b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/createMessageItemFrom..st
@@ -0,0 +1,17 @@
+messages
+createMessageItemFrom: aCoreMessage
+
+	| messageItem |
+
+	messageItem := TCUMessage newFrom: aCoreMessage.
+	messageItem when: #requestScroll send: #requestScrollToMessage: to: self with: aCoreMessage replyToMessageId.
+	messageItem isUserMessage
+		ifTrue: [^ TCUMessageWrapper newFromMessage: messageItem withWidth: self scroller width].
+		
+	^ RectangleMorph new
+			color: Color transparent;
+			borderWidth: 0;
+			width: self scroller width;
+			height: messageItem height;
+			addMorphCentered: messageItem;
+			yourself
diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatMessageList.class/methodProperties.json
@@ -3,16 +3,17 @@
 		"defaultScrollOffsetBeforeLoading" : "JB 6/26/2021 10:15",
 		"defaultWidth" : "rgw 6/2/2022 15:39" },
 	"instance" : {
-		"addAtBottom:" : "aka 7/14/2022 14:58",
-		"addAtTop:" : "aka 7/14/2022 15:18",
-		"addBottomDayDividerForDate:" : "js 7/18/2022 07:29",
+		"addAtBottom:" : "rgw 7/21/2022 15:02",
+		"addAtTop:" : "rgw 7/21/2022 15:02",
+		"addBottomDayDividerForDate:" : " 7/22/2022 15:41:43",
 		"addMessages" : "RS 7/17/2021 17:40",
 		"addTopDayDividerForDate:" : "js 7/18/2022 07:30",
 		"chat" : "js 7/31/2020 16:39",
 		"chat:" : "js 7/31/2020 16:39",
 		"core" : "JB 6/26/2021 10:22",
-		"createDayDividerForDate:" : "aka 7/22/2022 09:29",
-		"displayChat:" : "aka 7/14/2022 13:50",
+		"createDayDividerForDate:" : " 7/22/2022 15:41:43",
+		"createMessageItemFrom:" : "rgw 7/21/2022 15:09",
+		"displayChat:" : "RS 7/17/2021 11:54",
 		"initialize" : "RS 7/17/2021 17:40",
 		"isFromCurrentChat:" : "pk 8/5/2021 17:07",
 		"isFullyScrolledDown" : "JB 8/4/2021 11:15",
diff --git a/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/class/defaultBorderWidth.st b/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/class/defaultBorderWidth.st
@@ -0,0 +1,4 @@
+defaults
+defaultBorderWidth
+
+	^ 2
diff --git a/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/class/defaultLayoutInset.st b/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/class/defaultLayoutInset.st
@@ -0,0 +1,4 @@
+defaults
+defaultLayoutInset
+
+	^ 7
diff --git a/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/class/defaultMargin.st b/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/class/defaultMargin.st
diff --git a/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/instance/initialize.st
@@ -6,9 +6,14 @@ initialize
 
 	textMorph := TextMorph new
 		contents: self content;
+		left: self class defaultLayoutInset;
+		top: self class defaultLayoutInset;
+		color: Color white;
 		lock.
 	self color: Color gray;
-		width: textMorph width + self class defaultMargin;
-		addMorphCentered: textMorph;
+		addMorph: textMorph;
 		useRoundedCorners;
-		borderWidth: 0.
+		borderWidth: self class defaultBorderWidth;
+		borderColor: Color transparent;
+		width: textMorph width + (2*self class defaultLayoutInset);
+		height: textMorph height + (2*self class defaultLayoutInset).
diff --git a/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUDayDividerMessage.class/methodProperties.json
@@ -1,8 +1,9 @@
 {
 	"class" : {
-		"defaultMargin" : "aka 7/14/2022 15:15",
+		"defaultBorderWidth" : "rgw 7/22/2022 15:44",
+		"defaultLayoutInset" : "rgw 7/22/2022 15:45",
 		"newFromDate:" : "aka 7/14/2022 15:14" },
 	"instance" : {
 		"content" : "aka 7/10/2022 12:37",
 		"content:" : "aka 7/10/2022 12:37",
-		"initialize" : "aka 7/14/2022 15:16" } }
+		"initialize" : "rgw 7/22/2022 15:46" } }
diff --git a/packages/TelegramClient-UI.package/TCUInfoMessage.class/README.md b/packages/TelegramClient-UI.package/TCUInfoMessage.class/README.md
@@ -0,0 +1 @@
+UI element containing 'added XYZ'
diff --git a/packages/TelegramClient-UI.package/TCUInfoMessage.class/class/defaultBorderWidth.st b/packages/TelegramClient-UI.package/TCUInfoMessage.class/class/defaultBorderWidth.st
@@ -0,0 +1,4 @@
+default values
+defaultBorderWidth
+
+	^ 2
diff --git a/packages/TelegramClient-UI.package/TCUInfoMessage.class/class/defaultLayoutInset.st b/packages/TelegramClient-UI.package/TCUInfoMessage.class/class/defaultLayoutInset.st
@@ -0,0 +1,4 @@
+default values
+defaultLayoutInset
+
+	^ 7
diff --git a/packages/TelegramClient-UI.package/TCUInfoMessage.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUInfoMessage.class/instance/initialize.st
@@ -0,0 +1,21 @@
+initialization
+initialize
+	
+	| textMorph |
+	super initialize.
+	
+	textMorph := (TextMorph new
+		lock;
+		contents: self messageModel asText;
+		color: Color white;
+		left: self class defaultLayoutInset;
+		top: self class defaultLayoutInset;
+		yourself).
+	self
+		color: Color gray;
+		addMorph: textMorph;
+		borderWidth: self class defaultBorderWidth;
+		borderColor: Color transparent;
+		useRoundedCorners;
+		width: textMorph width + (2*self class defaultLayoutInset);
+		height: textMorph height + (2*self class defaultLayoutInset).
diff --git a/packages/TelegramClient-UI.package/TCUInfoMessage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUInfoMessage.class/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		"defaultBorderWidth" : "rgw 7/21/2022 15:38",
+		"defaultLayoutInset" : "rgw 7/21/2022 14:52" },
+	"instance" : {
+		"initialize" : "rgw 7/21/2022 15:54" } }
diff --git a/packages/TelegramClient-UI.package/TCUInfoMessage.class/properties.json b/packages/TelegramClient-UI.package/TCUInfoMessage.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "TelegramClient-UI",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "rgw 7/21/2022 15:08",
+	"instvars" : [
+		 ],
+	"name" : "TCUInfoMessage",
+	"pools" : [
+		 ],
+	"super" : "TCUMessage",
+	"type" : "normal" }
diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/class/newFrom..st b/packages/TelegramClient-UI.package/TCUMessage.class/class/newFrom..st
@@ -4,6 +4,7 @@ newFrom: aCoreMessage
 	^ (aCoreMessage class caseOf: {
 			[TCCTextMessage] -> [TCUTextMessage].
 			[TCCPhotoMessage] -> [TCUPhotoMessage].
+			[TCCAddMembersMessage] -> [TCUInfoMessage].
 		} otherwise: [TCUTextMessage])
 		basicNew
 		messageModel: aCoreMessage;
diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/isUserMessage.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/isUserMessage.st
@@ -0,0 +1,4 @@
+accessing
+isUserMessage
+
+	^ false
diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUMessage.class/methodProperties.json
@@ -2,7 +2,8 @@
 	"class" : {
 		"defaultBottomMargin" : "aka 7/14/2022 16:20",
 		"defaultMargins" : "aka 7/14/2022 16:20",
-		"newFrom:" : "aka 7/14/2022 16:22" },
+		"newFrom:" : "rgw 7/22/2022 15:13" },
 	"instance" : {
+		"isUserMessage" : "rgw 7/21/2022 14:07",
 		"messageModel" : "aka 7/14/2022 17:22",
 		"messageModel:" : "aka 7/14/2022 16:18" } }
diff --git a/packages/TelegramClient-UI.package/TCUMessageWrapper.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUMessageWrapper.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"defaultMessageMargin" : "JS 6/11/2022 11:05",
+		"defaultMessageMargin" : "rgw 7/21/2022 14:41",
 		"defaultPhotoSize" : "JS 6/11/2022 11:32",
 		"newFromMessage:withWidth:" : "JS 6/11/2022 11:53" },
 	"instance" : {
diff --git a/packages/TelegramClient-UI.package/TCUUserMessage.class/instance/isUserMessage.st b/packages/TelegramClient-UI.package/TCUUserMessage.class/instance/isUserMessage.st
@@ -0,0 +1,4 @@
+accessing
+isUserMessage
+
+	^ true
diff --git a/packages/TelegramClient-UI.package/TCUUserMessage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUUserMessage.class/methodProperties.json
@@ -18,6 +18,7 @@
 		"initializeDefaults" : "JS 6/11/2022 11:00",
 		"initializeSubmorphs" : "rgw 6/2/2022 10:26",
 		"isOutgoing" : "TR 6/20/2021 11:37",
+		"isUserMessage" : "rgw 7/21/2022 14:08",
 		"messageColor" : "JB 5/29/2021 21:06",
 		"messageDateText" : "JB 5/17/2021 10:04",
 		"messageModel:" : "aka 7/14/2022 16:18",
diff --git a/packages/TelegramClientTests-Core.package/TCTCMessageTests.class/instance/testMessageAddMembersCorrectlyConstructedFromJson.st b/packages/TelegramClientTests-Core.package/TCTCMessageTests.class/instance/testMessageAddMembersCorrectlyConstructedFromJson.st
@@ -0,0 +1,12 @@
+testing
+testMessageAddMembersCorrectlyConstructedFromJson
+
+	| chat addMembersEvent addMembersMessage |
+
+ 	chat := TCTMMocks mockBasicGroupChat.
+	addMembersEvent := TCTMMocks mockMessageAddMembersFrom: {TCTMMocks mockUser1 id} to: chat id.
+	addMembersMessage := TCCUserMessage newFromMessageEvent: addMembersEvent in: chat with: self core.
+
+	self assert: addMembersMessage members equals: {TCTMMocks mockUser1 id}.
+	self assert: 'Added: Test User' equals: addMembersMessage asSnippet.
+	self assert: 'Added: Test User' equals: addMembersMessage asText
diff --git a/packages/TelegramClientTests-Core.package/TCTCMessageTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCMessageTests.class/methodProperties.json
@@ -2,6 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
+		"testMessageAddMembersCorrectlyConstructedFromJson" : "rgw 7/21/2022 16:04",
 		"testMessageCorrectlyConstructedFromJson" : "aka 7/14/2022 16:58",
 		"testMessageHasTextRepresentation" : "tom.richter 6/26/2021 21:06",
 		"testMessageIsReply" : "rgw 5/12/2022 16:40",
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageAddMembersFrom.to..st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageAddMembersFrom.to..st
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockTextMessageJsonFrom.with.replyingTo.with..st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockTextMessageJsonFrom.with.replyingTo.with..st
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json
diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testAddMembersMessage.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testAddMembersMessage.st
diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testAddMembersMessageIsNotUserMessage.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testAddMembersMessageIsNotUserMessage.st
diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testTextMessageIsUserMessage.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testTextMessageIsUserMessage.st
diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/methodProperties.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Reprents a message where members are added to a group.`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +accessing
 +members
++
 +	^ members