From a617c9d2c46aab28c705c2f6b567d6b71562402b Mon Sep 17 00:00:00 2001
From: Christoph Thiede <christoph.thiede@student.hpi.de>
Date: Sat, 24 Jul 2021 03:33:54 +0200
Subject: [PATCH] Some minor refactoring, inspired by SwaLint

---
 .../instance/visitBySearcher.context..st         |  2 +-
 .../TalkContribution.class/methodProperties.json |  2 +-
 .../instance/involvementFor..st                  |  6 ++++--
 .../TalkConversation.class/methodProperties.json |  2 +-
 .../TalkFilterSet.class/instance/inbox..st       |  2 +-
 .../instance/newDecoratedReply.st                | 13 +------------
 .../TalkMessage.class/instance/newReply..st      | 16 ++++++++++++++++
 .../TalkMessage.class/instance/newReply.st       | 13 +------------
 .../TalkMessage.class/methodProperties.json      |  5 +++--
 .../instance/compilePredicate..st                |  2 +-
 .../instance/compilerClass.st                    |  4 ++++
 .../methodProperties.json                        |  3 ++-
 .../instance/date.st                             |  2 +-
 .../instance/diffText.st                         |  2 +-
 .../instance/messageText.st                      |  2 +-
 .../instance/state.st                            |  2 +-
 16 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply..st
 create mode 100644 packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilerClass.st

diff --git a/packages/SqueakInboxTalk.package/TalkContribution.class/instance/visitBySearcher.context..st b/packages/SqueakInboxTalk.package/TalkContribution.class/instance/visitBySearcher.context..st
index be19fa1d..4534269a 100644
--- a/packages/SqueakInboxTalk.package/TalkContribution.class/instance/visitBySearcher.context..st
+++ b/packages/SqueakInboxTalk.package/TalkContribution.class/instance/visitBySearcher.context..st
@@ -3,4 +3,4 @@ visitBySearcher: aTextSearcher context: context
 
 	self flag: #todo.
 	"Search source code? Would require better caching."
-	aTextSearcher visit: self text: self summary context: context
\ No newline at end of file
+	aTextSearcher visit: self contents: self summary context: context
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkContribution.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkContribution.class/methodProperties.json
index f8b71a85..538fdd27 100644
--- a/packages/SqueakInboxTalk.package/TalkContribution.class/methodProperties.json
+++ b/packages/SqueakInboxTalk.package/TalkContribution.class/methodProperties.json
@@ -17,5 +17,5 @@
 		"state" : "ct 5/8/2021 17:23",
 		"summary" : "ct 5/8/2021 17:45",
 		"summaryWithState" : "ct 7/14/2021 23:11",
-		"visitBySearcher:context:" : "ct 7/2/2021 22:46",
+		"visitBySearcher:context:" : "ct 7/24/2021 03:08",
 		"wasAuthoredBy:" : "ct 6/15/2021 14:50" } }
diff --git a/packages/SqueakInboxTalk.package/TalkConversation.class/instance/involvementFor..st b/packages/SqueakInboxTalk.package/TalkConversation.class/instance/involvementFor..st
index 8f87fcad..43e044a9 100644
--- a/packages/SqueakInboxTalk.package/TalkConversation.class/instance/involvementFor..st
+++ b/packages/SqueakInboxTalk.package/TalkConversation.class/instance/involvementFor..st
@@ -1,11 +1,13 @@
 accessing - state
 involvementFor: aPerson
 
