diff --git a/FemboyWatchdog/FemboyWatchdog.csproj b/FemboyWatchdog/FemboyWatchdog.csproj
index 693943c..61b5a40 100644
--- a/FemboyWatchdog/FemboyWatchdog.csproj
+++ b/FemboyWatchdog/FemboyWatchdog.csproj
@@ -162,7 +162,9 @@
VinnySpam.cs
-
+
+ Designer
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/FemboyWatchdog/LocationProvider.cs b/FemboyWatchdog/LocationProvider.cs
index 0cc5e5a..099acb3 100644
--- a/FemboyWatchdog/LocationProvider.cs
+++ b/FemboyWatchdog/LocationProvider.cs
@@ -12,6 +12,7 @@ namespace FemboyWatchdog
private Timer _timer;
public IPLocationData LocationData { get; private set; }
+ public string IPAddress { get; private set; }
internal class IPLocationData
{
@@ -77,14 +78,15 @@ namespace FemboyWatchdog
try
{
- if (!_wcLocation.IsBusy)
+ /*if (!_wcLocation.IsBusy)
_wcLocation.DownloadStringAsync(new Uri(
string.Format(
"http://api.ipstack.com/{0}?access_key={1}&fields=latitude,longitude,region_name,country_name,city",
e.Result,
Properties.Settings.Default.IpStackApiToken
)
- ));
+ ));*/
+ IPAddress = e.Result;
}
catch (WebException err) { }
}
diff --git a/FemboyWatchdog/MeetingProvider.cs b/FemboyWatchdog/MeetingProvider.cs
index b77d385..8fe32df 100644
--- a/FemboyWatchdog/MeetingProvider.cs
+++ b/FemboyWatchdog/MeetingProvider.cs
@@ -119,13 +119,9 @@ namespace FemboyWatchdog
{
try
{
- _meetingChecker.DownloadStringAsync(new Uri(
- string.Format(
- "{0}meet/?token={1}",
- Properties.Settings.Default.FemboyApiBaseUrl,
- Properties.Settings.Default.FemboyApiToken
- )
- ));
+ _meetingChecker.DownloadStringAsync(
+ new Uri(Properties.Settings.Default.FemboyApiBaseUrl + "meet")
+ );
}
catch (WebException err) { }
}
diff --git a/FemboyWatchdog/Monitor.cs b/FemboyWatchdog/Monitor.cs
index 544054f..ee09ba9 100644
--- a/FemboyWatchdog/Monitor.cs
+++ b/FemboyWatchdog/Monitor.cs
@@ -173,6 +173,8 @@ namespace FemboyWatchdog
private void ttsTimer_Tick(object sender, EventArgs e)
{
string msg = "You are being monitored.";
+ if (tracker.IPAddress != null)
+ msg += string.Format(" Your IP is: {0}", tracker.IPAddress);
if (tracker.LocationData != null)
msg += string.Format(" Your location is: {0}, {1}", tracker.LocationData.latitude, tracker.LocationData.longitude);
ss.SpeakAsync(msg);
diff --git a/FemboyWatchdog/Properties/Settings.Designer.cs b/FemboyWatchdog/Properties/Settings.Designer.cs
index 3b64a48..63d3bca 100644
--- a/FemboyWatchdog/Properties/Settings.Designer.cs
+++ b/FemboyWatchdog/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace FemboyWatchdog.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("http://howfeed.biz/api/")]
+ [global::System.Configuration.DefaultSettingValueAttribute("https://api.femboyfinancial.jp/")]
public string FemboyApiBaseUrl {
get {
return ((string)(this["FemboyApiBaseUrl"]));
@@ -43,7 +43,7 @@ namespace FemboyWatchdog.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("31d59064bb7ef00a9daff4794b73118c")]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
public string IpStackApiToken {
get {
return ((string)(this["IpStackApiToken"]));
diff --git a/FemboyWatchdog/Properties/Settings.settings b/FemboyWatchdog/Properties/Settings.settings
index 4332a09..9fe5c3b 100644
--- a/FemboyWatchdog/Properties/Settings.settings
+++ b/FemboyWatchdog/Properties/Settings.settings
@@ -3,13 +3,13 @@
- http://howfeed.biz/api/
+ https://api.femboyfinancial.jp/
1445
- 31d59064bb7ef00a9daff4794b73118c
+
\ No newline at end of file
diff --git a/FemboyWatchdog/app.config b/FemboyWatchdog/app.config
index 2cbdbeb..a6fb20f 100644
--- a/FemboyWatchdog/app.config
+++ b/FemboyWatchdog/app.config
@@ -9,13 +9,13 @@
- http://howfeed.biz/api/
+ https://api.femboyfinancial.jp/
1445
- 31d59064bb7ef00a9daff4794b73118c
+