notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[frontend/components] Don't mention yourself or local host part when composing replies (ISH-603)

Browse source
This commit is contained in:
pancakes 2024-11-21 18:42:36 +10:00 • committed by Laura Hausmann
parent 11575e4daf
commit b581714387
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Iceshrimp.Frontend/Components/Compose.razor
View file

@ -10,6 +10,7 @@
@inject ApiService ApiService
@inject ComposeService ComposeService
@inject SessionService SessionService
@inject MetadataService MetadataService
@inject IStringLocalizer<Localization> Loc;
@inject GlobalComponentSvc GlobalComponentSvc
@inject MessageService MessageService
@ -157,7 +158,7 @@
{
if (replyTo != null)
{
var mentions = EnumerateMentions(replyTo);
var mentions = await EnumerateMentions(replyTo);
ResetState();
ReplyOrQuote = replyTo;
NoteDraft.ReplyId = replyTo.Id;
@ -189,7 +190,7 @@
await _module.InvokeVoidAsync("openDialog", Dialog);
}
private List<string> EnumerateMentions(NoteBase noteBase)
private async Task<List<string>> EnumerateMentions(NoteBase noteBase)
{
List<string> mentions = [];
if (noteBase.User.Id != SessionService.Current!.Id)
@ -203,18 +204,18 @@
mentions.Add(userMention);
}
var current = $"@{SessionService.Current.Username}@{SessionService.Current.Host}";
var instance = await MetadataService.Instance.Value;
var mfmNodes = noteBase.Text != null ? Mfm.parse(noteBase.Text) : [];
foreach (var node in mfmNodes)
{
if (node is MfmNodeTypes.MfmMentionNode mentionNode)
{
mentions.Add(mentionNode.Acct);
mentions.Add(mentionNode.Acct.Replace($"@{instance.AccountDomain}", ""));
}
}
mentions = mentions.Distinct().ToList();
mentions.Remove(current);
mentions.Remove(SessionService.Current.Username);
return mentions;
}