Skip to content

Commit

Permalink
Merge f2cc567 into 69c8e19
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob271 committed Jul 31, 2022
2 parents 69c8e19 + f2cc567 commit 391e0bb
Show file tree
Hide file tree
Showing 99 changed files with 245 additions and 173 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"name" : "TCCAddMembersMessage",
"pools" : [
],
"super" : "TCCUserMessage",
"super" : "TCCMessage",
"type" : "normal" }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ loading
chatHistoryReceived: anEvent

(anEvent at: 'messages') do:
[:message | self addOldestMessage: (TCCUserMessage newFromMessageEvent: message in: self with: self core).
[:message | self addOldestMessage: (TCCMessage newFromMessageEvent: message in: self with: self core).
self fulfillMessageRequest: (message at: 'id').
].

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"addOldestMessage:" : "aka 7/14/2022 14:26",
"canSendMessages" : "5/11/2021 10:09:15",
"canSendMessages:" : "JB 8/4/2021 00:08",
"chatHistoryReceived:" : "aka 7/14/2022 16:38",
"chatHistoryReceived:" : "js 7/31/2022 09:28",
"core" : "per 6/4/2021 16:00",
"core:" : "per 6/4/2021 15:58",
"fulfillMessageRequest:" : "LR 6/15/2022 10:11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ addNewMessage: aJsonObject

| chat message |
chat := self chats getChat: (aJsonObject at: 'chat_id').
message := TCCUserMessage newFromMessageEvent: aJsonObject in: chat with: self core.
message := TCCMessage newFromMessageEvent: aJsonObject in: chat with: self core.

chat addNewestMessage: message.
self core triggerEvent: #newMessageReceived with: message.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ answeredMessageReceived: aJsonObject

| chat message |
chat := self chats getChat: (aJsonObject at: 'chat_id').
message := TCCUserMessage newFromMessageEvent: aJsonObject in: chat with: self core.
message := TCCMessage newFromMessageEvent: aJsonObject in: chat with: self core.

chat addAnsweredMessage: message.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ updateLastMessage: anEvent
detect: [:e | ((e at: 'list') at: '@type') = 'chatListMain'])
at: 'order')].

lastMessage := (TCCUserMessage newFromMessageEvent: messageJson in: chat with: self core).
lastMessage := (TCCMessage newFromMessageEvent: messageJson in: chat with: self core).
chat lastMessageText: lastMessage asSnippet.
chat lastMessageSenderName: lastMessage senderName.
chat lastMessageSenderId: lastMessage userId.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
},
"instance" : {
"addChat:" : "js 6/18/2022 09:27",
"addNewMessage:" : "aka 7/14/2022 16:38",
"answeredMessageReceived:" : "aka 7/14/2022 16:38",
"addNewMessage:" : "js 7/31/2022 09:28",
"answeredMessageReceived:" : "js 7/31/2022 09:28",
"chatHistoryReceived:" : "pk 8/5/2021 16:37",
"chats" : "RS 8/1/2021 12:50",
"chats:" : "RS 8/1/2021 12:51",
Expand All @@ -16,4 +16,4 @@
"openNewChat:" : "pk 8/5/2021 16:38",
"searchChat:" : "pk 8/5/2021 16:38",
"updateChatPosition:" : "js 6/18/2022 11:04",
"updateLastMessage:" : "aka 7/14/2022 16:38" } }
"updateLastMessage:" : "js 7/31/2022 09:28" } }
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"name" : "TCCDeleteMemberMessage",
"pools" : [
],
"super" : "TCCUserMessage",
"super" : "TCCMessage",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -1 +1 @@
super-dataclass for messages of all types
super-dataclass for messages that can be created by users
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
instance creation
json conversion
newMessageWith: aJsonObject

^ (aJsonObject at: '@type') caseOf: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
chat: aChat

chat := aChat.
chat := aChat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
id: aNumber

id := aNumber.
id := aNumber
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
isFirstMessageOfDay: aBool
isFirstMessageOfDay: aBoolean

isFirstMessageOfDay := aBool
isFirstMessageOfDay := aBoolean
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
isLastMessageOfDay: aBool
isLastMessageOfDay: aBoolean

isLastMessageOfDay := aBool
isLastMessageOfDay := aBoolean
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
{
"class" : {
"newMessageWith:" : "LR 7/23/2022 10:44" },
"maxReplySnippetSize" : "rgw 5/12/2022 16:05",
"newFromMessageEvent:in:with:" : "rgw 6/2/2022 09:01",
"newMessageWith:" : "js 7/31/2022 09:28",
"timeStampToDateAndTime:" : "JB 5/16/2021 09:42" },
"instance" : {
"chat" : "aka 7/14/2022 16:41",
"chat:" : "aka 7/14/2022 16:41",
"chatId" : "aka 7/14/2022 16:41",
"core" : "aka 7/14/2022 16:41",
"core:" : "aka 7/14/2022 16:41",
"date" : "aka 7/14/2022 16:40",
"date:" : "aka 7/14/2022 16:40",
"id" : "aka 7/14/2022 16:40",
"id:" : "aka 7/14/2022 16:40",
"initialize" : "7/22/2022 10:40:18",
"isFirstMessageOfDay" : "7/22/2022 10:40:18",
"isFirstMessageOfDay:" : "7/22/2022 10:40:18",
"isLastMessageOfDay" : "7/22/2022 10:40:18",
"isLastMessageOfDay:" : "7/22/2022 10:40:18" } }
"asReplySnippet" : "rgw 5/12/2022 16:05",
"asSnippet" : "rgw 7/21/2022 15:11",
"asText" : "rgw 7/21/2022 15:11",
"chat" : "js 7/31/2022 09:23",
"chat:" : "js 7/31/2022 09:23",
"chatId" : "js 7/31/2022 09:27",
"core" : "js 7/31/2022 09:25",
"core:" : "js 7/31/2022 09:25",
"date" : "js 7/31/2022 09:24",
"date:" : "js 7/31/2022 09:25",
"id" : "js 7/31/2022 09:24",
"id:" : "js 7/31/2022 09:24",
"initialize" : "js 7/31/2022 09:27",
"isFirstMessageOfDay" : "js 7/31/2022 09:26",
"isFirstMessageOfDay:" : "js 7/31/2022 09:26",
"isLastMessageOfDay" : "js 7/31/2022 09:26",
"isLastMessageOfDay:" : "js 7/31/2022 09:26",
"isOutgoing" : "js 8/2/2020 22:00",
"isOutgoing:" : "pk 8/4/2021 11:42",
"isReply" : "rgw 5/12/2022 15:40",
"replyText" : "LR 6/5/2022 11:12",
"replyToMessageId" : "rgw 5/12/2022 13:43",
"replyToMessageId:" : "rgw 5/12/2022 13:43",
"senderName" : "JS 6/11/2022 09:50",
"senderType" : "tom.richter 7/25/2021 10:42",
"senderType:" : "pk 8/4/2021 11:42",
"senderUser" : "JS 6/11/2022 09:49",
"shouldNotify" : "per 6/16/2021 17:35",
"userId" : "tom.richter 7/25/2021 11:17",
"userId:" : "pk 8/4/2021 11:42" } }
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
"date",
"core",
"isFirstMessageOfDay",
"isLastMessageOfDay" ],
"isLastMessageOfDay",
"isOutgoing",
"senderType",
"userId",
"replyToMessageId" ],
"name" : "TCCMessage",
"pools" : [
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"name" : "TCCNotLoadedMessage",
"pools" : [
],
"super" : "TCCUserMessage",
"super" : "TCCMessage",
"type" : "normal" }
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"name" : "TCCNotSupportedMessage",
"pools" : [
],
"super" : "TCCUserMessage",
"super" : "TCCMessage",
"type" : "normal" }
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"name" : "TCCPhotoMessage",
"pools" : [
],
"super" : "TCCUserMessage",
"super" : "TCCMessage",
"type" : "normal" }
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"name" : "TCCTextMessage",
"pools" : [
],
"super" : "TCCUserMessage",
"super" : "TCCMessage",
"type" : "normal" }

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,5 @@ createDayDividerForDate: aDate

