From 1485006a087343a86f48d18e78ee06d24d186189 Mon Sep 17 00:00:00 2001 From: David Florness Date: Sun, 14 Mar 2021 15:43:21 -0400 Subject: [PATCH] Put election filter after main function --- cmd/tallyard/main.go | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/tallyard/main.go b/cmd/tallyard/main.go index 0f551db..ecfa134 100644 --- a/cmd/tallyard/main.go +++ b/cmd/tallyard/main.go @@ -17,39 +17,6 @@ import ( "tallyard.xyz/ui" ) -var electionFilter = &mautrix.Filter{ - AccountData: mautrix.FilterPart{ - NotTypes: []event.Type{event.NewEventType("*")}, - }, - Presence: mautrix.FilterPart{ - NotTypes: []event.Type{event.NewEventType("*")}, - }, - Room: mautrix.RoomFilter{ - AccountData: mautrix.FilterPart{ - NotTypes: []event.Type{event.NewEventType("*")}, - }, - Ephemeral: mautrix.FilterPart{ - NotTypes: []event.Type{event.NewEventType("*")}, - }, - State: mautrix.FilterPart{ - LazyLoadMembers: true, - Types: []event.Type{event.StateRoomName}, - }, - Timeline: mautrix.FilterPart{ - LazyLoadMembers: true, - // TODO figure out how to have no limit; -1 is giving me 500s - Limit: 500, - Types: []event.Type{ - election.CreateElectionMessage, - election.JoinElectionMessage, - election.StartElectionMessage, - election.EvalsMessage, - election.SumMessage, - }, - }, - }, -} - func main() { os.MkdirAll(xdg.DataHome() + "/tallyard", 0700) @@ -177,6 +144,39 @@ func main() { el.Finish() } +var electionFilter = &mautrix.Filter{ + AccountData: mautrix.FilterPart{ + NotTypes: []event.Type{event.NewEventType("*")}, + }, + Presence: mautrix.FilterPart{ + NotTypes: []event.Type{event.NewEventType("*")}, + }, + Room: mautrix.RoomFilter{ + AccountData: mautrix.FilterPart{ + NotTypes: []event.Type{event.NewEventType("*")}, + }, + Ephemeral: mautrix.FilterPart{ + NotTypes: []event.Type{event.NewEventType("*")}, + }, + State: mautrix.FilterPart{ + LazyLoadMembers: true, + Types: []event.Type{event.StateRoomName}, + }, + Timeline: mautrix.FilterPart{ + LazyLoadMembers: true, + // TODO figure out how to have no limit; -1 is giving me 500s + Limit: 500, + Types: []event.Type{ + election.CreateElectionMessage, + election.JoinElectionMessage, + election.StartElectionMessage, + election.EvalsMessage, + election.SumMessage, + }, + }, + }, +} + func debugEventHook(_ mautrix.EventSource, evt *event.Event) { log.Debugf("<%[1]s> %[4]s (%[2]s/%[3]s)\n", evt.Sender, evt.Type.String(), evt.ID, -- 2.38.4