Skip to content

Commit

Permalink
clearing out variable/package name collisions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mleku
mleku committed Jan 4, 2024
1 parent 8a1c484 commit 3db9b3f
Show file tree
Hide file tree
Showing 33 changed files with 276 additions and 269 deletions.
24 changes: 12 additions & 12 deletions cmd/algia/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ func (cfg *Config) GetFollows(profile string) (map[string]Profile, error) {
mu.Unlock()
m := map[string]struct{}{}

cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, relay *relays.Relay) bool {
evs, err := relay.QuerySync(ctx, filter.Filter{Kinds: []int{event.KindContactList}, Authors: []string{pub}, Limit: 1})
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, rl *relays.Relay) bool {
evs, err := rl.QuerySync(ctx, filter.Filter{Kinds: []int{event.KindContactList}, Authors: []string{pub}, Limit: 1})
if err != nil {
return true
}
Expand Down Expand Up @@ -191,8 +191,8 @@ func (cfg *Config) GetFollows(profile string) (map[string]Profile, error) {
}

// get follower's descriptions
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, relay *relays.Relay) bool {
evs, err := relay.QuerySync(ctx, filter.Filter{
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, rl *relays.Relay) bool {
evs, err := rl.QuerySync(ctx, filter.Filter{
Kinds: []int{event.KindProfileMetadata},
Authors: follows[i:end], // Use the updated end index
})
Expand Down Expand Up @@ -236,14 +236,14 @@ func (cfg *Config) FindRelay(ctx context.Context, r RelayPerms) *relays.Relay {
if cfg.verbose {
fmt.Printf("trying relay: %s\n", k)
}
relay, err := relays.RelayConnect(ctx, k)
rl, err := relays.RelayConnect(ctx, k)
if err != nil {
if cfg.verbose {
fmt.Fprintln(os.Stderr, err.Error())
}
continue
}
return relay
return rl
}
return nil
}
Expand Down Expand Up @@ -383,18 +383,18 @@ func (cfg *Config) PrintEvents(evs []*event.T, followsMap map[string]Profile, j,
}

// Events is
func (cfg *Config) Events(filter filter.Filter) []*event.T {
func (cfg *Config) Events(f filter.Filter) []*event.T {
var mu sync.Mutex
found := false
var m sync.Map
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, relay *relays.Relay) bool {
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, rl *relays.Relay) bool {
mu.Lock()
if found {
mu.Unlock()
return false
}
mu.Unlock()
evs, err := relay.QuerySync(ctx, filter)
evs, err := rl.QuerySync(ctx, f)
if err != nil {
return true
}
Expand All @@ -406,7 +406,7 @@ func (cfg *Config) Events(filter filter.Filter) []*event.T {
}
}
m.LoadOrStore(ev.ID, ev)
if len(filter.IDs) == 1 {
if len(f.IDs) == 1 {
mu.Lock()
found = true
ctx.Done()
Expand Down Expand Up @@ -677,8 +677,8 @@ func main() {
relays := cCtx.String("relays")
if strings.TrimSpace(relays) != "" {
cfg.Relays = make(map[string]RelayPerms)
for _, relay := range strings.Split(relays, ",") {
cfg.Relays[relay] = RelayPerms{
for _, rl := range strings.Split(relays, ",") {
cfg.Relays[rl] = RelayPerms{
Read: true,
Write: true,
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/algia/profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ func doProfile(cCtx *cli.Context) (e error) {
j := cCtx.Bool("json")

cfg := cCtx.App.Metadata["config"].(*Config)
relay := cfg.FindRelay(context.Background(), RelayPerms{Read: true})
if relay == nil {
rl := cfg.FindRelay(context.Background(), RelayPerms{Read: true})
if rl == nil {
return errors.New("cannot connect relays")
}
defer relay.Close()
defer rl.Close()

var pub string
if user == "" {
Expand Down
102 changes: 51 additions & 51 deletions cmd/algia/timeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ func doDMList(cCtx *cli.Context) (e error) {
}

// get timeline
filter := filter.Filter{
f := filter.Filter{
Kinds: []int{event.KindEncryptedDirectMessage},
Authors: []string{npub},
}

evs := cfg.Events(filter)
evs := cfg.Events(f)
type entry struct {
name string
pubkey string
Expand Down Expand Up @@ -135,14 +135,14 @@ func doDMTimeline(cCtx *cli.Context) (e error) {
}

// get timeline
filter := filter.Filter{
f := filter.Filter{
Kinds: []int{event.KindEncryptedDirectMessage},
Authors: []string{npub, pub},
Tags: filter.TagMap{"p": []string{npub, pub}},
Limit: 9999,
}

evs := cfg.Events(filter)
evs := cfg.Events(f)
cfg.PrintEvents(evs, followsMap, j, extra)
return nil
}
Expand Down Expand Up @@ -217,10 +217,10 @@ func doDMPost(cCtx *cli.Context) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
err := relay.Publish(ctx, ev)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -324,10 +324,10 @@ func doPost(cCtx *cli.Context) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
err := relay.Publish(ctx, ev)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -425,18 +425,18 @@ func doReply(cCtx *cli.Context) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
if !quote {
ev.Tags = ev.Tags.AppendUnique(tags.Tag{"e", id, relay.URL, "reply"})
ev.Tags = ev.Tags.AppendUnique(tags.Tag{"e", id, rl.URL, "reply"})
} else {
ev.Tags = ev.Tags.AppendUnique(tags.Tag{"e", id, relay.URL, "mention"})
ev.Tags = ev.Tags.AppendUnique(tags.Tag{"e", id, rl.URL, "mention"})
}
if err := ev.Sign(sk); err != nil {
return true
}
err := relay.Publish(ctx, ev)
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -475,7 +475,7 @@ func doRepost(cCtx *cli.Context) (e error) {
return fmt.Errorf("failed to parse event from '%s'", id)
}
ev.Tags = ev.Tags.AppendUnique(tags.Tag{"e", id})
filter := filter.Filter{
f := filter.Filter{
Kinds: []int{event.KindTextNote},
IDs: []string{id},
}
Expand All @@ -488,9 +488,9 @@ func doRepost(cCtx *cli.Context) (e error) {
first.Store(true)

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
if first.Load() {
evs, err := relay.QuerySync(ctx, filter)
evs, err := rl.QuerySync(ctx, f)
if err != nil {
return true
}
Expand All @@ -502,9 +502,9 @@ func doRepost(cCtx *cli.Context) (e error) {
return true
}
}
err := relay.Publish(ctx, ev)
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -543,8 +543,8 @@ func doUnrepost(cCtx *cli.Context) (e error) {
}
var repostID string
var mu sync.Mutex
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, relay *relays.Relay) bool {
evs, err := relay.QuerySync(ctx, f)
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, rl *relays.Relay) bool {
evs, err := rl.QuerySync(ctx, f)
if err != nil {
return true
}
Expand All @@ -565,10 +565,10 @@ func doUnrepost(cCtx *cli.Context) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
err := relay.Publish(ctx, ev)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -607,7 +607,7 @@ func doLike(cCtx *cli.Context) (e error) {
return fmt.Errorf("failed to parse event from '%s'", id)
}
ev.Tags = ev.Tags.AppendUnique(tags.Tag{"e", id})
filter := filter.Filter{
f := filter.Filter{
Kinds: []int{event.KindTextNote},
IDs: []string{id},
}
Expand All @@ -631,9 +631,9 @@ func doLike(cCtx *cli.Context) (e error) {
first.Store(true)

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
if first.Load() {
evs, err := relay.QuerySync(ctx, filter)
evs, err := rl.QuerySync(ctx, f)
if err != nil {
return true
}
Expand All @@ -646,9 +646,9 @@ func doLike(cCtx *cli.Context) (e error) {
}
return true
}
err := relay.Publish(ctx, ev)
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -687,8 +687,8 @@ func doUnlike(cCtx *cli.Context) (e error) {
}
var likeID string
var mu sync.Mutex
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, relay *relays.Relay) bool {
evs, err := relay.QuerySync(ctx, f)
cfg.Do(RelayPerms{Read: true}, func(ctx context.Context, rl *relays.Relay) bool {
evs, err := rl.QuerySync(ctx, f)
if err != nil {
return true
}
Expand All @@ -709,10 +709,10 @@ func doUnlike(cCtx *cli.Context) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
err := relay.Publish(ctx, ev)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -758,10 +758,10 @@ func doDelete(cCtx *cli.Context) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
err := relay.Publish(ctx, ev)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down Expand Up @@ -793,13 +793,13 @@ func doSearch(cCtx *cli.Context) (e error) {
}

// get timeline
filter := filter.Filter{
f := filter.Filter{
Kinds: []int{event.KindTextNote},
Search: strings.Join(cCtx.Args().Slice(), " "),
Limit: n,
}

evs := cfg.Events(filter)
evs := cfg.Events(f)
cfg.PrintEvents(evs, followsMap, j, extra)
return nil
}
Expand All @@ -822,11 +822,11 @@ func doStream(cCtx *cli.Context) (e error) {

cfg := cCtx.App.Metadata["config"].(*Config)

relay := cfg.FindRelay(context.Background(), RelayPerms{Read: true})
if relay == nil {
rl := cfg.FindRelay(context.Background(), RelayPerms{Read: true})
if rl == nil {
return errors.New("cannot connect relays")
}
defer relay.Close()
defer rl.Close()

var sk string
if _, s, err := nip19.Decode(cfg.PrivateKey); err == nil {
Expand Down Expand Up @@ -860,7 +860,7 @@ func doStream(cCtx *cli.Context) (e error) {
Since: &since,
}

sub, err := relay.Subscribe(context.Background(), filter.Filters{ff})
sub, err := rl.Subscribe(context.Background(), filter.Filters{ff})
if err != nil {
return err
}
Expand All @@ -880,8 +880,8 @@ func doStream(cCtx *cli.Context) (e error) {
if err := evr.Sign(sk); err != nil {
return err
}
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
relay.Publish(ctx, evr)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
rl.Publish(ctx, evr)
return true
})
}
Expand Down Expand Up @@ -910,13 +910,13 @@ func doTimeline(cCtx *cli.Context) (e error) {
}

// get timeline
filter := filter.Filter{
f := filter.Filter{
Kinds: []int{event.KindTextNote},
Authors: follows,
Limit: n,
}

evs := cfg.Events(filter)
evs := cfg.Events(f)
cfg.PrintEvents(evs, followsMap, j, extra)
return nil
}
Expand Down Expand Up @@ -949,10 +949,10 @@ func postMsg(cCtx *cli.Context, msg string) (e error) {
}

var success atomic.Int64
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, relay *relays.Relay) bool {
err := relay.Publish(ctx, ev)
cfg.Do(RelayPerms{Write: true}, func(ctx context.Context, rl *relays.Relay) bool {
err := rl.Publish(ctx, ev)
if err != nil {
fmt.Fprintln(os.Stderr, relay.URL, err)
fmt.Fprintln(os.Stderr, rl.URL, err)
} else {
success.Add(1)
}
Expand Down
Loading

0 comments on commit 3db9b3f

Please sign in to comment.