From bb8c2637af3b7982e7a4b2fd15e2fbec613d0848 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 30 Jun 2023 03:36:58 +0200 Subject: Todays progress --- .../Shared/IndexComponents/IndexUserItem.razor | 54 -------------- MatrixRoomUtils.Web/Shared/InlineUserItem.razor | 24 +++---- MatrixRoomUtils.Web/Shared/LogView.razor | 83 +++++++++++----------- MatrixRoomUtils.Web/Shared/MainLayout.razor | 16 ++--- MatrixRoomUtils.Web/Shared/NavMenu.razor | 5 -- MatrixRoomUtils.Web/Shared/PortableDevTools.razor | 52 +++++++------- MatrixRoomUtils.Web/Shared/RoomList.razor | 17 +++-- .../RoomListComponents/RoomListCategory.razor | 4 +- .../Shared/RoomListComponents/RoomListSpace.razor | 4 +- MatrixRoomUtils.Web/Shared/RoomListItem.razor | 60 +++++++--------- .../TimelineComponents/TimelineMemberItem.razor | 23 +++--- .../TimelineComponents/TimelineMessageItem.razor | 2 +- MatrixRoomUtils.Web/Shared/UserListItem.razor | 15 ++-- 13 files changed, 146 insertions(+), 213 deletions(-) delete mode 100644 MatrixRoomUtils.Web/Shared/IndexComponents/IndexUserItem.razor (limited to 'MatrixRoomUtils.Web/Shared') diff --git a/MatrixRoomUtils.Web/Shared/IndexComponents/IndexUserItem.razor b/MatrixRoomUtils.Web/Shared/IndexComponents/IndexUserItem.razor deleted file mode 100644 index 975da43..0000000 --- a/MatrixRoomUtils.Web/Shared/IndexComponents/IndexUserItem.razor +++ /dev/null @@ -1,54 +0,0 @@ -@using MatrixRoomUtils.Core.Extensions -@inject ILocalStorageService LocalStorage -@inject NavigationManager NavigationManager - -
- -

- - @User.Profile.DisplayName on @User.LoginResponse.HomeServer - Remove -

-

Member of @_roomCount rooms

- -
- -@code { - - [Parameter] - public UserInfo User { get; set; } = null!; - - private string? _avatarUrl { get; set; } - private int _roomCount { get; set; } = 0; - - protected override async Task OnInitializedAsync() { - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); - - if (User.Profile.AvatarUrl != null && User.Profile.AvatarUrl != "") - _avatarUrl = RuntimeCache.CurrentHomeServer.ResolveMediaUri(User.Profile.AvatarUrl); - else _avatarUrl = "https://api.dicebear.com/6.x/identicon/svg?seed=" + User.LoginResponse.UserId; - try { - _roomCount = (await RuntimeCache.CurrentHomeServer.GetJoinedRooms()).Count; - } - catch { - _roomCount = -1; - } - await base.OnInitializedAsync(); - } - - private async Task RemoveUser() { - Console.WriteLine(User.ToJson()); - RuntimeCache.LoginSessions.Remove(User.AccessToken); - - StateHasChanged(); - } - - private async Task SetCurrent() { - RuntimeCache.LastUsedToken = User.AccessToken; - //RuntimeCache.CurrentHomeserver = await MatrixAuth.ResolveHomeserverFromWellKnown(LocalStorageWrapper.LoginSessions[Token].LoginResponse.HomeServer); - await LocalStorageWrapper.SaveToLocalStorage(LocalStorage); - await LocalStorageWrapper.InitialiseRuntimeVariables(LocalStorage); - StateHasChanged(); - } - -} \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor index 44f3b0a..a498c70 100644 --- a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor +++ b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor @@ -1,11 +1,12 @@ @using MatrixRoomUtils.Core.Responses @using MatrixRoomUtils.Core.StateEventTypes +@using MatrixRoomUtils.Core.Helpers
- + @ProfileName
- @if (ChildContent != null) { + @if (ChildContent is not null) { @ChildContent }
@@ -21,7 +22,7 @@ public ProfileResponse User { get; set; } [Parameter] - public string UserId { get; set; } + public string? UserId { get; set; } [Parameter] public string? ProfileAvatar { get; set; } = null; @@ -33,19 +34,16 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); - + var hs = await MRUStorage.GetCurrentSession(); + await _semaphoreSlim.WaitAsync(); - if (User == null) { - if (UserId == null) { - throw new ArgumentNullException(nameof(UserId)); - } - User = await RuntimeCache.CurrentHomeServer.GetProfile(UserId); - } + if (User == null && UserId == null) + throw new ArgumentNullException(nameof(UserId)); + User ??= await hs.GetProfile(UserId); + - // UserId = User.; - ProfileAvatar ??= RuntimeCache.CurrentHomeServer.ResolveMediaUri(User.AvatarUrl); + ProfileAvatar ??= MediaResolver.ResolveMediaUri(hs.FullHomeServerDomain, User.AvatarUrl); ProfileName ??= User.DisplayName; _semaphoreSlim.Release(); diff --git a/MatrixRoomUtils.Web/Shared/LogView.razor b/MatrixRoomUtils.Web/Shared/LogView.razor index 2f83cb2..d541b82 100644 --- a/MatrixRoomUtils.Web/Shared/LogView.razor +++ b/MatrixRoomUtils.Web/Shared/LogView.razor @@ -1,42 +1,41 @@ -@using System.Text -@if (LocalStorageWrapper.Settings.DeveloperSettings.EnableLogViewers) { - Logs -
- 
-        @_stringBuilder
-
-} - -@code { - StringBuilder _stringBuilder = new(); - - protected override async Task OnInitializedAsync() { - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); - if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableConsoleLogging) { - Console.WriteLine("Console logging disabled!"); - var _sw = new StringWriter(); - Console.SetOut(_sw); - Console.SetError(_sw); - return; - } - if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableLogViewers) return; - //intecept stdout with textwriter to get logs - var sw = new StringWriter(_stringBuilder); - Console.SetOut(sw); - Console.SetError(sw); - //keep updated - var length = 0; - Task.Run(async () => { - while (true) { - await Task.Delay(100); - if (_stringBuilder.Length != length) { - StateHasChanged(); - length = _stringBuilder.Length; - } - } - // ReSharper disable once FunctionNeverReturns - This is intentional behavior - }); - await base.OnInitializedAsync(); - } - -} \ No newline at end of file +@* @using System.Text *@ +@* @if (LocalStorageWrapper.Settings.DeveloperSettings.EnableLogViewers) { *@ +@* Logs *@ +@*
*@ +@* 
 *@
