Chats: accepting_messages --> accepts_chat_messages

app/soapbox/features/chats/components/chat-page/components/chat-page-settings.tsx

@@ -7,7 +7,7 @@ import { useOwnAccount } from 'soapbox/hooks';
 import { useUpdateCredentials } from 'soapbox/queries/accounts';
 
 type FormData = {
-  accepting_messages?: boolean
+  accepts_chat_messages?: boolean
   chats_onboarded: boolean
 }
 
@@ -26,7 +26,7 @@ const ChatPageSettings = () => {
 
   const [data, setData] = useState<FormData>({
     chats_onboarded: true,
-    accepting_messages: account?.accepting_messages,
+    accepts_chat_messages: account?.accepts_chat_messages,
   });
 
   const handleSubmit = (event: React.FormEvent) => {
@@ -49,8 +49,8 @@ const ChatPageSettings = () => {
               hint={intl.formatMessage(messages.acceptingMessageHint)}
             >
               <Toggle
-                checked={data.accepting_messages}
-                onChange={(event) => setData((prevData) => ({ ...prevData, accepting_messages: event.target.checked }))}
+                checked={data.accepts_chat_messages}
+                onChange={(event) => setData((prevData) => ({ ...prevData, accepts_chat_messages: event.target.checked }))}
               />
             </ListItem>
           </List>

app/soapbox/features/chats/components/chat-page/components/welcome.tsx

@@ -7,7 +7,7 @@ import { useOwnAccount } from 'soapbox/hooks';
 import { useUpdateCredentials } from 'soapbox/queries/accounts';
 
 type FormData = {
-  accepting_messages?: boolean
+  accepts_chat_messages?: boolean
   chats_onboarded: boolean
 }
 
@@ -27,7 +27,7 @@ const Welcome = () => {
 
   const [data, setData] = useState<FormData>({
     chats_onboarded: true,
-    accepting_messages: account?.accepting_messages,
+    accepts_chat_messages: account?.accepts_chat_messages,
   });
 
   const handleSubmit = (event: React.FormEvent) => {
@@ -65,8 +65,8 @@ const Welcome = () => {
                 hint={intl.formatMessage(messages.acceptingMessageHint)}
               >
                 <Toggle
-                  checked={data.accepting_messages}
-                  onChange={(event) => setData((prevData) => ({ ...prevData, accepting_messages: event.target.checked }))}
+                  checked={data.accepts_chat_messages}
+                  onChange={(event) => setData((prevData) => ({ ...prevData, accepts_chat_messages: event.target.checked }))}
                 />
               </ListItem>
             </List>

app/soapbox/features/settings/components/messages-settings.tsx

@@ -17,7 +17,7 @@ const MessagesSettings = () => {
   const updateCredentials = useUpdateCredentials();
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    updateCredentials.mutate({ accepting_messages: event.target.checked });
+    updateCredentials.mutate({ accepts_chat_messages: event.target.checked });
   };
 
   if (!account) {
@@ -31,7 +31,7 @@ const MessagesSettings = () => {
         hint={intl.formatMessage(messages.hint)}
       >
         <Toggle
-          checked={account.accepting_messages}
+          checked={account.accepts_chat_messages}
           onChange={handleChange}
         />
       </ListItem>

app/soapbox/normalizers/account.ts

@@ -21,7 +21,7 @@ import type { Emoji, Field, EmbeddedEntity, Relationship } from 'soapbox/types/e
 
 // https://docs.joinmastodon.org/entities/account/
 export const AccountRecord = ImmutableRecord({
-  accepting_messages: false,
+  accepts_chat_messages: false,
   acct: '',
   avatar: '',
   avatar_static: '',
@@ -264,6 +264,12 @@ const normalizeDiscoverable = (account: ImmutableMap<string, any>) => {
   return account.set('discoverable', discoverable);
 };
 
+/** Normalize message acceptance between Pleroma and Truth Social. */
+const normalizeMessageAcceptance = (account: ImmutableMap<string, any>) => {
+  const acceptance = Boolean(account.getIn(['pleroma', 'accepts_chat_messages']) || account.get('accepting_messages'));
+  return account.set('accepts_chat_messages', acceptance);
+};
+
 /** Normalize undefined/null birthday to empty string. */
 const fixBirthday = (account: ImmutableMap<string, any>) => {
   const birthday = account.get('birthday');
@@ -285,6 +291,7 @@ export const normalizeAccount = (account: Record<string, any>) => {
       normalizeFqn(account);
       normalizeFavicon(account);
       normalizeDiscoverable(account);
+      normalizeMessageAcceptance(account);
       addDomain(account);
       addStaffFields(account);
       fixUsername(account);

app/soapbox/queries/accounts.ts

@@ -30,7 +30,7 @@ export type IAccount = {
 }
 
 type UpdateCredentialsData = {
-  accepting_messages?: boolean
+  accepts_chat_messages?: boolean
   chats_onboarded?: boolean
 }