diff options
| author | Michael <[email protected]> | 2017-03-25 10:30:41 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-03-25 10:30:41 -0400 |
| commit | 90d062973ba1331aaf68d16846e62784fc325822 (patch) | |
| tree | 3a9d84826ed1f0b408bc01eaedb3a6a97bc04e67 | |
| parent | 0a8c420c920e5293afbb536643b96496a103aed4 (diff) | |
| download | project-unite-90d062973ba1331aaf68d16846e62784fc325822.tar.gz project-unite-90d062973ba1331aaf68d16846e62784fc325822.tar.bz2 project-unite-90d062973ba1331aaf68d16846e62784fc325822.zip | |
icefry
| -rw-r--r-- | Project-Unite/Global.asax.cs | 2 | ||||
| -rw-r--r-- | Project-Unite/Models/AdminViewModels.cs | 9 | ||||
| -rw-r--r-- | Project-Unite/Models/IdentityModels.cs | 1 | ||||
| -rw-r--r-- | Project-Unite/NotificationDaemon.cs | 2 | ||||
| -rw-r--r-- | Project-Unite/Project-Unite.csproj | 15 |
5 files changed, 26 insertions, 3 deletions
diff --git a/Project-Unite/Global.asax.cs b/Project-Unite/Global.asax.cs index a9ee5ca..2b23462 100644 --- a/Project-Unite/Global.asax.cs +++ b/Project-Unite/Global.asax.cs @@ -26,6 +26,8 @@ namespace Project_Unite BundleConfig.RegisterBundles(BundleTable.Bundles); } + + protected void Application_BeginRequest(object sender, EventArgs e) { var configuration = new Migrations.Configuration(); diff --git a/Project-Unite/Models/AdminViewModels.cs b/Project-Unite/Models/AdminViewModels.cs index 7a24aec..5e4d562 100644 --- a/Project-Unite/Models/AdminViewModels.cs +++ b/Project-Unite/Models/AdminViewModels.cs @@ -92,4 +92,13 @@ namespace Project_Unite.Models Moderator, User } + + public class Configuration + { + public string Id { get; set; } + public string SiteName { get; set; } + public string ReturnEmail { get; set; } + public string UniteBotToken { get; set; } + public string DiscordChannelId { get; set; } + } }
\ No newline at end of file diff --git a/Project-Unite/Models/IdentityModels.cs b/Project-Unite/Models/IdentityModels.cs index 8b1730e..cb832da 100644 --- a/Project-Unite/Models/IdentityModels.cs +++ b/Project-Unite/Models/IdentityModels.cs @@ -194,6 +194,7 @@ namespace Project_Unite.Models return new ApplicationDbContext(); } + public DbSet<Configuration> Configs { get; set; } public DbSet<ShiftoriumUpgrade> ShiftoriumUpgrades { get; set; } public DbSet<Notification> Notifications { get; set; } public DbSet<UserFollow> Follows { get; set; } diff --git a/Project-Unite/NotificationDaemon.cs b/Project-Unite/NotificationDaemon.cs index 0d63944..25d384a 100644 --- a/Project-Unite/NotificationDaemon.cs +++ b/Project-Unite/NotificationDaemon.cs @@ -8,6 +8,8 @@ namespace Project_Unite { public static class NotificationDaemon { + public static Action<Notification> OnBroadcast; + public static void NotifyFollowers(string uid, string title, string desc, string url) { var db = new ApplicationDbContext(); diff --git a/Project-Unite/Project-Unite.csproj b/Project-Unite/Project-Unite.csproj index a8676af..9b0f4d9 100644 --- a/Project-Unite/Project-Unite.csproj +++ b/Project-Unite/Project-Unite.csproj @@ -106,6 +106,18 @@ <Private>True</Private> </Reference> <Reference Include="Microsoft.CSharp" /> + <Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> @@ -169,9 +181,6 @@ </Reference> </ItemGroup> <ItemGroup> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath> - </Reference> <Reference Include="EntityFramework"> <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath> </Reference> |