+@*         @_stringBuilder *@
+@*
*@ +@* } *@ +@* *@ +@* @code { *@ +@* StringBuilder _stringBuilder = new(); *@ +@* *@ +@* protected override async Task OnInitializedAsync() { *@ +@* if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableConsoleLogging) { *@ +@* Console.WriteLine("Console logging disabled!"); *@ +@* var _sw = new StringWriter(); *@ +@* Console.SetOut(_sw); *@ +@* Console.SetError(_sw); *@ +@* return; *@ +@* } *@ +@* if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableLogViewers) return; *@ +@* //intecept stdout with textwriter to get logs *@ +@* var sw = new StringWriter(_stringBuilder); *@ +@* Console.SetOut(sw); *@ +@* Console.SetError(sw); *@ +@* //keep updated *@ +@* var length = 0; *@ +@* Task.Run(async () => { *@ +@* while (true) { *@ +@* await Task.Delay(100); *@ +@* if (_stringBuilder.Length != length) { *@ +@* StateHasChanged(); *@ +@* length = _stringBuilder.Length; *@ +@* } *@ +@* } *@ +@* // ReSharper disable once FunctionNeverReturns - This is intentional behavior *@ +@* }); *@ +@* await base.OnInitializedAsync(); *@ +@* } *@ +@* *@ +@* } *@ \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/MainLayout.razor b/MatrixRoomUtils.Web/Shared/MainLayout.razor index 317f9e6..691acbb 100644 --- a/MatrixRoomUtils.Web/Shared/MainLayout.razor +++ b/MatrixRoomUtils.Web/Shared/MainLayout.razor @@ -29,14 +29,14 @@ using var hc = new HttpClient(); var hr = await hc.SendAsync(new HttpRequestMessage(HttpMethod.Head, NavigationManager.ToAbsoluteUri("/MRU-BIN.tar.xz").AbsoluteUri)); showDownload = hr.StatusCode == HttpStatusCode.OK; - - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); - if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableConsoleLogging) { - Console.WriteLine("Console logging disabled!"); - var sw = new StringWriter(); - Console.SetOut(sw); - Console.SetError(sw); - } + + // TODO: fix console logging toggle + // if (!LocalStorageWrapper.Settings.DeveloperSettings.EnableConsoleLogging) { + // Console.WriteLine("Console logging disabled!"); + // var sw = new StringWriter(); + // Console.SetOut(sw); + // Console.SetError(sw); + // } await base.OnInitializedAsync(); } diff --git a/MatrixRoomUtils.Web/Shared/NavMenu.razor b/MatrixRoomUtils.Web/Shared/NavMenu.razor index 9ddbd84..5f9ad8a 100644 --- a/MatrixRoomUtils.Web/Shared/NavMenu.razor +++ b/MatrixRoomUtils.Web/Shared/NavMenu.razor @@ -23,11 +23,6 @@
Main tools
-
- - Export data - -
Manage Rooms diff --git a/MatrixRoomUtils.Web/Shared/PortableDevTools.razor b/MatrixRoomUtils.Web/Shared/PortableDevTools.razor index ffd7082..8ca10a0 100644 --- a/MatrixRoomUtils.Web/Shared/PortableDevTools.razor +++ b/MatrixRoomUtils.Web/Shared/PortableDevTools.razor @@ -1,26 +1,26 @@ -@if (Enabled) { - Portable devtools (enabled) -
-

Cache size: @RuntimeCache.GenericResponseCache.Sum(x => x.Value.Cache.Count)

-
-} -else { - Portable devtools (disabled) -} - -@code { - private bool Enabled { get; set; } = LocalStorageWrapper.Settings.DeveloperSettings.EnablePortableDevtools; - - protected override async Task OnInitializedAsync() => - // if(!RuntimeCache.WasLoaded) - // await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); - // StateHasChanged(); - Task.Run(async () => { - while (true) { - await Task.Delay(100); - Enabled = LocalStorageWrapper.Settings.DeveloperSettings.EnablePortableDevtools; - StateHasChanged(); - } - }); - -} \ No newline at end of file +@* @if (Enabled) { *@ +@* Portable devtools (enabled) *@ +@*
*@ +@* $1$

Cache size: @RuntimeCache.GenericResponseCache.Sum(x => x.Value.Cache.Count)

#1# *@ +@*
*@ +@* } *@ +@* else { *@ +@* Portable devtools (disabled) *@ +@* } *@ +@* *@ +@* @code { *@ +@* private bool Enabled { get; set; } = LocalStorageWrapper.Settings.DeveloperSettings.EnablePortableDevtools; *@ +@* *@ +@* protected override async Task OnInitializedAsync() => *@ +@* // if(!RuntimeCache.WasLoaded) *@ +@* // await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); *@ +@* // StateHasChanged(); *@ +@* Task.Run(async () => { *@ +@* while (true) { *@ +@* await Task.Delay(100); *@ +@* Enabled = LocalStorageWrapper.Settings.DeveloperSettings.EnablePortableDevtools; *@ +@* StateHasChanged(); *@ +@* } *@ +@* }); *@ +@* *@ +@* } *@ \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/RoomList.razor b/MatrixRoomUtils.Web/Shared/RoomList.razor index ca93fa6..ac2cbb3 100644 --- a/MatrixRoomUtils.Web/Shared/RoomList.razor +++ b/MatrixRoomUtils.Web/Shared/RoomList.razor @@ -1,4 +1,5 @@ @using MatrixRoomUtils.Web.Shared.RoomListComponents; +@using MatrixRoomUtils.Core.StateEventTypes

@Rooms.Count rooms total, @RoomsWithTypes.Sum(x=>x.Value.Count) fetched so far...

@foreach (var category in RoomsWithTypes.OrderBy(x => x.Value.Count)) { @@ -7,15 +8,13 @@ @code { [Parameter] - public List Rooms { get; set; } + public List Rooms { get; set; } - Dictionary> RoomsWithTypes = new(); + Dictionary> RoomsWithTypes = new(); protected override async Task OnInitializedAsync() { if (RoomsWithTypes.Any()) return; - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); - var tasks = Rooms.Select(AddRoom); await Task.WhenAll(tasks); @@ -31,17 +30,17 @@ private static SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(8, 8); - private async Task AddRoom(Room room) { + private async Task AddRoom(GenericRoom room) { await _semaphoreSlim.WaitAsync(); - var roomType = GetRoomTypeName(await room.GetRoomType()); + var roomType = GetRoomTypeName((await room.GetCreateEventAsync()).Type); if (roomType == "Room") { - var shortcodeState = await room.GetStateAsync("org.matrix.mjolnir.shortcode"); - if (shortcodeState.HasValue) roomType = "Legacy policy room"; + var shortcodeState = await room.GetStateAsync("org.matrix.mjolnir.shortcode"); + if (shortcodeState is not null) roomType = "Legacy policy room"; } if (!RoomsWithTypes.ContainsKey(roomType)) { - RoomsWithTypes.Add(roomType, new List()); + RoomsWithTypes.Add(roomType, new List()); } RoomsWithTypes[roomType].Add(room); diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor index ecdcc68..a7e9399 100644 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor +++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor @@ -16,9 +16,9 @@ @code { [Parameter] - public KeyValuePair> Category { get; set; } + public KeyValuePair> Category { get; set; } private string roomType => Category.Key; - private List rooms => Category.Value; + private List rooms => Category.Value; } \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor index c90ae8f..5d106c3 100644 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor +++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor @@ -14,7 +14,7 @@ @code { [Parameter] - public Room Space { get; set; } + public GenericRoom Space { get; set; } [Parameter, CascadingParameter] public string? Breadcrumbs { @@ -22,7 +22,7 @@ set => _breadcrumbs = value; } - private List Children { get; set; } = new(); + private List Children { get; set; } = new(); protected override async Task OnInitializedAsync() { if (Breadcrumbs == null) throw new ArgumentNullException(nameof(Breadcrumbs)); diff --git a/MatrixRoomUtils.Web/Shared/RoomListItem.razor b/MatrixRoomUtils.Web/Shared/RoomListItem.razor index 6dc0683..53219d6 100644 --- a/MatrixRoomUtils.Web/Shared/RoomListItem.razor +++ b/MatrixRoomUtils.Web/Shared/RoomListItem.razor @@ -1,15 +1,17 @@ @using MatrixRoomUtils.Core.Extensions @using System.Text.Json +@using MatrixRoomUtils.Core.Helpers +@using MatrixRoomUtils.Core.StateEventTypes
@if (ShowOwnProfile) { - + @(profileName ?? "Loading...") -> } - +
@RoomName - @if (ChildContent != null) { + @if (ChildContent is not null) { @ChildContent }
@@ -22,7 +24,7 @@ public RenderFragment? ChildContent { get; set; } [Parameter] - public Room Room { get; set; } + public GenericRoom Room { get; set; } [Parameter] public string RoomId { get; set; } @@ -47,11 +49,11 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); await _semaphoreSlim.WaitAsync(); - var hs = RuntimeCache.CurrentHomeServer; + var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + if (hs is null) return; if (Room == null) { if (RoomId == null) { @@ -66,7 +68,7 @@ RoomName ??= await Room.GetNameAsync() ?? "Unnamed room: " + RoomId; var ce = await Room.GetCreateEventAsync(); - if (ce != null) { + if (ce is not null) { if (int.TryParse(ce.RoomVersion, out var rv) && rv < 10) { hasOldRoomVersion = true; } @@ -76,47 +78,37 @@ } } - var state = await Room.GetStateAsync("m.room.avatar"); - if (state != null) { + var state = await Room.GetStateAsync("m.room.avatar"); + if (state is not null) { try { - var url = state.Value.GetProperty("url").GetString(); - if (url != null) { - roomIcon = hs.ResolveMediaUri(url); + var url = state.Url; + if (url is not null) { + roomIcon = MediaResolver.ResolveMediaUri(hs.FullHomeServerDomain, url); Console.WriteLine($"Got avatar for room {RoomId}: {roomIcon} ({url})"); } } catch (InvalidOperationException e) { - Console.WriteLine($"Failed to get avatar for room {RoomId}: {e.Message}\n{state.Value.ToJson()}"); + Console.WriteLine($"Failed to get avatar for room {RoomId}: {e.Message}\n{state.ToJson()}"); + } + catch (Exception e) { + Console.WriteLine(e); } } if (ShowOwnProfile) { var profile = await hs.GetProfile(hs.UserId, true); - var memberState = await Room.GetStateAsync("m.room.member", hs.UserId); - if (memberState.HasValue) { - memberState.Value.TryGetProperty("avatar_url", out var _avatar); - if (_avatar.ValueKind == JsonValueKind.String) { - hasCustomProfileAvatar = _avatar.GetString() != profile.AvatarUrl; - profileAvatar = hs.ResolveMediaUri(_avatar.GetString()); - } - else { - profileAvatar = "/icon-192.png"; - } - memberState.Value.TryGetProperty("displayname", out var _name); - if (_name.ValueKind == JsonValueKind.String) { - hasCustomProfileName = _name.GetString() != profile.DisplayName; - profileName = _name.GetString(); - // Console.WriteLine($"{profile.DisplayName} - {_name.GetString()}: {hasCustomProfileName}"); - } - else { - profileName = "Unnamed user"; - } + var memberState = await Room.GetStateAsync("m.room.member", hs.UserId); + if (memberState is not null) { + + hasCustomProfileAvatar = memberState.AvatarUrl != profile.AvatarUrl; + profileAvatar = MediaResolver.ResolveMediaUri(hs.FullHomeServerDomain, memberState.AvatarUrl ?? profile.AvatarUrl ?? "/icon-192.png"); + + hasCustomProfileName = memberState.Displayname != profile.DisplayName; + profileName = memberState.Displayname; } } _semaphoreSlim.Release(); - if (Random.Shared.Next(100) == 1) - await LocalStorageWrapper.SaveCacheToLocalStorage(LocalStorage); } } \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor index 598ae7e..b7e0220 100644 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor +++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor @@ -1,23 +1,24 @@ -@using MatrixRoomUtils.Core -@using Microsoft.AspNetCore.Components -@if (Event.membership"]!.GetValue() == "ban") { +@using MatrixRoomUtils.Core.Responses +@using MatrixRoomUtils.Core.StateEventTypes + +@if (roomMemberData.Membership == "ban") { @Event.StateKey was banned } -else if (Event.membership"]!.GetValue() == "invite") { +else if (roomMemberData.Membership == "invite") { @Event.StateKey was invited } -else if (Event.membership"]!.GetValue() == "join") { - @if (Event.ReplacesState != null) { - @Event.StateKey changed their display name to @(Event.displayname"]!.GetValue()) +else if (roomMemberData.Membership == "join") { + @if (Event.ReplacesState is not null) { + @Event.StateKey changed their display name to @(roomMemberData.Displayname ?? Event.Sender) } else { joined } } -else if (Event.membership"]!.GetValue() == "leave") { +else if (roomMemberData.Membership == "leave") { @Event.StateKey left } -else if (Event.membership"]!.GetValue() == "knock") { +else if (roomMemberData.Membership == "knock") { @Event.StateKey knocked } else { @@ -30,6 +31,8 @@ else { @code { [Parameter] - public StateEvent Event { get; set; } + public StateEventResponse Event { get; set; } + + private RoomMemberEventData? roomMemberData => Event.TypedContent as RoomMemberEventData; } \ No newline at end of file diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor index 6c26dc2..b1ce146 100644 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor +++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor @@ -1,6 +1,6 @@ @using MatrixRoomUtils.Core.Responses 
-    @ObjectExtensions.ToJson(Event.Content, indent: false)
+    @ObjectExtensions.ToJson(Event.RawContent, indent: false)
@code { diff --git a/MatrixRoomUtils.Web/Shared/UserListItem.razor b/MatrixRoomUtils.Web/Shared/UserListItem.razor index 9b3cff1..a41ce49 100644 --- a/MatrixRoomUtils.Web/Shared/UserListItem.razor +++ b/MatrixRoomUtils.Web/Shared/UserListItem.razor @@ -1,11 +1,12 @@ @using MatrixRoomUtils.Core.Responses @using MatrixRoomUtils.Core.StateEventTypes +@using MatrixRoomUtils.Core.Helpers
- + @profileName
- @if (ChildContent != null) { + @if (ChildContent is not null) { @ChildContent }
@@ -30,24 +31,24 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - await LocalStorageWrapper.LoadFromLocalStorage(LocalStorage); + var hs = await MRUStorage.GetCurrentSessionOrNavigate(); + if (hs is null) return; + await _semaphoreSlim.WaitAsync(); if (User == null) { if (UserId == null) { throw new ArgumentNullException(nameof(UserId)); } - User = await RuntimeCache.CurrentHomeServer.GetProfile(UserId); + User = await hs.GetProfile(UserId); } // UserId = User.; - profileAvatar = RuntimeCache.CurrentHomeServer.ResolveMediaUri(User.AvatarUrl); + profileAvatar = MediaResolver.ResolveMediaUri(hs.FullHomeServerDomain, User.AvatarUrl); profileName = User.DisplayName; _semaphoreSlim.Release(); - if (Random.Shared.Next(100) == 1) - await LocalStorageWrapper.SaveCacheToLocalStorage(LocalStorage); } } \ No newline at end of file -- cgit 1.5.1