fix: formatting, refs NOISSUE
This commit is contained in:
@@ -21,21 +21,22 @@ public class IndexModel : PageModel
|
||||
|
||||
public User CurrentUser
|
||||
{
|
||||
get {
|
||||
if(_currentUser == null)
|
||||
get
|
||||
{
|
||||
if (_currentUser == null)
|
||||
{
|
||||
var userName = this.User.Identity.Name;
|
||||
using(var dci = DataContext.Instance)
|
||||
using (var dci = DataContext.Instance)
|
||||
{
|
||||
_currentUser = dci.Users.Include(u => u.LikedSongs).Where(u => u.LdapUserName == userName).SingleOrDefault();
|
||||
}
|
||||
}
|
||||
|
||||
return _currentUser;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public bool HasUserLikedThisSong(Song song)
|
||||
{
|
||||
return CurrentUser.LikedSongs.Where(s => s.SongId == song.SongId).FirstOrDefault() != default(Song);
|
||||
@@ -68,7 +69,7 @@ public class IndexModel : PageModel
|
||||
|
||||
public async Task<IActionResult> OnPostUnlikeSong(int? songId)
|
||||
{
|
||||
using(var dci = DataContext.Instance)
|
||||
using (var dci = DataContext.Instance)
|
||||
{
|
||||
var user = dci.Users.Include(u => u.LikedSongs).Where(u => u.UserId == CurrentUser.UserId).SingleOrDefault();
|
||||
var songToRemove = user.LikedSongs.Where(s => s.SongId == songId).SingleOrDefault();
|
||||
|
@@ -79,19 +79,20 @@ public class SongSubmissionModel : PageModel
|
||||
|
||||
public User CurrentUser
|
||||
{
|
||||
get {
|
||||
if(_currentUser == null)
|
||||
get
|
||||
{
|
||||
if (_currentUser == null)
|
||||
{
|
||||
var userName = this.User.Identity.Name;
|
||||
using(var dci = DataContext.Instance)
|
||||
using (var dci = DataContext.Instance)
|
||||
{
|
||||
_currentUser = dci.Users.Include(u => u.LikedSongs).Where(u => u.LdapUserName == userName).SingleOrDefault();
|
||||
}
|
||||
}
|
||||
|
||||
return _currentUser;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public List<SpotifyAPI.Web.FullTrack> SpotifySuggestions
|
||||
@@ -262,7 +263,7 @@ public class SongSubmissionModel : PageModel
|
||||
|
||||
public async Task<IActionResult> OnPostUnlikeSong(int? songId)
|
||||
{
|
||||
using(var dci = DataContext.Instance)
|
||||
using (var dci = DataContext.Instance)
|
||||
{
|
||||
var user = dci.Users.Include(u => u.LikedSongs).Where(u => u.UserId == CurrentUser.UserId).SingleOrDefault();
|
||||
var songToRemove = user.LikedSongs.Where(s => s.SongId == songId).SingleOrDefault();
|
||||
|
@@ -60,10 +60,10 @@ public class UserModel : PageModel
|
||||
var loginRequest = new LoginRequest(
|
||||
new Uri(spotifyClient.GetLoginRedirectUri()),
|
||||
AppConfiguration.Instance.SpotifyClientId,
|
||||
LoginRequest.ResponseType.Code)
|
||||
{
|
||||
Scope = new[] { Scopes.PlaylistReadPrivate, Scopes.PlaylistReadCollaborative, Scopes.PlaylistModifyPrivate, Scopes.PlaylistModifyPublic, Scopes.UgcImageUpload }
|
||||
};
|
||||
LoginRequest.ResponseType.Code)
|
||||
{
|
||||
Scope = new[] { Scopes.PlaylistReadPrivate, Scopes.PlaylistReadCollaborative, Scopes.PlaylistModifyPrivate, Scopes.PlaylistModifyPublic, Scopes.UgcImageUpload }
|
||||
};
|
||||
var redirectUri = loginRequest.ToUri().ToString() + $"&finalRedirect={HttpUtility.UrlEncode($"{Request.Scheme}://{Request.Host}:{Request.Host.Port ?? 80}{Request.Path}")}";
|
||||
|
||||
return this.Redirect(redirectUri);
|
||||
|
Reference in New Issue
Block a user