JoinServer can now fail
This commit is contained in:
parent
c1b150ad19
commit
18a78c4de5
|
@ -84,8 +84,10 @@ func (ch *Channel) Nickname(labeler cchat.LabelContainer) error {
|
||||||
func (ch *Channel) JoinServer(container cchat.MessagesContainer) (stop func(), err error) {
|
func (ch *Channel) JoinServer(container cchat.MessagesContainer) (stop func(), err error) {
|
||||||
// Is this a fresh channel? If yes, generate messages with some IO latency.
|
// Is this a fresh channel? If yes, generate messages with some IO latency.
|
||||||
if len(ch.messageids) == 0 || ch.messages == nil {
|
if len(ch.messageids) == 0 || ch.messages == nil {
|
||||||
// Simulate IO.
|
// Simulate IO and error.
|
||||||
simulateAustralianInternet()
|
if err := simulateAustralianInternet(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
// Initialize.
|
// Initialize.
|
||||||
ch.messages = make(map[uint32]Message, FetchBacklog)
|
ch.messages = make(map[uint32]Message, FetchBacklog)
|
||||||
|
@ -383,6 +385,7 @@ func (ch *Channel) CompleteMessage(words []string, i int) (entries []cchat.Compl
|
||||||
for _, id := range ch.messageids {
|
for _, id := range ch.messageids {
|
||||||
if msg := ch.messages[id]; strings.HasPrefix(msg.author.Content, words[i]) {
|
if msg := ch.messages[id]; strings.HasPrefix(msg.author.Content, words[i]) {
|
||||||
entries = append(entries, cchat.CompletionEntry{
|
entries = append(entries, cchat.CompletionEntry{
|
||||||
|
Raw: msg.author.Content,
|
||||||
Text: msg.author,
|
Text: msg.author,
|
||||||
IconURL: avatarURL,
|
IconURL: avatarURL,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue