diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 277f063fd..0cb7a287c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,7 +10,7 @@ Please, go through these steps before you submit a PR. c. You have only one commit (if not, squash them into one commit). d. Running tests doesn't throw any error. If it does, fix them first and amend your commit (`git commit --amend`). - + e. You have tracked ALL applicable time working in clockify! 3. **After** these steps, you're ready to open a pull request. diff --git a/.github/workflows/ci-linter.yml b/.github/workflows/ci-linter.yml index 4f613f1d0..689b769a3 100644 --- a/.github/workflows/ci-linter.yml +++ b/.github/workflows/ci-linter.yml @@ -1,6 +1,6 @@ name: CI-Lint -on: +on: push: branches: - develop diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 971e27a8c..7f0e82a2f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: CI -on: +on: push: branches: - develop diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b771daf0d..e4c1cd9f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,17 +39,17 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.tag_prefix.outputs.value }}${{ steps.current-time.outputs.formattedTime }} + tag_name: ${{ steps.tag_prefix.outputs.value }}${{ steps.current-time.outputs.formattedTime }} release_name: ${{ matrix.smalltalk }} ${{ steps.current-time.outputs.formattedTime }} draft: false prerelease: ${{ env.prerelease }} - name: Upload Release Asset - id: upload-release-asset + id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_path: /home/runner/.smalltalkCI/_builds/TelegramClient.sar asset_name: TelegramClient.sar asset_content_type: application/zip diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6edde254b..25a1118c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -83,7 +83,7 @@ $ git merge develop // merges changes from mast When development on the feature is complete, reviewers should merge changes into `develop` and then make sure the remote branch is deleted. ``` -$ git checkout develop // change to the develop branch +$ git checkout develop // change to the develop branch $ git merge --no-ff feature/GH-id // makes sure to create a commit object during merge $ git push origin develop // push merge changes $ git push origin :feature/GH-id // deletes the remote branch @@ -97,7 +97,7 @@ Fix branches differ from feature branches only semantically. Fix branches will b Although likelihood will be less, during the lifespan of the bug development, the lead should watch the `develop` branch (network tool or branch tool in GitHub) to see if there have been commits since the bug was branched. Any and all changes to `develop` should be merged into the bug before merging back to `develop`; this can be done at various times during the project or at the end, but time to handle merge conflicts should be accounted for. -`` represents the Basecamp project to which Project Management will be tracked. +`` represents the Basecamp project to which Project Management will be tracked. * Must branch from: `develop` * Must merge back into: `develop` @@ -121,7 +121,7 @@ $ git merge develop // merges changes from deve When development on the bug is complete, [the Lead] should merge changes into `develop` and then make sure the remote branch is deleted. ``` -$ git checkout develop // change to the develop branch +$ git checkout develop // change to the develop branch $ git merge --no-ff bugfix/GH-id // makes sure to create a commit object during merge $ git push origin develop // push merge changes $ git push origin :bugfix/GH-id // deletes the remote branch diff --git a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/README.md b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/README.md index e69de29bb..381d0ffb5 100644 --- a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/README.md +++ b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/README.md @@ -0,0 +1 @@ +defines prequisites \ No newline at end of file diff --git a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/baseline..st b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/baseline..st index 3a8679f0e..3ed195a63 100644 --- a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/baseline..st +++ b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/baseline..st @@ -1,7 +1,7 @@ baseline baseline: spec - + spec for: #common do: [ spec baseline: 'Animations' with: [ @@ -21,7 +21,7 @@ baseline: spec spec repository: 'github://hpi-swa-teaching/Morphic-Testing-Framework:master/packages']; baseline: 'SwaLint' with: [ spec repository: 'github://hpi-swa-teaching/SwaLint:develop/packages']. - + spec package: 'TelegramClient-Core' with: [ spec requires: #('libraries')]; diff --git a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/postLoad.st b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/postLoad.st index defa2c3c8..dfbc82715 100644 --- a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/postLoad.st +++ b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/postLoad.st @@ -1,6 +1,6 @@ baseline postLoad -(((Smalltalk respondsTo: #globals) +(((Smalltalk respondsTo: #globals) ifTrue: [Smalltalk globals] "Squeak >=4.1" ifFalse: [Smalltalk]) "Pharo and squeak <=4.0" at: #SwaLint) perform: #install. \ No newline at end of file diff --git a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/properties.json b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/properties.json index 7cc3a1bdb..cd06626d2 100644 --- a/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/properties.json +++ b/packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "per 6/15/2021 09:40", "instvars" : [ ], "name" : "BaselineOfTelegramClient", diff --git a/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/README.md b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/README.md new file mode 100644 index 000000000..157782816 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/README.md @@ -0,0 +1 @@ +A TCCBasicGroupChat represents a Telegram BasicGroup with up to 200 members \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/initializeFromChatEvent..st b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/initializeFromChatEvent..st new file mode 100644 index 000000000..5d96f7496 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/initializeFromChatEvent..st @@ -0,0 +1,5 @@ +initialization +initializeFromChatEvent: anEvent + + super initializeFromChatEvent: anEvent. + self groupId: (((anEvent at: 'chat') at: 'type') at: 'basic_group_id') \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/isBasicGroup.st b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/isBasicGroup.st new file mode 100644 index 000000000..f6c798cf9 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/isBasicGroup.st @@ -0,0 +1,4 @@ +accessing +isBasicGroup + + ^ true \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/loadInfo.st b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/loadInfo.st new file mode 100644 index 000000000..1731e9cf9 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/instance/loadInfo.st @@ -0,0 +1,14 @@ +loading +loadInfo + + self core client send: (TCCRequest + newWithType: 'getBasicGroupFullInfo' + from: { + 'basic_group_id'->self groupId. + '@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 \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/methodProperties.json new file mode 100644 index 000000000..0dc680d34 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + }, + "instance" : { + "initializeFromChatEvent:" : "per 6/4/2021 15:06", + "isBasicGroup" : "per 6/15/2021 08:41", + "loadInfo" : "per 6/15/2021 08:36" } } diff --git a/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/properties.json b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/properties.json new file mode 100644 index 000000000..0e7dc7491 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCBasicGroupChat.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "TelegramClient-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "per 6/4/2021 14:36", + "instvars" : [ + ], + "name" : "TCCBasicGroupChat", + "pools" : [ + ], + "super" : "TCCGroupChat", + "type" : "normal" } diff --git a/packages/TelegramClient-Core.package/TCCChat.class/class/newFromChatEvent..st b/packages/TelegramClient-Core.package/TCCChat.class/class/newFromChatEvent..st index d1d357bae..c20905548 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/class/newFromChatEvent..st +++ b/packages/TelegramClient-Core.package/TCCChat.class/class/newFromChatEvent..st @@ -1,11 +1,14 @@ instance creation newFromChatEvent: anEvent - | type | + | type chat | type := ((anEvent at: 'chat') at: 'type') at: '@type'. - - ^ (((type = 'chatTypeSupergroup') or: (type = 'chatTypeBasicGroup')) - ifTrue: [TCCGroup new] - ifFalse: [self new]) - initializeFromChatEvent: anEvent; - yourself \ No newline at end of file + type caseOf: { + ['chatTypeSupergroup']->[chat := TCCSuperGroupChat new]. + ['chatTypeBasicGroup']->[chat := TCCBasicGroupChat new]. + ['chatTypePrivate']->[chat := TCCPrivateChat new]. + }. + + ^ chat + initializeFromChatEvent: anEvent; + yourself diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/core..st b/packages/TelegramClient-Core.package/TCCChat.class/instance/core..st new file mode 100644 index 000000000..bd19251b0 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/core..st @@ -0,0 +1,4 @@ +accessing +core: aCore + + core := aCore \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/core.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/core.st new file mode 100644 index 000000000..7652dd8d1 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/core.st @@ -0,0 +1,4 @@ +accessing +core + + ^ core \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/infoLoaded..st b/packages/TelegramClient-Core.package/TCCChat.class/instance/infoLoaded..st new file mode 100644 index 000000000..cbea78a91 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/infoLoaded..st @@ -0,0 +1,4 @@ +accessing +infoLoaded: aBoolean + + infoLoaded := aBoolean \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/infoLoaded.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/infoLoaded.st new file mode 100644 index 000000000..3868753b7 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/infoLoaded.st @@ -0,0 +1,4 @@ +accessing +infoLoaded + + ^ infoLoaded \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st index d40a2c24c..90d5515a1 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st @@ -6,4 +6,5 @@ initialize messages: (OrderedCollection newFrom: {TCCNullMessage new}); waitingForUpdate: false; positionKnown: false; - numberOfRequestedMessages: self class defaultNumberOfRequestedMessages. + infoLoaded: false; + numberOfRequestedMessages: self class defaultNumberOfRequestedMessages. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/isBasicGroup.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/isBasicGroup.st new file mode 100644 index 000000000..084cbec6a --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/isBasicGroup.st @@ -0,0 +1,4 @@ +accessing +isBasicGroup + + ^ false \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/isGroup.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/isGroup.st index 7a74c58ec..e93c4294c 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/instance/isGroup.st +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/isGroup.st @@ -1,4 +1,4 @@ accessing isGroup - ^ false \ No newline at end of file + self subclassResponsibility diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/isPrivate.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/isPrivate.st index f24e62ba1..d28f8f16b 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/instance/isPrivate.st +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/isPrivate.st @@ -1,4 +1,4 @@ accessing isPrivate - ^ (self type = 'chatTypePrivate') \ No newline at end of file + self subclassResponsibility \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/isSuperGroup.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/isSuperGroup.st new file mode 100644 index 000000000..ee1446e8d --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/isSuperGroup.st @@ -0,0 +1,4 @@ +accessing +isSuperGroup + + ^ false \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/loadInfo.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/loadInfo.st new file mode 100644 index 000000000..8a7677a8c --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/loadInfo.st @@ -0,0 +1,4 @@ +accessing +loadInfo + + self subclassResponsibility \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/loadInfoIfNotLoaded.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/loadInfoIfNotLoaded.st new file mode 100644 index 000000000..7d6685e5f --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/loadInfoIfNotLoaded.st @@ -0,0 +1,7 @@ +accessing +loadInfoIfNotLoaded + + self infoLoaded ifFalse: [ + self loadInfo. + self infoLoaded: true. + ] \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json index fcaf4dcca..56ce29546 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json @@ -1,21 +1,29 @@ { "class" : { "defaultNumberOfRequestedMessages" : "js 8/1/2020 18:52", - "newFromChatEvent:" : "JB 5/31/2021 16:21" }, + "newFromChatEvent:" : "TR 6/15/2021 16:51" }, "instance" : { "addNewestMessage:" : "js 8/2/2020 12:58", "addOldestMessage:" : "js 8/2/2020 12:58", "canSendMessages" : "5/11/2021 10:09:15", "canSendMessages:" : "TR 5/5/2021 16:31", + "core" : "per 6/4/2021 16:00", + "core:" : "per 6/4/2021 15:58", "id" : "rs 6/7/2020 22:20", "id:" : "5/11/2021 10:09:15", "ifNotWaitingForUpdate:" : "js 8/2/2020 13:17", - "initialize" : "JB 6/11/2021 18:31", - "initializeFromChatEvent:" : "JB 5/31/2021 16:19", - "isGroup" : "RS 5/29/2021 18:12", - "isPrivate" : "per 5/13/2021 08:48", + "infoLoaded" : "per 6/4/2021 15:59", + "infoLoaded:" : "per 6/4/2021 15:51", + "initialize" : "per 6/4/2021 15:49", + "initializeFromChatEvent:" : "RS 5/29/2021 17:23", + "isBasicGroup" : "per 6/15/2021 08:08", + "isGroup" : "per 6/4/2021 14:42", + "isPrivate" : "per 6/4/2021 14:42", + "isSuperGroup" : "per 6/15/2021 08:09", "lastMessage" : "rs 6/19/2020 17:33", "lastMessage:" : "5/11/2021 10:09:15", + "loadInfo" : "per 6/15/2021 09:49", + "loadInfoIfNotLoaded" : "TR 6/13/2021 15:54", "messages" : "R.S 6/1/2020 15:37", "messages:" : "5/11/2021 10:09:15", "numberOfMessages" : "js 8/1/2020 18:04", diff --git a/packages/TelegramClient-Core.package/TCCChat.class/properties.json b/packages/TelegramClient-Core.package/TCCChat.class/properties.json index f3fe729f7..5f19ee48d 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/properties.json +++ b/packages/TelegramClient-Core.package/TCCChat.class/properties.json @@ -15,7 +15,9 @@ "waitingForUpdate", "numberOfRequestedMessages", "type", - "canSendMessages" ], + "canSendMessages", + "core", + "infoLoaded" ], "name" : "TCCChat", "pools" : [ ], diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/addChat..st b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/addChat..st index b3f9b5a39..69ae7c6e2 100644 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/addChat..st +++ b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/addChat..st @@ -1,14 +1,9 @@ events addChat: aChatEvent - + | chat | chat := TCCChat newFromChatEvent: aChatEvent. - (chat type = 'chatTypeSupergroup') ifTrue: [ - self loadSuperGroupInfoFor: chat with: (((aChatEvent at: 'chat') at: 'type') at: 'supergroup_id'). - ]. - (chat type = 'chatTypeBasicGroup') ifTrue: [ - self loadBasicGroupInfoFor: chat with: (((aChatEvent at: 'chat') at: 'type') at: 'basic_group_id'). - ]. + chat core: self core. self core chats add: chat; diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/getChatHistoryFrom.with.limit..st b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/getChatHistoryFrom.with.limit..st index 05b8021ef..eb2adf51d 100644 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/getChatHistoryFrom.with.limit..st +++ b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/getChatHistoryFrom.with.limit..st @@ -2,7 +2,7 @@ library calls getChatHistoryFrom: aChatID with: aMessageId limit: aLimit | chat | - + chat := self core chats getChat: aChatID. chat ifNotWaitingForUpdate: [ self client send: (TCCRequest diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadBasicGroupInfoFor.with..st b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadBasicGroupInfoFor.with..st deleted file mode 100644 index 65418fede..000000000 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadBasicGroupInfoFor.with..st +++ /dev/null @@ -1,15 +0,0 @@ -events -loadBasicGroupInfoFor: aChat with: aBasicGroupId - - self client send: (TCCRequest - newWithType: 'getBasicGroupFullInfo' - from: { - 'basic_group_id'->aBasicGroupId. - '@extra'->aBasicGroupId}). - - self core - registerCallback: [:aBasicGroupFullInfoEvent | - aChat - memberCount: (aBasicGroupFullInfoEvent at: 'members') size; - description: (aBasicGroupFullInfoEvent at: 'description').] - with: aBasicGroupId. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateLastMessage..st b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateLastMessage..st index dd01adab5..c65502732 100644 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateLastMessage..st +++ b/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/updateLastMessage..st @@ -6,7 +6,7 @@ updateLastMessage: anEvent (anEvent includesKey: 'last_message') ifTrue: [ content := (anEvent at: 'last_message') at: 'content'. chat := self core chats getChat: (anEvent at: 'chat_id'). - + (anEvent at: 'positions') notEmpty ifTrue: [chat position: (((anEvent at: 'positions') diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json index 5213ef8e6..8c023f910 100644 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json @@ -1,18 +1,16 @@ { "class" : { - "defaultMessageLimit" : "js 8/1/2020 18:24" }, + "defaultMessageLimit" : "per 6/4/2021 15:30" }, "instance" : { - "addChat:" : "JB 6/4/2021 21:34", - "addNewMessage:" : "pk 6/8/2021 09:31", - "chatHistoryReceived:" : "JB 6/13/2021 10:59", - "client" : "per 5/21/2021 16:55", - "core" : "per 5/21/2021 16:55", - "core:" : "per 5/21/2021 16:55", - "getChatHistoryFrom:with:limit:" : "per 5/21/2021 16:55", + "addChat:" : "per 6/15/2021 08:31", + "addNewMessage:" : "6/13/2021 15:37:32", + "chatHistoryReceived:" : "pk 5/12/2021 12:35", + "client" : "js 6/1/2020 14:44", + "core" : "6/4/2021 16:24:10", + "core:" : "6/4/2021 16:24:10", + "getChatHistoryFrom:with:limit:" : "js 8/2/2020 13:17", "getChats" : "js 7/31/2020 22:50", "handleNewMessage:" : "pk 6/8/2021 09:32", - "loadBasicGroupInfoFor:with:" : "TR 6/2/2021 13:59", - "loadSuperGroupInfoFor:with:" : "TR 6/2/2021 13:58", "openNewChat:" : "pk 5/13/2021 12:45", "remainingMessages" : "5/11/2021 10:09:15", "remainingMessages:" : "js 8/1/2020 16:50", diff --git a/packages/TelegramClient-Core.package/TCCCore.class/class/newWithTeleClient..st b/packages/TelegramClient-Core.package/TCCCore.class/class/newWithTeleClient..st index 5edbba6e4..0be57d3d3 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/class/newWithTeleClient..st +++ b/packages/TelegramClient-Core.package/TCCCore.class/class/newWithTeleClient..st @@ -1,4 +1,4 @@ -as yet unclassified +instance creation newWithTeleClient: aTeleClient ^ self basicNew diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/getOwnProfile.st b/packages/TelegramClient-Core.package/TCCCore.class/instance/getOwnProfile.st index 3c3320f28..e96af3265 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/instance/getOwnProfile.st +++ b/packages/TelegramClient-Core.package/TCCCore.class/instance/getOwnProfile.st @@ -1,6 +1,6 @@ events getOwnProfile - + self pendingRequests at: 'getMe' put: [:aUserEvent | self setUserID: aUserEvent]. self client send: (TCCRequest newWithType: 'getMe' diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/handleEvent..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/handleEvent..st index 0cacfc52f..25b304a91 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/instance/handleEvent..st +++ b/packages/TelegramClient-Core.package/TCCCore.class/instance/handleEvent..st @@ -13,6 +13,7 @@ handleEvent: anEvent ['updateNewMessage'] -> [self handleMessageEvent: anEvent]. ['user'] -> [self handlePendingEvent: anEvent]. ['supergroupFullInfo'] -> [self handlePendingEvent: anEvent]. + ['chatMembers'] -> [self handlePendingEvent: anEvent]. ['basicGroupFullInfo'] -> [self handlePendingEvent: anEvent]. ['chat'] -> [self chatsHandler openNewChat: anEvent]} otherwise: []. diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/handlePendingEvent..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/handlePendingEvent..st index e809b1c69..b4ed512c3 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/instance/handlePendingEvent..st +++ b/packages/TelegramClient-Core.package/TCCCore.class/instance/handlePendingEvent..st @@ -1,6 +1,6 @@ event handling handlePendingEvent: anEvent - + | extra | extra := (anEvent at: '@extra') asString. (self pendingRequests at: extra) value: anEvent. diff --git a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json index 4f5f65949..92e5f60c2 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json @@ -12,14 +12,14 @@ "checkAuthenticationCode:" : "RS 5/4/2021 18:43", "client" : "R.S 5/20/2020 16:08", "client:" : "js 6/13/2020 19:10", - "freeClient" : "JB 6/7/2021 11:14", - "getChatHistoryFrom:" : "JB 6/11/2021 18:27", + "freeClient" : "6/9/2021 14:12:18", + "getChatHistoryFrom:" : "per 6/4/2021 15:30", "getOwnProfile" : "pk 5/13/2021 09:44", - "handleEvent:" : "per 5/26/2021 14:04", - "handleMessageEvent:" : "pk 6/11/2021 10:20", - "handlePendingEvent:" : "per 5/26/2021 14:03", - "initialize" : "JB 6/10/2021 22:29", - "initializeHandlers" : "per 5/21/2021 16:55", + "handleEvent:" : "per 6/4/2021 11:54", + "handleMessageEvent:" : "pk 5/28/2021 09:41", + "handlePendingEvent:" : "5/30/2021 12:11:04", + "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", diff --git a/packages/TelegramClient-Core.package/TCCFFIClient.class/class/moduleName.st b/packages/TelegramClient-Core.package/TCCFFIClient.class/class/moduleName.st index 1e12ba429..7bd9519b9 100644 --- a/packages/TelegramClient-Core.package/TCCFFIClient.class/class/moduleName.st +++ b/packages/TelegramClient-Core.package/TCCFFIClient.class/class/moduleName.st @@ -4,7 +4,7 @@ moduleName | filePath response | filePath := FileDirectory default / self fileName. - + filePath exists ifFalse: [ FileStream fileNamed: filePath fullName do: [:stream | response := WebClient httpGet: self downloadUrl. diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCGroup.class/instance/initialize.st deleted file mode 100644 index 5e7b0b98e..000000000 --- a/packages/TelegramClient-Core.package/TCCGroup.class/instance/initialize.st +++ /dev/null @@ -1,5 +0,0 @@ -initialization -initialize - - super initialize. - self description: ''. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCGroup.class/methodProperties.json deleted file mode 100644 index 8725b2b55..000000000 --- a/packages/TelegramClient-Core.package/TCCGroup.class/methodProperties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "description" : "RS 5/29/2021 18:44", - "description:" : "RS 5/29/2021 18:44", - "initialize" : "RS 5/29/2021 18:44", - "isGroup" : "RS 5/29/2021 18:13", - "isPrivate" : "RS 5/29/2021 17:38", - "memberCount" : "RS 5/29/2021 18:44", - "memberCount:" : "RS 5/29/2021 18:44" } } diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/README.md b/packages/TelegramClient-Core.package/TCCGroupChat.class/README.md similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/README.md rename to packages/TelegramClient-Core.package/TCCGroupChat.class/README.md diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/addMembersFrom..st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/addMembersFrom..st new file mode 100644 index 000000000..d3f0e4396 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/addMembersFrom..st @@ -0,0 +1,6 @@ +initialization +addMembersFrom: aJsonCollection + + [aJsonCollection do: [:aMember | + self members add: (self core users getUserFor: (aMember at: 'user_id')). + ]] fork. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/canLoadMoreMembers.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/canLoadMoreMembers.st new file mode 100644 index 000000000..73f5d78ee --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/canLoadMoreMembers.st @@ -0,0 +1,4 @@ +accessing +canLoadMoreMembers + + ^ self isSuperGroup and: [self members size ~= self memberCount] \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/description..st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/description..st similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/instance/description..st rename to packages/TelegramClient-Core.package/TCCGroupChat.class/instance/description..st diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/description.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/description.st similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/instance/description.st rename to packages/TelegramClient-Core.package/TCCGroupChat.class/instance/description.st diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/groupId..st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/groupId..st new file mode 100644 index 000000000..243a968da --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/groupId..st @@ -0,0 +1,4 @@ +accessing +groupId: aNumber + + groupId := aNumber \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/groupId.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/groupId.st new file mode 100644 index 000000000..3170ed46f --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/groupId.st @@ -0,0 +1,4 @@ +accessing +groupId + + ^ groupId \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/initialize.st new file mode 100644 index 000000000..f11ec0569 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/initialize.st @@ -0,0 +1,7 @@ +initialization +initialize + + super initialize. + self + description: ''; + members: OrderedCollection new. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isBasicGroup.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isBasicGroup.st new file mode 100644 index 000000000..084cbec6a --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isBasicGroup.st @@ -0,0 +1,4 @@ +accessing +isBasicGroup + + ^ false \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/isGroup.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isGroup.st similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/instance/isGroup.st rename to packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isGroup.st diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/isPrivate.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isPrivate.st similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/instance/isPrivate.st rename to packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isPrivate.st diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isSuperGroup.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isSuperGroup.st new file mode 100644 index 000000000..ee1446e8d --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/isSuperGroup.st @@ -0,0 +1,4 @@ +accessing +isSuperGroup + + ^ false \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/loadInfo.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/loadInfo.st new file mode 100644 index 000000000..ec793cf0e --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/loadInfo.st @@ -0,0 +1,4 @@ +initialization +loadInfo + + self subclassResponsibility \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/memberCount..st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/memberCount..st similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/instance/memberCount..st rename to packages/TelegramClient-Core.package/TCCGroupChat.class/instance/memberCount..st diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/instance/memberCount.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/memberCount.st similarity index 100% rename from packages/TelegramClient-Core.package/TCCGroup.class/instance/memberCount.st rename to packages/TelegramClient-Core.package/TCCGroupChat.class/instance/memberCount.st diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/members..st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/members..st new file mode 100644 index 000000000..33d915560 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/members..st @@ -0,0 +1,4 @@ +accessing +members: anOrderedCollection + + members := anOrderedCollection. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/members.st b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/members.st new file mode 100644 index 000000000..feda34609 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/instance/members.st @@ -0,0 +1,4 @@ +accessing +members + + ^ members \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCGroupChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCGroupChat.class/methodProperties.json new file mode 100644 index 000000000..fa88eb231 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/methodProperties.json @@ -0,0 +1,20 @@ +{ + "class" : { + }, + "instance" : { + "addMembersFrom:" : "per 6/15/2021 08:37", + "canLoadMoreMembers" : "per 6/15/2021 08:37", + "description" : "RS 5/29/2021 18:44", + "description:" : "RS 5/29/2021 18:44", + "groupId" : "per 6/3/2021 12:01", + "groupId:" : "per 6/15/2021 08:38", + "initialize" : "per 6/15/2021 09:44", + "isBasicGroup" : "per 6/15/2021 08:41", + "isGroup" : "RS 5/29/2021 18:13", + "isPrivate" : "RS 5/29/2021 17:38", + "isSuperGroup" : "per 6/15/2021 08:42", + "loadInfo" : "per 6/4/2021 15:12", + "memberCount" : "RS 5/29/2021 18:44", + "memberCount:" : "RS 5/29/2021 18:44", + "members" : "per 6/3/2021 12:02", + "members:" : "per 6/15/2021 08:49" } } diff --git a/packages/TelegramClient-Core.package/TCCGroup.class/properties.json b/packages/TelegramClient-Core.package/TCCGroupChat.class/properties.json similarity index 75% rename from packages/TelegramClient-Core.package/TCCGroup.class/properties.json rename to packages/TelegramClient-Core.package/TCCGroupChat.class/properties.json index 21b66da7c..cf5693666 100644 --- a/packages/TelegramClient-Core.package/TCCGroup.class/properties.json +++ b/packages/TelegramClient-Core.package/TCCGroupChat.class/properties.json @@ -7,8 +7,10 @@ "commentStamp" : "RS 5/29/2021 18:45", "instvars" : [ "description", - "memberCount" ], - "name" : "TCCGroup", + "memberCount", + "members", + "groupId" ], + "name" : "TCCGroupChat", "pools" : [ ], "super" : "TCCChat", diff --git a/packages/TelegramClient-Core.package/TCCMessage.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCMessage.class/instance/initialize.st index 4ff3b2038..70c0f6c53 100644 --- a/packages/TelegramClient-Core.package/TCCMessage.class/instance/initialize.st +++ b/packages/TelegramClient-Core.package/TCCMessage.class/instance/initialize.st @@ -2,5 +2,5 @@ accessing initialize super initialize. - + self message: ''. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCNullChat.class/instance/isGroup.st b/packages/TelegramClient-Core.package/TCCNullChat.class/instance/isGroup.st new file mode 100644 index 000000000..7a74c58ec --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCNullChat.class/instance/isGroup.st @@ -0,0 +1,4 @@ +accessing +isGroup + + ^ false \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCNullChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCNullChat.class/methodProperties.json index e8701aece..a539d5d11 100644 --- a/packages/TelegramClient-Core.package/TCCNullChat.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCNullChat.class/methodProperties.json @@ -3,5 +3,6 @@ }, "instance" : { "id" : "rs 6/17/2020 22:31", + "isGroup" : "per 6/4/2021 14:57", "isPrivate" : "RS 5/29/2021 18:12", "messages" : "rs 7/4/2020 19:17" } } diff --git a/packages/TelegramClient-Core.package/TCCPrivateChat.class/README.md b/packages/TelegramClient-Core.package/TCCPrivateChat.class/README.md new file mode 100644 index 000000000..2e519a7a8 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCPrivateChat.class/README.md @@ -0,0 +1 @@ +A TCCPrivateChat represents a private Telegram chat diff --git a/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/isGroup.st b/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/isGroup.st new file mode 100644 index 000000000..7a74c58ec --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/isGroup.st @@ -0,0 +1,4 @@ +accessing +isGroup + + ^ false \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/isPrivate.st b/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/isPrivate.st new file mode 100644 index 000000000..021b54460 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/isPrivate.st @@ -0,0 +1,4 @@ +accessing +isPrivate + + ^ true \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/loadInfo.st b/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/loadInfo.st new file mode 100644 index 000000000..d504c5204 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCPrivateChat.class/instance/loadInfo.st @@ -0,0 +1,2 @@ +accessing +loadInfo \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCPrivateChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCPrivateChat.class/methodProperties.json new file mode 100644 index 000000000..552faf830 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCPrivateChat.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + }, + "instance" : { + "isGroup" : "per 6/15/2021 08:50", + "isPrivate" : "per 6/15/2021 08:50", + "loadInfo" : "per 6/15/2021 09:49" } } diff --git a/packages/TelegramClient-Core.package/TCCPrivateChat.class/properties.json b/packages/TelegramClient-Core.package/TCCPrivateChat.class/properties.json new file mode 100644 index 000000000..768a145bb --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCPrivateChat.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "TelegramClient-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "per 6/4/2021 14:37", + "instvars" : [ + ], + "name" : "TCCPrivateChat", + "pools" : [ + ], + "super" : "TCCChat", + "type" : "normal" } diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/README.md b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/README.md new file mode 100644 index 000000000..7da3f3014 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/README.md @@ -0,0 +1 @@ +A TCCSuperGroupChat represents a Telegram Supergroup with up to 200.000 members diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/class/defaultLimit.st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/class/defaultLimit.st new file mode 100644 index 000000000..b376518f9 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/class/defaultLimit.st @@ -0,0 +1,4 @@ +default values +defaultLimit + + ^ 20 \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/initializeFromChatEvent..st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/initializeFromChatEvent..st new file mode 100644 index 000000000..cd4bde4eb --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/initializeFromChatEvent..st @@ -0,0 +1,5 @@ +initialization +initializeFromChatEvent: anEvent + + super initializeFromChatEvent: anEvent. + self groupId: (((anEvent at: 'chat') at: 'type') at: 'supergroup_id') \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/isSuperGroup.st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/isSuperGroup.st new file mode 100644 index 000000000..7957d5204 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/isSuperGroup.st @@ -0,0 +1,4 @@ +accessing +isSuperGroup + + ^ true \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadSuperGroupInfoFor.with..st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadGeneralInfo.st similarity index 53% rename from packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadSuperGroupInfoFor.with..st rename to packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadGeneralInfo.st index 52ea79a0f..b2cae5a86 100644 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/loadSuperGroupInfoFor.with..st +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadGeneralInfo.st @@ -1,15 +1,14 @@ -events -loadSuperGroupInfoFor: aChat with: aSupergroupId +loading +loadGeneralInfo - self client send: (TCCRequest + self core client send: (TCCRequest newWithType: 'getSupergroupFullInfo' - from: { - 'supergroup_id'->aSupergroupId. - '@extra'->aSupergroupId}). - + from: {'supergroup_id'->self groupId. + '@extra'->self groupId}). + self core registerCallback: [:aSupergroupFullInfoEvent | - aChat + self memberCount: (aSupergroupFullInfoEvent at: 'member_count'); description: (aSupergroupFullInfoEvent at: 'description').] - with: aSupergroupId. \ No newline at end of file + with: self groupId. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadInfo.st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadInfo.st new file mode 100644 index 000000000..190179b6e --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadInfo.st @@ -0,0 +1,6 @@ +loading +loadInfo + + self + loadGeneralInfo; + loadMembers. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMembers.st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMembers.st new file mode 100644 index 000000000..aa4cd5932 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMembers.st @@ -0,0 +1,14 @@ +loading +loadMembers + + self core client send: (TCCRequest + newWithType: 'getSupergroupMembers' + from: {'supergroup_id'->self groupId. + 'offset'->self members size. + 'limit'->self class defaultLimit. + '@extra'->('#', self groupId)}). + + self core + registerCallback: [:aSupergroupMembersEvent | + self addMembersFrom: (aSupergroupMembersEvent at: 'members').] + with: '#', self groupId. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMoreMembers.st b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMoreMembers.st new file mode 100644 index 000000000..0f515e08d --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/instance/loadMoreMembers.st @@ -0,0 +1,4 @@ +loading +loadMoreMembers + + self canLoadMoreMembers ifTrue: [self loadMembers]. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/methodProperties.json new file mode 100644 index 000000000..f143d003e --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + "defaultLimit" : "per 6/15/2021 08:51" }, + "instance" : { + "initializeFromChatEvent:" : "per 6/4/2021 15:08", + "isSuperGroup" : "per 6/15/2021 08:41", + "loadGeneralInfo" : "TR 6/15/2021 16:39", + "loadInfo" : "TR 6/14/2021 14:54", + "loadMembers" : "TR 6/15/2021 16:39", + "loadMoreMembers" : "per 6/15/2021 08:15" } } diff --git a/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/properties.json b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/properties.json new file mode 100644 index 000000000..4efa54ed2 --- /dev/null +++ b/packages/TelegramClient-Core.package/TCCSuperGroupChat.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "TelegramClient-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "per 6/4/2021 14:35", + "instvars" : [ + ], + "name" : "TCCSuperGroupChat", + "pools" : [ + ], + "super" : "TCCGroupChat", + "type" : "normal" } diff --git a/packages/TelegramClient-Core.package/TCCTeleClient.class/class/newForCurrentOS.st b/packages/TelegramClient-Core.package/TCCTeleClient.class/class/newForCurrentOS.st index 8112b597b..41a2726eb 100644 --- a/packages/TelegramClient-Core.package/TCCTeleClient.class/class/newForCurrentOS.st +++ b/packages/TelegramClient-Core.package/TCCTeleClient.class/class/newForCurrentOS.st @@ -1,4 +1,4 @@ instance creation newForCurrentOS - + ^ self newWithClient: TCCFFIClient newForCurrentOS \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCUser.class/class/newFrom..st b/packages/TelegramClient-Core.package/TCCUser.class/class/newFrom..st index f19e6aad6..999715657 100644 --- a/packages/TelegramClient-Core.package/TCCUser.class/class/newFrom..st +++ b/packages/TelegramClient-Core.package/TCCUser.class/class/newFrom..st @@ -1,4 +1,4 @@ -as yet unclassified +instance creation newFrom: aUserEvent ^ self new diff --git a/packages/TelegramClient-Core.package/TCCUsers.class/instance/core..st b/packages/TelegramClient-Core.package/TCCUsers.class/instance/core..st index bd19251b0..3844709d3 100644 --- a/packages/TelegramClient-Core.package/TCCUsers.class/instance/core..st +++ b/packages/TelegramClient-Core.package/TCCUsers.class/instance/core..st @@ -1,4 +1,4 @@ accessing core: aCore - core := aCore \ No newline at end of file + core := aCore. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCUsers.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCUsers.class/methodProperties.json index e7230cc68..c69c25055 100644 --- a/packages/TelegramClient-Core.package/TCCUsers.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCUsers.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "core" : "RK 5/19/2021 10:34", - "core:" : "RK 5/19/2021 10:34", - "getUserFor:" : "pk 5/30/2021 12:55", - "requestUserFor:" : "JB 6/4/2021 21:03" } } + "core:" : "TR 6/15/2021 16:52", + "getUserFor:" : "RK 5/19/2021 11:05", + "requestUserFor:" : "pk 5/21/2021 09:33" } } diff --git a/packages/TelegramClient-Core.package/TCCWindowsClient.class/class/moduleName.st b/packages/TelegramClient-Core.package/TCCWindowsClient.class/class/moduleName.st index b841d6680..ab9cd79bd 100644 --- a/packages/TelegramClient-Core.package/TCCWindowsClient.class/class/moduleName.st +++ b/packages/TelegramClient-Core.package/TCCWindowsClient.class/class/moduleName.st @@ -4,7 +4,7 @@ moduleName | filePath | filePath := FileDirectory default / self fileName. - + filePath exists ifFalse: [self downloadArchive]. ^ filePath fullName \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUButton.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUButton.class/methodProperties.json index 0cd0c1ab5..a8f7666ac 100644 --- a/packages/TelegramClient-UI.package/TCUButton.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUButton.class/methodProperties.json @@ -2,6 +2,6 @@ "class" : { }, "instance" : { - "initialize" : "js 6/13/2020 18:22", + "initialize" : "per 6/15/2021 09:07", "text" : "R.S 5/20/2020 13:56", "text:" : "N.S. 7/26/2020 15:46" } } diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addContent.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addContent.st index 2b4dcb198..2088091d0 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addContent.st +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addContent.st @@ -3,6 +3,9 @@ addContent self createContentWrapper; - addMorph: self contentWrapper. - - self chat isGroup ifTrue: [self addDescription]. \ No newline at end of file + addMorphFront: self contentWrapper. + self chat isGroup ifTrue: [ + self + addUserList; + addDescription + ]. diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addUserList.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addUserList.st new file mode 100644 index 000000000..cb6700060 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addUserList.st @@ -0,0 +1,5 @@ +drawing +addUserList + + self userList: ((TCUUserList newFrom: self chat) width: self contentWrapper width). + self contentWrapper addMorph: self userList. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/userList..st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/userList..st new file mode 100644 index 000000000..4fe29e69d --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/userList..st @@ -0,0 +1,4 @@ +accessing +userList: aTCUUserList + + userList := aTCUUserList \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/userList.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/userList.st new file mode 100644 index 000000000..c22de5d60 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/userList.st @@ -0,0 +1,4 @@ +accessing +userList + + ^ userList \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json index 2552a1b85..e78a2b5f8 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json @@ -8,21 +8,24 @@ "newFor:withBounds:" : "RS 5/29/2021 18:05" }, "instance" : { "addBackButton" : "JB 6/11/2021 15:31", - "addContent" : "RS 5/29/2021 18:12", + "addContent" : "per 6/15/2021 08:56", "addDescription" : "RS 5/29/2021 18:00", "addDescriptionText" : "JB 5/31/2021 15:05", "addInfoBar" : "RS 5/20/2021 21:28", - "addInfoText" : "JB 6/4/2021 16:36", + "addInfoText" : "RS 5/20/2021 21:22", + "addUserList" : "per 6/15/2021 08:59", "buttonBackPressed" : "RS 5/20/2021 19:48", "chat" : "RS 5/29/2021 18:46", "chat:" : "RS 5/29/2021 18:46", "contentWrapper" : "RS 5/29/2021 18:46", "contentWrapper:" : "RS 5/29/2021 18:46", - "createContentWrapper" : "JB 6/11/2021 15:31", - "createDescription" : "JB 6/11/2021 15:31", - "createInfoBar" : "JB 6/11/2021 18:35", + "createContentWrapper" : "RS 5/29/2021 18:50", + "createDescription" : "RS 5/29/2021 18:32", + "createInfoBar" : "RS 5/20/2021 21:31", "description" : "RS 5/29/2021 18:46", "description:" : "RS 5/29/2021 18:47", "infoBar" : "RS 5/20/2021 21:38", "infoBar:" : "RS 5/20/2021 21:38", - "initialize" : "RS 5/20/2021 20:39" } } + "initialize" : "RS 5/20/2021 20:39", + "userList" : "per 6/3/2021 17:27", + "userList:" : "per 6/3/2021 17:28" } } diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/properties.json b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/properties.json index 98ae6b717..dc44bb8ea 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/properties.json +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/properties.json @@ -9,7 +9,8 @@ "infoBar", "contentWrapper", "description", - "chat" ], + "chat", + "userList" ], "name" : "TCUChatInfoPage", "pools" : [ ], diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/select.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/select.st index b243bca78..b9dbf5ac9 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/select.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/select.st @@ -1,4 +1,5 @@ event handling select + self chat loadInfoIfNotLoaded. self color: TCUDefaultValues colorLightBlue. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json index 8cffce5d1..3760886e6 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json @@ -15,5 +15,5 @@ "chatID" : "rs 6/17/2020 23:05", "chatName" : "rs 6/17/2020 21:45", "deselect" : "rs 6/13/2020 09:02", - "initialize" : "JB 6/11/2021 18:35", - "select" : "rs 6/13/2020 08:49" } } + "initialize" : "r.s 7/31/2020 14:43", + "select" : "TR 6/13/2021 16:02" } } diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/scrollDown.st b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/scrollDown.st index f18559d96..f596620ca 100644 --- a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/scrollDown.st +++ b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/scrollDown.st @@ -1,5 +1,5 @@ event handling scrollDown - + self lowestVisibleMessage < 1 ifFalse: [ self showChatMessagesFrom: self lowestVisibleMessage - 1.]. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMemberCount.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMemberCount.st index 19942b0fe..74e5ccfc5 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMemberCount.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMemberCount.st @@ -6,4 +6,4 @@ addMemberCount TextMorph new contents: ('Members: ' , self selectedChat memberCount) asString; lock ) - ] \ No newline at end of file + ] diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTitleBar.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTitleBar.st index 6f524e010..9f4b2fe79 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTitleBar.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTitleBar.st @@ -1,9 +1,9 @@ drawing addTitleBar - + self createTitleBar; addMorph: self titleBar; addChatTitle. self titleBar addVariableTransparentSpacer. - self selectedChat isGroup ifTrue: [self addMemberCount.] \ No newline at end of file + self selectedChat isGroup ifTrue: [self addMemberCount.] diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st index 6194415c3..74b3dbfd3 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st @@ -13,5 +13,5 @@ createTitleBar hResizing: #spaceFill; vResizing: #shrinkWrap; cellInset: 12). - + self titleBar on: #mouseDown send: #showInfoPage to: self. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st index d75d64be8..cba7f75d9 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st @@ -1,6 +1,6 @@ event handling newChatSelected: aChat - + self welcomeMessage hide. self inputBar show. self titleBar delete. diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json index 7f1cab96f..63af455bf 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json @@ -5,7 +5,7 @@ "newWithHeight:width:" : "RS 5/20/2021 21:18" }, "instance" : { "addChatTitle" : "RS 5/20/2021 18:31", - "addHiddenInfoPage" : "JB 5/31/2021 15:11", + "addHiddenInfoPage" : "per 6/15/2021 09:02", "addInputBar" : "js 6/13/2020 17:59", "addMemberCount" : "JB 6/4/2021 21:48", "addMessageWindow" : "JB 6/11/2021 18:33", @@ -28,7 +28,7 @@ "newChatSelected:" : "RS 5/20/2021 21:18", "selectedChat" : "rs 6/13/2020 09:11", "selectedChat:" : "rs 6/13/2020 09:11", - "showInfoPage" : "RS 5/20/2021 21:13", + "showInfoPage" : "per 5/30/2021 11:51", "textInputField" : "rs 6/13/2020 10:41", "textInputField:" : "rs 6/13/2020 10:42", "titleBar" : "sp 8/2/2020 15:04", diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/createChatListItem..st b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/createChatListItem..st index 3acc0fbac..fd65d2810 100644 --- a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/createChatListItem..st +++ b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/createChatListItem..st @@ -2,9 +2,9 @@ drawing createChatListItem: aChat | item | - + item := TCUChatListItem newWithChat: aChat width: self width. (aChat = self selectedChat) ifTrue: [item select]. item on: #mouseDown send: #chatItemClicked:event:from: to: self withValue: item. - + ^ item \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st index dc901a5c3..bd9724b3d 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st @@ -6,7 +6,7 @@ addNewChatButton newChatButton := (TCUButton new text: '+ Chat'; on: #mouseUp send: #newChatButtonClicked to: self). - + newChatButton text color: Color white. newChatButton position: (self main position x + newChatButton width + (4 * self class defaultSpacing)) @ self class defaultSpacing. diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st index 5eb4318ba..d803259d6 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st @@ -2,7 +2,7 @@ initialization initialize super initialize. - + self borderWidth: 0; color: TCUDefaultValues colorGray; diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/newChatButtonClicked.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/newChatButtonClicked.st index 3c18a4e13..d9663924c 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/newChatButtonClicked.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/newChatButtonClicked.st @@ -12,7 +12,7 @@ newChatButtonClicked inputField crAction: [ self main core searchChat: inputField text. modal delete]. - + modal addMorphCentered: inputField. self main addMorphCentered: modal. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUMain.class/instance/addHeader.st b/packages/TelegramClient-UI.package/TCUMain.class/instance/addHeader.st index 7e8688fc3..658073fcd 100644 --- a/packages/TelegramClient-UI.package/TCUMain.class/instance/addHeader.st +++ b/packages/TelegramClient-UI.package/TCUMain.class/instance/addHeader.st @@ -1,6 +1,6 @@ drawing addHeader - + self header: (TCUHeaderBar newForMain: self); addMorph: self header. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/README.md b/packages/TelegramClient-UI.package/TCUUserList.class/README.md new file mode 100644 index 000000000..af8c58c11 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/README.md @@ -0,0 +1 @@ +A TCUUserList stores and shows users with a scrollBar diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/class/newFrom..st b/packages/TelegramClient-UI.package/TCUUserList.class/class/newFrom..st new file mode 100644 index 000000000..d2f6ebb66 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/class/newFrom..st @@ -0,0 +1,7 @@ +instance creation +newFrom: aChat + + ^ self basicNew + chat: aChat; + initialize; + yourself \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/addLoadButton.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addLoadButton.st new file mode 100644 index 000000000..daf4bed4d --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addLoadButton.st @@ -0,0 +1,4 @@ +drawing +addLoadButton + + self content addMorphBack: self loadButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/addNewMembers..st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addNewMembers..st new file mode 100644 index 000000000..1ac126063 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addNewMembers..st @@ -0,0 +1,9 @@ +drawing +addNewMembers: aUserCollection + + | lastSeenUser | + self content removeMorph: self loadButton. + lastSeenUser := self content submorphs last. + aUserCollection do: [:aUser | self addUserBack: aUser]. + self chat canLoadMoreMembers ifTrue: [self addLoadButton]. + self scrollToShow: lastSeenUser. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/addUserBack..st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addUserBack..st new file mode 100644 index 000000000..d3ccce882 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addUserBack..st @@ -0,0 +1,6 @@ +drawing +addUserBack: aUser + + self content addMorphBack: (TextMorph new + contents: aUser fullName; + lock). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/addUsers.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addUsers.st new file mode 100644 index 000000000..326a75fa9 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/addUsers.st @@ -0,0 +1,7 @@ +initialization +addUsers + + self chat members do: [:aUser| + self addUserBack: aUser. + ]. + self chat canLoadMoreMembers ifTrue: [self addLoadButton]. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/chat..st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/chat..st new file mode 100644 index 000000000..de02cfb96 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/chat..st @@ -0,0 +1,4 @@ +accessing +chat: aChat + + chat := aChat \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/chat.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/chat.st new file mode 100644 index 000000000..207f37ad7 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/chat.st @@ -0,0 +1,4 @@ +accessing +chat + + ^ chat \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/content..st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/content..st new file mode 100644 index 000000000..7f2f6b5af --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/content..st @@ -0,0 +1,4 @@ +accessing +content: aMorph + + content := aMorph. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/content.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/content.st new file mode 100644 index 000000000..a5f2cf173 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/content.st @@ -0,0 +1,4 @@ +accessing +content + + ^ content \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/createUserListButton.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/createUserListButton.st new file mode 100644 index 000000000..a0977a57f --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/createUserListButton.st @@ -0,0 +1,8 @@ +initialization +createUserListButton + + ^ TCUButton new + text: 'more...'; + on: #mouseDown send: #loadMoreMembers to: self chat; + name: 'userLoadButton'; + yourself \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/initialize.st new file mode 100644 index 000000000..1ead53f63 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/initialize.st @@ -0,0 +1,7 @@ +initialization +initialize + + super initialize. + self initializeContent. + self loadButton: self createUserListButton. + self addUsers. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/initializeContent.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/initializeContent.st new file mode 100644 index 000000000..bc13ed69a --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/initializeContent.st @@ -0,0 +1,8 @@ +initialization +initializeContent + + self content: (Morph new + layoutPolicy: TableLayout new; + listDirection: #topToBottom; + color: Color white). + self scroller addMorph: self content. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/loadButton..st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/loadButton..st new file mode 100644 index 000000000..b1b4338fd --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/loadButton..st @@ -0,0 +1,4 @@ +accessing +loadButton: aButtonMorph + + loadButton := aButtonMorph \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/instance/loadButton.st b/packages/TelegramClient-UI.package/TCUUserList.class/instance/loadButton.st new file mode 100644 index 000000000..5e7176371 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/instance/loadButton.st @@ -0,0 +1,4 @@ +accessing +loadButton + + ^ loadButton \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUUserList.class/methodProperties.json new file mode 100644 index 000000000..ddaec6fa7 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/methodProperties.json @@ -0,0 +1,17 @@ +{ + "class" : { + "newFrom:" : "TR 6/4/2021 16:47" }, + "instance" : { + "addLoadButton" : "per 6/15/2021 09:06", + "addNewMembers:" : "TR 6/15/2021 16:40", + "addUserBack:" : "TR 6/15/2021 16:41", + "addUsers" : "per 6/15/2021 09:12", + "chat" : "TR 6/4/2021 16:39", + "chat:" : "TR 6/4/2021 16:40", + "content" : "per 6/3/2021 17:20", + "content:" : "per 6/3/2021 17:21", + "createUserListButton" : "per 6/15/2021 09:07", + "initialize" : "per 6/15/2021 09:45", + "initializeContent" : "per 6/15/2021 09:11", + "loadButton" : "per 6/3/2021 17:20", + "loadButton:" : "per 6/3/2021 17:21" } } diff --git a/packages/TelegramClient-UI.package/TCUUserList.class/properties.json b/packages/TelegramClient-UI.package/TCUUserList.class/properties.json new file mode 100644 index 000000000..8cfcd0ce3 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUUserList.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "TelegramClient-UI", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "per 6/3/2021 17:49", + "instvars" : [ + "content", + "loadButton", + "chat" ], + "name" : "TCUUserList", + "pools" : [ + ], + "super" : "ScrollPane", + "type" : "normal" } diff --git a/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testExtraAPIAttribute.st b/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testExtraAPIAttribute.st index 34360361f..59fbd9ff6 100644 --- a/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testExtraAPIAttribute.st +++ b/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testExtraAPIAttribute.st @@ -6,6 +6,6 @@ testExtraAPIAttribute event := nil. self sharedCore pendingRequests at: callbackID put: [:anEvent | event := anEvent]. self sharedCore client send: (TCCRequest newWithType: 'getMe' from: {'@extra' -> callbackID}). - + self waitUntil: [event notNil]. self assert: callbackID equals: (event at: '@extra') \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testMessageSending.st b/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testMessageSending.st index 0911270f5..626b34a5b 100644 --- a/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testMessageSending.st +++ b/packages/TelegramClientTests-Core.package/TCTCAPITests.class/instance/testMessageSending.st @@ -2,11 +2,11 @@ testing testMessageSending | testChatId testChatMessages | - + "Choose any writable chat. The Telegram Test Data Center 'periodically wipe[s] all information stored. See TCTTestCore." self waitUntil: [self sharedCore chats anySatisfy: [:c | c canSendMessages]]. testChatId := (self sharedCore chats detect: [:chat | chat canSendMessages]) id. - + self sharedCore sendMessage: 'TestMessage' to: testChatId. 5 seconds wait. testChatMessages := (self sharedCore chats getChat: testChatId) messages. diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/setUp.st b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/setUp.st index 098d76f9e..8e861c863 100644 --- a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/setUp.st +++ b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/setUp.st @@ -4,7 +4,7 @@ setUp self chat: (TCCChat new id: 1337; yourself). - + 1 to: 5 do: [:aNumber | self chat messages add: (TCCMessage new message: aNumber asString; diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessage.st b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessage.st index 8923397c7..71232497a 100644 --- a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessage.st +++ b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessage.st @@ -3,8 +3,8 @@ testMessage | message | message := TCCMessage newFromMessageEvent: (TCTMMocks mockMessageJsonFrom: self chat id) in: self chat with: nil. - - self assert: TCTMMocks mockUser id equals: message senderID. + + self assert: TCTMMocks mockUser1 id equals: message senderID. self assert: TCTMMocks mockMessageID equals: message id. self assert: TCTMMocks mockMessageText equals: message message. self assert: '1557' equals: message date asUTC asTime hhmm24. diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessages.st b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessages.st index 023abcf5c..cbf914e49 100644 --- a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessages.st +++ b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testMessages.st @@ -2,7 +2,7 @@ testing testMessages | collection | - + collection := OrderedCollection newFrom: {TCCMessage new. TCCMessage new}. self chat messages: collection. diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testStillRequestedMessages.st b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testStillRequestedMessages.st index 0768a429a..eda441857 100644 --- a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testStillRequestedMessages.st +++ b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testStillRequestedMessages.st @@ -2,11 +2,11 @@ testing testStillRequestedMessages self chat numberOfRequestedMessages: 10. - + self assert: 5 equals: self chat stillRequestedMessages. - + self chat requestMessages: 20. self assert: 20 equals: self chat stillRequestedMessages. - + self chat addOldestMessage: TCCMessage new. self assert: 19 equals: self chat stillRequestedMessages. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testWaitingForUpdate.st b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testWaitingForUpdate.st index 4430d08c0..c6de3475a 100644 --- a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testWaitingForUpdate.st +++ b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/instance/testWaitingForUpdate.st @@ -3,12 +3,12 @@ testWaitingForUpdate | marker | self assert: self chat waitingForUpdate not. - + marker := false. self chat ifNotWaitingForUpdate: [marker := true]. self assert: marker. self assert: self chat waitingForUpdate. - + marker := false. self chat ifNotWaitingForUpdate: [marker := true]. self assert: marker not. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/methodProperties.json index acbcbde79..aa0fd7de5 100644 --- a/packages/TelegramClientTests-Core.package/TCTCChatTests.class/methodProperties.json +++ b/packages/TelegramClientTests-Core.package/TCTCChatTests.class/methodProperties.json @@ -9,7 +9,7 @@ "testAddOldestMessage" : "per 5/21/2021 16:32", "testID" : "per 5/21/2021 16:32", "testLastMessage" : "per 5/21/2021 16:31", - "testMessage" : "pk 6/11/2021 10:35", + "testMessage" : "TR 6/13/2021 14:48", "testMessages" : "per 5/21/2021 16:30", "testMessagesSize" : "per 5/21/2021 16:30", "testNullID" : "js 8/2/2020 21:15", diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/core..st b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/core..st index bd19251b0..3844709d3 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/core..st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/core..st @@ -1,4 +1,4 @@ accessing core: aCore - core := aCore \ No newline at end of file + core := aCore. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedIn.st b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedIn.st index fc4323e67..7286e8c42 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedIn.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedIn.st @@ -1,8 +1,8 @@ controlling ensureLoggedIn - + self core client isAlive ifFalse: [ self setUp. ]. - + self core authHandler isAuthorizationStateReady ifFalse: [ self core loginWithTestData. [self core authHandler isAuthorizationStateReady] diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedOut.st b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedOut.st index 9e38fd5c6..2091a306b 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedOut.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/ensureLoggedOut.st @@ -1,6 +1,6 @@ controlling ensureLoggedOut - + self core authHandler isAuthStateClosed ifFalse: [ self core authHandler logout. [self core authHandler isAuthStateClosed] diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/setUp.st b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/setUp.st index 59b4fcb59..e299a9f5f 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/setUp.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/setUp.st @@ -1,6 +1,6 @@ -running +controlling setUp - + self core: TCTCTestCore new. 3 seconds wait. self ensureLoggedIn. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/tearDown.st b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/tearDown.st index e407cc80d..ab7f15719 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/tearDown.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/instance/tearDown.st @@ -1,4 +1,4 @@ -running +controlling tearDown - self core freeClient. \ No newline at end of file + self core freeClient \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/methodProperties.json index ddba7279f..b7750cd9e 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/methodProperties.json +++ b/packages/TelegramClientTests-Core.package/TCTCCoreResource.class/methodProperties.json @@ -2,9 +2,9 @@ "class" : { }, "instance" : { - "core" : "JB 6/7/2021 09:09", - "core:" : "JB 6/7/2021 09:09", + "core" : "TR 6/13/2021 15:03", + "core:" : "TR 6/13/2021 14:53", "ensureLoggedIn" : "RS 6/5/2021 17:58", "ensureLoggedOut" : "RS 6/5/2021 17:53", - "setUp" : "JB 6/7/2021 09:27", - "tearDown" : "JB 6/7/2021 11:18" } } + "setUp" : "per 6/10/2021 20:58", + "tearDown" : "per 6/15/2021 08:17" } } diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/partialGroupMembersTestFor..st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/partialGroupMembersTestFor..st new file mode 100644 index 000000000..b61e0f162 --- /dev/null +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/partialGroupMembersTestFor..st @@ -0,0 +1,11 @@ +testing +partialGroupMembersTestFor: aChat + + self core users: TCTMMocks mockUserPromises. + aChat core: self core. + aChat loadInfo. + 1 seconds wait. + self assert: (aChat members allSatisfy: [:member | + ((TCTMMocks mockUser1 id = member id) or: [TCTMMocks mockUser2 id = member id]). + ]). + self assert: 2 equals: aChat members size. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testAuthHandler.st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testAuthHandler.st index b0131daed..9642d780f 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testAuthHandler.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testAuthHandler.st @@ -4,5 +4,5 @@ testAuthHandler | authHandler | authHandler := TCCAuthHandler new. self core authHandler: authHandler. - + self assert: authHandler equals: (self core authHandler). \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testBasicGroupMembers.st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testBasicGroupMembers.st new file mode 100644 index 000000000..d81a77811 --- /dev/null +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testBasicGroupMembers.st @@ -0,0 +1,8 @@ +testing +testBasicGroupMembers + + | basicGroupChat | + self mockTeleClient onRequestType: 'getBasicGroupFullInfo' respond: TCTMMocks mockBasicGroupFullInfoJson. + basicGroupChat := TCTMMocks mockUnloadedBasicGroupChat. + + self partialGroupMembersTestFor: basicGroupChat \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testChatsHandler.st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testChatsHandler.st index fea18833e..fa61cadb4 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testChatsHandler.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testChatsHandler.st @@ -4,5 +4,5 @@ testChatsHandler | chatsHandler | chatsHandler := TCCChatsHandler new. self core chatsHandler: chatsHandler. - + self assert: chatsHandler equals: (self core chatsHandler). \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testLoggedInUserID.st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testLoggedInUserID.st index 350db0321..81ac975d3 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testLoggedInUserID.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testLoggedInUserID.st @@ -1,9 +1,9 @@ testing testLoggedInUserID - self mockTeleClient onRequestType: 'getMe' respond: TCTMMocks mockUserJson. + self mockTeleClient onRequestType: 'getMe' respond: TCTMMocks mockUserJson1. self mockTeleClient logIn. - + 1 seconds wait. - - self assert: TCTMMocks mockUser id equals: (self core loggedInUserID). \ No newline at end of file + + self assert: TCTMMocks mockUser1 id equals: (self core loggedInUserID). \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testMessageSenderTriggersUserRequest.st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testMessageSenderTriggersUserRequest.st index ff986d0e3..a8e037c91 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testMessageSenderTriggersUserRequest.st +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testMessageSenderTriggersUserRequest.st @@ -4,17 +4,17 @@ testMessageSenderTriggersUserRequest | messageEvent userJson | self core when: #newMessageReceived send: #newMessageReceived: to: self. self core chats add: TCTMMocks mockPrivateChat. - + self receivedMessage: nil. messageEvent := TCTMMocks mockMessageEventFrom: TCTMMocks mockPrivateChat id. self core handleEvent: messageEvent. 1 seconds wait. - - userJson := TCTMMocks mockUserJson. + + userJson := TCTMMocks mockUserJson1. self core client onRequestType: 'getUser' respond: userJson. self assert: self receivedMessage notNil. - self assert: TCTMMocks mockUser fullName equals: self receivedMessage sender fullName. + self assert: TCTMMocks mockUser1 fullName equals: self receivedMessage sender fullName. self assert: TCTMMocks mockPrivateChat id equals: self receivedMessage chat id. self assert: TCTMMocks mockMessageText equals: self receivedMessage message. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testSuperGroupMembers.st b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testSuperGroupMembers.st new file mode 100644 index 000000000..847a06e66 --- /dev/null +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/instance/testSuperGroupMembers.st @@ -0,0 +1,8 @@ +testing +testSuperGroupMembers + + | superGroupChat | + self mockTeleClient onRequestType: 'getSupergroupMembers' respond: TCTMMocks mockSupergroupMembersJson. + superGroupChat := TCTMMocks mockUnloadedSuperGroupChat. + + self partialGroupMembersTestFor: superGroupChat \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json index ddc186c4f..2019d238d 100644 --- a/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json +++ b/packages/TelegramClientTests-Core.package/TCTCCoreTests.class/methodProperties.json @@ -3,12 +3,15 @@ }, "instance" : { "newMessageReceived:" : "pk 5/17/2021 19:20", + "partialGroupMembersTestFor:" : "TR 6/13/2021 15:19", "receivedMessage" : "TR 6/2/2021 15:46", "receivedMessage:" : "TR 6/2/2021 15:47", "testAuthConstants" : "js 8/2/2020 22:54", "testAuthHandler" : "per 5/21/2021 16:28", + "testBasicGroupMembers" : "per 6/10/2021 20:47", "testCallback" : "per 5/21/2021 16:28", "testChatsHandler" : "per 5/21/2021 16:28", "testErrorConstants" : "js 8/2/2020 21:23", - "testLoggedInUserID" : "JB 6/7/2021 09:28", - "testMessageSenderTriggersUserRequest" : "JB 6/13/2021 10:49" } } + "testLoggedInUserID" : "TR 6/13/2021 14:48", + "testMessageSenderTriggersUserRequest" : "TR 6/13/2021 15:50", + "testSuperGroupMembers" : "per 6/10/2021 20:53" } } diff --git a/packages/TelegramClientTests-Core.package/TCTCEventTests.class/instance/testType.st b/packages/TelegramClientTests-Core.package/TCTCEventTests.class/instance/testType.st index 994e1f731..e5404e9d9 100644 --- a/packages/TelegramClientTests-Core.package/TCTCEventTests.class/instance/testType.st +++ b/packages/TelegramClientTests-Core.package/TCTCEventTests.class/instance/testType.st @@ -2,8 +2,8 @@ testing testType | event | - + event := TCCEvent newFromTDLibEvent: (Dictionary newFrom: {'@type' -> 'authentication'. 'code' -> 200}). - + self assert: 'authentication' equals: event type. self assert: (event includesKey: 'type') not. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCMockFFIClient.class/instance/setLogLevel..st b/packages/TelegramClientTests-Core.package/TCTCMockFFIClient.class/instance/setLogLevel..st index cd9f17390..b800d9f19 100644 --- a/packages/TelegramClientTests-Core.package/TCTCMockFFIClient.class/instance/setLogLevel..st +++ b/packages/TelegramClientTests-Core.package/TCTCMockFFIClient.class/instance/setLogLevel..st @@ -1,4 +1,4 @@ external calls setLogLevel: aLogLevel - + "avoid making call to library" \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/core..st b/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/core..st index bd19251b0..3844709d3 100644 --- a/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/core..st +++ b/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/core..st @@ -1,4 +1,4 @@ accessing core: aCore - core := aCore \ No newline at end of file + core := aCore. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/setUp.st b/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/setUp.st index 7129f9c19..a430215de 100644 --- a/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/setUp.st +++ b/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/instance/setUp.st @@ -1,4 +1,4 @@ running setUp - + self core: (TCCCore newWithTeleClient: TCTMMockTeleClient new). \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/methodProperties.json index e18938607..a12bec3ec 100644 --- a/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/methodProperties.json +++ b/packages/TelegramClientTests-Core.package/TCTCNoTdlibTestCase.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "core" : "JB 6/7/2021 09:14", - "core:" : "JB 6/7/2021 09:14", + "core" : "TR 6/13/2021 15:00", + "core:" : "TR 6/13/2021 14:54", "mockTeleClient" : "RS 6/6/2021 11:28", - "setUp" : "JB 6/7/2021 11:36" } } + "setUp" : "per 6/15/2021 08:23" } } diff --git a/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/class/resources.st b/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/class/resources.st index 803cad596..00c2f7d5b 100644 --- a/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/class/resources.st +++ b/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/class/resources.st @@ -1,4 +1,4 @@ as yet unclassified resources - + ^ { TCTCCoreResource } \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/instance/defaultTimeout.st b/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/instance/defaultTimeout.st index a501e67ed..94ecda1d5 100644 --- a/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/instance/defaultTimeout.st +++ b/packages/TelegramClientTests-Core.package/TCTCTdlibTestCase.class/instance/defaultTimeout.st @@ -1,4 +1,4 @@ accessing defaultTimeout - + ^ 50 \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCTestCore.class/instance/loginWithTestData.st b/packages/TelegramClientTests-Core.package/TCTCTestCore.class/instance/loginWithTestData.st index aafd5faee..ae0e1b9a5 100644 --- a/packages/TelegramClientTests-Core.package/TCTCTestCore.class/instance/loginWithTestData.st +++ b/packages/TelegramClientTests-Core.package/TCTCTestCore.class/instance/loginWithTestData.st @@ -3,11 +3,11 @@ loginWithTestData "See https://core.telegram.org/api/auth#test-phone-numbers. Choose random numbers to bypass flood limits." | phoneNumber testX testYYYY | - + testX := $1. "($1 to: $3) atRandom" testYYYY := '1234'. "((1 to: 4) collect: [:i | ($0 to: $9) atRandom]) join" phoneNumber := '99966' , testX , testYYYY. - + self authHandler sendPhoneNumber: phoneNumber. 2 seconds wait. self checkAuthenticationCode: (String new: 6 withAll: testX). \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserConstructor.st b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserConstructor.st index 2ff300c9a..2566ab21b 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserConstructor.st +++ b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserConstructor.st @@ -4,7 +4,7 @@ testUserConstructor | user | user := TCCUser newFrom: TCTMMocks mockUserEvent. - self assert: TCTMMocks mockUser firstName equals: user firstName. - self assert: TCTMMocks mockUser lastName equals: user lastName. - self assert: TCTMMocks mockUser username equals: user username. - self assert: TCTMMocks mockUser fullName equals: user fullName. + self assert: TCTMMocks mockUser1 firstName equals: user firstName. + self assert: TCTMMocks mockUser1 lastName equals: user lastName. + self assert: TCTMMocks mockUser1 username equals: user username. + self assert: TCTMMocks mockUser1 fullName equals: user fullName. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserEquality.st b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserEquality.st index 291ea9d5c..f856a1819 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserEquality.st +++ b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserEquality.st @@ -2,7 +2,7 @@ testing testUserEquality | user1 user2 | - user1 := TCTMMocks mockUser. - user2 := TCTMMocks mockUser. + user1 := TCTMMocks mockUser1. + user2 := TCTMMocks mockUser1. self assert: user1 equals: user2. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserHash.st b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserHash.st index fe24be645..2615bce3b 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserHash.st +++ b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserHash.st @@ -2,7 +2,7 @@ testing testUserHash | user1 user2 | - user1 := TCTMMocks mockUser. - user2 := TCTMMocks mockUser. + user1 := TCTMMocks mockUser1. + user2 := TCTMMocks mockUser1. self assert: user1 hash equals: user2 hash. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserInequality.st b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserInequality.st index ac0bef95f..f167301d6 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserInequality.st +++ b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/instance/testUserInequality.st @@ -2,8 +2,8 @@ testing testUserInequality | user1 user2 | - user1 := TCTMMocks mockUser. - user2 := TCTMMocks mockUser. + user1 := TCTMMocks mockUser1. + user2 := TCTMMocks mockUser1. user2 id: user2 id + 1. self deny: user1 = user2. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/methodProperties.json index df77e1e3b..c374c491e 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUserTest.class/methodProperties.json +++ b/packages/TelegramClientTests-Core.package/TCTCUserTest.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "testUserConstructor" : "JB 6/10/2021 22:44", - "testUserEquality" : "pk 6/13/2021 11:12", - "testUserHash" : "pk 6/13/2021 11:13", - "testUserInequality" : "pk 6/13/2021 11:13" } } + "testUserConstructor" : "TR 6/13/2021 14:47", + "testUserEquality" : "TR 6/13/2021 15:50", + "testUserHash" : "TR 6/13/2021 15:49", + "testUserInequality" : "TR 6/13/2021 15:49" } } diff --git a/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/instance/testGetUserFor.st b/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/instance/testGetUserFor.st index 21481ac12..b42025368 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/instance/testGetUserFor.st +++ b/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/instance/testGetUserFor.st @@ -3,13 +3,13 @@ testGetUserFor | user | user := nil. - - self mockTeleClient onRequestType: 'getUser' respond: TCTMMocks mockUserJson. - - [user := self core users getUserFor: TCTMMocks mockUser id.] fork. + + self mockTeleClient onRequestType: 'getUser' respond: TCTMMocks mockUserJson1. + + [user := self core users getUserFor: TCTMMocks mockUser1 id.] fork. 1 seconds wait. - self assert: TCTMMocks mockUser id equals: user id. - self assert: TCTMMocks mockUser firstName equals: user firstName. - self assert: TCTMMocks mockUser lastName equals: user lastName. - self assert: TCTMMocks mockUser username equals: user username. \ No newline at end of file + self assert: TCTMMocks mockUser1 id equals: user id. + self assert: TCTMMocks mockUser1 firstName equals: user firstName. + self assert: TCTMMocks mockUser1 lastName equals: user lastName. + self assert: TCTMMocks mockUser1 username equals: user username. \ No newline at end of file diff --git a/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/methodProperties.json b/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/methodProperties.json index 324c2f931..1eb4a3717 100644 --- a/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/methodProperties.json +++ b/packages/TelegramClientTests-Core.package/TCTCUsersTests.class/methodProperties.json @@ -2,4 +2,4 @@ "class" : { }, "instance" : { - "testGetUserFor" : "JB 6/7/2021 09:28" } } + "testGetUserFor" : "TR 6/13/2021 14:47" } } diff --git a/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testCorrectClassPrefix.st b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testCorrectClassPrefix.st index 7bf16b4d3..5a5bb8476 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testCorrectClassPrefix.st +++ b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testCorrectClassPrefix.st @@ -7,12 +7,12 @@ testCorrectClassPrefix (aClass class category endsWith: 'Client-UI') ifTrue: [self assert: (aClass class name beginsWith: 'TCU')]. - + (aClass class category endsWith: 'Tests-Core') ifTrue: [self assert: (aClass class name beginsWith: 'TCTC')]. - + (aClass class category endsWith: 'Tests-UI') ifTrue: [self assert: (aClass class name beginsWith: 'TCTU')]. - + (aClass class category endsWith: 'Tests-Misc') ifTrue: [self assert: (aClass class name beginsWith: 'TCTM')]]. \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/appendResponsesToRequest..st b/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/appendResponsesToRequest..st index 87fc3a67f..110777a6d 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/appendResponsesToRequest..st +++ b/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/appendResponsesToRequest..st @@ -5,5 +5,5 @@ appendResponsesToRequest: aRequest responses := self requestResponses at: (aRequest at: '@type') ifAbsent: [{}]. (aRequest includesKey: '@extra') ifTrue: [self addExtraAttribute: (aRequest at: '@extra') to: responses]. - + self responseQueue addAll: responses. \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/send..st b/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/send..st index 84fc416ce..ab8d4c4cc 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/send..st +++ b/packages/TelegramClientTests-Misc.package/TCTMMockTeleClient.class/instance/send..st @@ -1,4 +1,4 @@ library calls send: aRequest - + self appendResponsesToRequest: aRequest. \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupChat.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupChat.st index 77d4da8cf..73c5ba7fc 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupChat.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupChat.st @@ -1,11 +1,9 @@ chat mockBasicGroupChat - ^ TCCGroup new - id: 2; - title: 'GroupMockChat'; - type: 'chatTypeBasicGroup'; - lastMessage: 'lastBasicGroupMessage'; - canSendMessages: true; - memberCount: 5; - description: 'basic group description' \ No newline at end of file + ^ self mockUnloadedBasicGroupChat + memberCount: self mockUsers size; + description: 'basic group description'; + members: self mockUsers; + infoLoaded: true; + yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupFullInfoJson.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupFullInfoJson.st new file mode 100644 index 000000000..a8bb172f6 --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockBasicGroupFullInfoJson.st @@ -0,0 +1,8 @@ +user +mockBasicGroupFullInfoJson + + ^ JsonObject newFrom: { + '@type' -> 'basicGroupFullInfo'. + 'description' -> 'some description'. + 'members' -> self mockMembers + } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockCore.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockCore.st index 014399b50..386981d0a 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockCore.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockCore.st @@ -2,5 +2,5 @@ core mockCore ^ (TCCCore newWithTeleClient: TCTMMockTeleClient new) - users: self mockUsers; + users: self mockUserPromises; yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMembers.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMembers.st new file mode 100644 index 000000000..ac60edfb4 --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMembers.st @@ -0,0 +1,7 @@ +user +mockMembers + + ^ { + JsonObject newFrom: {'user_id'->self mockUser1 id}. + JsonObject newFrom: {'user_id'->self mockUser2 id} + } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessage.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessage.st index 0e8a1c78a..af863fb18 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessage.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessage.st @@ -1,4 +1,4 @@ message mockMessage - ^ self mockMessageWith: self mockCore + ^ self mockMessageWith: self mockCore \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageEventFrom..st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageEventFrom..st index e69953d8c..34d9ff4e2 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageEventFrom..st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageEventFrom..st @@ -1,6 +1,6 @@ message mockMessageEventFrom: aChatId - + ^ TCCEvent newFromTDLibEvent: (Dictionary newFrom: { '@type' -> 'updateNewMessage'. 'message' -> (self mockMessageJsonFrom: aChatId). diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageJsonFrom..st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageJsonFrom..st index c761f9cf8..8c0c5974c 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageJsonFrom..st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockMessageJsonFrom..st @@ -1,13 +1,13 @@ message mockMessageJsonFrom: aChatId - + ^ (JsonObject newFrom: { '@type' -> 'message'. 'id' -> self mockMessageID. 'chat_id' -> aChatId. 'sender' -> (JsonObject newFrom: { '@type' -> 'messageSenderUser'. - 'user_id' -> self mockUser id + 'user_id' -> self mockUser1 id }). 'content' -> (JsonObject newFrom: { '@type' -> 'messageText'. diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockPrivateChat.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockPrivateChat.st index 9346a57a7..452439a72 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockPrivateChat.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockPrivateChat.st @@ -1,9 +1,11 @@ chat mockPrivateChat - ^ TCCChat new + ^ TCCPrivateChat new id: 1; title: 'PrivateMockChat'; type: 'chatTypePrivate'; lastMessage: 'lastPrivateMessage'; - canSendMessages: true \ No newline at end of file + canSendMessages: true; + infoLoaded: true; + yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupChat.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupChat.st index e5541f4c0..04817dbb9 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupChat.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupChat.st @@ -1,11 +1,9 @@ chat mockSupergroupChat - ^ TCCGroup new - id: 3; - title: 'SupergroupMockChat'; - type: 'chatTypeSupergroup'; - lastMessage: 'lastSupergroupMessage'; - canSendMessages: true; - memberCount: 8972981; - description: 'a very great super group description $$123' \ No newline at end of file + ^ self mockUnloadedSuperGroupChat + memberCount: self mockUsers size; + description: 'a very great super group description $$123'; + members: self mockUsers; + infoLoaded: true; + yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupMembersJson.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupMembersJson.st new file mode 100644 index 000000000..b0a41300d --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockSupergroupMembersJson.st @@ -0,0 +1,8 @@ +user +mockSupergroupMembersJson + + ^ JsonObject newFrom: { + '@type' -> 'supergroupFullInfo'. + 'total_count'-> self mockMembers size. + 'members' -> self mockMembers + } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUnloadedBasicGroupChat.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUnloadedBasicGroupChat.st new file mode 100644 index 000000000..6ba324a4f --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUnloadedBasicGroupChat.st @@ -0,0 +1,11 @@ +chat +mockUnloadedBasicGroupChat + + ^ TCCBasicGroupChat new + id: -2; + groupId: 2; + title: 'GroupMockChat'; + type: 'chatTypeBasicGroup'; + lastMessage: 'lastBasicGroupMessage'; + canSendMessages: true; + yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUnloadedSuperGroupChat.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUnloadedSuperGroupChat.st new file mode 100644 index 000000000..48efaeebb --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUnloadedSuperGroupChat.st @@ -0,0 +1,10 @@ +chat +mockUnloadedSuperGroupChat + + ^ TCCSuperGroupChat new + id: 3; + title: 'SupergroupMockChat'; + type: 'chatTypeSupergroup'; + lastMessage: 'lastSupergroupMessage'; + canSendMessages: true; + yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser1.st similarity index 91% rename from packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser.st rename to packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser1.st index 6ca5bf754..e43e26fdb 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser1.st @@ -1,5 +1,5 @@ user -mockUser +mockUser1 ^ TCCUser new firstName: 'Test'; diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser2.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser2.st new file mode 100644 index 000000000..fece756f1 --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUser2.st @@ -0,0 +1,9 @@ +user +mockUser2 + + ^ TCCUser new + firstName: 'Tom'; + lastName: 'Tiger'; + username: 'Tomtigerttoll'; + id: 1673511735; + yourself \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserEvent.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserEvent.st index 6b3b8bdb3..c4b6d3572 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserEvent.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserEvent.st @@ -1,4 +1,4 @@ user mockUserEvent - ^ TCCEvent newFromTDLibEvent: self mockUserJson \ No newline at end of file + ^ TCCEvent newFromTDLibEvent: self mockUserJson1 \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson.st deleted file mode 100644 index c11358d63..000000000 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson.st +++ /dev/null @@ -1,11 +0,0 @@ -user -mockUserJson - - ^ JsonObject newFrom: { - '@type' -> 'user'. - 'id' -> self mockUser id. - 'first_name' -> self mockUser firstName. - 'last_name' -> self mockUser lastName. - 'username' -> self mockUser username. - '@extra' -> self mockUser id asString - } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson1.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson1.st new file mode 100644 index 000000000..34318d120 --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson1.st @@ -0,0 +1,11 @@ +user +mockUserJson1 + + ^ JsonObject newFrom: { + '@type' -> 'user'. + 'id' -> self mockUser1 id. + 'first_name' -> self mockUser1 firstName. + 'last_name' -> self mockUser1 lastName. + 'username' -> self mockUser1 username. + '@extra' -> self mockUser1 id asString + } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson2.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson2.st new file mode 100644 index 000000000..877f079de --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserJson2.st @@ -0,0 +1,11 @@ +user +mockUserJson2 + + ^ JsonObject newFrom: { + '@type' -> 'user'. + 'id' -> self mockUser2 id. + 'first_name' -> self mockUser2 firstName. + 'last_name' -> self mockUser2 lastName. + 'username' -> self mockUser2 username. + '@extra' -> self mockUser2 id asString + } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserPromises.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserPromises.st new file mode 100644 index 000000000..2f5846879 --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUserPromises.st @@ -0,0 +1,7 @@ +user +mockUserPromises + + ^ TCCUsers newFrom: { + self mockUser1 id -> (Promise new resolveWith: self mockUser1). + self mockUser2 id -> (Promise new resolveWith: self mockUser2) + } \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUsers.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUsers.st index 1c6489f73..df9232001 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUsers.st +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockUsers.st @@ -1,9 +1,4 @@ user mockUsers - | promise users | - promise := Promise new. - promise resolveWith: (TCCUser newFrom: self mockUserEvent). - users := TCCUsers new. - users at: self mockUser id put: promise. - ^ users \ No newline at end of file + ^ {self mockUser1 . self mockUser2} \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json index 938f9cabc..3d3131007 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json +++ b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json @@ -1,20 +1,28 @@ { "class" : { - "mockBasicGroupChat" : "JB 6/10/2021 22:46", - "mockChats" : "JB 6/10/2021 22:52", - "mockCore" : "pk 6/13/2021 12:59", - "mockMessage" : "pk 6/13/2021 13:02", + "mockBasicGroupChat" : "per 6/15/2021 09:16", + "mockBasicGroupFullInfoJson" : "per 6/10/2021 19:41", + "mockChats" : "TR 5/27/2021 19:55", + "mockCore" : "TR 6/13/2021 15:45", + "mockMembers" : "per 6/15/2021 08:25", + "mockMessage" : "per 6/10/2021 19:30", "mockMessageDate" : "RS 6/6/2021 11:42", "mockMessageEventFrom:" : "RS 5/23/2021 17:56", "mockMessageID" : "pk 5/19/2021 11:36", - "mockMessageJsonFrom:" : "RS 6/6/2021 12:05", + "mockMessageJsonFrom:" : "per 6/10/2021 19:30", "mockMessageText" : "pk 5/19/2021 11:38", - "mockMessageWith:" : "pk 6/13/2021 13:07", - "mockPrivateChat" : "JB 6/10/2021 22:47", - "mockSupergroupChat" : "JB 6/10/2021 22:46", - "mockUser" : "RS 6/6/2021 12:05", - "mockUserEvent" : "RS 6/6/2021 12:36", - "mockUserJson" : "JB 6/7/2021 09:22", - "mockUsers" : "JB 6/13/2021 10:42" }, + "mockMessageWith:" : "6/13/2021 15:37:31", + "mockPrivateChat" : "per 6/15/2021 09:15", + "mockSupergroupChat" : "per 6/15/2021 09:16", + "mockSupergroupMembersJson" : "per 6/10/2021 20:53", + "mockUnloadedBasicGroupChat" : "per 6/15/2021 09:16", + "mockUnloadedSuperGroupChat" : "per 6/15/2021 09:16", + "mockUser1" : "TR 6/13/2021 15:03", + "mockUser2" : "per 6/10/2021 19:31", + "mockUserEvent" : "per 6/10/2021 19:30", + "mockUserJson1" : "per 6/10/2021 19:43", + "mockUserJson2" : "per 6/10/2021 19:29", + "mockUserPromises" : "per 6/15/2021 09:21", + "mockUsers" : "TR 6/13/2021 15:15" }, "instance" : { } } diff --git a/packages/TelegramClientTests-Misc.package/TCTMSarFileGenerator.class/instance/streamForPackage.inZip..st b/packages/TelegramClientTests-Misc.package/TCTMSarFileGenerator.class/instance/streamForPackage.inZip..st index 0cbc45d0c..8363ebfee 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMSarFileGenerator.class/instance/streamForPackage.inZip..st +++ b/packages/TelegramClientTests-Misc.package/TCTMSarFileGenerator.class/instance/streamForPackage.inZip..st @@ -2,7 +2,7 @@ helpers streamForPackage: aPackage inZip: aZip | mczStream workingCopy version | - + mczStream := RWBinaryOrTextStream on: (String new: 10000). workingCopy := MCWorkingCopy forPackage: (MCPackage new name: aPackage). version := self versionForWorkingCopy: workingCopy. diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openAnyChatWith..st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openAnyChatWith..st new file mode 100644 index 000000000..75505e26d --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openAnyChatWith..st @@ -0,0 +1,9 @@ +navigating +openAnyChatWith: aSymbol + + | chat | + + self waitUntil: [self core chats anySatisfy: [:c | c perform: aSymbol]]. + chat := self core chats detect: [:aChat | aChat perform: aSymbol]. + + self openChatWithId: chat id. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openInfoPageInChatWindow.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openInfoPageInChatWindow.st index eee974544..e992848fc 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openInfoPageInChatWindow.st +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/openInfoPageInChatWindow.st @@ -2,6 +2,6 @@ navigating openInfoPageInChatWindow | titleBar | - + titleBar := (self subject findByClass: TCUChatWindow) morphs collect: [:chatWindow | chatWindow titleBar]. (self subject createWrapperFor: titleBar) click. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/partialTestChatList.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/partialTestChatList.st new file mode 100644 index 000000000..3900bf679 --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/partialTestChatList.st @@ -0,0 +1,11 @@ +testing +partialTestChatList + + | chatInfoPage | + self openInfoPageInChatWindow. + + chatInfoPage := (self subject findByClass: TCUChatInfoPage) morphs anyOne. + + chatInfoPage chat members do: [:aMember | + self assertReading: aMember fullName in: (self subject findByClass: TCUUserList). + ]. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testBasicGroupChatHasUserList.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testBasicGroupChatHasUserList.st new file mode 100644 index 000000000..cbe8ae9d1 --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testBasicGroupChatHasUserList.st @@ -0,0 +1,5 @@ +testing +testBasicGroupChatHasUserList + + self openAnyChatWith: #isBasicGroup. + self partialTestChatList. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanCloseChatInfoPage.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanCloseChatInfoPage.st index e83ac7f36..6e1f242e6 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanCloseChatInfoPage.st +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanCloseChatInfoPage.st @@ -3,8 +3,8 @@ testCanCloseChatInfoPage self openAnyChat. self openInfoPageInChatWindow. - + self assert: (self subject findByClass: TCUChatInfoPage) visible. - + (self subject findByName: 'infoBackButton') click. self assert: (self subject findByClass: TCUChatInfoPage) visible not. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanOpenChatInfoPage.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanOpenChatInfoPage.st index 56eb76d33..06e36904d 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanOpenChatInfoPage.st +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testCanOpenChatInfoPage.st @@ -1,7 +1,7 @@ testing testCanOpenChatInfoPage - + self openAnyChat. self openInfoPageInChatWindow. - + self assert: (self subject findByClass: TCUChatInfoPage) visible. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testChatInfoPageIsHidden.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testChatInfoPageIsHidden.st index 16821091f..38483e905 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testChatInfoPageIsHidden.st +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testChatInfoPageIsHidden.st @@ -1,5 +1,5 @@ testing testChatInfoPageIsHidden - + self openAnyChat. self assert: (self subject findByClass: TCUChatInfoPage) visible not. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testDoesDisplayGroupDescription.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testDoesDisplayGroupDescription.st index b42a31f1d..d090fdd0d 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testDoesDisplayGroupDescription.st +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testDoesDisplayGroupDescription.st @@ -2,10 +2,10 @@ testing testDoesDisplayGroupDescription | groupChat | - + self waitUntil: [self core chats anySatisfy: [:c | c isGroup]]. groupChat := (self core chats detect: [:chat | chat isGroup]). - + self openChatWithId: groupChat id. - + self assertReading: groupChat description in: (self subject findByClass: TCUChatInfoPage). \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoDescription.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoDescription.st index ac11e4cb0..9801e2045 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoDescription.st +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoDescription.st @@ -2,10 +2,10 @@ testing testPrivateChatHasNoDescription | groupChat chatInfoPage | - + self waitUntil: [self core chats anySatisfy: [:c | c isPrivate]]. groupChat := (self core chats detect: [:chat | chat isPrivate]). - + self openChatWithId: groupChat id. self openInfoPageInChatWindow. diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoUserList.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoUserList.st new file mode 100644 index 000000000..4259d8fd8 --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testPrivateChatHasNoUserList.st @@ -0,0 +1,10 @@ +testing +testPrivateChatHasNoUserList + + | chatInfoPage | + + self openAnyChatWith: #isPrivate. + self openInfoPageInChatWindow. + + chatInfoPage := (self subject findByClass: TCUChatInfoPage) morphs anyOne. + self assertNotSeeing: TCUUserList in: chatInfoPage. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testSupergroupChatHasUserList.st b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testSupergroupChatHasUserList.st new file mode 100644 index 000000000..3ce855a63 --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/instance/testSupergroupChatHasUserList.st @@ -0,0 +1,5 @@ +testing +testSupergroupChatHasUserList + + self openAnyChatWith: #isSuperGroup. + self partialTestChatList. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/methodProperties.json index 3b5e4bc7e..87c19f77d 100644 --- a/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/methodProperties.json +++ b/packages/TelegramClientTests-UI.package/TCTUChatInfoPageTests.class/methodProperties.json @@ -4,10 +4,15 @@ "instance" : { "expectedSqueak5_2Failures" : "TR 6/2/2021 15:14", "openAnyChat" : "RS 6/6/2021 15:49", + "openAnyChatWith:" : "per 6/15/2021 09:18", "openChatWithId:" : "RS 6/6/2021 15:48", "openInfoPageInChatWindow" : "RS 6/6/2021 15:48", + "partialTestChatList" : "per 6/15/2021 09:23", + "testBasicGroupChatHasUserList" : "per 6/15/2021 09:23", "testCanCloseChatInfoPage" : "JB 6/7/2021 09:30", "testCanOpenChatInfoPage" : "RS 6/6/2021 15:50", "testChatInfoPageIsHidden" : "RS 6/6/2021 15:50", "testDoesDisplayGroupDescription" : "RS 6/6/2021 15:48", - "testPrivateChatHasNoDescription" : "RS 6/6/2021 15:51" } } + "testPrivateChatHasNoDescription" : "per 6/15/2021 11:00", + "testPrivateChatHasNoUserList" : "TR 6/15/2021 16:44", + "testSupergroupChatHasUserList" : "per 6/15/2021 09:23" } } diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageColorsDifferentForIncomingOutgoing.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageColorsDifferentForIncomingOutgoing.st index 59e425797..191496f59 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageColorsDifferentForIncomingOutgoing.st +++ b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageColorsDifferentForIncomingOutgoing.st @@ -5,7 +5,7 @@ testMessageColorsDifferentForIncomingOutgoing outgoingMessage := TCTMMocks mockMessage. incomingMessage := TCTMMocks mockMessage. - + outgoingMessage isOutgoing: true. incomingMessage isOutgoing: false. diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsDate.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsDate.st index e80496382..e7d4ab466 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsDate.st +++ b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsDate.st @@ -2,9 +2,9 @@ testing testMessageContainsDate | message | - + message := TCTMMocks mockMessage. message date: message date asUTC. - + self wantsToTest: (TCUMessage newFromTCCMessage: message). self assertReading: '15:57' in: self subject. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsMessageSender.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsMessageSender.st index de6bc2376..21f811ea7 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsMessageSender.st +++ b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageContainsMessageSender.st @@ -2,4 +2,4 @@ testing testMessageContainsMessageSender self wantsToTest: (TCUMessage newFromTCCMessage: TCTMMocks mockMessage). - self assertReading: TCTMMocks mockUser fullName in: self subject. \ No newline at end of file + self assertReading: TCTMMocks mockUser1 fullName in: self subject. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageShrinksCorrectly.st b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageShrinksCorrectly.st index 22ed81c8a..77c5572a1 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageShrinksCorrectly.st +++ b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/instance/testMessageShrinksCorrectly.st @@ -5,6 +5,6 @@ testMessageShrinksCorrectly message := TCTMMocks mockMessage. messageMorph := TCUMessage newFromTCCMessage: message. - + self forceSaveScreenshotOf: messageMorph as: 'testMessageShrinksCorrectly' in: self class defaultTestResultPath. self assert: 153740059 equals: (self computeHashOf: (self takeScreenshotOf: messageMorph)). \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/methodProperties.json index 9c9890c26..418cf3756 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/methodProperties.json +++ b/packages/TelegramClientTests-UI.package/TCTUMessageTests.class/methodProperties.json @@ -5,6 +5,6 @@ "expectedSqueak5_2Failures" : "RS 6/6/2021 15:43", "testMessageColorsDifferentForIncomingOutgoing" : "pk 6/11/2021 10:28", "testMessageContainsDate" : "pk 6/11/2021 10:28", - "testMessageContainsMessageSender" : "pk 6/13/2021 10:42", + "testMessageContainsMessageSender" : "TR 6/13/2021 15:46", "testMessageContainsMessageText" : "pk 6/11/2021 10:28", "testMessageShrinksCorrectly" : "pk 6/13/2021 11:04" } } diff --git a/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/instance/testChatMemberCount.st b/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/instance/testChatMemberCount.st index 353446b1f..2b3b98d17 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/instance/testChatMemberCount.st +++ b/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/instance/testChatMemberCount.st @@ -1,10 +1,11 @@ testing testChatMemberCount - + ((self subject findByClass: TCUChatListItem)morphs) do: [ :chatListItem | | chatWindowWrapper | chatWindowWrapper := self subject findByClass: TCUChatWindow. (MTFMorphWrapper newWith: {chatListItem}) click. + 0.1 seconds wait. chatListItem chat isPrivate ifTrue: [ self assertNotReading: 'Members: ' in: chatWindowWrapper. diff --git a/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/methodProperties.json index 9889a9926..f597a613c 100644 --- a/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/methodProperties.json +++ b/packages/TelegramClientTests-UI.package/TCTUMiscellaneousTests.class/methodProperties.json @@ -2,4 +2,4 @@ "class" : { }, "instance" : { - "testChatMemberCount" : "JB 6/10/2021 22:46" } } + "testChatMemberCount" : "TR 6/13/2021 14:41" } } diff --git a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationConstructor.st b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationConstructor.st index 8f1566211..219fe7d3b 100644 --- a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationConstructor.st +++ b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationConstructor.st @@ -2,15 +2,15 @@ testing testNotificationConstructor | chat message notification | - + chat := TCTMMocks mockPrivateChat. message := TCCMessage new chat: chat; core: self core; - senderID: TCTMMocks mockUser id; + senderID: TCTMMocks mockUser1 id; message: 'm'. notification := TCUNotification newWithMessage: message. - - self assert: TCTMMocks mockUser equals: notification sender. + + self assert: TCTMMocks mockUser1 equals: notification sender. self assert: chat equals: notification chat. self assert: message equals: notification message. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationContainsSender.st b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationContainsSender.st index 88313f5b5..39c896ba9 100644 --- a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationContainsSender.st +++ b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationContainsSender.st @@ -2,4 +2,4 @@ testing testNotificationContainsSender self wantsToTest: (TCUNotification newWithMessage: TCTMMocks mockMessage). - self assertReading: TCTMMocks mockUser fullName in: self subject. \ No newline at end of file + self assertReading: TCTMMocks mockUser1 fullName in: self subject. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationHidesPrivateChatTitle.st b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationHidesPrivateChatTitle.st index 4a5edfb3a..3bf853530 100644 --- a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationHidesPrivateChatTitle.st +++ b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationHidesPrivateChatTitle.st @@ -2,12 +2,12 @@ testing testNotificationHidesPrivateChatTitle | chat message | - + chat := TCTMMocks mockPrivateChat. message := TCCMessage new chat: chat; core: self core; - senderID: TCTMMocks mockUser id. + senderID: TCTMMocks mockUser1 id. self wantsToTest: (TCUNotification newWithMessage: message). self assertNotReading: TCTMMocks mockPrivateChat title in: self subject. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationShowsGroupChatTitle.st b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationShowsGroupChatTitle.st index d97046897..8155bd0ff 100644 --- a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationShowsGroupChatTitle.st +++ b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/instance/testNotificationShowsGroupChatTitle.st @@ -2,12 +2,12 @@ testing testNotificationShowsGroupChatTitle | chat message | - + chat := TCTMMocks mockBasicGroupChat. message := TCCMessage new chat: chat; core: self core; - senderID: TCTMMocks mockUser id. + senderID: TCTMMocks mockUser1 id. self wantsToTest: (TCUNotification newWithMessage: message). self assertReading: TCTMMocks mockBasicGroupChat title in: self subject. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/methodProperties.json index d096fc86f..f08c23d86 100644 --- a/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/methodProperties.json +++ b/packages/TelegramClientTests-UI.package/TCTUNotificationTests.class/methodProperties.json @@ -2,8 +2,8 @@ "class" : { }, "instance" : { - "testNotificationConstructor" : "JB 6/13/2021 10:50", - "testNotificationContainsMessage" : "pk 6/11/2021 10:23", - "testNotificationContainsSender" : "pk 6/11/2021 10:28", - "testNotificationHidesPrivateChatTitle" : "JB 6/13/2021 10:50", - "testNotificationShowsGroupChatTitle" : "JB 6/13/2021 10:51" } } + "testNotificationConstructor" : "TR 6/13/2021 15:45", + "testNotificationContainsMessage" : "JB 6/7/2021 09:28", + "testNotificationContainsSender" : "per 6/10/2021 19:31", + "testNotificationHidesPrivateChatTitle" : "TR 6/13/2021 15:46", + "testNotificationShowsGroupChatTitle" : "TR 6/13/2021 15:46" } } diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assert.looksLike..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assert.looksLike..st index d2e6a8a7b..26e64e4f0 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assert.looksLike..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assert.looksLike..st @@ -1,10 +1,10 @@ asserting assert: aMorph looksLike: aScreenshotFilename - + | screenshotHash morphHash | - + screenshotHash := self computeHashOf: (ImageReadWriter formFromFileNamed: aScreenshotFilename). morphHash := self computeHashOf: (self takeScreenshotOf: aMorph). - + "only comparing hashes might lead to false positives" self assert: screenshotHash equals: morphHash. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotReading.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotReading.in..st index 5ddcbe7c9..c055c2981 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotReading.in..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotReading.in..st @@ -1,4 +1,4 @@ asserting assertNotReading: aString in: aMorphWrapper - + self assert: (self findByTextContent: aString in: aMorphWrapper) morphs isEmpty. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotSeeing.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotSeeing.in..st new file mode 100644 index 000000000..326f4e588 --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertNotSeeing.in..st @@ -0,0 +1,6 @@ +asserting +assertNotSeeing: aMorphClassName in: aSuperMorph + + self + deny: (self seeing: aMorphClassName in: aSuperMorph) + description: 'Morph ' , aMorphClassName asString , ' found in ' , aSuperMorph class asString. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertReading.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertReading.in..st index c5f74b5a0..fa0c656ea 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertReading.in..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertReading.in..st @@ -1,4 +1,4 @@ asserting assertReading: aString in: aMorphWrapper - + self assert: (self findByTextContent: aString in: aMorphWrapper) morphs notEmpty. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertSeeing.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertSeeing.in..st index 2eef62ab2..84048a237 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertSeeing.in..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/assertSeeing.in..st @@ -1,7 +1,6 @@ asserting assertSeeing: aMorphClassName in: aSuperMorph - - aSuperMorph findDeepSubmorphThat: - [:submorph | submorph isKindOf: aMorphClassName] - ifAbsent: - [AssertionFailure signal: 'No Morph ' , aMorphClassName asString , ' found in ' , aSuperMorph class asString] \ No newline at end of file + + self + assert: (self seeing: aMorphClassName in: aSuperMorph) + description: 'No Morph ' , aMorphClassName asString , ' found in ' , aSuperMorph class asString. \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/findByTextContent.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/findByTextContent.in..st index ada38c0d0..0d3cba200 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/findByTextContent.in..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/findByTextContent.in..st @@ -1,5 +1,5 @@ navigating findByTextContent: aString in: aMorphWrapper - + ^ aMorphWrapper findByCriteria: [ :morph | (morph respondsTo: #text) and: [morph text asString includesSubstring: aString]] \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/forceSaveScreenshotOf.as.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/forceSaveScreenshotOf.as.in..st index 97c5f0d3c..8020ff1ed 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/forceSaveScreenshotOf.as.in..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/forceSaveScreenshotOf.as.in..st @@ -5,6 +5,6 @@ forceSaveScreenshotOf: aMorph as: aFileName in: aDirName imageForm := self takeScreenshotOf: aMorph. directory := FileDirectory default directoryNamed: aDirName. directory assureExistence. - + directory deleteFileNamed: aFileName , '.png'. imageForm writePNGfileNamed: (directory fullNameFor: aFileName , '.png'). \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/seeing.in..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/seeing.in..st new file mode 100644 index 000000000..33c021045 --- /dev/null +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/seeing.in..st @@ -0,0 +1,8 @@ +asserting +seeing: aMorphClassName in: aSuperMorph + + aSuperMorph findDeepSubmorphThat: + [:submorph | submorph isKindOf: aMorphClassName] + ifAbsent: + [^ false]. + ^ true \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/setUp.st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/setUp.st index fab571700..9937dc546 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/setUp.st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/setUp.st @@ -3,5 +3,5 @@ setUp self core: (TCTUMockCore newWithTeleClient: TCTMMockTeleClient new). self core chats: TCTMMocks mockChats. - self core users: TCTMMocks mockUsers. + self core users: TCTMMocks mockUserPromises. self wantsToTest: (TCUMain newWithCore: self core). diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/takeScreenshotOf..st b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/takeScreenshotOf..st index 19a2f2432..8a19b8603 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/takeScreenshotOf..st +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/instance/takeScreenshotOf..st @@ -1,4 +1,4 @@ image handling takeScreenshotOf: aMorph - + ^ aMorph imageForm: self class defaultScreenshotDepth backgroundColor: self class defaultScreenshotBackgroundColor forRectangle: aMorph bounds \ No newline at end of file diff --git a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/methodProperties.json b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/methodProperties.json index 427fce66f..7214ba7da 100644 --- a/packages/TelegramClientTests-UI.package/TCTUTestCase.class/methodProperties.json +++ b/packages/TelegramClientTests-UI.package/TCTUTestCase.class/methodProperties.json @@ -7,8 +7,9 @@ "instance" : { "assert:looksLike:" : "JB 5/24/2021 16:17", "assertNotReading:in:" : "RS 5/31/2021 07:54", - "assertReading:in:" : "TR 5/30/2021 18:05", - "assertSeeing:in:" : "JB 6/10/2021 22:46", + "assertNotSeeing:in:" : "TR 6/15/2021 16:49", + "assertReading:in:" : "TR 6/9/2021 14:55", + "assertSeeing:in:" : "TR 6/15/2021 16:47", "computeHashOf:" : "RS 5/23/2021 16:19", "core" : "TR 6/2/2021 15:09", "core:" : "TR 6/2/2021 15:10", @@ -16,7 +17,8 @@ "expectedSqueak5_2Failures" : "JB 6/10/2021 22:49", "findByTextContent:in:" : "RS 5/31/2021 07:55", "forceSaveScreenshotOf:as:in:" : "RS 5/26/2021 13:29", - "setUp" : "pk 6/11/2021 10:22", + "seeing:in:" : "per 6/15/2021 09:29", + "setUp" : "TR 6/13/2021 15:39", "takeScreenshotOf:" : "JB 5/24/2021 16:21", "tearDown" : "JB 5/24/2021 17:42", "waitUntil:" : "RS 6/6/2021 13:00" } }