better handling of address input
This commit is contained in:
parent
0b38c46d37
commit
cd7537c110
11
fun.go
11
fun.go
|
@ -295,13 +295,18 @@ func grapevine(mentions []Mention) []string {
|
|||
return s
|
||||
}
|
||||
|
||||
func grapeape(s string) []Mention {
|
||||
func grapeape(userid int64, s string) []Mention {
|
||||
var mentions []Mention
|
||||
for _, m := range strings.Split(s, " ") {
|
||||
if m == "" {
|
||||
if m == "" {
|
||||
continue
|
||||
}
|
||||
where := gofish(m)
|
||||
var where string
|
||||
if name := fullname(m, userid); name != "" {
|
||||
where = name
|
||||
} else {
|
||||
where = gofish(m)
|
||||
}
|
||||
if where != "" {
|
||||
mentions = append(mentions, Mention{Who: m, Where: where})
|
||||
}
|
||||
|
|
2
web.go
2
web.go
|
@ -1481,7 +1481,7 @@ func submithonk(w http.ResponseWriter, r *http.Request, isAPI bool) {
|
|||
noise = strings.Replace(noise, "\r", "", -1)
|
||||
noise = quickrename(noise, userinfo.UserID)
|
||||
noise = hooterize(noise)
|
||||
honk.Mentions = append(grapeape(mentions), bunchofgrapes(noise)...)
|
||||
honk.Mentions = append(grapeape(userinfo.UserID, mentions), bunchofgrapes(noise)...)
|
||||
honk.Noise = noise
|
||||
translate(honk)
|
||||
|
||||
|
|
Loading…
Reference in New Issue