From 328c9150228156c04d1045469c7dbcd7b5f4fedf Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Mon, 2 May 2022 17:43:39 -0700
Subject: admin auth and manage page working for initial pass through
---
activitypub/actor.go | 12 ++---
activitypub/object.go | 33 ++++++++++++
main.go | 11 ++--
routes/actor.go | 12 ++---
routes/admin.go | 142 +++++++++++++++++++++++++++++++++++++++++++++++++-
routes/follow.go | 17 +++---
routes/structs.go | 1 +
static/manage.html | 72 -------------------------
views/manage.html | 65 +++++++++++++++++++++++
webfinger/comm.go | 1 -
10 files changed, 265 insertions(+), 101 deletions(-)
delete mode 100644 static/manage.html
create mode 100644 views/manage.html
diff --git a/activitypub/actor.go b/activitypub/actor.go
index 3fbcb75..757f6bf 100644
--- a/activitypub/actor.go
+++ b/activitypub/actor.go
@@ -339,7 +339,7 @@ func GetActorFollowTotal(id string) (int, int, error) {
return following, followers, nil
}
-func GetActorFollowers(w http.ResponseWriter, id string) error {
+func GetActorFollowers(ctx *fiber.Ctx, id string) error {
var following Collection
var err error
@@ -356,12 +356,12 @@ func GetActorFollowers(w http.ResponseWriter, id string) error {
}
enc, _ := json.MarshalIndent(following, "", "\t")
- w.Header().Set("Content-Type", config.ActivityStreams)
- _, err = w.Write(enc)
+ ctx.Response().Header.Set("Content-Type", config.ActivityStreams)
+ _, err = ctx.Write(enc)
return err
}
-func GetActorFollowing(w http.ResponseWriter, id string) error {
+func GetActorFollowing(ctx *fiber.Ctx, id string) error {
var following Collection
var err error
@@ -378,8 +378,8 @@ func GetActorFollowing(w http.ResponseWriter, id string) error {
}
enc, _ := json.MarshalIndent(following, "", "\t")
- w.Header().Set("Content-Type", config.ActivityStreams)
- _, err = w.Write(enc)
+ ctx.Response().Header.Set("Content-Type", config.ActivityStreams)
+ _, err = ctx.Write(enc)
return err
}
diff --git a/activitypub/object.go b/activitypub/object.go
index 1256fac..c461310 100644
--- a/activitypub/object.go
+++ b/activitypub/object.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
+ "log"
"mime/multipart"
"net/http"
"os"
@@ -1777,3 +1778,35 @@ func WriteWalletToDB(obj ObjectBase) error {
}
return nil
}
+
+func GetRecentPostsDB(actorID string) []ObjectBase {
+ var collection []ObjectBase
+
+ query := `select id, actor, content, published, attachment from activitystream where actor=$1 and type='Note' union select id, actor, content, published, attachment from cacheactivitystream where actor in (select follower from follower where id=$1) and type='Note' order by published desc limit 20`
+
+ rows, err := config.DB.Query(query, actorID)
+
+ if err != nil {
+ log.Println("Could not get recent posts")
+ }
+
+ defer rows.Close()
+ for rows.Next() {
+ var nObj ObjectBase
+ var attachmentID string
+ rows.Scan(&nObj.Id, &nObj.Actor, &nObj.Content, &nObj.Published, &attachmentID)
+
+ isOP, _ := CheckIfObjectOP(nObj.Id)
+ nObj.Attachment, _ = GetObjectAttachment(attachmentID)
+
+ if !isOP {
+ var reply ObjectBase
+ reply.Id = nObj.Id
+ nObj.InReplyTo = append(nObj.InReplyTo, reply)
+ }
+
+ collection = append(collection, nObj)
+ }
+
+ return collection
+}
diff --git a/main.go b/main.go
index ec1e61f..5410cf1 100644
--- a/main.go
+++ b/main.go
@@ -59,9 +59,12 @@ func main() {
app.Post("/verify", routes.AdminVerify)
app.Post("/auth", routes.AdminAuth)
app.All("/"+config.Key+"/", routes.AdminIndex)
+ app.Post("/"+config.Key+"/follow", routes.AdminFollow)
app.Get("/"+config.Key+"/addboard", routes.AdminAddBoard)
app.Get("/"+config.Key+"/postnews", routes.AdminPostNews)
app.Get("/"+config.Key+"/newsdelete", routes.AdminNewsDelete)
+ app.Post("/"+config.Key+"/:actor/follow", routes.AdminActorIndex)
+ app.Get("/"+config.Key+"/:actor", routes.AdminActorIndex)
app.Get("/news", routes.NewsGet)
// Board managment
@@ -80,16 +83,16 @@ func main() {
app.Get("/api/media", routes.Media)
// Board actor
- app.Get("/:actor", routes.OutboxGet)
- app.Post("/:actor", routes.ActorPost)
app.Get("/:actor/catalog", routes.CatalogGet)
- app.Get("/:actor/:post", routes.PostGet)
app.Post("/:actor/inbox", routes.ActorInbox)
app.Post("/:actor/outbox", routes.ActorOutbox)
app.Get("/:actor/following", routes.ActorFollowing)
- app.Get("/:actor/followers", routes.ActorFollowers)
+ app.All("/:actor/followers", routes.ActorFollowers)
app.Get("/:actor/reported", routes.ActorReported)
app.Get("/:actor/archive", routes.ActorArchive)
+ app.Get("/:actor", routes.OutboxGet)
+ app.Post("/:actor", routes.ActorPost)
+ app.Get("/:actor/:post", routes.PostGet)
//404 handler
app.Use(routes.NotFound)
diff --git a/routes/actor.go b/routes/actor.go
index d8b6631..d564850 100644
--- a/routes/actor.go
+++ b/routes/actor.go
@@ -403,16 +403,12 @@ func ActorOutbox(ctx *fiber.Ctx) error {
return nil
}
-func ActorFollowing(c *fiber.Ctx) error {
- // STUB
-
- return c.SendString("actor following")
+func ActorFollowing(ctx *fiber.Ctx) error {
+ return activitypub.GetActorFollowing(ctx, config.Domain+"/"+ctx.Params("actor"))
}
-func ActorFollowers(c *fiber.Ctx) error {
- // STUB
-
- return c.SendString("actor followers")
+func ActorFollowers(ctx *fiber.Ctx) error {
+ return activitypub.GetActorFollowers(ctx, config.Domain+"/"+ctx.Params("actor"))
}
func ActorReported(c *fiber.Ctx) error {
diff --git a/routes/admin.go b/routes/admin.go
index a6978f4..e80d24f 100644
--- a/routes/admin.go
+++ b/routes/admin.go
@@ -3,10 +3,10 @@ package routes
import (
"bytes"
"encoding/json"
- "fmt"
"io/ioutil"
"log"
"net/http"
+ "regexp"
"time"
"github.com/FChannel0/FChannel-Server/activitypub"
@@ -96,7 +96,6 @@ func AdminAuth(ctx *fiber.Ctx) error {
}
func AdminIndex(ctx *fiber.Ctx) error {
- fmt.Println("admin index")
id, _ := db.GetPasswordFromSession(ctx)
actor, _ := webfinger.GetActorFromPath(ctx.Path(), "/"+config.Key+"/")
@@ -150,6 +149,77 @@ func AdminIndex(ctx *fiber.Ctx) error {
})
}
+func AdminFollow(ctx *fiber.Ctx) error {
+ actor, _ := webfinger.GetActorFromPath(ctx.Path(), "/"+config.Key+"/")
+
+ following := regexp.MustCompile(`(.+)\/following`)
+ followers := regexp.MustCompile(`(.+)\/followers`)
+
+ follow := ctx.FormValue("follow")
+ actorId := ctx.FormValue("actor")
+
+ //follow all of boards following
+ if following.MatchString(follow) {
+ followingActor, _ := webfinger.FingerActor(follow)
+ col, _ := webfinger.GetActorCollection(followingActor.Following)
+
+ var nObj activitypub.ObjectBase
+ nObj.Id = followingActor.Id
+
+ col.Items = append(col.Items, nObj)
+
+ for _, e := range col.Items {
+ if isFollowing, _ := activitypub.IsAlreadyFollowing(actorId, e.Id); isFollowing && e.Id != config.Domain && e.Id != actorId {
+ followActivity, _ := db.MakeFollowActivity(actorId, e.Id)
+
+ if actor, _ := webfinger.FingerActor(e.Id); actor.Id != "" {
+ db.MakeActivityRequestOutbox(followActivity)
+ }
+ }
+ }
+
+ //follow all of boards followers
+ } else if followers.MatchString(follow) {
+ followersActor, _ := webfinger.FingerActor(follow)
+ col, _ := webfinger.GetActorCollection(followersActor.Followers)
+
+ var nObj activitypub.ObjectBase
+ nObj.Id = followersActor.Id
+
+ col.Items = append(col.Items, nObj)
+
+ for _, e := range col.Items {
+ if isFollowing, _ := activitypub.IsAlreadyFollowing(actorId, e.Id); isFollowing && e.Id != config.Domain && e.Id != actorId {
+ followActivity, _ := db.MakeFollowActivity(actorId, e.Id)
+ if actor, _ := webfinger.FingerActor(e.Id); actor.Id != "" {
+ db.MakeActivityRequestOutbox(followActivity)
+ }
+ }
+ }
+
+ //do a normal follow to a single board
+ } else {
+ followActivity, _ := db.MakeFollowActivity(actorId, follow)
+
+ if isLocal, _ := activitypub.IsActorLocal(followActivity.Object.Actor); !isLocal && followActivity.Actor.Id == config.Domain {
+ _, err := ctx.Write([]byte("main board can only follow local boards. Create a new board and then follow outside boards from it."))
+ return err
+ }
+
+ if actor, _ := webfinger.FingerActor(follow); actor.Id != "" {
+ db.MakeActivityRequestOutbox(followActivity)
+ }
+ }
+
+ var redirect string
+
+ if actor.Name != "main" {
+ redirect = "/" + actor.Name
+ }
+
+ return ctx.Redirect("/"+config.Key+"/"+redirect, http.StatusSeeOther)
+}
+
func AdminAddBoard(c *fiber.Ctx) error {
// STUB
@@ -167,3 +237,71 @@ func AdminNewsDelete(c *fiber.Ctx) error {
return c.SendString("admin news delete")
}
+
+func AdminActorIndex(ctx *fiber.Ctx) error {
+ actor, _ := webfinger.GetActorFromPath(ctx.Path(), "/"+config.Key+"/")
+
+ follow, _ := webfinger.GetActorCollection(actor.Following)
+ follower, _ := webfinger.GetActorCollection(actor.Followers)
+ reported, _ := activitypub.GetActorCollectionReq(actor.Id + "/reported")
+
+ var following []string
+ var followers []string
+ var reports []db.Report
+
+ for _, e := range follow.Items {
+ following = append(following, e.Id)
+ }
+
+ for _, e := range follower.Items {
+ followers = append(followers, e.Id)
+ }
+
+ for _, e := range reported.Items {
+ var r db.Report
+ r.Count = int(e.Size)
+ r.ID = e.Id
+ r.Reason = e.Content
+ reports = append(reports, r)
+ }
+
+ localReports, _ := db.GetLocalReportDB(actor.Name)
+
+ for _, e := range localReports {
+ var r db.Report
+ r.Count = e.Count
+ r.ID = e.ID
+ r.Reason = e.Reason
+ reports = append(reports, r)
+ }
+
+ var data AdminPage
+ data.Following = following
+ data.Followers = followers
+ data.Reported = reports
+ data.Domain = config.Domain
+ data.IsLocal, _ = activitypub.IsActorLocal(actor.Id)
+
+ data.Title = "Manage /" + actor.Name + "/"
+ data.Boards = webfinger.Boards
+ data.Board.Name = actor.Name
+ data.Board.Actor = actor
+ data.Key = config.Key
+ data.Board.TP = config.TP
+
+ data.Board.Post.Actor = actor.Id
+
+ data.AutoSubscribe, _ = activitypub.GetActorAutoSubscribeDB(actor.Id)
+
+ data.Themes = &config.Themes
+
+ data.RecentPosts = activitypub.GetRecentPostsDB(actor.Id)
+
+ if cookie := ctx.Cookies("theme"); cookie != "" {
+ data.ThemeCookie = cookie
+ }
+
+ return ctx.Render("manage", fiber.Map{
+ "page": data,
+ })
+}
diff --git a/routes/follow.go b/routes/follow.go
index 2578983..3dbf9cf 100644
--- a/routes/follow.go
+++ b/routes/follow.go
@@ -1,15 +1,16 @@
package routes
-import "github.com/gofiber/fiber/v2"
+import (
+ "github.com/FChannel0/FChannel-Server/activitypub"
+ "github.com/FChannel0/FChannel-Server/config"
+ "github.com/gofiber/fiber/v2"
+)
-func Following(c *fiber.Ctx) error {
- // STUB
-
- return c.SendString("main following")
+func Following(ctx *fiber.Ctx) error {
+ return activitypub.GetActorFollowing(ctx, config.Domain)
}
-func Followers(c *fiber.Ctx) error {
+func Followers(ctx *fiber.Ctx) error {
// STUB
-
- return c.SendString("main followers")
+ return activitypub.GetActorFollowers(ctx, config.Domain)
}
diff --git a/routes/structs.go b/routes/structs.go
index 7c6e980..1c85676 100644
--- a/routes/structs.go
+++ b/routes/structs.go
@@ -42,6 +42,7 @@ type AdminPage struct {
IsLocal bool
PostBlacklist []util.PostBlacklist
AutoSubscribe bool
+ RecentPosts []activitypub.ObjectBase
Themes *[]string
ThemeCookie string
diff --git a/static/manage.html b/static/manage.html
deleted file mode 100644
index c3d818c..0000000
--- a/static/manage.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{{ define "title" }}{{ .Title }}{{ end }}
-{{ define "header" }}
-
-{{ end }}
-{{ define "top" }}{{ end }}
-{{ define "content" }}
-
-
Manage /{{ .Board.Name }}/
-
-
-
-
Followers
-
- {{ range .Followers }}
- - {{ . }}
- {{ end }}
-
-
+
Manage /{{ .page.Board.Name }}/
+
+
+
+
Followers
+
+ {{ range .page.Followers }}
+ - {{ . }}
+ {{ end }}
+
+