Minor cleanup

diff --git a/hotline/news.go b/hotline/news.go
index 11e2a27dc54ee9bcc729faf6b429ad943d09ef98..38db97af42dee4f11a8731e0cdb740674a01b79b 100644 (file)
--- a/hotline/news.go
+++ b/hotline/news.go
@@ -7,6 +7,14 @@ import (
        "sort"
 )
 
        "sort"
 )
 

+const defaultNewsDateFormat = "Jan02 15:04" // Jun23 20:49
+
+const defaultNewsTemplate = `From %s (%s):
+
+%s
+
+__________________________________________________________`
+

 type ThreadedNews struct {
        Categories map[string]NewsCategoryListData15 `yaml:"Categories"`
 }
 type ThreadedNews struct {
        Categories map[string]NewsCategoryListData15 `yaml:"Categories"`
 }

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index d3238f4d05bc5d3b247d978cce94031c3525b5c6..86cc7580f7216710042bea40bd5ace81e11470e5 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -990,15 +990,6 @@ func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err er
        return res, err
 }
 
        return res, err
 }
 

-const defaultNewsDateFormat = "Jan02 15:04" // Jun23 20:49
-//  "Mon, 02 Jan 2006 15:04:05 MST"
-
-const defaultNewsTemplate = `From %s (%s):
-
-%s
-
-__________________________________________________________`
-

 // HandleTranOldPostNews updates the flat news
 // Fields used in this request:
 // 101 Data
 // HandleTranOldPostNews updates the flat news
 // Fields used in this request:
 // 101 Data


@@ -1919,7 +1910,7 @@ func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction, err err
 // HandleSetChatSubject is sent from a v1.8+ Hotline client when the user sets a private chat subject
 // Fields used in the request:
 // * 114       Chat ID
 // HandleSetChatSubject is sent from a v1.8+ Hotline client when the user sets a private chat subject
 // Fields used in the request:
 // * 114       Chat ID

-// * 115       Chat subject    Chat subject string
+// * 115       Chat subject

 // Reply is not expected.
 func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        chatID := t.GetField(fieldChatID).Data
 // Reply is not expected.
 func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        chatID := t.GetField(fieldChatID).Data


@@ -1942,7 +1933,7 @@ func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, er
        return res, err
 }
 
        return res, err
 }
 

-// HandleMakeAlias makes a filer alias using the specified path.
+// HandleMakeAlias makes a file alias using the specified path.

 // Fields used in the request:
 // 201 File name
 // 202 File path
 // Fields used in the request:
 // 201 File name
 // 202 File path