+	self flag: #discuss. "Ensure date order - decide about the right place to guarantee this"
+	
 	self contributions ifNotEmpty: [:contributions |
-		((contributions first flag: #todo) wasAuthoredBy: aPerson) ifTrue: ["ensure date order"
+		(contributions first wasAuthoredBy: aPerson) ifTrue: [
 		^ #started]].
 	
-	((self messages first flag: #todo) wasAuthoredBy: aPerson) ifTrue: ["ensure date order"
+	(self messages first wasAuthoredBy: aPerson) ifTrue: [
 	^ #started].
 	(self messages anySatisfy: [:message | message wasAuthoredBy: aPerson]) ifTrue: [^ #participated].
 	(self includesMentionOf: aPerson) ifTrue: [^ #mentioned].
diff --git a/packages/SqueakInboxTalk.package/TalkConversation.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkConversation.class/methodProperties.json
index d3b69dfc..4e453e91 100644
--- a/packages/SqueakInboxTalk.package/TalkConversation.class/methodProperties.json
+++ b/packages/SqueakInboxTalk.package/TalkConversation.class/methodProperties.json
@@ -14,7 +14,7 @@
 		"includesMentionOf:" : "ct 7/1/2021 13:58",
 		"includesParticipationOf:" : "ct 7/1/2021 13:58",
 		"initialMessage" : "ct 5/7/2021 15:38",
-		"involvementFor:" : "ct 7/21/2021 01:07",
+		"involvementFor:" : "ct 7/24/2021 03:10",
 		"involvementState" : "ct 6/16/2021 16:27",
 		"involvementStateFor:" : "ct 6/15/2021 19:49",
 		"latestDate" : "ct 5/7/2021 15:38",
diff --git a/packages/SqueakInboxTalk.package/TalkFilterSet.class/instance/inbox..st b/packages/SqueakInboxTalk.package/TalkFilterSet.class/instance/inbox..st
index c1a48f3d..e9c6e0a2 100644
--- a/packages/SqueakInboxTalk.package/TalkFilterSet.class/instance/inbox..st
+++ b/packages/SqueakInboxTalk.package/TalkFilterSet.class/instance/inbox..st
@@ -1,4 +1,4 @@
-initialize-release
+accessing
 inbox: anInbox
 
 	self filters do: [:filter | filter inbox: anInbox]
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newDecoratedReply.st b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newDecoratedReply.st
index 75f4180f..af8a2055 100644
--- a/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newDecoratedReply.st
+++ b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newDecoratedReply.st
@@ -1,15 +1,4 @@
 sending messages
 newDecoratedReply
 
-	| receivers ccReceivers bodyString |
-	receivers := ({self inbox mailAddress. self mail replyReceiver}, self mail receivers) withoutDuplicates.
-	ccReceivers := self mail ccReceivers.
-	bodyString := '{1}\\{2}' withCRs asText format: {self inbox decorateMessage: ''. self textQuoted}.
-	
-	^ self mail newReply
-		from: MailSender userEmail;
-		to: (receivers joinSeparatedBy: ', ');
-		cc: (ccReceivers joinSeparatedBy: ', ');
-		subject: self replySubject;
-		body: (self inbox newMessageBodyFor: bodyString);
-		yourself
\ No newline at end of file
+	^ self newReply: true
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply..st b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply..st
new file mode 100644
index 00000000..da96e4d8
--- /dev/null
+++ b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply..st
@@ -0,0 +1,16 @@
+sending messages
+newReply: decorated
+
+	| receivers ccReceivers bodyString |
+	receivers := {self inbox mailAddress. self mail replyReceiver} withoutDuplicates.
+	ccReceivers := self mail ccReceivers.
+	bodyString := '\\{1}' withCRs format: {self textQuoted}.
+	decorated ifTrue: [bodyString := (self inbox decorateMessage: '') asText, bodyString].
+	
+	^ self mail newReply
+		from: MailSender userEmail;
+		to: (receivers joinSeparatedBy: ', ');
+		cc: (ccReceivers joinSeparatedBy: ', ');
+		subject: self replySubject;
+		body: (self inbox newMessageBodyFor: bodyString);
+		yourself
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply.st b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply.st
index 1ab32ba4..dd09288e 100644
--- a/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply.st
+++ b/packages/SqueakInboxTalk.package/TalkMessage.class/instance/newReply.st
@@ -1,15 +1,4 @@
 sending messages
 newReply
 
-	| receivers ccReceivers bodyString |
-	receivers := {self inbox mailAddress. self mail replyReceiver} withoutDuplicates.
-	ccReceivers := self mail ccReceivers.
-	bodyString := '\\{1}' withCRs format: {self textQuoted}.
-	
-	^ self mail newReply
-		from: MailSender userEmail;
-		to: (receivers joinSeparatedBy: ', ');
-		cc: (ccReceivers joinSeparatedBy: ', ');
-		subject: self replySubject;
-		body: (self inbox newMessageBodyFor: bodyString);
-		yourself
\ No newline at end of file
+	^ self newReply: false
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkMessage.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkMessage.class/methodProperties.json
index 587fcf35..f4992522 100644
--- a/packages/SqueakInboxTalk.package/TalkMessage.class/methodProperties.json
+++ b/packages/SqueakInboxTalk.package/TalkMessage.class/methodProperties.json
@@ -14,8 +14,9 @@
 		"mail" : "ct 5/7/2021 15:07",
 		"mail:" : "ct 5/7/2021 15:07",
 		"nabbleUrl" : "ct 7/14/2021 21:03",
-		"newDecoratedReply" : "ct 7/14/2021 18:30",
-		"newReply" : "ct 7/22/2021 15:44",
+		"newDecoratedReply" : "ct 7/24/2021 03:17",
+		"newReply" : "ct 7/24/2021 03:15",
+		"newReply:" : "ct 7/24/2021 03:17",
 		"openInNabble" : "ct 7/22/2021 18:14",
 		"openInPipermail" : "ct 7/22/2021 18:14",
 		"pipermailUrl" : "ct 7/14/2021 21:01",
diff --git a/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilePredicate..st b/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilePredicate..st
index 4ede46ac..6d2a47a5 100644
--- a/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilePredicate..st
+++ b/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilePredicate..st
@@ -5,7 +5,7 @@ compilePredicate: aString
 	Internally, the expression will be stored as a CompiledMethod with a #DoItIn: selector generated by the compiler. See also Compiler >> #evaluateCue:ifFail: or InspectorField >> #getValueFor:."
 
 	| compiledMethod |
-	compiledMethod := Compiler new
+	compiledMethod := self compilerClass new
 		compiledMethodFor: aString
 		in: self makeFilterContext
 		to: nil
diff --git a/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilerClass.st b/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilerClass.st
new file mode 100644
index 00000000..953c4296
--- /dev/null
+++ b/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/instance/compilerClass.st
@@ -0,0 +1,4 @@
+compiling
+compilerClass
+
+	^ Compiler
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/methodProperties.json
index 8d4067e1..273ce79c 100644
--- a/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/methodProperties.json
+++ b/packages/SqueakInboxTalk.package/TalkPluggableFilter.class/methodProperties.json
@@ -4,7 +4,8 @@
 	"instance" : {
 		"accepts:" : "ct 7/21/2021 01:56",
 		"argumentNameForConversation" : "ct 7/24/2021 00:29",
-		"compilePredicate:" : "ct 7/24/2021 00:22",
+		"compilePredicate:" : "ct 7/24/2021 03:25",
+		"compilerClass" : "ct 7/24/2021 03:25",
 		"defaultPredicate" : "ct 7/24/2021 00:18",
 		"defaultPredicateString" : "ct 7/13/2021 02:00",
 		"editPredicate" : "ct 7/24/2021 00:27",
diff --git a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/date.st b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/date.st
index c6bdda77..5804976f 100644
--- a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/date.st
+++ b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/date.st
@@ -1,4 +1,4 @@
-accessing
+accessing - messages
 date
 
 	^ self initialMessage date
\ No newline at end of file
diff --git a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/diffText.st b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/diffText.st
index 60a2cef9..bedd8982 100644
--- a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/diffText.st
+++ b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/diffText.st
@@ -1,4 +1,4 @@
-accessing
+accessing - messages
 diffText
 
 	self conversations ifNotEmpty: [ | text diffEnd summaryStart |
diff --git a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/messageText.st b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/messageText.st
index b4064991..aa2b0f26 100644
--- a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/messageText.st
+++ b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/messageText.st
@@ -1,4 +1,4 @@
-accessing
+accessing - messages
 messageText
 
 	self conversations ifNotEmpty: [ | text diffStart summaryEnd |
diff --git a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/state.st b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/state.st
index ec68c02f..ad1b3552 100644
--- a/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/state.st
+++ b/packages/SqueakInboxTalk.package/TalkRepositoryContribution.class/instance/state.st
@@ -1,4 +1,4 @@
-accessing
+accessing - contribution
 state
 
 	self repositoryName = #inbox ifTrue: [^ #pending].