Merge origin/develop into develop

hpi-swa-teaching · Jul 12, 2024 · effdb35 · effdb35
2 parents 6feaa10 + 4d9f20d
commit effdb35
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,9 @@
 
 TelegramClient is a **Squeak-Client** for the widely used Telegram-Messenger. It aims to provide features such as Authentication, Contacts, Message and Media sending and a minimal UI as well as as a Zen-mode and receiving messages in the background.
 
-*This Project is part of the "Softwaretechnik" Lecture 2020 at the Hasso Plattner Institute.*
+The current TelegramClient doesn't works because the TDLib (Version 1.8.0) is outdated and is not longer supported [further informations](https://github.com/hpi-swa-teaching/TelegramClient/wiki/TDLib#maintanance-required---updating-tdlib).
+
+*This Project is part of the "Softwaretechnik" Lecture since 2020 at the Hasso Plattner Institute.*
 
 ## Features
 
@@ -77,14 +79,34 @@ TelegramClient is a **Squeak-Client** for the widely used Telegram-Messenger. It
     </tr>
     <tr>
       <td>🖼</td>
-      <td>Show profile pictures</td>
+      <td>Show profile pictures, also in info screen</td>
+    </tr>
+    <tr>
+      <td>🖼️</td>
+      <td>Display, choose and send static sticker</td>
+    </tr>
+    <tr>
+      <td>:)</td>
+      <td>Display emoji as substitute for an animated sticker</td>
+    </tr>
+    <tr>
+      <td>🙋</td>
+      <td>Display, participate, create and send polls</td>
+    </tr>
+    <tr>
+      <td>🎬</td>
+      <td>view and send videos</td>
+    </tr>
+    <tr>
+      <td>📄</td>
+      <td>view, download and send documents</td>
     </tr>
   </tbody>
 </table>
 
 ## Running TelegramClient
 
-We currently only support Squeak 5.3.
+We currently only support Squeak 6.
 
 ### Option 1 (online installation)
 
@@ -123,11 +145,15 @@ Pre-Releases are created automatically whenever a commit is added to the develop
 
 ## Our Group
 
