mirror of
https://salsa.debian.org/mdosch/feed-to-muc.git
synced 2024-11-22 14:08:39 +01:00
Made some changes to remove multiple linebreaks and (hopefully) made help output look more nice.
Revert "Revert "(Hopefully) made help output look more nice.""
This reverts commit b73f39ef48
.
This commit is contained in:
parent
b73f39ef48
commit
efe8f1a549
2 changed files with 13 additions and 3 deletions
|
@ -251,8 +251,8 @@ func processStanzas(client *xmpp.Client, muc string, mucNick string, feeds []str
|
|||
_, err = client.Send(xmpp.Chat{Remote: muc,
|
||||
Type: "groupchat", Text: strings.Split(v.Remote, "/")[1] +
|
||||
": The following commands are available:\n" +
|
||||
"feeds\t" + "List feeds I'm following.\n" +
|
||||
"source\t" + "Show source code URL."})
|
||||
"feeds " + "List feeds I'm following.\n" +
|
||||
"source " + "Show source code URL."})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
|
|
@ -209,13 +209,23 @@ func getArticles(feedURL string, max int, noExcerpt bool) (string, error) {
|
|||
return "", err
|
||||
}
|
||||
|
||||
// To make the message look not so bloated we remove multiple newlines.
|
||||
// Split the article description/content into fragments between newlines.
|
||||
fragments := strings.Split(description, "\n")
|
||||
// Empty article description/content
|
||||
description = ""
|
||||
// Fill article description/content with the fragments separated by one newline.
|
||||
for _, line := range fragments {
|
||||
description = description + line + "n"
|
||||
}
|
||||
|
||||
// Only append article link if it is not yet contained in description (e.g. read more: URL).
|
||||
if strings.Contains(description, article.Link) == true {
|
||||
// Replace article link with URL cleaned from redirects and trackers.
|
||||
description = strings.Replace(description, article.Link, cleanURL, -1)
|
||||
output = output + feed.Title + ": *" + article.Title + "*\n\n" + description
|
||||
} else {
|
||||
output = output + feed.Title + ": *" + article.Title + "*\n\n" + description + "\n" + cleanURL
|
||||
output = output + feed.Title + ": *" + article.Title + "*\n\n" + description + cleanURL
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue