Order model and chat declarations

[onechat] / whatsapp_batch.go

diff --git a/whatsapp_batch.go b/whatsapp_batch.go
index 7f43a3cfcbd8922a7fc7108000f6b4697a178400..dcdd712a8fdf2e938e3842e5bf2966dd0cb8a62c 100644 (file)
--- a/whatsapp_batch.go
+++ b/whatsapp_batch.go
@@ -27,6 +27,27 @@ type WhatsAppBatch struct {
        Messages []WhatsAppMessage `json:"messages"`
 }
 
        Messages []WhatsAppMessage `json:"messages"`
 }
 

+// WhatsAppChat is a chat: its ID, its name, and whether it is a group.
+type WhatsAppChat struct {
+       ID    string `json:"id"`
+       Name  string `json:"name"`
+       Group bool   `json:"group,omitempty"`
+}
+
+// WhatsAppMessage is one message of a batch: its ID, the name of its sender,
+// its WhatsApp time, and its text. Mine marks a message of the user. Mention
+// and Reply mark a message that mentions the user or replies to a message of
+// the user.
+type WhatsAppMessage struct {
+       ID      string    `json:"id"`
+       Sender  string    `json:"sender"`
+       Time    time.Time `json:"time"`
+       Text    string    `json:"text"`
+       Mine    bool      `json:"mine,omitempty"`
+       Mention bool      `json:"mention,omitempty"`
+       Reply   bool      `json:"reply,omitempty"`
+}
+

 // Turn tells if the batch starts a turn: a private batch with a message of
 // another person, or a group batch with a message of another person that
 // mentions the user or replies to a message of the user.
 // Turn tells if the batch starts a turn: a private batch with a message of
 // another person, or a group batch with a message of another person that
 // mentions the user or replies to a message of the user.


@@ -74,24 +95,3 @@ func (b WhatsAppBatch) Text(location *time.Location) string {
 
        return strings.Join(lines, "\n")
 }
 
        return strings.Join(lines, "\n")
 }

-
-// WhatsAppChat is a chat: its ID, its name, and whether it is a group.
-type WhatsAppChat struct {
-       ID    string `json:"id"`
-       Name  string `json:"name"`
-       Group bool   `json:"group,omitempty"`
-}
-
-// WhatsAppMessage is one message of a batch: its ID, the name of its sender,
-// its WhatsApp time, and its text. Mine marks a message of the user. Mention
-// and Reply mark a message that mentions the user or replies to a message of
-// the user.
-type WhatsAppMessage struct {
-       ID      string    `json:"id"`
-       Sender  string    `json:"sender"`
-       Time    time.Time `json:"time"`
-       Text    string    `json:"text"`
-       Mine    bool      `json:"mine,omitempty"`
-       Mention bool      `json:"mention,omitempty"`
-       Reply   bool      `json:"reply,omitempty"`
-}