liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: generalize API library

Browse Source
This commit is contained in:
spiral
2022-02-01 15:24:45 -05:00
parent 6d2fa78767
commit e74b5e1c13
26 changed files with 229 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/group/Body.svelte
View File

@@ -2,12 +2,12 @@
import { Row, Col, Modal, Image, Button, CardBody, ModalHeader, ModalBody, ModalFooter, Spinner } from 'sveltestrap';
import moment from 'moment';
import { toHTML } from 'discord-markdown';
import type Group from '../../api/group';
import Edit from './Edit.svelte';
import twemoji from 'twemoji';
import Privacy from './Privacy.svelte';
import type Member from 'src/api/member';
import MemberEdit from './MemberEdit.svelte';
import { Member, Group } from '../../api/types';
export let group: Group;
let editMode: boolean = false;

12
src/lib/group/Edit.svelte
View File

@@ -1,8 +1,8 @@
<script lang="ts">
import { Row, Col, Input, Button, Label, Alert, Spinner, Modal, ModalHeader, ModalBody } from 'sveltestrap';
import { createEventDispatcher } from 'svelte';
import Group from '../../api/group';
import PKAPI from '../../api';
import { Group } from '../../api/types';
import api from '../../api';
import autosize from 'svelte-autosize';
let loading: boolean = false;
@@ -11,7 +11,7 @@
let err: string[] = [];
let input = new Group({name: group.name, display_name: group.display_name, banner: group.banner, color: group.color, icon: group.icon, description: group.description});
let input: Group = {...group};
const dispatch = createEventDispatcher();
@@ -39,9 +39,8 @@
if (err.length > 0) return;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchGroup({token: localStorage.getItem("pk-token"), id: group.id, data: data});
let res = await api().groups(group.id).patch({data});
group = {...group, ...res};
err = [];
update();
@@ -74,9 +73,8 @@
return;
}
loading = true;
const api = new PKAPI();
try {
await api.deleteGroup({token: localStorage.getItem("pk-token"), id: group.id});
await api().groups(group.id).delete();
deleteErr = null;
toggleDeleteModal();
loading = false;

9
src/lib/group/List.svelte
View File

@@ -4,15 +4,15 @@
import { onMount } from 'svelte';
import FaSearch from 'svelte-icons/fa/FaSearch.svelte'
import { useParams } from 'svelte-navigator';
import type Group from '../../api/group'
import type Member from '../../api/member'
import PKAPI from '../../api';
import CardsHeader from '../CardsHeader.svelte';
import ListPagination from '../ListPagination.svelte';
import Body from './Body.svelte';
import Svelecte, { addFormatter } from 'svelecte';
import FaLock from 'svelte-icons/fa/FaLock.svelte';
import { Member, Group } from '../../api/types';
import api from '../../api';
export let isPublic: boolean;
export let list: Group[];
@@ -43,12 +43,11 @@
if (token || isPublic) fetchGroups();
});
const api = new PKAPI();
async function fetchGroups() {
listLoading = true;
try {
const res: Group[] = await api.getGroupList({token: !isPublic && token, id: isPublic && id, members: !isPublic ? true : false});
const res: Group[] = await api().systems(isPublic ? id : "@me").groups.get({ auth: !isPublic, query: { with_members: !isPublic } });
list = res;
listLoading = false;
} catch (error) {

12
src/lib/group/MemberEdit.svelte
View File

@@ -1,9 +1,6 @@
<script lang="ts">
import type Group from "../../api/group";
import type Member from "../../api/member";
import { Row, Col, Button, Alert, ListGroup, ListGroupItem, Spinner } from 'sveltestrap';
import { createEventDispatcher } from 'svelte';
import PKAPI from '../../api';
import ListPagination from "../ListPagination.svelte";
import twemoji from "twemoji";
import FaUserPlus from 'svelte-icons/fa/FaUserPlus.svelte'
@@ -11,6 +8,9 @@
import FaUserMinus from 'svelte-icons/fa/FaUserMinus.svelte'
import Svelecte, { addFormatter } from 'svelecte';
import { Group, Member } from '../../api/types';
import api from '../../api';
let loading: boolean = false;
let err: string;
export let group: Group;
@@ -67,14 +67,12 @@ function memberListRenderer(item: any) {
function update() {
dispatch("update", group)
}
const api = new PKAPI();
async function submitAdd() {
let data = membersToBeAdded;
try {
loading = true;
await api.postGroupMembers({token: localStorage.getItem("pk-token"), id: group.id, data: data, removing: false});
await api().groups(group.id).members.add.post({data});
data.forEach(member => group.members.push(member));
update();
err = null;
@@ -91,7 +89,7 @@ function memberListRenderer(item: any) {
let data = membersToBeRemoved;
try {
loading = true;
await api.postGroupMembers({token: localStorage.getItem("pk-token"), id: group.id, data: data, removing: true});
await api().groups(group.id).members.remove.post({data});
group.members = group.members.filter(m => !data.includes(m));
update();
err = null;

10
src/lib/group/Privacy.svelte
View File

@@ -1,9 +1,10 @@
<script lang="ts">
import Group from "../../api/group";
import PKAPI from "../../api";
import { createEventDispatcher } from "svelte";
import { ModalBody, ModalHeader, Col, Row, Input, Label, ModalFooter, Button, Spinner, Alert } from "sveltestrap";
import { Group } from '../../api/types';
import api from '../../api';
export let privacyOpen: boolean;
export let group: Group;
const togglePrivacyModal = () => (privacyOpen = !privacyOpen);
@@ -30,16 +31,15 @@
dispatch('update', group);
}
let input = new Group({privacy: group.privacy});
let input: Group = {privacy: group.privacy};
async function submit() {
let data = input;
err = null;
loading = true;
const api = new PKAPI();
try {
let res = await api.patchGroup({token: localStorage.getItem("pk-token"), id: group.id, data: data});
let res = await api().groups(group.id).patch({data});
group = res;
update();
loading = false;