Compare commits
2
Commits
6f3561a7ac
...
58b51e6e36
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58b51e6e36 | ||
|
|
16678c4e7a |
@@ -398,7 +398,7 @@ func GetAdmin(db *sql.DB, username string) (Admin, error) {
|
||||
|
||||
var result Admin
|
||||
if err := row.Scan(&result.Username, &result.Password); err != nil {
|
||||
return Admin{}, nil
|
||||
return Admin{}, err
|
||||
}
|
||||
|
||||
return result, nil
|
||||
|
||||
+7
-10
@@ -50,16 +50,8 @@ func EnrichPost(body string) string {
|
||||
var b strings.Builder
|
||||
|
||||
for _, rawLine := range strings.Split(body, "\n") {
|
||||
line := urlRx.ReplaceAllStringFunc(rawLine, func(u string) string {
|
||||
esc := template.HTMLEscapeString(u)
|
||||
return fmt.Sprintf(
|
||||
`<a href="%[1]s" target="_blank" rel="noopener noreferrer" class="ext-link">%[1]s</a>`,
|
||||
esc,
|
||||
)
|
||||
})
|
||||
|
||||
var outLine string
|
||||
for i, rawWord := range strings.Split(line, " ") {
|
||||
for i, rawWord := range strings.Split(rawLine, " ") {
|
||||
var outWord string
|
||||
if strings.HasPrefix(rawWord, ">>") {
|
||||
postId := strings.TrimPrefix(rawWord, ">>")
|
||||
@@ -68,8 +60,13 @@ func EnrichPost(body string) string {
|
||||
`onmouseleave="highlightPost(%[1]s,event,false)" href="#post-%[1]s" class="reply-link">%[2]s</a>`,
|
||||
postId, template.HTMLEscapeString(rawWord),
|
||||
)
|
||||
} else if urlRx.MatchString(rawWord) {
|
||||
outWord = fmt.Sprintf(
|
||||
`<a href="%[1]s" target="_blank" rel="noopener noreferrer" class="ext-link">%[1]s</a>`,
|
||||
template.HTMLEscapeString(rawWord),
|
||||
)
|
||||
} else {
|
||||
outWord = rawWord
|
||||
outWord = template.HTMLEscapeString(rawWord)
|
||||
}
|
||||
if i != 0 {
|
||||
outLine += " "
|
||||
|
||||
Reference in New Issue
Block a user