Merge pull request #24 from YDKK/develop

ユーザアイコンとユーザ名の書き換えに対応

Author: YDKK

SlackLineBridge/Controllers/WebhookController.cs

@@ -109,7 +109,7 @@ public async Task<IActionResult> Slack2()
 
                                         string text = data.@event.text;
                                         string userId = data.@event.user;
-                                        string userName = await GetSlackUserName(userId);
+                                        var user = await GetSlackUserNameAndIcon(userId);
 
                                         JsonDynamicArray files = data.@event.files;
                                         SlackFile[] slackFiles = null;
@@ -124,7 +124,7 @@ public async Task<IActionResult> Slack2()
                                             }).ToArray();
                                         }
 
-                                        return await PushToLine(Request.Host.ToString(), slackChannel, userName, text, slackFiles);
+                                        return await PushToLine(Request.Host.ToString(), slackChannel, user.icon, user.userName, text, slackFiles);
                                 }
                                 break;
                         }
@@ -138,15 +138,15 @@ public async Task<IActionResult> Slack2()
             return BadRequest();
         }
 
-        private async Task<string> GetSlackUserName(string userId)
+        private async Task<(string userName, string icon)> GetSlackUserNameAndIcon(string userId)
         {
             var client = _clientFactory.CreateClient("Slack");
             var result = await client.GetAsync($"https://slack.com/api/users.profile.get?user={userId}");
             var json = await result.Content.ReadAsStringAsync();
             dynamic data = JsonSerializer.Deserialize<dynamic>(json, _jsonOptions);
-            string name = data.profile.display_name;
+            (string name, string icon) = (data.profile.display_name, data.profile.image_512);
 
-            return name;
+            return (name, icon);
         }
 
         private record SlackFile
@@ -156,7 +156,7 @@ private record SlackFile
             public string mimeType { get; set; }
         }
 
-        private async Task<IActionResult> PushToLine(string host, SlackChannel slackChannel, string userName, string text, SlackFile[] files = null)
+        private async Task<IActionResult> PushToLine(string host, SlackChannel slackChannel, string userIconUrl, string userName, string text, SlackFile[] files = null)
         {
             var bridges = GetBridges(slackChannel);
             if (!bridges.Any())
@@ -180,41 +180,13 @@ private async Task<IActionResult> PushToLine(string host, SlackChannel slackChan
                 {
                     var message = new
                     {
-                        type = "flex",
-                        altText = $"{userName}\r\n「{text}」",
-                        contents = new
-                        {
-                            type = "bubble",
-                            size = "giga",
-                            body = new
-                            {
-                                type = "box",
-                                layout = "vertical",
-                                contents = new dynamic[]
-                                {
-                                    new
-                                    {
-                                        type = "text",
-                                        text = userName,
-                                        weight = "bold",
-                                        wrap = true,
-                                        size = "xs"
-                                    },
-                                    new
-                                    {
-                                        type = "separator",
-                                        margin = "sm"
-                                    },
-                                    new
-                                    {
-                                        type = "text",
-                                        text = text,
-                                        wrap = true,
-                                        margin = "sm"
-                                    }
-                                }
-                            }
-                        }
+                        type = "text",
+                        altText = text,
+                        text = text,
+                        sender = new {
+                            name = userName,
+                            iconUrl = $"https://{host}/proxy/slack/{Crypt.GetHMACHex(userIconUrl, _slackSigningSecret)}/{HttpUtility.UrlEncode(userIconUrl)}"
+                        },
                     };
                     var urlMessages = urls.Select(x => x.Groups["url"].Value).Select(x => new
                     {
@@ -243,7 +215,12 @@ private async Task<IActionResult> PushToLine(string host, SlackChannel slackChan
                         {
                             type = "image",
                             originalContentUrl = $"https://{host}/proxy/slack/{Crypt.GetHMACHex(urlPrivate, _slackSigningSecret)}/{HttpUtility.UrlEncode(urlPrivate)}",
-                            previewImageUrl = $"https://{host}/proxy/slack/{Crypt.GetHMACHex(urlThumb360, _slackSigningSecret)}/{HttpUtility.UrlEncode(urlThumb360)}"
+                            previewImageUrl = $"https://{host}/proxy/slack/{Crypt.GetHMACHex(urlThumb360, _slackSigningSecret)}/{HttpUtility.UrlEncode(urlThumb360)}",
+                            sender = new
+                            {
+                                name = userName,
+                                iconUrl = $"https://{host}/proxy/slack/{Crypt.GetHMACHex(userIconUrl, _slackSigningSecret)}/{HttpUtility.UrlEncode(userIconUrl)}"
+                            },
                         };
                     });
                     var json = new

SlackLineBridge/Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
 COPY ["SlackLineBridge/SlackLineBridge.csproj", "SlackLineBridge/"]
 RUN dotnet restore "SlackLineBridge/SlackLineBridge.csproj"

SlackLineBridge/SlackLineBridge.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>