Re-export Fedify vocab classes

fedify-dev · Jan 9, 2025 · cf7c7be · cf7c7be
1 parent cb4b124
commit cf7c7be
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/src/message-impl.ts b/src/message-impl.ts
@@ -13,6 +13,8 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
+import type { KvKey } from "@fedify/fedify/federation";
+import { LanguageString } from "@fedify/fedify/runtime";
 import {
   type Actor,
   Announce,
@@ -23,16 +25,14 @@ import {
   Document,
   Hashtag,
   isActor,
-  type KvKey,
-  LanguageString,
   Mention,
   Note,
   type Object,
   PUBLIC_COLLECTION,
   Question,
   Tombstone,
   Undo,
-} from "@fedify/fedify";
+} from "@fedify/fedify/vocab";
 import type { LanguageTag } from "@phensley/language-tag";
 import { unescape } from "@std/html/entities";
 import { generate as uuidv7 } from "@std/uuid/unstable-v7";

diff --git a/src/message.ts b/src/message.ts
@@ -29,7 +29,20 @@ import type {
   SessionPublishOptionsWithClass,
 } from "./session.ts";
 import type { Text } from "./text.ts";
-export { Article, ChatMessage, Note, Question } from "@fedify/fedify/vocab";
+export {
+  Article,
+  Audio,
+  ChatMessage,
+  Document,
+  Hashtag,
+  Image,
+  isActor,
+  Note,
+  Question,
+  Video,
+} from "@fedify/fedify/vocab";
+export type { Actor } from "@fedify/fedify/vocab";
+export { LanguageTag, parseLanguageTag } from "@phensley/language-tag";
 
 /**
  * A possible message class.
@@ -62,6 +75,8 @@ export type MessageVisibility =
   | "direct"
   /**
    * Signifies that the message is unknown; it is not clear who can see it.
+   * It is usually the case when the message is published by a minor fediverse
+   * server that is incompatible with Mastodon-style visibility.
    */
   | "unknown";
 

diff --git a/src/mod.ts b/src/mod.ts
@@ -13,14 +13,6 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-export {
-  type Actor,
-  Audio,
-  Document,
-  Image,
-  isActor,
-  Video,
-} from "@fedify/fedify/vocab";
 export {
   Application,
   type Bot,
@@ -34,15 +26,26 @@ export {
   type Software,
 } from "./bot.ts";
 export type * from "./events.ts";
-export type {
+export {
   Article,
+  Audio,
   ChatMessage,
+  Document,
+  Hashtag,
+  Image,
+  isActor,
+  LanguageTag,
+  Note,
+  parseLanguageTag,
+  Question,
+  Video,
+} from "./message.ts";
+export type {
+  Actor,
   Message,
   MessageClass,
   MessageShareOptions,
   MessageVisibility,
-  Note,
-  Question,
   SharedMessage,
 } from "./message.ts";
 export type {