last image

While testing others things, I had quite a few nil pointer dereference
errors from accessing bot data right after initializing. A for loop now
waits until the first of the pointers is non-nil, which should
hopefully avoid crashes.

discord.go

@@ -76,6 +76,10 @@ func (d *DiscordDaemon) run() {
 		d.app.err.Printf("Discord: Failed to start daemon: %v", err)
 		return
 	}
+	// Sometimes bot.State isn't populated quick enough
+	for d.bot.State == nil {
+		continue
+	}
 	d.username = d.bot.State.User.Username
 	// Choose the last guild (server), for now we don't really support multiple anyway
 	guild, err := d.bot.Guild(d.bot.State.Guilds[len(d.bot.State.Guilds)-1].ID)

stripmd.go

@@ -44,6 +44,16 @@ func StripAltText(md string, links bool) (string, []*dg.MessageEmbed) {
 				out += md[URLStart : URLEnd+1]
 			}
 			previousURLEnd = URLEnd
+			// Removing links often leaves a load of extra newlines which look weird, this removes them.
+			if links {
+				next := 2
+				for md[URLEnd+next] == '\n' {
+					next++
+				}
+				if next >= 3 {
+					previousURLEnd += next - 2
+				}
+			}
 			altTextStart, URLStart, URLEnd = -1, -1, -1
 			continue
 		}