From 8b59c1c1a852a78c8ffdf2878c9b8d72b016b150 Mon Sep 17 00:00:00 2001
From: DaneEveritt <dane@daneeveritt.com>
Date: Sun, 10 Jul 2022 13:47:19 -0400
Subject: [PATCH] Support new sftp event types

---
 resources/lang/en/activity.php                   | 16 +++++++++++++---
 .../elements/activity/ActivityLogEntry.tsx       |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en/activity.php b/resources/lang/en/activity.php
index 51bf77339..8edbfbe8b 100644
--- a/resources/lang/en/activity.php
+++ b/resources/lang/en/activity.php
@@ -83,6 +83,19 @@ return [
             'write' => 'Wrote new content to :file',
             'upload' => 'Began a file upload',
         ],
+        'sftp' => [
+            'denied' => 'Blocked SFTP access due to permissions',
+            'create_one' => 'Created :files.0',
+            'create_other' => 'Created :count new files',
+            'write_one' => 'Modified the contents of :files.0',
+            'write_other' => 'Modified the contents of :count files',
+            'delete_one' => 'Deleted :files.0',
+            'delete_other' => 'Deleted :count files',
+            'create-directory_one' => 'Created the :files.0 directory',
+            'create-directory_other' => 'Created :count directories',
+            'rename_one' => 'Renamed :files.0.from to :files.0.to',
+            'rename_other' => 'Renamed or moved :count files',
+        ],
         'allocation' => [
             'create' => 'Added :allocation to the server',
             'notes' => 'Updated the notes for :allocation from ":old" to ":new"',
@@ -100,9 +113,6 @@ return [
             'update' => 'Updated the ":action" task for the :name schedule',
             'delete' => 'Deleted a task for the :name schedule',
         ],
-        'sftp' => [
-            'denied' => 'Blocked SFTP access due to permissions',
-        ],
         'settings' => [
             'rename' => 'Renamed the server from :old to :new',
         ],
diff --git a/resources/scripts/components/elements/activity/ActivityLogEntry.tsx b/resources/scripts/components/elements/activity/ActivityLogEntry.tsx
index b12923532..183b2ab3f 100644
--- a/resources/scripts/components/elements/activity/ActivityLogEntry.tsx
+++ b/resources/scripts/components/elements/activity/ActivityLogEntry.tsx
@@ -69,7 +69,7 @@ export default ({ activity, children }: Props) => {
                                     <TerminalIcon />
                                 </Tooltip>
                             )}
-                            {activity.properties.using_sftp && (
+                            {activity.event.startsWith('server:sftp.') && (
                                 <Tooltip placement={'top'} content={'Using SFTP'}>
                                     <FolderOpenIcon />
                                 </Tooltip>