From 505a1b42d7c61b7f5d7344ec70c86d1629e8d420 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Mon, 29 Aug 2022 19:58:54 +0300
Subject: [PATCH] removed federation, closes #12

---
 README.md        | 1 -
 bot/bot.go       | 7 +++----
 bot/command.go   | 5 -----
 cmd/cmd.go       | 2 +-
 config/config.go | 1 -
 config/types.go  | 2 --
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 00bc65c..966222c 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,6 @@ env vars
 <summary>other optional config parameters</summary>
 
 * **POSTMOOGLE_NOOWNER** - allow change room settings by any room partisipant
-* **POSTMOOGLE_FEDERATION** - allow usage of Postmoogle by users from others homeservers
 * **POSTMOOGLE_NOENCRYPTION** - disable encryption support
 * **POSTMOOGLE_STATUSMSG** - presence status message
 * **POSTMOOGLE_SENTRY_DSN** - sentry DSN
diff --git a/bot/bot.go b/bot/bot.go
index c36373d..3e0a92c 100644
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -18,7 +18,6 @@ import (
 // Bot represents matrix bot
 type Bot struct {
 	noowner                 bool
-	federation              bool
 	prefix                  string
 	domain                  string
 	allowedUsers            []*regexp.Regexp
@@ -36,14 +35,14 @@ type Bot struct {
 func New(
 	lp *linkpearl.Linkpearl,
 	log *logger.Logger,
-	prefix, domain string,
-	noowner, federation bool,
+	prefix string,
+	domain string,
+	noowner bool,
 	allowedUsers []*regexp.Regexp,
 	allowedAdmins []*regexp.Regexp,
 ) *Bot {
 	b := &Bot{
 		noowner:       noowner,
-		federation:    federation,
 		prefix:        prefix,
 		domain:        domain,
 		allowedUsers:  allowedUsers,
diff --git a/bot/command.go b/bot/command.go
index 606436e..650e318 100644
--- a/bot/command.go
+++ b/bot/command.go
@@ -124,11 +124,6 @@ func (b *Bot) handleCommand(ctx context.Context, evt *event.Event, commandSlice
 		return
 	}
 
-	// ignore requests over federation if disabled
-	if !b.federation && evt.Sender.Homeserver() != b.lp.GetClient().UserID.Homeserver() {
-		return
-	}
-
 	if !cmd.allowed(evt.Sender, evt.RoomID) {
 		b.SendNotice(ctx, evt.RoomID, "not allowed to do that, kupo")
 		return
diff --git a/cmd/cmd.go b/cmd/cmd.go
index dc7d455..41671b9 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -87,7 +87,7 @@ func initBot(cfg *config.Config) {
 		// nolint // Fatal = panic, not os.Exit()
 		log.Fatal("cannot initialize matrix bot: %v", err)
 	}
-	mxb = bot.New(lp, mxlog, cfg.Prefix, cfg.Domain, cfg.NoOwner, cfg.Federation, cfg.Users, cfg.Admins)
+	mxb = bot.New(lp, mxlog, cfg.Prefix, cfg.Domain, cfg.NoOwner, cfg.Users, cfg.Admins)
 	log.Debug("bot has been created")
 }
 
diff --git a/config/config.go b/config/config.go
index c9e297f..c6fad30 100644
--- a/config/config.go
+++ b/config/config.go
@@ -34,7 +34,6 @@ func New() (*Config, error) {
 		Port:         env.String("port", defaultConfig.Port),
 		NoEncryption: env.Bool("noencryption"),
 		NoOwner:      env.Bool("noowner"),
-		Federation:   env.Bool("federation"),
 		MaxSize:      env.Int("maxsize", defaultConfig.MaxSize),
 		StatusMsg:    env.String("statusmsg", defaultConfig.StatusMsg),
 		Users:        userPatterns,
diff --git a/config/types.go b/config/types.go
index ba99036..9158e85 100644
--- a/config/types.go
+++ b/config/types.go
@@ -20,8 +20,6 @@ type Config struct {
 	NoEncryption bool
 	// NoOwner allows room settings change by any participant
 	NoOwner bool
-	// Federation allows usage of Postmoogle by users from other homeservers
-	Federation bool
 	// Prefix for commands
 	Prefix string
 	// MaxSize of an email (including attachments)