mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various typos and whitespace cleanup

Browse source
This commit is contained in:
Devon Hudson 2023-01-12 14:16:23 -07:00
parent 4626f6c9d8
commit 75bc8ab826
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
10 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
federationapi/storage/postgres/relay_servers_table.go
View file

@ -25,7 +25,7 @@ import (
const relayServersSchema = `
CREATE TABLE IF NOT EXISTS federationsender_relay_servers (
-- The destination server name
-- The destination server name
server_name TEXT NOT NULL,
-- The relay server name for a given destination
relay_server_name TEXT NOT NULL,
@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS federationsender_relay_servers (
);
CREATE INDEX IF NOT EXISTS federationsender_relay_servers_server_name_idx
ON federationsender_relay_servers (server_name);
ON federationsender_relay_servers (server_name);
`
const insertRelayServersSQL = "" +

4
federationapi/storage/sqlite3/relay_servers_table.go
View file

@ -25,7 +25,7 @@ import (
const relayServersSchema = `
CREATE TABLE IF NOT EXISTS federationsender_relay_servers (
-- The destination server name
-- The destination server name
server_name TEXT NOT NULL,
-- The relay server name for a given destination
relay_server_name TEXT NOT NULL,
@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS federationsender_relay_servers (
);
CREATE INDEX IF NOT EXISTS federationsender_relay_servers_server_name_idx
ON federationsender_relay_servers (server_name);
ON federationsender_relay_servers (server_name);
`
const insertRelayServersSQL = "" +

2
relayapi/internal/perform.go
View file

@ -24,7 +24,7 @@ import (
"github.com/sirupsen/logrus"
)
// PerformRelayServerSync implements api.FederationInternalAPI
// PerformRelayServerSync implements api.RelayInternalAPI
func (r *RelayInternalAPI) PerformRelayServerSync(
ctx context.Context,
request *api.PerformRelayServerSyncRequest,

2
relayapi/inthttp/client_test.go
View file

@ -16,7 +16,7 @@ func TestRelayAPIClientNil(t *testing.T) {
assert.Error(t, err)
}
func TestRelayAPIClientPerormSync(t *testing.T) {
func TestRelayAPIClientPerformSync(t *testing.T) {
// Start a local HTTP server
server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
assert.Equal(t, "/api"+RelayAPIPerformRelayServerSyncPath, req.URL.String())

2
relayapi/storage/postgres/relay_queue_json_table.go
View file

@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS relayapi_queue_json (
);
CREATE UNIQUE INDEX IF NOT EXISTS relayapi_queue_json_json_nid_idx
ON relayapi_queue_json (json_nid);
ON relayapi_queue_json (json_nid);
`
const insertQueueJSONSQL = "" +

10
relayapi/storage/postgres/relay_queue_table.go
View file

@ -26,20 +26,20 @@ import (
const relayQueueSchema = `
CREATE TABLE IF NOT EXISTS relayapi_queue (
-- The transaction ID that was generated before persisting the event.
-- The transaction ID that was generated before persisting the event.
transaction_id TEXT NOT NULL,
-- The destination server that we will send the event to.
-- The destination server that we will send the event to.
server_name TEXT NOT NULL,
-- The JSON NID from the relayapi_queue_json table.
json_nid BIGINT NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS relayapi_queue_queue_json_nid_idx
ON relayapi_queue (json_nid, server_name);
ON relayapi_queue (json_nid, server_name);
CREATE INDEX IF NOT EXISTS relayapi_queue_json_nid_idx
ON relayapi_queue (json_nid);
ON relayapi_queue (json_nid);
CREATE INDEX IF NOT EXISTS relayapi_queue_server_name_idx
ON relayapi_queue (server_name);
ON relayapi_queue (server_name);
`
const insertQueueEntrySQL = "" +

9
relayapi/storage/shared/storage.go
View file

@ -37,12 +37,12 @@ type Database struct {
}
func (d *Database) StoreTransaction(
ctx context.Context, txn gomatrixserverlib.Transaction,
ctx context.Context, transaction gomatrixserverlib.Transaction,
) (*shared.Receipt, error) {
var err error
json, err := json.Marshal(txn)
json, err := json.Marshal(transaction)
if err != nil {
return nil, fmt.Errorf("d.JSONUnmarshall: %w", err)
return nil, fmt.Errorf("failed to marshal: %w", err)
}
var nid int64
@ -83,7 +83,6 @@ func (d *Database) CleanTransactions(
userID gomatrixserverlib.UserID,
receipts []*shared.Receipt,
) error {
println(len(receipts))
nids := make([]int64, len(receipts))
for i, receipt := range receipts {
nids[i] = receipt.GetNID()
@ -132,7 +131,7 @@ func (d *Database) GetTransaction(
transaction := &gomatrixserverlib.Transaction{}
err = json.Unmarshal(txns[nids[0]], transaction)
if err != nil {
return nil, nil, fmt.Errorf("Unmarshall transaction: %w", err)
return nil, nil, fmt.Errorf("Unmarshal transaction: %w", err)
}
receipt := shared.NewReceipt(nids[0])

2
relayapi/storage/sqlite3/relay_queue_json_table.go
View file

@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS relayapi_queue_json (
);
CREATE UNIQUE INDEX IF NOT EXISTS relayapi_queue_json_json_nid_idx
ON relayapi_queue_json (json_nid);
ON relayapi_queue_json (json_nid);
`
const insertQueueJSONSQL = "" +

10
relayapi/storage/sqlite3/relay_queue_table.go
View file

@ -27,20 +27,20 @@ import (
const relayQueueSchema = `
CREATE TABLE IF NOT EXISTS relayapi_queue (
-- The transaction ID that was generated before persisting the event.
-- The transaction ID that was generated before persisting the event.
transaction_id TEXT NOT NULL,
-- The domain part of the user ID the m.room.member event is for.
-- The domain part of the user ID the m.room.member event is for.
server_name TEXT NOT NULL,
-- The JSON NID from the relayapi_queue_json table.
json_nid BIGINT NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS relayapi_queue_queue_json_nid_idx
ON relayapi_queue (json_nid, server_name);
ON relayapi_queue (json_nid, server_name);
CREATE INDEX IF NOT EXISTS relayapi_queue_json_nid_idx
ON relayapi_queue (json_nid);
ON relayapi_queue (json_nid);
CREATE INDEX IF NOT EXISTS relayapi_queue_server_name_idx
ON relayapi_queue (server_name);
ON relayapi_queue (server_name);
`
const insertQueueEntrySQL = "" +

2
setup/config/config_test.go
View file

@ -218,7 +218,7 @@ relay_api:
connection_string: file:relayapi.db
mscs:
database:
connection_string: file:federationapi.db
connection_string: file:mscs.db
tracing:
enabled: false
jaeger: