Serraniel/DiscordMediaLoader
1
0
Fork 0
Code Issues 30 Pull requests 16 Packages Projects Releases 18 Wiki Activity

#105 Extended filename legalisation to usernames

Browse source
This commit is contained in:
Serraniel 2021-12-16 14:53:37 +01:00
parent dccbd4ab0b
commit ed8039dfbc
Signed by: Serraniel
GPG key ID: 3690B4E7364525D3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Discord Media Loader.Application/Classes/JobScheduler.cs
View file

@ -251,7 +251,13 @@ namespace DML.AppCore.Classes
socketTextChannel.GetUser(message.Author socketTextChannel.GetUser(message.Author
.Id); // can be null if user left the server .Id); // can be null if user left the server
if (serverUser != null) if (serverUser != null)
{
nickname = serverUser.Nickname; nickname = serverUser.Nickname;
if (!string.IsNullOrEmpty(nickname))
nickname = Path.GetInvalidFileNameChars()
.Aggregate(nickname, (current, c) => current.Replace(c, ' '));
}
} }
} }
} }
@ -261,6 +267,12 @@ namespace DML.AppCore.Classes
channelName = Path.GetInvalidFileNameChars() channelName = Path.GetInvalidFileNameChars()
.Aggregate(channelName, (current, c) => current.Replace(c, ' ')); .Aggregate(channelName, (current, c) => current.Replace(c, ' '));
// fetch username
var username = message.Author.Username;
username = Path.GetInvalidFileNameChars()
.Aggregate(username, (current, c) => current.Replace(c, ' '));
fileName = fileName =
fileName.Replace("%guild%", serverName) fileName.Replace("%guild%", serverName)
.Replace("%channel%", channelName) .Replace("%channel%", channelName)
@ -268,9 +280,9 @@ namespace DML.AppCore.Classes
.Replace("%name%", a.Filename) .Replace("%name%", a.Filename)
.Replace("%id%", a.Id.ToString()) .Replace("%id%", a.Id.ToString())
.Replace("%userid%", message.Author.Id.ToString()) .Replace("%userid%", message.Author.Id.ToString())
.Replace("%username%", message.Author.Username) .Replace("%username%", username)
.Replace("%nickname%", .Replace("%nickname%",
!string.IsNullOrEmpty(nickname) ? nickname : message.Author.Username); !string.IsNullOrEmpty(nickname) ? nickname : username);
if (extensionRequired) if (extensionRequired)
fileName += Path.GetExtension(a.Filename); fileName += Path.GetExtension(a.Filename);