mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-23 11:16:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Code styling

Browse source
This commit is contained in:
Oleksii Holub 2017-12-22 16:29:50 +02:00
parent a6a54d688f
commit 2ce9e2c77e
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
DiscordChatExporter/Services/DataService.cs
View file

@ -21,27 +21,27 @@ namespace DiscordChatExporter.Services
private User ParseUser(JToken token) private User ParseUser(JToken token)
{ {
var id = token.Value<string>("id"); var id = token["id"].Value<string>();
var discriminator = token.Value<int>("discriminator"); var discriminator = token["discriminator"].Value<int>();
var name = token.Value<string>("username"); var name = token["username"].Value<string>();
var avatarHash = token.Value<string>("avatar"); var avatarHash = token["avatar"].Value<string>();
return new User(id, discriminator, name, avatarHash); return new User(id, discriminator, name, avatarHash);
} }
private Role ParseRole(JToken token) private Role ParseRole(JToken token)
{ {
var id = token.Value<string>("id"); var id = token["id"].Value<string>();
var name = token.Value<string>("name"); var name = token["name"].Value<string>();
return new Role(id, name); return new Role(id, name);
} }
private Guild ParseGuild(JToken token) private Guild ParseGuild(JToken token)
{ {
var id = token.Value<string>("id"); var id = token["id"].Value<string>();
var name = token.Value<string>("name"); var name = token["name"].Value<string>();
var iconHash = token.Value<string>("icon"); var iconHash = token["icon"].Value<string>();
var roles = token["roles"].Select(ParseRole).ToArray(); var roles = token["roles"].Select(ParseRole).ToArray();
return new Guild(id, name, iconHash, roles); return new Guild(id, name, iconHash, roles);
@ -50,9 +50,9 @@ namespace DiscordChatExporter.Services
private Channel ParseChannel(JToken token) private Channel ParseChannel(JToken token)
{ {
// Get basic data // Get basic data
var id = token.Value<string>("id"); var id = token["id"].Value<string>();
var type = (ChannelType) token.Value<int>("type"); var type = (ChannelType) token["type"].Value<int>();
var topic = token.Value<string>("topic"); var topic = token["topic"].Value<string>();
// Extract name based on type // Extract name based on type
string name; string name;
@ -63,7 +63,7 @@ namespace DiscordChatExporter.Services
} }
else else
{ {
name = token.Value<string>("name"); name = token["name"].Value<string>();
} }
return new Channel(id, name, topic, type); return new Channel(id, name, topic, type);
@ -72,11 +72,11 @@ namespace DiscordChatExporter.Services
private Message ParseMessage(JToken token) private Message ParseMessage(JToken token)
{ {
// Get basic data // Get basic data
var id = token.Value<string>("id"); var id = token["id"].Value<string>();
var timeStamp = token.Value<DateTime>("timestamp"); var timeStamp = token["timestamp"].Value<DateTime>();
var editedTimeStamp = token.Value<DateTime?>("edited_timestamp"); var editedTimeStamp = token["edited_timestamp"].Value<DateTime?>();
var content = token.Value<string>("content"); var content = token["content"].Value<string>();
var type = (MessageType) token.Value<int>("type"); var type = (MessageType) token["type"].Value<int>();
// Workarounds for non-default types // Workarounds for non-default types
if (type == MessageType.RecipientAdd) if (type == MessageType.RecipientAdd)
@ -101,13 +101,13 @@ namespace DiscordChatExporter.Services
var attachments = new List<Attachment>(); var attachments = new List<Attachment>();
foreach (var attachmentJson in token["attachments"].EmptyIfNull()) foreach (var attachmentJson in token["attachments"].EmptyIfNull())
{ {
var attachmentId = attachmentJson.Value<string>("id"); var attachmentId = attachmentJson["id"].Value<string>();
var attachmentUrl = attachmentJson.Value<string>("url"); var attachmentUrl = attachmentJson["url"].Value<string>();
var attachmentType = attachmentJson["width"] != null var attachmentType = attachmentJson["width"] != null
? AttachmentType.Image ? AttachmentType.Image
: AttachmentType.Other; : AttachmentType.Other;
var attachmentFileName = attachmentJson.Value<string>("filename"); var attachmentFileName = attachmentJson["filename"].Value<string>();
var attachmentFileSize = attachmentJson.Value<long>("size"); var attachmentFileSize = attachmentJson["size"].Value<long>();
var attachment = new Attachment( var attachment = new Attachment(
attachmentId, attachmentType, attachmentUrl, attachmentId, attachmentType, attachmentUrl,
@ -195,7 +195,7 @@ namespace DiscordChatExporter.Services
var content = await GetStringAsync(url); var content = await GetStringAsync(url);
// Parse IDs // Parse IDs
var guildIds = JArray.Parse(content).Select(t => t.Value<string>("id")); var guildIds = JArray.Parse(content).Select(t => t["id"].Value<string>());
// Get full guild infos // Get full guild infos
var guilds = new List<Guild>(); var guilds = new List<Guild>();