Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the Toggle status alternative and DnD duration #1

Merged
merged 1 commit into from
Mar 29, 2022
Merged

Added the Toggle status alternative and DnD duration #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions MM.Client/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,58 +6,58 @@

public class Client
{
private readonly ISettings _settings;
private readonly HttpClient _client;
private string _token;
private string? _userId;
private readonly ISettings _settings;
private readonly HttpClient _client;
private string _token;
private string? _userId;

public Client(ISettings settings)
{
_settings = settings;
_client = new HttpClient() { BaseAddress = new Uri($"https://{settings.ApiUrl}/api/v4/") };
}
public async Task Login()
{
var result = await _client.PostAsJsonAsync("users/login", _settings);
public Client(ISettings settings)
{
_settings = settings;
_client = new HttpClient() { BaseAddress = new Uri($"https://{settings.ApiUrl}/api/v4/") };
}
public async Task Login()
{
var result = await _client.PostAsJsonAsync("users/login", _settings);

if (result.IsSuccessStatusCode)
{
var response = await result.Content.ReadFromJsonAsync<LoginResponse>();
var token = result.Headers.FirstOrDefault(x => x.Key == "Token").Value;
_token = token.FirstOrDefault() ?? string.Empty;
_client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _token);
_userId = response?.UserId;
}
}
public async Task<UserStatus> GetStatus()
{
var result = await _client.GetAsync($"users/{_userId}/status");
if (result.IsSuccessStatusCode)
{
var response = await result.Content.ReadFromJsonAsync<StatusResponse>();
return response.Status;
}
return UserStatus.Unknown;
}
if (result.IsSuccessStatusCode)
{
var response = await result.Content.ReadFromJsonAsync<LoginResponse>();
var token = result.Headers.FirstOrDefault(x => x.Key == "Token").Value;
_token = token.FirstOrDefault() ?? string.Empty;
_client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _token);
_userId = response?.UserId;
}
}
public async Task<UserStatus> GetStatus()
{
var result = await _client.GetAsync($"users/{_userId}/status");
if (result.IsSuccessStatusCode)
{
var response = await result.Content.ReadFromJsonAsync<StatusResponse>();
return response.Status;
}
return UserStatus.Unknown;
}

public async Task<UserStatus> UpdateUserStatus(UserStatus newStatus, int dndEndTime = 0)
{
return await UpdateUserStatus(_userId, newStatus, dndEndTime);
}
public async Task<UserStatus> UpdateUserStatus(string userId, UserStatus newStatus, int dndEndTime = 0)
{
var request = new UpdateUserStatusPayload()
{
UserId = userId,
Status = newStatus,
DndEndTime = dndEndTime
};
var result = await _client.PutAsJsonAsync($"users/{userId}/status", request);
if (result.IsSuccessStatusCode)
{
var response = await result.Content.ReadFromJsonAsync<StatusResponse>();
return response.Status;
}
return UserStatus.Unknown;
}
public async Task<UserStatus> UpdateUserStatus(UserStatus newStatus, int dndEndTime = 0)
{
return await UpdateUserStatus(_userId, newStatus, dndEndTime);
}
public async Task<UserStatus> UpdateUserStatus(string userId, UserStatus newStatus, int dndEndTime = 0)
{
var request = new UpdateUserStatusPayload()
{
UserId = userId,
Status = newStatus,
DndEndTime = dndEndTime
};
var result = await _client.PutAsJsonAsync($"users/{userId}/status", request);
if (result.IsSuccessStatusCode)
{
var response = await result.Content.ReadFromJsonAsync<StatusResponse>();
return response.Status;
}
return UserStatus.Unknown;
}
}
8 changes: 4 additions & 4 deletions MM.Client/Status/UserStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ public enum UserStatus
{
Unknown = 0,
[EnumMember(Value = "online")]
Online,
Online = 1,
[EnumMember(Value = "away")]
Away,
Away = 2,
[EnumMember(Value = "dnd")]
DoNotDisturb,
DoNotDisturb = 3,
[EnumMember(Value = "offline")]
Offline
Offline = 4
}
15 changes: 7 additions & 8 deletions MM.StreamDeck/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
using BarRaider.SdTools;

namespace MM.StreamDeck
namespace MM.StreamDeck;

internal class Program
{
internal class Program
static void Main(string[] args)
{
static void Main(string[] args)
{
// Uncomment this line of code to allow for debugging
//while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); }
// Uncomment this line of code to allow for debugging
//while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); }

SDWrapper.Run(args);
}
SDWrapper.Run(args);
}
}
32 changes: 24 additions & 8 deletions MM.StreamDeck/PropertyInspector/PluginActionPI.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@
<div class="sdpi-item-label">Password</div>
<input class="sdpi-item-value sdProperty" type="password" value="" id="password" oninput="setSettings()">
</div>

<div class="sdpi-item" id="dvIsToggle">
<div class="sdpi-item-value">
<input id="isToggle" class="sdProperty sdCheckbox" type="checkbox" value="" oninput="setSettings()">
<label for="isToggle" class="sdpi-item-label"><span></span>Toggle between status?</label>
</div>
</div>

<div class="sdpi-item">
<div class="sdpi-item-label">Refresh Rate</div>
<select class="sdpi-item-value select sdProperty" id="refreshSeconds" oninput="setSettings()">
Expand All @@ -47,6 +39,30 @@
</select>
</div>

<div class="sdpi-item" id="dvIsToggle">
<div class="sdpi-item-value">
<input id="isToggle" class="sdProperty sdCheckbox" type="checkbox" value="" oninput="setSettings()">
<label for="isToggle" class="sdpi-item-label"><span></span>Toggle between status?</label>
</div>
</div>
<div class="sdpi-item">
<div class="sdpi-item-label">Toggle Status between Online and </div>
<select class="sdpi-item-value select sdProperty" id="toggleStatus" oninput="setSettings()">
<option value="2" selected>Away</option>
<option value="3">Do not disturb</option>
<option value="4">Offline</option>
</select>
</div>
<div class="sdpi-item">
<div class="sdpi-item-label">Dot not disturb duration</div>
<select class="sdpi-item-value select sdProperty" id="dndDuration" oninput="setSettings()">
<option value="30" selected>30 minutes</option>
<option value="60">1 hour</option>
<option value="120">2 hours</option>
<option value="1440">24 hours</option>
</select>
</div>

</div>
</body>
</html>
Loading