+Group 13 of the 2024 SWT I module included [Jannes Konarski](https://github.com/gitjannes), [Tebbe Ubben](https://github.com/TebbeUbben), [Jonas Kubeler](https://github.com/jkubuni), [Elia Doumerc](https://github.com/elimatao), [Fabian Möller](https://github.com/famoe03), and [Alexander Ho](https://github.com/ShAlexHo08HPI). 
+
 Group 11 of the 2022 SWT I module included [Richard Wohlbold](https://github.com/rgwohlbold), [Til Bergmann](https://github.com/Till-B), [Antony Kamp](https://github.com/antonykamp), [Lucas Reisener](https://github.com/LucasDerReisende), [Erik Kohlros](https://github.com/kohlros), and [Jacob Schäfer](https://github.com/jacob271).
 
 Group 2 of the 2021 SWT I module included [Romeo Sommerfeld](https://github.com/rsommerfeld), [Raphael Kunert](https://github.com/Storyxx), [Jannis Berndt](https://github.com/jb3rndt), [Philipp Keese](https://github.com/phkeese), [Tom Richter](https://github.com/tom-richter), and [Paul Ermler](https://github.com/permler).
 
-Group 13 of the 2020 SWT I module included [Rohan Sawahn](https://github.com/rohansaw), [Jonas Schmidt](https://github.com/schmidtjonas), [Frederik Wollny](https://github.com/Freddy200), [Stefan Spangenberg](https://github.com/sspangenberg), [Lukas Laskowski](https://github.com/lasklu), and [Niklas Schilli](https://github.com/Mrnikbobjeff). Feel free to add your names to the list.
+Group 13 of the 2020 SWT I module included [Rohan Sawahn](https://github.com/rohansaw), [Jonas Schmidt](https://github.com/schmidtjonas), [Frederik Wollny](https://github.com/Freddy200), [Stefan Spangenberg](https://github.com/sspangenberg), [Lukas Laskowski](https://github.com/lasklu), and [Niklas Schilli](https://github.com/Mrnikbobjeff). 
+
+Feel free to add your names to the list.
 
 ## Acknowledgements
 

diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/handleMessageEvent..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/handleMessageEvent..st
@@ -3,4 +3,4 @@ handleMessageEvent: anEvent
 
 	| message |
 	message := anEvent at: 'message'.
-	self chatsHandler handleNewMessage: message
+	self chatsHandler handleNewMessage: message.
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/handlePendingEvent..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/handlePendingEvent..st
@@ -4,4 +4,4 @@ handlePendingEvent: anEvent
 	| callbackId |
 	callbackId := anEvent at: '@extra'.
 	(self pendingRequests at: callbackId) value: anEvent.
-	self pendingRequests removeKey: callbackId ifAbsent: []
+	self pendingRequests removeKey: callbackId ifAbsent: [].
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/pendingRequests..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/pendingRequests..st
@@ -1,4 +1,4 @@
 accessing
 pendingRequests: aDictionary
 
-	pendingRequests := aDictionary
+	pendingRequests := aDictionary.
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/send..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/send..st
@@ -1,4 +1,4 @@
 sending
 send: aRequest
 
-	self client send: aRequest
+	self client send: aRequest.
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/send.thenDo..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/send.thenDo..st
@@ -1,8 +1,5 @@
 sending
 send: aRequest thenDo: aBlock
 
-	| callbackId |
-
-	callbackId := self registerCallback: aBlock.
-	aRequest at: '@extra' put: callbackId.
-	self send: aRequest
+	aRequest at: '@extra' put: (self registerCallback: aBlock).
+	self send: aRequest.
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/tryHandleError..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/tryHandleError..st
@@ -10,4 +10,5 @@ tryHandleError: anError
 	otherwise: [
 		((anError at: 'message') beginsWith: 'Can''t lock file')
 			ifTrue: [UIManager default inform: TCCErrorConstants tdlibAlreadyInUse]
-			ifFalse: [self halt: 'An Error Occured. Check Transcript Output.']].
+			ifFalse: [self halt: 'An Error Occured. Check Transcript Output.']
+	].
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json
@@ -20,8 +20,8 @@
 		"generateCallbackId" : "pk 8/5/2021 17:04",
 		"getOwnProfile" : "pk 8/5/2021 17:05",
 		"handleEvent:" : "JK 5/16/2024 22:13",
-		"handleMessageEvent:" : "rgw 5/12/2022 13:44",
-		"handlePendingEvent:" : "per 8/2/2021 15:05",
+		"handleMessageEvent:" : "ED 7/12/2024 14:58",
+		"handlePendingEvent:" : "ED 7/12/2024 14:58",
 		"imageStore" : "pk 6/19/2021 17:15",
 		"imageStore:" : "TR 6/22/2021 09:33",
 		"initialize" : "JK 7/12/2024 12:55",
@@ -30,17 +30,17 @@
 		"loggedInUserId" : "pk 8/5/2021 17:04",
 		"loggedInUserId:" : "pk 8/5/2021 17:04",
 		"pendingRequests" : "pk 5/13/2021 09:46",
-		"pendingRequests:" : "pk 5/13/2021 09:46",
+		"pendingRequests:" : "ED 7/12/2024 14:59",
 		"receiveLoop" : "rgw 7/24/2022 14:56",
 		"registerCallback:" : "pk 8/5/2021 17:04",
 		"searchChat:" : "pk 8/5/2021 16:39",
-		"send:" : "rgw 6/2/2022 09:43",
-		"send:thenDo:" : "rgw 6/2/2022 09:46",
+		"send:" : "ED 7/12/2024 14:59",
+		"send:thenDo:" : "ED 7/12/2024 15:00",
 		"sendPhoneNumber:" : "RS 7/31/2021 15:57",
 		"setUserId:" : "pk 8/5/2021 17:05",
 		"stickerStore" : "JK 5/16/2024 21:25",
 		"stickerStore:" : "JK 5/16/2024 21:25",
-		"tryHandleError:" : "aka 5/21/2022 12:07",
+		"tryHandleError:" : "ED 7/12/2024 15:01",
 		"update" : "TU 6/28/2024 03:18",
 		"userStore" : "per 7/15/2021 12:56",
 		"userStore:" : "tr 7/25/2021 17:57",

diff --git a/...ages/TelegramClient-Core.package/TCCStickerMessage.class/class/newAnimatedStickerFrom..st b/...ages/TelegramClient-Core.package/TCCStickerMessage.class/class/newAnimatedStickerFrom..st
@@ -1,4 +1,4 @@
 instance creation
 newAnimatedStickerFrom: aJsonObject
 
-	^ TCCAnimatedStickerMessage newFrom: aJsonObject.
+	^ TCCAnimatedStickerMessage newFrom: aJsonObject
diff --git a/packages/TelegramClient-Core.package/TCCStickerMessage.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCStickerMessage.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"newAnimatedStickerFrom:" : "JK 5/31/2024 11:36",
+		"newAnimatedStickerFrom:" : "ED 7/12/2024 14:20",
 		"newFrom:" : "JK 6/23/2024 11:39" },
 	"instance" : {
 		"asSnippet" : "JK 6/23/2024 14:32",

diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/class/newWith..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/class/newWith..st
@@ -4,4 +4,4 @@ newWith: aCore
 	^ self new
 		core: aCore;
 		stickerSets: Dictionary new;
-		yourself.
+		yourself
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"class" : {
 		"imageFormFrom:" : "JK 6/21/2024 13:46",
-		"newWith:" : "JK 6/20/2024 22:18" },
+		"newWith:" : "ED 7/12/2024 14:19" },
 	"instance" : {
 		"loadStickerIds" : "JK 7/12/2024 12:46",
 		"stickerSets" : "JK 6/19/2024 11:30",

diff --git a/packages/TelegramClient-UI.package/TCUPollOption.class/class/new.with..st b/packages/TelegramClient-UI.package/TCUPollOption.class/class/new.with..st
@@ -3,4 +3,4 @@ new: aPollMessage with: anOption
 
 	^ super new
 		initializeWith: aPollMessage and: anOption;
-		yourself.
+		yourself
diff --git a/packages/TelegramClient-UI.package/TCUPollOption.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUPollOption.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"new:with:" : "F.M. 6/5/2024 14:49" },
+		"new:with:" : "ED 7/12/2024 14:19" },
 	"instance" : {
 		"initializeWith:and:" : "JK 7/12/2024 12:45",
 		"mouseDown:" : "TU 6/6/2024 01:46",

diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockPollOptionsJson.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockPollOptionsJson.st
@@ -7,4 +7,4 @@ mockPollOptionsJson
 	options at: 2 put: (self mockPollOptionJson: 'Option 2' isBeingChosen: false isChosen: false votePercentage: 25 voterCount: 1).
 	options at: 3 put: (self mockPollOptionJson: 'Option 3' isBeingChosen: false isChosen: false votePercentage: 25 voterCount: 1).
 
-	^ options.
+	^ options
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockStickerSet.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockStickerSet.st
@@ -7,4 +7,4 @@ mockStickerSet
 				add: self mockStickerId;
 				add: self mockStickerId2;
 				yourself);
-		yourself.
+		yourself
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockStickerSetJson.st b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/class/mockStickerSetJson.st
@@ -15,4 +15,4 @@ mockStickerSetJson
 				}).
 			}).
 		}.
