beamsocial 0.18.0 → 0.19.0

package/lib/index.d.ts

@@ -3,6 +3,7 @@ import { User } from './models/users.js';
 import { Session } from './models/auth.js';
 import { Post } from './models/posts.js';
 import { Comment } from './models/comments.js';
+import { Inbox } from './models/inbox.js';
 export declare class Client {
     private readonly baseURL;
     private token?;
@@ -11,6 +12,7 @@ export declare class Client {
     login(username: string, password: string): Promise<Session | null>;
     refresh(token?: string): Promise<void>;
     me(): Promise<Session | null>;
+    inbox(): Promise<Inbox | null>;
     update_settings(settings: Settings): Promise<void>;
     /*************************************/
     getUser(name: string): Promise<User | null>;
@@ -22,8 +24,9 @@ export declare class Client {
     writeComment(content: string, visibility?: "me" | "friends" | "followers" | "everyone", answers_to?: string, post_id?: string): Promise<Comment>;
     getComment(id: string): Promise<Comment>;
 }
-export { User } from './models/users.js';
 export { Session } from './models/auth.js';
+export { Inbox, IncomingRequest, OutgoingRequest } from './models/inbox.js';
+export { User } from './models/users.js';
 export { Post } from './models/posts.js';
 export { Comment } from './models/comments.js';
 export type { Badge } from './models/types/profiles.js';

package/lib/index.js

@@ -12,6 +12,7 @@ import { User } from './models/users.js';
 import { Session } from './models/auth.js';
 import { Post } from './models/posts.js';
 import { Comment } from './models/comments.js';
+import { Inbox } from './models/inbox.js';
 export class Client {
     constructor(baseURL, token) {
         this.baseURL = baseURL;
@@ -78,6 +79,33 @@ export class Client {
             }
         });
     }
+    inbox() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield axios.get(this.baseURL + '/me/inbox', {
+                    withCredentials: true,
+                });
+                const data = res.data;
+                const inbox = new Inbox(data.id);
+                inbox.__load(data, this.session, this.baseURL);
+                return inbox;
+            }
+            catch (err) {
+                if (axios.isAxiosError(err) && err.response) {
+                    const res = err.response;
+                    if (res.status === 401) {
+                        throw new Error('NotLoggedIn');
+                    }
+                    else {
+                        throw new Error('Error');
+                    }
+                }
+                else {
+                    throw err;
+                }
+            }
+        });
+    }
     update_settings(settings) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -97,7 +125,7 @@ export class Client {
                         throw new Error('NotLoggedIn');
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -128,7 +156,7 @@ export class Client {
                         return null;
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -163,7 +191,7 @@ export class Client {
                         throw new Error('PostTooLong');
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -196,7 +224,7 @@ export class Client {
                         throw new Error('PostNotFound');
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -233,7 +261,7 @@ export class Client {
                         throw new Error('UserNotFound');
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -269,7 +297,7 @@ export class Client {
                         throw new Error('PostTooLong');
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -302,7 +330,7 @@ export class Client {
                         throw new Error('CommentNotFound');
                     }
                     else {
-                        throw new Error();
+                        throw new Error('Error');
                     }
                 }
                 else {
@@ -312,7 +340,8 @@ export class Client {
         });
     }
 }
-export { User } from './models/users.js';
 export { Session } from './models/auth.js';
+export { Inbox, IncomingRequest, OutgoingRequest } from './models/inbox.js';
+export { User } from './models/users.js';
 export { Post } from './models/posts.js';
 export { Comment } from './models/comments.js';

package/lib/models/auth.d.ts

@@ -1,5 +1,4 @@
 import type { Profile, Settings, Relations, Tastes } from "./types/profiles";
-import type { Inbox } from "./types/inbox";
 export declare class Session {
     readonly id: string;
     readonly token: string | null;
@@ -8,7 +7,6 @@ export declare class Session {
     settings: Settings;
     relations: Relations;
     tastes: Tastes;
-    inbox: Inbox;
     constructor(id: string, token: string | null);
     __load(url: string, data: {
         profile?: Profile;
@@ -16,6 +14,5 @@ export declare class Session {
         settings?: Settings;
         relations?: Relations;
         tastes?: Tastes;
-        inbox?: Inbox;
     }): void;
 }

package/lib/models/auth.js

@@ -6,7 +6,6 @@ export class Session {
         this.settings = {};
         this.relations = {};
         this.tastes = {};
-        this.inbox = {};
         this.id = id;
         this.token = token;
     }
@@ -21,8 +20,6 @@ export class Session {
             this.relations = data.relations;
         if (data.tastes)
             this.tastes = data.tastes;
-        if (data.inbox)
-            this.inbox = data.inbox;
     }
 }
 ;

package/lib/models/comments.js

@@ -38,8 +38,8 @@ export class Comment {
         this.visibility = data.visibility;
         this.likes = data.likes;
         this.answers = data.answers;
-        this.creation_date = new Date(data.creation_date),
-            this.update_date = data.update_date ? new Date(data.update_date) : null;
+        this.creation_date = new Date(data.creation_date);
+        this.update_date = data.update_date ? new Date(data.update_date) : null;
     }
     like() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/models/inbox.d.ts

@@ -0,0 +1,36 @@
+import type { RawInbox, Notification, RawPendingRequest } from "./types/inbox.js";
+import { Session } from "./auth.js";
+import { User } from "./users.js";
+export declare class IncomingRequest {
+    from: User;
+    to: User;
+    date: Date;
+    constructor(data: RawPendingRequest, __session?: Session, __url?: string);
+    accept(request?: "follow" | "child"): Promise<void>;
+    reject(request?: "follow" | "child"): Promise<void>;
+}
+export declare class OutgoingRequest {
+    from: User;
+    to: User;
+    date: Date;
+    constructor(data: RawPendingRequest, __session?: Session, __url?: string);
+    cancel(request?: "follow" | "child"): Promise<void>;
+}
+export declare class Inbox {
+    private __token?;
+    private __url?;
+    private __session?;
+    id: string;
+    outgoing: {
+        child: OutgoingRequest[];
+        follow: OutgoingRequest[];
+    };
+    incoming: {
+        child: IncomingRequest[];
+        follow: IncomingRequest[];
+    };
+    unread: Notification[];
+    read: Notification[];
+    constructor(id: string);
+    __load(data: RawInbox, __session?: Session, __url?: string): void;
+}

package/lib/models/inbox.js

@@ -0,0 +1,73 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { User } from "./users.js";
+export class IncomingRequest {
+    constructor(data, __session, __url) {
+        this.from = new User(data.from.id);
+        this.from.__load(data.from, __session, __url);
+        this.to = new User(data.to.id);
+        this.to.__load(data.to, __session, __url);
+        this.date = new Date(data.date);
+    }
+    accept() {
+        return __awaiter(this, arguments, void 0, function* (request = "follow") {
+            this.from.accept(request);
+        });
+    }
+    reject() {
+        return __awaiter(this, arguments, void 0, function* (request = "follow") {
+            this.from.reject(request);
+        });
+    }
+}
+export class OutgoingRequest {
+    constructor(data, __session, __url) {
+        this.from = new User(data.from.id);
+        this.from.__load(data.from, __session, __url);
+        this.to = new User(data.to.id);
+        this.to.__load(data.to, __session, __url);
+        this.date = new Date(data.date);
+    }
+    cancel() {
+        return __awaiter(this, arguments, void 0, function* (request = "follow") {
+            this.from.unfollow();
+        });
+    }
+}
+export class Inbox {
+    constructor(id) {
+        this.outgoing = {
+            child: [],
+            follow: []
+        };
+        this.incoming = {
+            child: [],
+            follow: []
+        };
+        this.unread = [];
+        this.read = [];
+        this.id = id;
+    }
+    __load(data, __session, __url) {
+        this.__token = (__session === null || __session === void 0 ? void 0 : __session.token) || this.__token;
+        this.__session = __session;
+        this.__url = __url + '/me';
+        this.outgoing = {
+            child: data.outgoing.child.map((req) => new OutgoingRequest(req, __session, __url)),
+            follow: data.outgoing.follow.map((req) => new OutgoingRequest(req, __session, __url))
+        };
+        this.incoming = {
+            child: data.incoming.child.map((req) => new IncomingRequest(req, __session, __url)),
+            follow: data.incoming.follow.map((req) => new IncomingRequest(req, __session, __url))
+        };
+        this.unread = data.unread;
+        this.read = data.read;
+    }
+}

package/lib/models/types/inbox.d.ts

@@ -1,14 +1,4 @@
 import type { Profile } from './profiles.js';
-export type PartialNotificationBase = {
-    id: string;
-    date: Date;
-    type: string;
-    isGroupable: boolean;
-    read: boolean;
-};
-export type PartialNotificationSingle = PartialNotificationBase & {
-    author: string;
-};
 export type NotificationBase = {
     id: string;
     date: Date;
@@ -20,13 +10,6 @@ export type NotificationBase = {
 export type NotificationSingle = NotificationBase & {
     author: Profile;
 };
-export type PartialNotificationPost = PartialNotificationSingle & {
-    target: string;
-};
-export type PartialNotificationComment = PartialNotificationSingle & {
-    target: string;
-    post: string;
-};
 export type NotificationPost = NotificationSingle & {
     target: string;
 };
@@ -43,22 +26,21 @@ export type NotificationBan = NotificationBase & {
     reason: string;
 };
 export type Notification = NotificationSingle | NotificationWarn | NotificationBan | NotificationPost | NotificationComment;
-export type PartialNotification = PartialNotificationSingle | PartialNotificationPost | PartialNotificationComment;
-export type PartialInbox = {
-    id: string;
-    requests: {
-        children: string[];
-        following: string[];
-        followers: string[];
-    };
-    other: PartialNotificationSingle[];
+export type RawPendingRequest = {
+    from: Profile;
+    to: Profile;
+    date: Date;
 };
-export type Inbox = {
+export type RawInbox = {
     id: string;
-    requests: {
-        children: Profile[];
-        following: Profile[];
-        followers: Profile[];
+    outgoing: {
+        child: RawPendingRequest[];
+        follow: RawPendingRequest[];
+    };
+    incoming: {
+        child: RawPendingRequest[];
+        follow: RawPendingRequest[];
     };
-    other: Notification[];
+    unread: Notification[];
+    read: Notification[];
 };

package/lib/models/types/profiles.d.ts

@@ -43,6 +43,8 @@ export type Relations = {
     followers: string[];
     friends: string[];
     children: string[];
+    outgoing: string[];
+    incoming: string[];
     parent: string | null;
 };
 export type Tastes = {

package/lib/models/users.d.ts

@@ -26,6 +26,7 @@ export declare class User {
     follow(): Promise<void>;
     unfollow(): Promise<void>;
     accept(request?: "follow" | "child"): Promise<void>;
+    reject(request?: "follow" | "child"): Promise<void>;
     block(): Promise<void>;
     unblock(): Promise<void>;
 }

package/lib/models/users.js

@@ -124,7 +124,7 @@ export class User {
                     this.followers += 1;
                 }
                 else if (res.status == 206) {
-                    (_a = this.__session) === null || _a === void 0 ? void 0 : _a.inbox.requests.following.push(this);
+                    (_a = this.__session) === null || _a === void 0 ? void 0 : _a.relations.outgoing.push(this.id);
                 }
                 return;
             }
@@ -183,7 +183,6 @@ export class User {
     }
     accept() {
         return __awaiter(this, arguments, void 0, function* (request = "follow") {
-            var _a;
             try {
                 const res = yield axios.post(this.__url + `/accept/${request}`, {}, {
                     withCredentials: true,
@@ -191,9 +190,6 @@ export class User {
                 if (res.status == 200) {
                     this.followers += 1;
                 }
-                else if (res.status == 206) {
-                    (_a = this.__session) === null || _a === void 0 ? void 0 : _a.inbox.requests.following.push(this);
-                }
                 return;
             }
             catch (err) {
@@ -218,6 +214,25 @@ export class User {
             }
         });
     }
+    reject() {
+        return __awaiter(this, arguments, void 0, function* (request = "follow") {
+            try {
+                const res = yield axios.post(this.__url + `/reject/${request}`, {}, {
+                    withCredentials: true,
+                });
+                return;
+            }
+            catch (err) {
+                if (axios.isAxiosError(err) && err.response) {
+                    const res = err.response;
+                    throw new Error('Error');
+                }
+                else {
+                    throw err;
+                }
+            }
+        });
+    }
     block() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beamsocial",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "type": "module",
   "description": "API-wrapper pour Beam",
   "main": "index.js",