M activity.go → activity.go

@@ -27,7 +27,6 @@ notrand "math/rand"
 	"net/http"
 	"net/url"
 	"os"
-	"regexp"
 	"strings"
 	"time"
 
@@ -594,26 +593,6 @@ return nil
 		}
 
 		if obj != nil {
-			if _, ok := obj.GetString("diaspora:guid"); ok {
-				// friendica does the silliest bonks
-				if c, ok := obj.GetString("source", "content"); ok {
-					re_link := regexp.MustCompile(`link='([^']*)'`)
-					if m := re_link.FindStringSubmatch(c); len(m) > 1 {
-						xid = m[1]
-						log.Printf("getting friendica flavored bonk: %s", xid)
-						if !needxonkid(user, xid) {
-							return nil
-						}
-						if newobj, err := GetJunkHardMode(xid); err == nil {
-							obj = newobj
-							origin = originate(xid)
-							what = "bonk"
-						} else {
-							log.Printf("error getting bonk: %s: %s", xid, err)
-						}
-					}
-				}
-			}
 			xid, _ = obj.GetString("id")
 		}
 
@@ -888,14 +867,6 @@ updatehonk(&xonk)
 			}
 		}
 		if !isUpdate && needxonk(user, &xonk) {
-			if strings.HasSuffix(convoy, "#context") {
-				// friendica...
-				if rid != "" {
-					convoy = ""
-				} else {
-					convoy = url
-				}
-			}
 			if rid != "" {
 				if needxonkid(user, rid) {
 					goingup++