diff --git a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
index 3a63532..a242125 100644
--- a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
+++ b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
@@ -5,5 +5,18 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Condition="Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj"/>
+ <!-- This is dangerous, but eases development since locking the version will drift out of sync without noticing,
+ which causes build errors due to missing functions.
+ Using the NuGet version in development is annoying due to delays between pushing and being able to consume.
+ If you want to use a time-appropriate version of the library, recursively clone https://cgit.rory.gay/matrix/MatrixRoomUtils.git
+ instead, since this will be locked by the MatrixRoomUtils project, which contains both LibMatrix and ArcaneLibs as a submodule. -->
+ <PackageReference Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="ArcaneLibs" Version="*-preview*"/>
+ </ItemGroup>
+ <Target Name="ArcaneLibsNugetWarning" AfterTargets="AfterBuild">
+ <Warning Text="ArcaneLibs is being referenced from NuGet, which is dangerous. Please read the warning in LibMatrix.csproj!" Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')"/>
+ </Target>
</Project>
diff --git a/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs b/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs
index d3ab8cb..5293082 100644
--- a/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs
+++ b/LibMatrix.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs
@@ -1,53 +1,80 @@
using System.Text.Json.Serialization;
+using ArcaneLibs.Attributes;
namespace LibMatrix.EventTypes.Spec.State.Policy;
//spec
-[MatrixEvent(EventName = EventId)] //spec
-[MatrixEvent(EventName = "m.room.rule.server")] //???
-[MatrixEvent(EventName = "org.matrix.mjolnir.rule.server")] //legacy
+[MatrixEvent(EventName = EventId)] //spec
+[MatrixEvent(EventName = "m.room.rule.server", Legacy = true)] //???
+[MatrixEvent(EventName = "org.matrix.mjolnir.rule.server", Legacy = true)] //legacy
+[FriendlyName(Name = "Server policy", NamePlural = "Server policies")]
public class ServerPolicyRuleEventContent : PolicyRuleEventContent {
public const string EventId = "m.policy.rule.server";
}
-[MatrixEvent(EventName = EventId)] //spec
-[MatrixEvent(EventName = "m.room.rule.user")] //???
-[MatrixEvent(EventName = "org.matrix.mjolnir.rule.user")] //legacy
+[MatrixEvent(EventName = EventId)] //spec
+[MatrixEvent(EventName = "m.room.rule.user", Legacy = true)] //???
+[MatrixEvent(EventName = "org.matrix.mjolnir.rule.user", Legacy = true)] //legacy
+[FriendlyName(Name = "User policy", NamePlural = "User policies")]
public class UserPolicyRuleEventContent : PolicyRuleEventContent {
public const string EventId = "m.policy.rule.user";
}
-[MatrixEvent(EventName = EventId)] //spec
-[MatrixEvent(EventName = "m.room.rule.room")] //???
-[MatrixEvent(EventName = "org.matrix.mjolnir.rule.room")] //legacy
+[MatrixEvent(EventName = EventId)] //spec
+[MatrixEvent(EventName = "m.room.rule.room", Legacy = true)] //???
+[MatrixEvent(EventName = "org.matrix.mjolnir.rule.room", Legacy = true)] //legacy
+[FriendlyName(Name = "Room policy", NamePlural = "Room policies")]
public class RoomPolicyRuleEventContent : PolicyRuleEventContent {
public const string EventId = "m.policy.rule.room";
}
public abstract class PolicyRuleEventContent : EventContent {
+ public PolicyRuleEventContent() {
+ Console.WriteLine($"init policy {GetType().Name}");
+ }
+ private string? _reason;
+
/// <summary>
/// Entity this ban applies to, can use * and ? as globs.
/// Policy is invalid if entity is null
/// </summary>
[JsonPropertyName("entity")]
+ [FriendlyName(Name = "Entity")]
public string? Entity { get; set; }
+
+ private bool init;
/// <summary>
/// Reason this user is banned
/// </summary>
[JsonPropertyName("reason")]
- public string? Reason { get; set; }
+ [FriendlyName(Name = "Reason")]
+ public virtual string? Reason {
+ get {
+ // Console.WriteLine($"Read policy reason: {_reason}");
+ return _reason;
+ }
+ set {
+ // Console.WriteLine($"Set policy reason: {value}");
+ // if(init)
+ // Console.WriteLine(string.Join('\n', Environment.StackTrace.Split('\n')[..5]));
+ // init = true;
+ _reason = value;
+ }
+ }
/// <summary>
/// Suggested action to take
/// </summary>
[JsonPropertyName("recommendation")]
+ [FriendlyName(Name = "Recommendation")]
public string? Recommendation { get; set; }
/// <summary>
/// Expiry time in milliseconds since the unix epoch, or null if the ban has no expiry.
/// </summary>
[JsonPropertyName("support.feline.policy.expiry.rev.2")] //stable prefix: expiry, msc pending
+ [TableHide]
public long? Expiry { get; set; }
//utils
@@ -55,6 +82,7 @@ public abstract class PolicyRuleEventContent : EventContent {
/// Readable expiry time, provided for easy interaction
/// </summary>
[JsonPropertyName("gay.rory.matrix_room_utils.readable_expiry_time_utc")]
+ [FriendlyName(Name = "Expires at")]
public DateTime? ExpiryDateTime {
get => Expiry == null ? null : DateTimeOffset.FromUnixTimeMilliseconds(Expiry.Value).DateTime;
set => Expiry = ((DateTimeOffset)value).ToUnixTimeMilliseconds();
@@ -72,3 +100,9 @@ public static class PolicyRecommendationTypes {
/// </summary>
public static string Mute = "support.feline.policy.recommendation_mute"; //stable prefix: m.mute, msc pending
}
+
+// public class PolicySchemaDefinition {
+// public required string Name { get; set; }
+// public required bool Optional { get; set; }
+//
+// }
\ No newline at end of file
|
