From ccd1d4bdc1d02a021bc26166e7a56fa1bbc955b9 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 2 Aug 2019 12:44:24 -0700
Subject: [PATCH 1/2] Wire up the account name for scripting.

---
 Mac/Resources/NetNewsWire.sdef                |  2 +-
 Mac/Scriptability/Account+Scriptability.swift | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Mac/Resources/NetNewsWire.sdef b/Mac/Resources/NetNewsWire.sdef
index 982719b4b..d9facd1da 100644
--- a/Mac/Resources/NetNewsWire.sdef
+++ b/Mac/Resources/NetNewsWire.sdef
@@ -76,7 +76,7 @@
         <class name="account" code="Acct" plural="accounts" description="An account for subscribing to feeds">
             <cocoa class="ScriptableAccount"/>
             <property name="name" code="pnam" type="text" access="r" description="The name of the account">
-                <cocoa key="name"/>
+                <cocoa key="scriptingName"/>
             </property>
             <property name="id" code="ID  " type="text" access="r" description="The unique id of the account">
                 <cocoa key="uniqueId"/>
diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/Account+Scriptability.swift
index 486a9c7c8..520c3d298 100644
--- a/Mac/Scriptability/Account+Scriptability.swift
+++ b/Mac/Scriptability/Account+Scriptability.swift
@@ -35,7 +35,17 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
 			account.isActive = newValue
 		}
 	}
-	
+
+	@objc(scriptingName)
+	var scriptingName: NSString {
+		get {
+			return account.nameForDisplay as NSString
+		}
+		set {
+			account.name = newValue as String
+		}
+	}
+
     // MARK: --- ScriptingObject protocol ---
     
     var scriptingKey: String {

From 4b5dd7cd179d0f7dbdd14c68ce9add067f277ae6 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Fri, 2 Aug 2019 14:03:04 -0700
Subject: [PATCH 2/2] Fix some AppleScript terminology conflicts. Change
 account.type too account.accountType. Change local account to onmymac.

---
 Mac/Resources/NetNewsWire.sdef | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mac/Resources/NetNewsWire.sdef b/Mac/Resources/NetNewsWire.sdef
index d9facd1da..aa7fb9974 100644
--- a/Mac/Resources/NetNewsWire.sdef
+++ b/Mac/Resources/NetNewsWire.sdef
@@ -66,7 +66,7 @@
          </class>
 
         <enumeration name="account type" code="enum">
-            <enumerator name="local" code="Locl" description="The On my Mac account"/>
+            <enumerator name="onmymac" code="Locl" description="An On my Mac (local) account"/>
             <enumerator name="feedly" code="Fdly" description="A Feedly account"/>
             <enumerator name="feedbin" code="Fdbn" description="A Feedbin account"/>
             <enumerator name="feed wrangler" code="FWrg" description="A Feed Wrangler account"/>
@@ -81,7 +81,7 @@
             <property name="id" code="ID  " type="text" access="r" description="The unique id of the account">
                 <cocoa key="uniqueId"/>
             </property>
-            <property name="type" code="ATyp" type="account type" access="r" description="The type of the account">
+            <property name="accountType" code="ATyp" type="account type" access="r" description="The type of the account">
                 <cocoa key="accountType"/>
             </property>
 			<property name="active" code="Actv" type="boolean" access="rw" description="Whether or not the account is active">