From 881ef2e39593757bdffa95ec984654271456c6a1 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Wed, 16 Oct 2019 02:27:04 -0400 Subject: [PATCH] updated junk interface --- activity.go | 4 ++-- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/activity.go b/activity.go index 493d1e8..4f21b35 100644 --- a/activity.go +++ b/activity.go @@ -312,7 +312,7 @@ var boxofboxes = cache.New(cache.Options{Filler: func(ident string) (*Box, bool) } inbox, _ := j.GetString("inbox") outbox, _ := j.GetString("outbox") - sbox, _ := j.FindString([]string{"endpoints", "sharedInbox"}) + sbox, _ := j.GetString("endpoints", "sharedInbox") b := &Box{In: inbox, Out: outbox, Shared: sbox} if inbox != "" { m := strings.Join([]string{inbox, outbox, sbox}, " ") @@ -593,7 +593,7 @@ func xonksaver(user *WhatAbout, item junk.Junk, origin string) *Honk { _, ok := obj.GetString("diaspora:guid") if ok { // friendica does the silliest bonks - c, ok := obj.FindString([]string{"source", "content"}) + c, ok := obj.GetString("source", "content") if ok { re_link := regexp.MustCompile(`link='([^']*)'`) m := re_link.FindStringSubmatch(c) diff --git a/go.mod b/go.mod index 6de5f1e..30ad2e7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 humungus.tedunangst.com/r/go-sqlite3 v1.1.3 - humungus.tedunangst.com/r/webs v0.6.12 + humungus.tedunangst.com/r/webs v0.6.13 ) go 1.11 diff --git a/go.sum b/go.sum index 279374e..d1d032e 100644 --- a/go.sum +++ b/go.sum @@ -23,3 +23,5 @@ humungus.tedunangst.com/r/go-sqlite3 v1.1.3 h1:G2N4wzDS0NbuvrZtQJhh4F+3X+s7BF8b9 humungus.tedunangst.com/r/go-sqlite3 v1.1.3/go.mod h1:FtEEmQM7U2Ey1TuEEOyY1BmphTZnmiEjPsNLEAkpf/M= humungus.tedunangst.com/r/webs v0.6.12 h1:tRQOF/tJ6FeT3V1KO+8iz+WFNwMQvzMmPqiykD0rgnA= humungus.tedunangst.com/r/webs v0.6.12/go.mod h1:S9sXpVSbgAIa24yYhnMN0C94LKHG+2rioS+NsiDimps= +humungus.tedunangst.com/r/webs v0.6.13 h1:NoPvn+92GVCmMekUCyfgT9rSgDQs6Jp5Fv/tyhHD1Gc= +humungus.tedunangst.com/r/webs v0.6.13/go.mod h1:S9sXpVSbgAIa24yYhnMN0C94LKHG+2rioS+NsiDimps=