-	}).
+	})
diff --git a/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMMocks.class/methodProperties.json
@@ -44,7 +44,7 @@
 		"mockPhotoWidth" : "tom.richter 6/28/2021 13:57",
 		"mockPollMessageJsonFrom:" : "TU 6/23/2024 16:36",
 		"mockPollOptionJson:isBeingChosen:isChosen:votePercentage:voterCount:" : "TU 6/23/2024 16:36",
-		"mockPollOptionsJson" : "TU 6/23/2024 16:36",
+		"mockPollOptionsJson" : "ED 7/12/2024 14:19",
 		"mockPrivateChat" : "LR 7/16/2022 12:03",
 		"mockPrivateChatLastMessageIsLoggedInUser" : "LR 7/16/2022 12:25",
 		"mockSingleEmojiSequence" : "pk 7/10/2021 15:21",
@@ -53,9 +53,9 @@
 		"mockStickerHeight" : "JK 6/23/2024 11:39",
 		"mockStickerId" : "JK 6/23/2024 11:39",
 		"mockStickerId2" : "JK 6/23/2024 16:35",
-		"mockStickerSet" : "JK 6/23/2024 16:46",
+		"mockStickerSet" : "ED 7/12/2024 14:19",
 		"mockStickerSetId" : "JK 6/23/2024 16:35",
-		"mockStickerSetJson" : "JK 6/23/2024 16:42",
+		"mockStickerSetJson" : "ED 7/12/2024 14:19",
 		"mockStickerWidth" : "JK 6/23/2024 11:39",
 		"mockSupergroupChat" : "rgw 6/2/2022 12:07",
 		"mockSupergroupMembersJson" : "per 6/10/2021 20:53",