Merge pull request #33 from JurajKubelka/dev

Private group conversation fix
JurajKubelka · Mar 12, 2018 · 9149fc4 · 9149fc4
2 parents ee5b9aa + 784405e
commit 9149fc4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/src/BaselineOfDiscordSt.package/BaselineOfDiscordSt.class/instance/externalProjects..st b/src/BaselineOfDiscordSt.package/BaselineOfDiscordSt.class/instance/externalProjects..st
@@ -15,9 +15,7 @@ externalProjects: spec
 			baseline: 'Brick' with: [ 
 				spec
 					repository: 'github://pharo-graphics/Brick/src';
-					loads: #development ];
-			baseline: 'Commander' with: [
-				spec repository: 'github://dionisiydk/Commander:v0.4.x' ]
+					loads: #development ]
 	].
 	spec for: #'pharo6.x' do: [
 		spec

diff --git a/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/name.st b/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/name.st
@@ -1,3 +1,3 @@
 accessing
 name
-	^ name
+	^ name ifNil: [ self nameBasedOnRecipients ]
diff --git a/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/nameBasedOnRecipients.st b/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/nameBasedOnRecipients.st
@@ -0,0 +1,6 @@
+accessing - computed
+nameBasedOnRecipients
+	^ String streamContents: [ :aStream |
+		self recipients 
+			do: [ :eachRecipient | aStream << eachRecipient username ]
+			separatedBy: [ aStream << ', ' ] ]
diff --git a/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/position.st b/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/position.st
@@ -0,0 +1,4 @@
+accessing
+position
+	"Complement protocol of other channels."
+	^ self lastMessageId asNumber negated
diff --git a/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/printOn..st b/src/Discord-Core.package/DSDirectMessageGroupChannel.class/instance/printOn..st
@@ -0,0 +1,7 @@
+printing
+printOn: aStream
+	"Print channel name if available"
+	aStream << 'DM Channel: '.
+	self recipients 
+		do: [ :eachRecipient | aStream << eachRecipient username ]
+		separatedBy: [ aStream << ', ' ]