ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Links mit https sind klickbar

Browse Source
This commit is contained in:
Lyndon Jetten
2019-12-09 12:15:40 +01:00
parent 1ebce8d36c
commit 7bec9afd9b
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChatController/ChatKlassen/ChatMessage.cs
View File

@@ -137,11 +137,6 @@ namespace ChatController.ChatKlassen
{ {
if (word.IndexOfAny(@":.\/".ToCharArray()) != -1) if (word.IndexOfAny(@":.\/".ToCharArray()) != -1)
{ {
if (Uri.IsWellFormedUriString(word, UriKind.Absolute))
{
return word.StartsWith("http://");
}
if (UrlRegex.IsMatch(word)) if (UrlRegex.IsMatch(word))
{ {
var uri = new Uri(word, UriKind.RelativeOrAbsolute); var uri = new Uri(word, UriKind.RelativeOrAbsolute);

18
ChatController/HauptKlassen/Chat.cs
View File

@@ -198,7 +198,7 @@ namespace ChatController.HauptKlassen
if (_UserMessages != null && _UserMessages.Response.Messages.Length > 0) if (_UserMessages != null && _UserMessages.Response.Messages.Length > 0)
{ {
timespan = _UserMessages.Response.Messages.First().Created_At; timespan = _UserMessages.Response.Messages.First().CreatedAt;
} }
if (pCurrentContact != null) if (pCurrentContact != null)
@@ -473,7 +473,7 @@ namespace ChatController.HauptKlassen
filename = filename.Replace(".bmp", ".jpg"); filename = filename.Replace(".bmp", ".jpg");
Messages.Add(new ChatMessage(message.User_Name, filename, sendTime, true, bitmapImage, pFile, filename, pGroupId)); Messages.Add(new ChatMessage(message.UserName, filename, sendTime, true, bitmapImage, pFile, filename, pGroupId));
} }
} }
@@ -482,7 +482,7 @@ namespace ChatController.HauptKlassen
} }
else else
{ {
Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFile), sendTime, message.Smaller_Image, true, pFile, pGroupId)); Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFile), sendTime, message.SmallerImage, true, pFile, pGroupId));
} }
} }
@@ -515,11 +515,11 @@ namespace ChatController.HauptKlassen
memoryStream.Close(); memoryStream.Close();
ImageSource logo = bitmapImage; ImageSource logo = bitmapImage;
Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, true, logo, pFileName, Path.GetFileName(pFileName), pGroupId)); Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFileName), sendtime, true, logo, pFileName, Path.GetFileName(pFileName), pGroupId));
} }
else else
{ {
Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, message.Smaller_Image, true, pFileName, pGroupId)); Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFileName), sendtime, message.SmallerImage, true, pFileName, pGroupId));
} }
} }
@@ -1288,17 +1288,17 @@ namespace ChatController.HauptKlassen
var clientZone = TimeZoneInfo.Local; var clientZone = TimeZoneInfo.Local;
var formattedTime = TimeZoneInfo.ConvertTimeFromUtc(time, clientZone); var formattedTime = TimeZoneInfo.ConvertTimeFromUtc(time, clientZone);
var isLoggedInUsersMessage = ChatDaten.Userid != null && message.UserId == ChatDaten.Userid.Value; var isLoggedInUsersMessage = ChatDaten.Userid != null && message.UserId == ChatDaten.Userid.Value;
var messageText = message.Text ?? (string.IsNullOrEmpty(message.File) ? string.Empty : message.Original_Filename); var messageText = message.Text ?? (string.IsNullOrEmpty(message.File) ? string.Empty : message.OriginalFilename);
if (!string.IsNullOrEmpty(message.File)) if (!string.IsNullOrEmpty(message.File))
{ {
Messages.Add(Constants.ImageFileExtensions.Contains(Path.GetExtension(message.File).ToUpperInvariant()) ? Messages.Add(Constants.ImageFileExtensions.Contains(Path.GetExtension(message.File).ToUpperInvariant()) ?
new ChatMessage(message.User_Name, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.Smaller_Image), message.File, message.Original_Filename, message.GroupId) : new ChatMessage(message.UserName, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.SmallerImage), message.File, message.OriginalFilename, message.GroupId) :
new ChatMessage(message.User_Name, messageText, formattedTime, message.Smaller_Image, isLoggedInUsersMessage, message.File, message.GroupId)); new ChatMessage(message.UserName, messageText, formattedTime, message.SmallerImage, isLoggedInUsersMessage, message.File, message.GroupId));
} }
else else
{ {
Messages.Add(new ChatMessage(message.User_Name, message.Text, formattedTime, isLoggedInUsersMessage, message.GroupId)); Messages.Add(new ChatMessage(message.UserName, message.Text, formattedTime, isLoggedInUsersMessage, message.GroupId));
} }
} }
} }

8
ChatController/LoginKlassen/UserMessages.cs
View File

@@ -23,12 +23,12 @@
public long Id { get; set; } public long Id { get; set; }
public string Text { get; set; } public string Text { get; set; }
public string File { get; set; } public string File { get; set; }
public string Original_Filename { get; set; } public string OriginalFilename { get; set; }
public string Smaller_Image { get; set; } public string SmallerImage { get; set; }
public LastMessageTimeStamp Timestamp { get; set; } public LastMessageTimeStamp Timestamp { get; set; }
public long Created_At { get; set; } public long CreatedAt { get; set; }
public long UserId { get; set; } public long UserId { get; set; }
public string User_Name { get; set; } public string UserName { get; set; }
public string UserPicture { get; set; } public string UserPicture { get; set; }
public long GroupId { get; set; } public long GroupId { get; set; }
} }