From d3f8ab1d28cb1aa49558aee006763e108822cd60 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Wed, 26 Apr 2023 10:12:21 -0600 Subject: [PATCH] Don't check blacklist when attempting federated join --- federationapi/internal/federationclient.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/federationapi/internal/federationclient.go b/federationapi/internal/federationclient.go index 41576728b..dd329057c 100644 --- a/federationapi/internal/federationclient.go +++ b/federationapi/internal/federationclient.go @@ -19,14 +19,11 @@ func (a *FederationInternalAPI) MakeJoin( ) (res gomatrixserverlib.MakeJoinResponse, err error) { ctx, cancel := context.WithTimeout(ctx, defaultTimeout) defer cancel() - ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { - return a.federation.MakeJoin(ctx, origin, s, roomID, userID) - }) + ires, err := a.federation.MakeJoin(ctx, origin, s, roomID, userID) if err != nil { return &fclient.RespMakeJoin{}, err } - r := ires.(fclient.RespMakeJoin) - return &r, nil + return &ires, nil } func (a *FederationInternalAPI) SendJoin( @@ -34,14 +31,11 @@ func (a *FederationInternalAPI) SendJoin( ) (res gomatrixserverlib.SendJoinResponse, err error) { ctx, cancel := context.WithTimeout(ctx, defaultTimeout) defer cancel() - ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { - return a.federation.SendJoin(ctx, origin, s, event) - }) + ires, err := a.federation.SendJoin(ctx, origin, s, event) if err != nil { return &fclient.RespSendJoin{}, err } - r := ires.(fclient.RespSendJoin) - return &r, nil + return &ires, nil } func (a *FederationInternalAPI) GetEventAuth(