From 24fc2c9bbb8052d6dc3eb2c8ed313afa40a3043a Mon Sep 17 00:00:00 2001
From: diamondburned <datutbrus@gmail.com>
Date: Thu, 17 Dec 2020 17:18:02 -0800
Subject: [PATCH] Fixed invalid types and bugs in MessageReferencer

---
 repository/gob/repository.gob | Bin 37889 -> 37967 bytes
 repository/main.go            |   3 ++-
 text/text.go                  |  21 ++++++++++-----------
 utils/empty/empty.go          |   3 +++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/repository/gob/repository.gob b/repository/gob/repository.gob
index 8337ab5f9f620304375f522491abea642b002a9c..beb0d9bae7c59404240b179485c082de6f5c44a6 100644
GIT binary patch
delta 51
zcmZo%!E}BF(*}2LMy|<?k`|L2xZg1um~JlMVPTrA$!E<dGTBf-cyloy57T4^dx6ap
H1qzx0rIinB

delta 51
zcmX@Vf~j!@(*}2LM$XBO@)naDxZg49Ki^!y!@{)r2p=~SFCP;l6Gw7#Mq-Jcr_1JB
H0;SCWvfL0t

diff --git a/repository/main.go b/repository/main.go
index 2982512..a5bda25 100644
--- a/repository/main.go
+++ b/repository/main.go
@@ -113,6 +113,7 @@ var Main = Packages{
 				AsserterMethod{ChildType: "Attributor"},
 				AsserterMethod{ChildType: "Codeblocker"},
 				AsserterMethod{ChildType: "Quoteblocker"},
+				AsserterMethod{ChildType: "MessageReferencer"},
 			},
 		}, {
 			Comment: Comment{`
@@ -128,7 +129,7 @@ var Main = Packages{
 			Methods: []Method{
 				GetterMethod{
 					method:  method{Name: "MessageID"},
-					Returns: []NamedType{{Type: "cchat.ID"}},
+					Returns: []NamedType{{Type: "string"}},
 				},
 			},
 		}, {
diff --git a/text/text.go b/text/text.go
index 816062b..4659b6f 100644
--- a/text/text.go
+++ b/text/text.go
@@ -11,8 +11,6 @@
 // shouldn't be.
 package text
 
-import cchat "cchat"
-
 // Attribute is the type for basic rich text markup attributes.
 type Attribute uint32
 
@@ -147,7 +145,7 @@ type Mentioner interface {
 // and highlight it, though this is also for appearance, so the frontend may
 // decide in detail how to display it.
 type MessageReferencer interface {
-	MessageID() cchat.ID
+	MessageID() string
 }
 
 // Quoteblocker represents a quoteblock that behaves similarly to the blockquote
@@ -172,12 +170,13 @@ type Segment interface {
 
 	// Asserters.
 
-	AsColorer() Colorer           // Optional
-	AsLinker() Linker             // Optional
-	AsImager() Imager             // Optional
-	AsAvatarer() Avatarer         // Optional
-	AsMentioner() Mentioner       // Optional
-	AsAttributor() Attributor     // Optional
-	AsCodeblocker() Codeblocker   // Optional
-	AsQuoteblocker() Quoteblocker // Optional
+	AsColorer() Colorer                     // Optional
+	AsLinker() Linker                       // Optional
+	AsImager() Imager                       // Optional
+	AsAvatarer() Avatarer                   // Optional
+	AsMentioner() Mentioner                 // Optional
+	AsAttributor() Attributor               // Optional
+	AsCodeblocker() Codeblocker             // Optional
+	AsQuoteblocker() Quoteblocker           // Optional
+	AsMessageReferencer() MessageReferencer // Optional
 }
diff --git a/utils/empty/empty.go b/utils/empty/empty.go
index e2374d8..5649043 100644
--- a/utils/empty/empty.go
+++ b/utils/empty/empty.go
@@ -140,3 +140,6 @@ func (TextSegment) AsCodeblocker() text.Codeblocker { return nil }
 
 // AsQuoteblocker returns nil.
 func (TextSegment) AsQuoteblocker() text.Quoteblocker { return nil }
+
+// AsMessageReferencer returns nil.
+func (TextSegment) AsMessageReferencer() text.MessageReferencer { return nil }