creating boards works

8 files changed, 257 insertions, 244 deletions

diff --git a/routes/actor.go b/routes/actor.go
index d564850..5cd0fa9 100644
--- a/routes/actor.go
+++ b/routes/actor.go
@@ -35,13 +35,11 @@ func ActorInbox(ctx *fiber.Ctx) error {
 
 	if !db.VerifyHeaderSignature(ctx, *activity.Actor) {
 		response := activitypub.RejectActivity(activity)
-
 		return db.MakeActivityRequest(response)
 	}
 
 	switch activity.Type {
 	case "Create":
-
 		for _, e := range activity.To {
 			if res, err := activitypub.IsActorLocal(e); err == nil && res {
 				if res, err := activitypub.IsActorLocal(activity.Actor.Id); err == nil && res {
@@ -171,7 +169,6 @@ func ActorInbox(ctx *fiber.Ctx) error {
 			} else {
 				fmt.Println("follow request for rejected")
 				response := activitypub.RejectActivity(activity)
-
 				return db.MakeActivityRequest(response)
 			}
 		}
@@ -202,205 +199,7 @@ func ActorOutbox(ctx *fiber.Ctx) error {
 		return nil
 	}
 
-	contentType := util.GetContentType(ctx.Get("content-type"))
-
-	if contentType == "multipart/form-data" || contentType == "application/x-www-form-urlencoded" {
-		hasCaptcha, err := db.BoardHasAuthType(actor.Name, "captcha")
-		if err != nil {
-			return err
-		}
-
-		valid, err := post.CheckCaptcha(ctx.FormValue("captcha"))
-		if err == nil && hasCaptcha && valid {
-			header, _ := ctx.FormFile("file")
-			if header != nil {
-				f, _ := header.Open()
-				defer f.Close()
-				if header.Size > (7 << 20) {
-					ctx.Response().Header.SetStatusCode(403)
-					_, err := ctx.Write([]byte("7MB max file size"))
-					return err
-				} else if isBanned, err := post.IsMediaBanned(f); err == nil && isBanned {
-					//Todo add logging
-					fmt.Println("media banned")
-					ctx.Response().Header.SetStatusCode(403)
-					_, err := ctx.Write([]byte("media banned"))
-					return err
-				} else if err != nil {
-					return err
-				}
-
-				contentType, _ := util.GetFileContentType(f)
-
-				if !post.SupportedMIMEType(contentType) {
-					ctx.Response().Header.SetStatusCode(403)
-					_, err := ctx.Write([]byte("file type not supported"))
-					return err
-				}
-			}
-
-			var nObj = activitypub.CreateObject("Note")
-			nObj, err := post.ObjectFromForm(ctx, nObj)
-			if err != nil {
-				return err
-			}
-
-			nObj.Actor = config.Domain + "/" + actor.Name
-
-			nObj, err = activitypub.WriteObjectToDB(nObj)
-			if err != nil {
-				return err
-			}
-
-			if len(nObj.To) == 0 {
-				if err := db.ArchivePosts(actor); err != nil {
-					return err
-				}
-			}
-
-			activity, err := webfinger.CreateActivity("Create", nObj)
-			if err != nil {
-				return err
-			}
-
-			activity, err = webfinger.AddFollowersToActivity(activity)
-			if err != nil {
-				return err
-			}
-
-			go db.MakeActivityRequest(activity)
-
-			var id string
-			op := len(nObj.InReplyTo) - 1
-			if op >= 0 {
-				if nObj.InReplyTo[op].Id == "" {
-					id = nObj.Id
-				} else {
-					id = nObj.InReplyTo[0].Id + "|" + nObj.Id
-				}
-			}
-
-			ctx.Response().Header.Set("Status", "200")
-			_, err = ctx.Write([]byte(id))
-			return err
-		}
-
-		ctx.Response().Header.Set("Status", "403")
-		_, err = ctx.Write([]byte("captcha could not auth"))
-		return err
-	} else { // json request
-		activity, err := activitypub.GetActivityFromJson(ctx)
-		if err != nil {
-			return err
-		}
-
-		if res, err := activitypub.IsActivityLocal(activity); err == nil && res {
-			if res := db.VerifyHeaderSignature(ctx, *activity.Actor); err == nil && !res {
-				ctx.Response().Header.Set("Status", "403")
-				_, err = ctx.Write([]byte(""))
-				return err
-			}
-
-			switch activity.Type {
-			case "Create":
-				ctx.Response().Header.Set("Status", "403")
-				_, err = ctx.Write([]byte(""))
-				break
-
-			case "Follow":
-				var validActor bool
-				var validLocalActor bool
-
-				validActor = (activity.Object.Actor != "")
-				validLocalActor = (activity.Actor.Id == actor.Id)
-
-				var rActivity activitypub.Activity
-				if validActor && validLocalActor {
-					rActivity = db.AcceptFollow(activity)
-					rActivity, err = db.SetActorFollowingDB(rActivity)
-					if err != nil {
-						return err
-					}
-					if err := db.MakeActivityRequest(activity); err != nil {
-						return err
-					}
-				}
-
-				webfinger.FollowingBoards, err = activitypub.GetActorFollowingDB(config.Domain)
-				if err != nil {
-					return err
-				}
-
-				webfinger.Boards, err = webfinger.GetBoardCollection()
-				if err != nil {
-					return err
-				}
-				break
-
-			case "Delete":
-				fmt.Println("This is a delete")
-				ctx.Response().Header.Set("Status", "403")
-				_, err = ctx.Write([]byte("could not process activity"))
-				break
-
-			case "Note":
-				ctx.Response().Header.Set("Satus", "403")
-				_, err = ctx.Write([]byte("could not process activity"))
-				break
-
-			case "New":
-				name := activity.Object.Alias
-				prefname := activity.Object.Name
-				summary := activity.Object.Summary
-				restricted := activity.Object.Sensitive
-
-				actor, err := db.CreateNewBoardDB(*activitypub.CreateNewActor(name, prefname, summary, config.AuthReq, restricted))
-				if err != nil {
-					return err
-				}
-
-				if actor.Id != "" {
-					var board []activitypub.ObjectBase
-					var item activitypub.ObjectBase
-					var removed bool = false
-
-					item.Id = actor.Id
-					for _, e := range webfinger.FollowingBoards {
-						if e.Id != item.Id {
-							board = append(board, e)
-						} else {
-							removed = true
-						}
-					}
-
-					if !removed {
-						board = append(board, item)
-					}
-
-					webfinger.FollowingBoards = board
-					webfinger.Boards, err = webfinger.GetBoardCollection()
-					return err
-				}
-
-				ctx.Response().Header.Set("Status", "403")
-				_, err = ctx.Write([]byte(""))
-				break
-
-			default:
-				ctx.Response().Header.Set("status", "403")
-				_, err = ctx.Write([]byte("could not process activity"))
-			}
-		} else if err != nil {
-			return err
-		} else {
-			fmt.Println("is NOT activity")
-			ctx.Response().Header.Set("Status", "403")
-			_, err = ctx.Write([]byte("could not process activity"))
-			return err
-		}
-	}
-
-	return nil
+	return ParseOutboxRequest(ctx, actor)
 }
 
 func ActorFollowing(ctx *fiber.Ctx) error {
diff --git a/routes/admin.go b/routes/admin.go
index e80d24f..580b4dd 100644
--- a/routes/admin.go
+++ b/routes/admin.go
@@ -169,7 +169,7 @@ func AdminFollow(ctx *fiber.Ctx) error {
 		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 {
+			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 != "" {
@@ -189,7 +189,7 @@ func AdminFollow(ctx *fiber.Ctx) error {
 		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 {
+			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)
@@ -220,10 +220,42 @@ func AdminFollow(ctx *fiber.Ctx) error {
 	return ctx.Redirect("/"+config.Key+"/"+redirect, http.StatusSeeOther)
 }
 
-func AdminAddBoard(c *fiber.Ctx) error {
-	// STUB
+func AdminAddBoard(ctx *fiber.Ctx) error {
+	actor, _ := activitypub.GetActorFromDB(config.Domain)
+
+	if hasValidation := db.HasValidation(ctx, actor); !hasValidation {
+		return nil
+	}
+
+	var newActorActivity activitypub.Activity
+	var board activitypub.Actor
+
+	var restrict bool
+	if ctx.FormValue("restricted") == "True" {
+		restrict = true
+	} else {
+		restrict = false
+	}
+
+	board.Name = ctx.FormValue("name")
+	board.PreferredUsername = ctx.FormValue("prefname")
+	board.Summary = ctx.FormValue("summary")
+	board.Restricted = restrict
+
+	newActorActivity.AtContext.Context = "https://www.w3.org/ns/activitystreams"
+	newActorActivity.Type = "New"
+
+	var nobj activitypub.ObjectBase
+	newActorActivity.Actor = &actor
+	newActorActivity.Object = &nobj
+
+	newActorActivity.Object.Alias = board.Name
+	newActorActivity.Object.Name = board.PreferredUsername
+	newActorActivity.Object.Summary = board.Summary
+	newActorActivity.Object.Sensitive = board.Restricted
 
-	return c.SendString("admin add board")
+	db.MakeActivityRequestOutbox(newActorActivity)
+	return ctx.Redirect("/"+config.Key, http.StatusSeeOther)
 }
 
 func AdminPostNews(c *fiber.Ctx) error {
diff --git a/routes/archive.go b/routes/archive.go
index f3b4487..81cad48 100644
--- a/routes/archive.go
+++ b/routes/archive.go
@@ -21,7 +21,7 @@ func ArchiveGet(ctx *fiber.Ctx) error {
 	returnData.Board.To = actor.Outbox
 	returnData.Board.Actor = *actor
 	returnData.Board.Summary = actor.Summary
-	returnData.Board.ModCred, _ = getPassword(ctx)
+	returnData.Board.ModCred, _ = db.GetPassword(ctx)
 	returnData.Board.Domain = config.Domain
 	returnData.Board.Restricted = actor.Restricted
 	returnData.Key = config.Key
diff --git a/routes/index.go b/routes/index.go
index 015ad0c..efa8838 100644
--- a/routes/index.go
+++ b/routes/index.go
@@ -42,7 +42,7 @@ func Index(ctx *fiber.Ctx) error {
 	data.Board.Name = ""
 	data.Key = config.Key
 	data.Board.Domain = config.Domain
-	data.Board.ModCred, _ = getPassword(ctx)
+	data.Board.ModCred, _ = db.GetPassword(ctx)
 	data.Board.Actor = actor
 	data.Board.Post.Actor = actor.Id
 	data.Board.Restricted = actor.Restricted
diff --git a/routes/news.go b/routes/news.go
index 2a8a0f9..736b664 100644
--- a/routes/news.go
+++ b/routes/news.go
@@ -23,7 +23,7 @@ func NewsGet(ctx *fiber.Ctx) error {
 	data.Board.Name = ""
 	data.Key = config.Key
 	data.Board.Domain = config.Domain
-	data.Board.ModCred, _ = getPassword(ctx)
+	data.Board.ModCred, _ = db.GetPassword(ctx)
 	data.Board.Actor = actor
 	data.Board.Post.Actor = actor.Id
 	data.Board.Restricted = actor.Restricted
@@ -55,7 +55,7 @@ func AllNewsGet(ctx *fiber.Ctx) error {
 	data.Board.Name = ""
 	data.Key = config.Key
 	data.Board.Domain = config.Domain
-	data.Board.ModCred, _ = getPassword(ctx)
+	data.Board.ModCred, _ = db.GetPassword(ctx)
 	data.Board.Actor = actor
 	data.Board.Post.Actor = actor.Id
 	data.Board.Restricted = actor.Restricted
diff --git a/routes/outbox.go b/routes/outbox.go
index 8049bd5..c7ca7b4 100644
--- a/routes/outbox.go
+++ b/routes/outbox.go
@@ -12,14 +12,23 @@ import (
 )
 
 func Outbox(ctx *fiber.Ctx) error {
-	// STUB
 
-	return ctx.SendString("main outbox")
+	actor, err := webfinger.GetActorFromPath(ctx.Path(), "/")
+	if err != nil {
+		return err
+	}
+
+	if activitypub.AcceptActivity(ctx.Get("Accept")) {
+		activitypub.GetActorOutbox(ctx, actor)
+		return nil
+	}
+
+	return ParseOutboxRequest(ctx, actor)
 }
 
 func OutboxGet(ctx *fiber.Ctx) error {
 
-	actor := webfinger.GetActorByName(ctx.Params("actor"))
+	actor, _ := activitypub.GetActorByNameFromDB(ctx.Params("actor"))
 
 	if activitypub.AcceptActivity(ctx.Get("Accept")) {
 		activitypub.GetActorInfo(ctx, actor.Id)
@@ -62,7 +71,7 @@ func OutboxGet(ctx *fiber.Ctx) error {
 	data.Board.InReplyTo = ""
 	data.Board.To = actor.Outbox
 	data.Board.Actor = actor
-	data.Board.ModCred, _ = getPassword(ctx)
+	data.Board.ModCred, _ = db.GetPassword(ctx)
 	data.Board.Domain = config.Domain
 	data.Board.Restricted = actor.Restricted
 	data.CurrentPage = page
diff --git a/routes/post.go b/routes/post.go
index 64df600..7fa3d7b 100644
--- a/routes/post.go
+++ b/routes/post.go
@@ -80,7 +80,7 @@ func PostGet(ctx *fiber.Ctx) error {
 	data.Board.To = actor.Outbox
 	data.Board.Actor = actor
 	data.Board.Summary = actor.Summary
-	data.Board.ModCred, _ = getPassword(ctx)
+	data.Board.ModCred, _ = db.GetPassword(ctx)
 	data.Board.Domain = config.Domain
 	data.Board.Restricted = actor.Restricted
 	data.ReturnTo = "feed"
@@ -147,7 +147,7 @@ func CatalogGet(ctx *fiber.Ctx) error {
 	data.Board.To = actor.Outbox
 	data.Board.Actor = actor
 	data.Board.Summary = actor.Summary
-	data.Board.ModCred, _ = getPassword(ctx)
+	data.Board.ModCred, _ = db.GetPassword(ctx)
 	data.Board.Domain = config.Domain
 	data.Board.Restricted = actor.Restricted
 	data.Key = config.Key
diff --git a/routes/util.go b/routes/util.go
index ef7d379..8d36752 100644
--- a/routes/util.go
+++ b/routes/util.go
@@ -8,6 +8,9 @@ import (
 	"github.com/FChannel0/FChannel-Server/activitypub"
 	"github.com/FChannel0/FChannel-Server/config"
 	"github.com/FChannel0/FChannel-Server/db"
+	"github.com/FChannel0/FChannel-Server/post"
+	"github.com/FChannel0/FChannel-Server/util"
+	"github.com/FChannel0/FChannel-Server/webfinger"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -23,27 +26,6 @@ func getThemeCookie(c *fiber.Ctx) string {
 	return "default"
 }
 
-func getPassword(r *fiber.Ctx) (string, string) {
-	c := r.Cookies("session_token")
-
-	sessionToken := c
-
-	response, err := db.Cache.Do("GET", sessionToken)
-	if err != nil {
-		return "", ""
-	}
-
-	token := fmt.Sprintf("%s", response)
-
-	parts := strings.Split(token, "|")
-
-	if len(parts) > 1 {
-		return parts[0], parts[1]
-	}
-
-	return "", ""
-}
-
 func wantToServePage(actorName string, page int) (activitypub.Collection, bool, error) {
 	var collection activitypub.Collection
 	serve := false
@@ -115,13 +97,204 @@ func wantToServeArchive(actorName string) (activitypub.Collection, bool, error)
 	return collection, serve, nil
 }
 
-func hasValidation(ctx *fiber.Ctx, actor activitypub.Actor) bool {
-	id, _ := getPassword(ctx)
+func ParseOutboxRequest(ctx *fiber.Ctx, actor activitypub.Actor) error {
+	contentType := util.GetContentType(ctx.Get("content-type"))
+
+	if contentType == "multipart/form-data" || contentType == "application/x-www-form-urlencoded" {
+		hasCaptcha, err := db.BoardHasAuthType(actor.Name, "captcha")
+		if err != nil {
+			return err
+		}
+
+		valid, err := post.CheckCaptcha(ctx.FormValue("captcha"))
+		if err == nil && hasCaptcha && valid {
+			header, _ := ctx.FormFile("file")
+			if header != nil {
+				f, _ := header.Open()
+				defer f.Close()
+				if header.Size > (7 << 20) {
+					ctx.Response().Header.SetStatusCode(403)
+					_, err := ctx.Write([]byte("7MB max file size"))
+					return err
+				} else if isBanned, err := post.IsMediaBanned(f); err == nil && isBanned {
+					//Todo add logging
+					fmt.Println("media banned")
+					ctx.Response().Header.SetStatusCode(403)
+					_, err := ctx.Write([]byte("media banned"))
+					return err
+				} else if err != nil {
+					return err
+				}
+
+				contentType, _ := util.GetFileContentType(f)
+
+				if !post.SupportedMIMEType(contentType) {
+					ctx.Response().Header.SetStatusCode(403)
+					_, err := ctx.Write([]byte("file type not supported"))
+					return err
+				}
+			}
+
+			var nObj = activitypub.CreateObject("Note")
+			nObj, err := post.ObjectFromForm(ctx, nObj)
+			if err != nil {
+				return err
+			}
+
+			nObj.Actor = config.Domain + "/" + actor.Name
+
+			nObj, err = activitypub.WriteObjectToDB(nObj)
+			if err != nil {
+				return err
+			}
+
+			if len(nObj.To) == 0 {
+				if err := db.ArchivePosts(actor); err != nil {
+					return err
+				}
+			}
+
+			activity, err := webfinger.CreateActivity("Create", nObj)
+			if err != nil {
+				return err
+			}
+
+			activity, err = webfinger.AddFollowersToActivity(activity)
+			if err != nil {
+				return err
+			}
+
+			go db.MakeActivityRequest(activity)
 
-	if id == "" || (id != actor.Id && id != config.Domain) {
-		//http.Redirect(w, r, "/", http.StatusSeeOther)
-		return false
+			var id string
+			op := len(nObj.InReplyTo) - 1
+			if op >= 0 {
+				if nObj.InReplyTo[op].Id == "" {
+					id = nObj.Id
+				} else {
+					id = nObj.InReplyTo[0].Id + "|" + nObj.Id
+				}
+			}
+
+			ctx.Response().Header.Set("Status", "200")
+			_, err = ctx.Write([]byte(id))
+			return err
+		}
+
+		ctx.Response().Header.Set("Status", "403")
+		_, err = ctx.Write([]byte("captcha could not auth"))
+		return err
+	} else { // json request
+		activity, err := activitypub.GetActivityFromJson(ctx)
+		if err != nil {
+			return err
+		}
+
+		if res, err := activitypub.IsActivityLocal(activity); err == nil && res {
+			if res := db.VerifyHeaderSignature(ctx, *activity.Actor); err == nil && !res {
+				ctx.Response().Header.Set("Status", "403")
+				_, err = ctx.Write([]byte(""))
+				return err
+			}
+
+			switch activity.Type {
+			case "Create":
+				ctx.Response().Header.Set("Status", "403")
+				_, err = ctx.Write([]byte(""))
+				break
+
+			case "Follow":
+				var validActor bool
+				var validLocalActor bool
+
+				validActor = (activity.Object.Actor != "")
+				validLocalActor = (activity.Actor.Id == actor.Id)
+
+				var rActivity activitypub.Activity
+				if validActor && validLocalActor {
+					rActivity = db.AcceptFollow(activity)
+					rActivity, err = db.SetActorFollowingDB(rActivity)
+					if err != nil {
+						return err
+					}
+					if err := db.MakeActivityRequest(activity); err != nil {
+						return err
+					}
+				}
+
+				webfinger.FollowingBoards, err = activitypub.GetActorFollowingDB(config.Domain)
+				if err != nil {
+					return err
+				}
+
+				webfinger.Boards, err = webfinger.GetBoardCollection()
+				if err != nil {
+					return err
+				}
+				break
+
+			case "Delete":
+				fmt.Println("This is a delete")
+				ctx.Response().Header.Set("Status", "403")
+				_, err = ctx.Write([]byte("could not process activity"))
+				break
+
+			case "Note":
+				ctx.Response().Header.Set("Satus", "403")
+				_, err = ctx.Write([]byte("could not process activity"))
+				break
+
+			case "New":
+				name := activity.Object.Alias
+				prefname := activity.Object.Name
+				summary := activity.Object.Summary
+				restricted := activity.Object.Sensitive
+
+				actor, err := db.CreateNewBoardDB(*activitypub.CreateNewActor(name, prefname, summary, config.AuthReq, restricted))
+				if err != nil {
+					return err
+				}
+
+				if actor.Id != "" {
+					var board []activitypub.ObjectBase
+					var item activitypub.ObjectBase
+					var removed bool = false
+
+					item.Id = actor.Id
+					for _, e := range webfinger.FollowingBoards {
+						if e.Id != item.Id {
+							board = append(board, e)
+						} else {
+							removed = true
+						}
+					}
+
+					if !removed {
+						board = append(board, item)
+					}
+
+					webfinger.FollowingBoards = board
+					webfinger.Boards, err = webfinger.GetBoardCollection()
+					return err
+				}
+
+				ctx.Response().Header.Set("Status", "403")
+				_, err = ctx.Write([]byte(""))
+				break
+
+			default:
+				ctx.Response().Header.Set("status", "403")
+				_, err = ctx.Write([]byte("could not process activity"))
+			}
+		} else if err != nil {
+			return err
+		} else {
+			fmt.Println("is NOT activity")
+			ctx.Response().Header.Set("Status", "403")
+			_, err = ctx.Write([]byte("could not process activity"))
+			return err
+		}
 	}
 
-	return true
+	return nil
 }