commit 45f6aaecfe822236cca2982fae4b0e4e8c501380 · dunkirk.sh/akami

+7 -7
handler/main.go
···

       39
       39
        
       

     

       40
       40
        
       			rawCfg, err := os.ReadFile(hackatime_path)

     

       41
       41
        
       			if errors.Is(err, os.ErrNotExist) {

     

       42
       42
       -
       				return errors.New("you don't have a wakatime config file! go check https://hackatime.hackclub.com/my/wakatime_setup for the instructions and then try this again")

     

       42
       42
       +
       				return errors.New("you don't have a wakatime config file! go check " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " for the instructions and then try this again")

     

       43
       43
        
       			}

     

       44
       44
        
       

     

       45
       45
        
       			cfg, err := ini.Load(rawCfg)

     
···

       49
       49
        
       

     

       50
       50
        
       			settings, err := cfg.GetSection("settings")

     

       51
       51
        
       			if err != nil {

     

       52
       52
       -
       				return errors.New("wow! your config file seems to be messed up and doesn't have a settings heading; can you follow the instructions at https://hackatime.hackclub.com/my/wakatime_setup to regenerate it?\n\nThe raw error we got was: " + err.Error())

     

       52
       52
       +
       				return errors.New("wow! your config file seems to be messed up and doesn't have a settings heading; can you follow the instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " to regenerate it?\n\nThe raw error we got was: " + err.Error())

     

       53
       53
        
       			}

     

       54
       54
        
       

     

       55
       55
        
       			api_key := settings.Key("api_key").String()

     

       56
       56
        
       			api_url := settings.Key("api_url").String()

     

       57
       57
        
       			if api_key == "" {

     

       58
       58
       -
       				return errors.New("hmm 🤔 looks like you don't have an api_key in your config file? are you sure you have followed the setup instructions at https://hackatime.hackclub.com/my/wakatime_setup correctly?")

     

       58
       58
       +
       				return errors.New("hmm 🤔 looks like you don't have an api_key in your config file? are you sure you have followed the setup instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " correctly?")

     

       59
       59
        
       			}

     

       60
       60
        
       			if api_url == "" {

     

       61
       61
       -
       				return errors.New("hmm 🤔 looks like you don't have an api_url in your config file? are you sure you have followed the setup instructions at https://hackatime.hackclub.com/my/wakatime_setup correctly?")

     

       61
       61
       +
       				return errors.New("hmm 🤔 looks like you don't have an api_url in your config file? are you sure you have followed the setup instructions at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " correctly?")

     

       62
       62
        
       			}

     

       63
       63
        
       

     

       64
       64
        
       			if api_url != "https://hackatime.hackclub.com/api/hackatime/v1" {

     
···

       67
       67
        
       					_, err := client.GetStatusBar()

     

       68
       68
        
       

     

       69
       69
        
       					if !errors.Is(err, wakatime.ErrUnauthorized) {

     

       70
       70
       -
       						return errors.New("turns out you were connected to wakatime.com instead of hackatime; since your key seems to work if you would like to keep syncing data to wakatime.com as well as to hackatime you can either setup a realy serve like " + styles.Muted.Render("https://github.com/JasonLovesDoggo/multitime") + " or you can wait for https://github.com/hackclub/hackatime/issues/85 to get merged in hackatime and have it synced there :)\n\nIf you want to import your wakatime.com data into hackatime then you can use hackatime v1 temporarily to connect your wakatime account and import (in settings under integrations at https://waka.hackclub.com) and then click the import from hackatime v1 button at https://hackatime.hackclub.com/my/settings.\n\n If you have more questions feel free to reach out to me (hackatime v1 creator) on slack (at @krn) or via email at me@dunkirk.sh")

     

       70
       70
       +
       						return errors.New("turns out you were connected to wakatime.com instead of hackatime; since your key seems to work if you would like to keep syncing data to wakatime.com as well as to hackatime you can either setup a realy serve like " + styles.Muted.Render("https://github.com/JasonLovesDoggo/multitime") + " or you can wait for " + styles.Muted.Render("https://github.com/hackclub/hackatime/issues/85") + " to get merged in hackatime and have it synced there :)\n\nIf you want to import your wakatime.com data into hackatime then you can use hackatime v1 temporarily to connect your wakatime account and import (in settings under integrations at " + styles.Muted.Render("https://waka.hackclub.com") + ") and then click the import from hackatime v1 button at " + styles.Muted.Render("https://hackatime.hackclub.com/my/settings") + ".\n\n If you have more questions feel free to reach out to me (hackatime v1 creator) on slack (at @krn) or via email at me@dunkirk.sh")

     

       71
       71
        
       					} else {

     

       72
       72
       -
       						return errors.New("turns out your config is connected to the wrong api url and is trying to use wakatime.com to sync time but you don't have a working api key from them. Go to https://hackatime.hackclub.com/my/wakatime_setup to run the setup script and fix your config file")

     

       72
       72
       +
       						return errors.New("turns out your config is connected to the wrong api url and is trying to use wakatime.com to sync time but you don't have a working api key from them. Go to " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + " to run the setup script and fix your config file")

     

       73
       73
        
       					}

     

       74
       74
        
       				}

     

       75
       75
        
       				c.Println("\nYour api url", styles.Muted.Render(api_url), "doesn't match the expected url of", styles.Muted.Render("https://hackatime.hackclub.com/api/hackatime/v1"), "however if you are using a custom forwarder or are sure you know what you are doing then you are probably fine")

     
···

       79
       79
        
       			duration, err := client.GetStatusBar()

     

       80
       80
        
       			if err != nil {

     

       81
       81
        
       				if errors.Is(err, wakatime.ErrUnauthorized) {

     

       82
       82
       -
       					return errors.New("Your config file looks mostly correct and you have the correct api url but when we tested your api_key it looks like it is invalid? Can you double check if the key in your config file is the same as at https://hackatime.hackclub.com/my/wakatime_setup?")

     

       82
       82
       +
       					return errors.New("Your config file looks mostly correct and you have the correct api url but when we tested your api_key it looks like it is invalid? Can you double check if the key in your config file is the same as at " + styles.Muted.Render("https://hackatime.hackclub.com/my/wakatime_setup") + "?")

     

       83
       83
        
       				}

     

       84
       84
        
       

     

       85
       85
        
       				return errors.New("Something weird happened with the hackatime api; if the error doesn't make sense then please contact @krn on slack or via email at me@dunkirk.sh\n\n" + styles.Bad.Render("Full error: "+err.Error()))