fmatch/aptok
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add rejected to list so that we don't try again

Browse source 
Fix following after moving id's to /item/
Create GetActor that checks if actor exists and if not
creates it
This commit is contained in:
Michael Demetriou 2019-09-17 11:42:17 +03:00
parent 8bb04402d9
commit c4594779db
3 changed files with 64 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
http.go
View file

@ -107,7 +107,7 @@ func Serve() {
"first" : "` + baseURL + actor.name + `/outbox?page=1",
"id" : "` + baseURL + actor.name + `/outbox",
"last" : "` + baseURL + actor.name + `/outbox?page=` + strconv.Itoa(totalLines/postsPerPage+1) + `",
"totalItems" : 10,
"totalItems" : ` + strconv.Itoa(totalLines) + `,
"type" : "OrderedCollection"
}`)
} else {
@ -213,7 +213,7 @@ func Serve() {
return
}
// try to get the hash only
hash := strings.Replace(id, baseURL+actor.name+"/", "", 1)
hash := strings.Replace(id, baseURL+actor.name+"/item/", "", 1)
// if there are still slashes in the result this means the
// above didn't work
if strings.ContainsAny(hash, "/") {
@ -234,6 +234,17 @@ func Serve() {
}
actor.following[acceptor] = hash
actor.save()
case "Reject":
rejector := activity["actor"].(string)
actor, err := LoadActor(mux.Vars(r)["actor"]) // load the actor from disk
if err != nil {
log.Error("No such actor")
return
}
// write the actor to the list of rejected follows so that
// we won't try following them again
actor.rejected[rejector] = ""
actor.save()
default:
}
@ -282,7 +293,7 @@ func Serve() {
return
}
postJSON, err := json.Marshal(post)
if err!= nil{
if err != nil {
log.Info("failed to marshal json from item " + hash + " text")
return
}