| messageItem |
messageItem := TCUDayDividerMessage newFromDate: aDate.
^ RectangleMorph new
color: Color transparent;
width: self scroller width;
height: messageItem height;
borderWidth: 0;
addMorphCentered: messageItem;
yourself

^ TCUDayDividerMessageWrapper newFromMessage: messageItem withWidth: self scroller width
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,5 @@ createMessageItemFrom: aCoreMessage
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
ifTrue: [^ TCUUserMessageWrapper newFromMessage: messageItem withWidth: self scroller width]
ifFalse: [^ TCUInfoMessageWrapper newFromMessage: messageItem withWidth: self scroller width].
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ drawing
scrollToMessage: aMessageId

| messageItem |
messageItem := self items detect: [:item | ((item isKindOf: TCUMessageWrapper)) and: [item messageId = aMessageId]].
messageItem := self items detect: [:item | item messageId = aMessageId].
self scrollToShow: messageItem
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"chat" : "js 7/31/2020 16:39",
"chat:" : "js 7/31/2020 16:39",
"core" : "JB 6/26/2021 10:22",
"createDayDividerForDate:" : "7/22/2022 15:41:43",
"createMessageItemFrom:" : "rgw 7/21/2022 15:09",
"createDayDividerForDate:" : "js 7/31/2022 10:20",
"createMessageItemFrom:" : "js 7/31/2022 10:02",
"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",
"requestScrollToMessage:" : "aka 6/15/2022 11:56",
"scrollToMessage:" : "aka 7/22/2022 09:34",
"scrollToMessage:" : "js 7/31/2022 10:21",
"scrollToNewestMessage" : "per 6/24/2021 23:14",
"showMessages" : "RS 7/17/2021 17:34",
"step" : "JB 7/19/2021 12:12" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wraps TCUDayDividerMessage to align it in the center of chatMessageList
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
default values
defaultInvalidMessageId

^ -1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
messageId

^ self class defaultInvalidMessageId
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
"defaultInvalidMessageId" : "js 7/31/2022 10:42" },
"instance" : {
"messageId" : "js 7/31/2022 10:41" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "TelegramClient-UI",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "js 7/31/2022 10:37",
"instvars" : [
],
"name" : "TCUDayDividerMessageWrapper",
"pools" : [
],
"super" : "TCUMessageWrapper",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wraps TCUInfoMessage to align it in the center of chatMessageList
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
},
"instance" : {
} }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "TelegramClient-UI",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "js 7/31/2022 10:36",
"instvars" : [
],
"name" : "TCUInfoMessageWrapper",
"pools" : [
],
"super" : "TCUMessageWrapper",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
initialization
event handling
mouseDown: anEvent

^ self messageModel chat selectedReplyToMessageId: self messageModel id
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"defaultMargins" : "aka 7/14/2022 16:20",
"newFrom:" : "LR 7/23/2022 10:44" },
"instance" : {
"handlesMouseDown:" : "js 7/31/2022 11:13",
"isUserMessage" : "rgw 7/21/2022 14:07",
"messageModel" : "aka 7/14/2022 17:22",
"messageModel:" : "aka 7/14/2022 16:18" } }
"messageModel:" : "aka 7/14/2022 16:18",
"mouseDown:" : "js 7/31/2022 11:13" } }
Original file line number Diff line number Diff line change
@@ -1 +1 @@
wraps TCUMessage to add profile photo in group chats and align the message depending on senderType
abstract class to wrap a message to use it in chatMessageList
Loading

0 comments on commit 391e0bb

Please sign in to comment.