All checks were successful
Tag and Release Lightless / tag-and-release (push) Successful in 2m9s
# Patchnotes 2.1.0 The changes in this update are more than just "patches". With a new UI, a new feature, and a bunch of bug fixes, improvements and a new member on the dev team, we thought this was more of a minor update. We would like to introduce @tsubasahane of MareCN to the team! We’re happy to work with them to bring Lightless and its features to the CN client as well as having another talented dev bring features and ideas to us. Speaking of which: # Location Sharing (Big shout out to @tsubasahane for bringing this feature) - Are you TIRED of scrambling to find the address of the venue you're in to share with your friends? We are introducing Location Sharing! An optional feature where you can share your location with direct pairs temporarily [30 minutes, 1 hour, 3 hours] minutes or until you turn it off for them. That's up to you! [#125](<#125>) [#49](<Lightless-Sync/LightlessServer#49>) - To share your location with a pair, click the three dots beside the pair and choose a duration to share with them. [#125](<#125>) [#49](<Lightless-Sync/LightlessServer#49>) - To view the location of someone who's shared with you, simply hover over the globe icon! [#125](<#125>) [#49](<Lightless-Sync/LightlessServer#49>) [1] # Model Optimization (Mesh Decimating) - This new option can automatically “simplify” incoming character meshes to help performance by reducing triangle counts. You choose how strong the reduction is (default/recommended is 80%). [#131](<#131>) - Decimation only kicks in when a mesh is above a certain triangle threshold, and only for the items that qualify for it and you selected for. [#131](<#131>) - Hair meshes is always excluded, since simplifying hair meshes is very prone to breaking. - You can find everything under Settings → Performance → Model Optimization. [#131](<#131>) + ** IF YOU HAVE USED DECIMATION IN TESTING, PLEASE CLEAR YOUR CACHE ❗ ** [2] # Animation (PAP) Validation (Safer animations) - Lightless now checks your currently animations to see if they work with your local skeleton/bone mod. If an animation matches, it’s included in what gets sent to other players. If it doesn’t, Lightless will skip it and write a warning to your log showing how many were skipped due to skeleton changes. Its defaulted to Unsafe (off). turn it on if you experience crashes from others users. [#131](<#131>) - Lightless also does the same kind of check for incoming animation files, to make sure they match the body/skeleton they were sent with. [#131](<#131>) - Because these checks can sometimes be a little picky, you can adjust how strict they are in Settings -> General -> Animation & Bones to reduce false positives. [#131](<#131>) # UI Changes (Thanks to @kyuwu for UI Changes) - The top part of the main screen has gotten a makeover. You can adjust the colors of the gradiant in the Color settings of Lightless. [#127](<#127>) [3] - Settings have gotten some changes as well to make this change more universal, and will use the same color settings. [#127](<#127>) - The particle effects of the gradient are toggleable in 'Settings -> UI -> Behavior' [#127](<#127>) - Instead of showing download/upload on bottom of Main UI, it will show VRAM usage and triangles with their optimization options next to it [#138](<#138>) # LightFinder / ShellFinder - UI Changes that follow our new design follow the color codes for the Gradient top as the main screen does. [#127](<#127>) [4] Co-authored-by: defnotken <itsdefnotken@gmail.com> Co-authored-by: azyges <aaaaaa@aaa.aaa> Co-authored-by: cake <admin@cakeandbanana.nl> Co-authored-by: Tsubasa <tsubasa@noreply.git.lightless-sync.org> Co-authored-by: choco <choco@patat.nl> Co-authored-by: celine <aaa@aaa.aaa> Co-authored-by: celine <celine@noreply.git.lightless-sync.org> Co-authored-by: Tsubasahane <wozaiha@gmail.com> Co-authored-by: cake <cake@noreply.git.lightless-sync.org> Reviewed-on: #123
276 lines
10 KiB
C#
276 lines
10 KiB
C#
using Lifestream.Enums;
|
|
using LightlessSync.API.Data;
|
|
using LightlessSync.API.Dto.CharaData;
|
|
using LightlessSync.API.Dto.User;
|
|
using LightlessSync.Services.Mediator;
|
|
using LightlessSync.WebAPI;
|
|
using Microsoft.Extensions.Caching.Memory;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Primitives;
|
|
|
|
namespace LightlessSync.Services
|
|
{
|
|
public class LocationShareService : DisposableMediatorSubscriberBase
|
|
{
|
|
private readonly DalamudUtilService _dalamudUtilService;
|
|
private readonly ApiController _apiController;
|
|
private IMemoryCache _locations = new MemoryCache(new MemoryCacheOptions());
|
|
private IMemoryCache _sharingStatus = new MemoryCache(new MemoryCacheOptions());
|
|
private CancellationTokenSource _resetToken = new CancellationTokenSource();
|
|
|
|
public LocationShareService(ILogger<LocationShareService> logger, LightlessMediator mediator, DalamudUtilService dalamudUtilService, ApiController apiController) : base(logger, mediator)
|
|
{
|
|
_dalamudUtilService = dalamudUtilService;
|
|
_apiController = apiController;
|
|
|
|
|
|
Mediator.Subscribe<DisconnectedMessage>(this, (msg) =>
|
|
{
|
|
_resetToken.Cancel();
|
|
_resetToken.Dispose();
|
|
_resetToken = new CancellationTokenSource();
|
|
});
|
|
Mediator.Subscribe<ConnectedMessage>(this, (msg) =>
|
|
{
|
|
_ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, apiController.DisplayName), _dalamudUtilService.GetMapData()));
|
|
_ = RequestAllLocation();
|
|
} );
|
|
Mediator.Subscribe<LocationSharingMessage>(this, UpdateLocationList);
|
|
Mediator.Subscribe<MapChangedMessage>(this,
|
|
msg => _ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, _apiController.DisplayName), _dalamudUtilService.GetMapData())));
|
|
}
|
|
|
|
private void UpdateLocationList(LocationSharingMessage msg)
|
|
{
|
|
if (_locations.TryGetValue(msg.User.UID, out _) && msg.LocationInfo.ServerId is 0)
|
|
{
|
|
_locations.Remove(msg.User.UID);
|
|
return;
|
|
}
|
|
|
|
if ( msg.LocationInfo.ServerId is not 0 && msg.ExpireAt > DateTime.UtcNow)
|
|
{
|
|
AddLocationInfo(msg.User.UID, msg.LocationInfo, msg.ExpireAt);
|
|
}
|
|
}
|
|
|
|
private void AddLocationInfo(string uid, LocationInfo location, DateTimeOffset expireAt)
|
|
{
|
|
var options = new MemoryCacheEntryOptions()
|
|
.SetAbsoluteExpiration(expireAt)
|
|
.AddExpirationToken(new CancellationChangeToken(_resetToken.Token));
|
|
_locations.Set(uid, location, options);
|
|
}
|
|
|
|
private async Task RequestAllLocation()
|
|
{
|
|
try
|
|
{
|
|
var (data, status) = await _apiController.RequestAllLocationInfo().ConfigureAwait(false);
|
|
foreach (var dto in data)
|
|
{
|
|
AddLocationInfo(dto.LocationDto.User.UID, dto.LocationDto.Location, dto.ExpireAt);
|
|
}
|
|
|
|
foreach (var dto in status)
|
|
{
|
|
AddStatus(dto.User.UID, dto.ExpireAt);
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Logger.LogError(e,"RequestAllLocation error : ");
|
|
throw;
|
|
}
|
|
}
|
|
|
|
private void AddStatus(string uid, DateTimeOffset expireAt)
|
|
{
|
|
var options = new MemoryCacheEntryOptions()
|
|
.SetAbsoluteExpiration(expireAt)
|
|
.AddExpirationToken(new CancellationChangeToken(_resetToken.Token));
|
|
_sharingStatus.Set(uid, expireAt, options);
|
|
}
|
|
|
|
public string GetUserLocation(string uid)
|
|
{
|
|
try
|
|
{
|
|
if (_locations.TryGetValue<LocationInfo>(uid, out var location))
|
|
{
|
|
return _dalamudUtilService.LocationToString(location);
|
|
}
|
|
return String.Empty;
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Logger.LogError(e,"GetUserLocation error : ");
|
|
throw;
|
|
}
|
|
}
|
|
|
|
public LocationInfo? GetLocationForLifestreamByUid(string uid)
|
|
{
|
|
try
|
|
{
|
|
if (_locations.TryGetValue<LocationInfo>(uid, out var location))
|
|
{
|
|
return location;
|
|
}
|
|
return null;
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Logger.LogError(e,"GetLocationInfoByUid error : ");
|
|
throw;
|
|
}
|
|
}
|
|
|
|
public AddressBookEntryTuple? GetAddressBookEntryByLocation(LocationInfo location)
|
|
{
|
|
if (location.ServerId is 0 || location.TerritoryId is 0)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
var territoryHousing = (TerritoryTypeIdHousing)location.TerritoryId;
|
|
|
|
if (territoryHousing == TerritoryTypeIdHousing.None || !Enum.IsDefined(typeof(TerritoryTypeIdHousing), territoryHousing))
|
|
{
|
|
return null;
|
|
}
|
|
|
|
var city = GetResidentialAetheryteKind(territoryHousing);
|
|
|
|
if (city == ResidentialAetheryteKind.None)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if (location.HouseId is not 0 and not 100)
|
|
{
|
|
AddressBookEntryTuple addressEntry = (
|
|
Name: "",
|
|
World: (int)location.ServerId,
|
|
City: (int)city,
|
|
Ward: (int)location.WardId,
|
|
PropertyType: 0,
|
|
Plot: (int)location.HouseId,
|
|
Apartment: 0,
|
|
ApartmentSubdivision: location.DivisionId == 2,
|
|
AliasEnabled: false,
|
|
Alias: ""
|
|
);
|
|
return addressEntry;
|
|
}
|
|
else if (location.HouseId is 100)
|
|
{
|
|
AddressBookEntryTuple addressEntry = (
|
|
Name: "",
|
|
World: (int)location.ServerId,
|
|
City: (int)city,
|
|
Ward: (int)location.WardId,
|
|
PropertyType: 1,
|
|
Plot: 0,
|
|
Apartment: (int)location.RoomId,
|
|
ApartmentSubdivision: location.DivisionId == 2,
|
|
AliasEnabled: false,
|
|
Alias: ""
|
|
);
|
|
return addressEntry;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
private ResidentialAetheryteKind GetResidentialAetheryteKind(TerritoryTypeIdHousing territoryHousing)
|
|
{
|
|
return territoryHousing switch
|
|
{
|
|
TerritoryTypeIdHousing.Shirogane or
|
|
TerritoryTypeIdHousing.ShiroganeApartment or
|
|
TerritoryTypeIdHousing.ShiroganeSmall or
|
|
TerritoryTypeIdHousing.ShiroganeMedium or
|
|
TerritoryTypeIdHousing.ShiroganeLarge or
|
|
TerritoryTypeIdHousing.ShiroganeFCRoom or
|
|
TerritoryTypeIdHousing.ShiroganeFCWorkshop
|
|
=> ResidentialAetheryteKind.Kugane,
|
|
|
|
TerritoryTypeIdHousing.Lavender or
|
|
TerritoryTypeIdHousing.LavenderSmall or
|
|
TerritoryTypeIdHousing.LavenderMedium or
|
|
TerritoryTypeIdHousing.LavenderLarge or
|
|
TerritoryTypeIdHousing.LavenderApartment or
|
|
TerritoryTypeIdHousing.LavenderFCRoom or
|
|
TerritoryTypeIdHousing.LavenderFCWorkshop
|
|
=> ResidentialAetheryteKind.Gridania,
|
|
|
|
TerritoryTypeIdHousing.Mist or
|
|
TerritoryTypeIdHousing.MistSmall or
|
|
TerritoryTypeIdHousing.MistMedium or
|
|
TerritoryTypeIdHousing.MistLarge or
|
|
TerritoryTypeIdHousing.MistApartment or
|
|
TerritoryTypeIdHousing.MistFCRoom or
|
|
TerritoryTypeIdHousing.MistFCWorkshop
|
|
=> ResidentialAetheryteKind.Limsa,
|
|
|
|
TerritoryTypeIdHousing.Goblet or
|
|
TerritoryTypeIdHousing.GobletSmall or
|
|
TerritoryTypeIdHousing.GobletMedium or
|
|
TerritoryTypeIdHousing.GobletLarge or
|
|
TerritoryTypeIdHousing.GobletApartment or
|
|
TerritoryTypeIdHousing.GobletFCRoom or
|
|
TerritoryTypeIdHousing.GobletFCWorkshop
|
|
=> ResidentialAetheryteKind.Uldah,
|
|
|
|
TerritoryTypeIdHousing.Empyream or
|
|
TerritoryTypeIdHousing.EmpyreamSmall or
|
|
TerritoryTypeIdHousing.EmpyreamMedium or
|
|
TerritoryTypeIdHousing.EmpyreamLarge or
|
|
TerritoryTypeIdHousing.EmpyreamApartment or
|
|
TerritoryTypeIdHousing.EmpyreamFCRoom or
|
|
TerritoryTypeIdHousing.EmpyreamFCWorkshop
|
|
=> ResidentialAetheryteKind.Foundation,
|
|
|
|
_ => ResidentialAetheryteKind.None
|
|
};
|
|
}
|
|
|
|
public string? GetMapAddressByLocation(LocationInfo location)
|
|
{
|
|
string? liString = null;
|
|
var territoryHousing = (TerritoryTypeIdHousing)location.TerritoryId;
|
|
if (GetResidentialAetheryteKind(territoryHousing) == ResidentialAetheryteKind.None)
|
|
{
|
|
liString = _dalamudUtilService.LocationToLifestream(location);
|
|
}
|
|
return liString;
|
|
}
|
|
|
|
public DateTimeOffset GetSharingStatus(string uid)
|
|
{
|
|
try
|
|
{
|
|
if (_sharingStatus.TryGetValue<DateTimeOffset>(uid, out var expireAt))
|
|
{
|
|
return expireAt;
|
|
}
|
|
return DateTimeOffset.MinValue;
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Logger.LogError(e,"GetSharingStatus error : ");
|
|
throw;
|
|
}
|
|
}
|
|
|
|
public void UpdateSharingStatus(List<string> users, DateTimeOffset expireAt)
|
|
{
|
|
foreach (var user in users)
|
|
{
|
|
AddStatus(user, expireAt);
|
|
}
|
|
}
|
|
|
|
}
|
|
} |