github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep tags sorted when adding everyone/here mentions

Browse Source
This commit is contained in:
RogueException
2017-04-01 21:47:04 -03:00
parent a7f50e7f59
commit aae2667fed
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
View File

@@ -126,8 +126,9 @@ namespace Discord.Rest
index = text.IndexOf("@everyone", index); index = text.IndexOf("@everyone", index);
if (index == -1) break; if (index == -1) break;
if (!TagOverlaps(tags, index)) var tagIndex = FindIndex(tags, index);
tags.Add(new Tag<object>(TagType.EveryoneMention, index, "@everyone".Length, 0, null)); if (tagIndex.HasValue)
tags.Insert(tagIndex.Value, new Tag<object>(TagType.EveryoneMention, index, "@everyone".Length, 0, null));
index++; index++;
} }
@@ -137,22 +138,26 @@ namespace Discord.Rest
index = text.IndexOf("@here", index); index = text.IndexOf("@here", index);
if (index == -1) break; if (index == -1) break;
if (!TagOverlaps(tags, index)) var tagIndex = FindIndex(tags, index);
tags.Add(new Tag<object>(TagType.HereMention, index, "@here".Length, 0, null)); if (tagIndex.HasValue)
tags.Insert(tagIndex.Value, new Tag<object>(TagType.HereMention, index, "@here".Length, 0, null));
index++; index++;
} }
return tags.ToImmutable(); return tags.ToImmutable();
} }
private static bool TagOverlaps(IReadOnlyList<ITag> tags, int index) private static int? FindIndex(IReadOnlyList<ITag> tags, int index)
{ {
for (int i = 0; i < tags.Count; i++) int i = 0;
for (; i < tags.Count; i++)
{ {
var tag = tags[i]; var tag = tags[i];
if (index >= tag.Index && index < tag.Index + tag.Length) if (index < tag.Index)
return true; break; //Position before this tag
} }
return false; if (i > 0 && index < tags[i - 1].Index + tags[i - 1].Length)
return null; //Overlaps tag before this
return i;
} }
public static ImmutableArray<ulong> FilterTagsByKey(TagType type, ImmutableArray<ITag> tags) public static ImmutableArray<ulong> FilterTagsByKey(TagType type, ImmutableArray<ITag> tags)
{ {